From ac8fbdfef42086481957297b825f272b6bc43652 Mon Sep 17 00:00:00 2001
From: Catherine Garabedian <catherine@kubos.co>
Date: Fri, 16 Aug 2019 16:21:47 +0000
Subject: [PATCH] Bumping U-Boot version. Improving OpenSSL support

---
 configs/at91sam9g20isis_defconfig  | 3 ++-
 configs/beaglebone-black_defconfig | 3 ++-
 configs/generic-kubos_defconfig    | 3 ++-
 configs/pumpkin-mbm2_defconfig     | 3 ++-
 tools/format-image.sh              | 2 +-
 tools/kubos-kernel.sh              | 2 +-
 tools/kubos-nor-package.sh         | 2 +-
 tools/kubos-package.sh             | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/configs/at91sam9g20isis_defconfig b/configs/at91sam9g20isis_defconfig
index 55e520c9..c958a934 100644
--- a/configs/at91sam9g20isis_defconfig
+++ b/configs/at91sam9g20isis_defconfig
@@ -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
@@ -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
diff --git a/configs/beaglebone-black_defconfig b/configs/beaglebone-black_defconfig
index 5436c43d..4f0b34ed 100644
--- a/configs/beaglebone-black_defconfig
+++ b/configs/beaglebone-black_defconfig
@@ -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
@@ -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
diff --git a/configs/generic-kubos_defconfig b/configs/generic-kubos_defconfig
index 6bebdab0..842565d5 100644
--- a/configs/generic-kubos_defconfig
+++ b/configs/generic-kubos_defconfig
@@ -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
@@ -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
diff --git a/configs/pumpkin-mbm2_defconfig b/configs/pumpkin-mbm2_defconfig
index 646acaf8..5c0ecdcf 100644
--- a/configs/pumpkin-mbm2_defconfig
+++ b/configs/pumpkin-mbm2_defconfig
@@ -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
@@ -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
diff --git a/tools/format-image.sh b/tools/format-image.sh
index a7867651..ae216c92 100755
--- a/tools/format-image.sh
+++ b/tools/format-image.sh
@@ -31,7 +31,7 @@
  
 device=""
 image=kubos-linux.img
-branch=1.0
+branch=1.2
 package=0
 size=3800
 output=output
diff --git a/tools/kubos-kernel.sh b/tools/kubos-kernel.sh
index b550aacd..294df500 100755
--- a/tools/kubos-kernel.sh
+++ b/tools/kubos-kernel.sh
@@ -18,7 +18,7 @@
 #
  
 input=kubos-kernel.its
-branch=1.0
+branch=1.2
 output=output
 
 # Process command arguments
diff --git a/tools/kubos-nor-package.sh b/tools/kubos-nor-package.sh
index e6def296..56e06134 100755
--- a/tools/kubos-nor-package.sh
+++ b/tools/kubos-nor-package.sh
@@ -19,7 +19,7 @@
  
 version=$(date +%Y.%m.%d)
 input=kpack-NOR.its
-branch=1.0
+branch=1.2
 
 # Process command arguments
 
diff --git a/tools/kubos-package.sh b/tools/kubos-package.sh
index 739a349d..59809d77 100755
--- a/tools/kubos-package.sh
+++ b/tools/kubos-package.sh
@@ -19,7 +19,7 @@
  
 version=$(date +%Y.%m.%d)
 input=kpack.its
-branch=1.1
+branch=1.2
 rflag=false
 output=output