Skip to content

Commit

Permalink
Bumping U-Boot version. Improving OpenSSL support
Browse files Browse the repository at this point in the history
  • Loading branch information
Catherine Garabedian committed Aug 16, 2019
1 parent 5b6fece commit ac8fbdf
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 8 deletions.
3 changes: 2 additions & 1 deletion configs/at91sam9g20isis_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/k
BR2_LINUX_KERNEL_LZ4=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/at91sam9g20isis/at91sam9g20isis.dts ${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/at91sam9g20isis/iobc-common.dtsi"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/common/busybox-kubos.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_E2FSPROGS=y
Expand Down Expand Up @@ -58,7 +59,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/kubos/uboot"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1.1"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1.2"
BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/at91sam9g20isis/at91sam9g20isis_config"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
Expand Down
3 changes: 2 additions & 1 deletion configs/beaglebone-black_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/common/
BR2_LINUX_KERNEL_LZ4=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/beaglebone-black/beaglebone-black.dts ${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/beaglebone-black/am33xx-boneblack.dtsi"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/common/busybox-kubos.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_GDB=y
Expand Down Expand Up @@ -70,7 +71,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/kubos/uboot"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1.1"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1.2"
BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/beaglebone-black/beaglebone-black_config"
BR2_TARGET_UBOOT_FORMAT_IMG=y
Expand Down
3 changes: 2 additions & 1 deletion configs/generic-kubos_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ BR2_LINUX_KERNEL_LZ4=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/{target}/{target}.dts"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/common/busybox-kubos.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_GDB=y
Expand All @@ -49,7 +50,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/kubos/uboot"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1.1"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1.2"
BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/{target}/{target}_config"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
Expand Down
3 changes: 2 additions & 1 deletion configs/pumpkin-mbm2_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ BR2_LINUX_KERNEL_LZ4=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/pumpkin-mbm2/pumpkin-mbm2.dts ${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/pumpkin-mbm2/am33xx-boneblack.dtsi"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/common/busybox-kubos.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_GDB=y
Expand Down Expand Up @@ -73,7 +74,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/kubos/uboot"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1.1"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1.2"
BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_KUBOS_LINUX_PATH}/board/kubos/pumpkin-mbm2/pumpkin-mbm2_config"
BR2_TARGET_UBOOT_FORMAT_IMG=y
Expand Down
2 changes: 1 addition & 1 deletion tools/format-image.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

device=""
image=kubos-linux.img
branch=1.0
branch=1.2
package=0
size=3800
output=output
Expand Down
2 changes: 1 addition & 1 deletion tools/kubos-kernel.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

input=kubos-kernel.its
branch=1.0
branch=1.2
output=output

# Process command arguments
Expand Down
2 changes: 1 addition & 1 deletion tools/kubos-nor-package.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

version=$(date +%Y.%m.%d)
input=kpack-NOR.its
branch=1.0
branch=1.2

# Process command arguments

Expand Down
2 changes: 1 addition & 1 deletion tools/kubos-package.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

version=$(date +%Y.%m.%d)
input=kpack.its
branch=1.1
branch=1.2
rflag=false
output=output

Expand Down

0 comments on commit ac8fbdf

Please sign in to comment.