Temporarily drop OpenSSL 1.1 patches (need rebase), Add fix for UDOO Neo distro boot, Rebase mvebu distro boot patch

0001-arm-mvebu-enable-generic-distro-boot-config.patch

@@ -1,6 +1,6 @@
-From 011868fbddecffffb38b1318953bf65c4816f966 Mon Sep 17 00:00:00 2001
+From 09339c34eeab4a73d5dfa48034b6c8ae8a775c14 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
-Date: Mon, 31 Oct 2016 21:29:32 +0000
+Date: Tue, 14 Feb 2017 13:15:23 +0000
 Subject: [PATCH] arm: mvebu: enable generic distro boot config
 
 Switch all of the mvebu boards to support disto generic booting
@@ -14,10 +14,10 @@ Signed-off-by: Dennis Gilmore <dgilmore@redhat.com>
  2 files changed, 84 insertions(+), 5 deletions(-)
 
 diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
-index a8cda40..6abe313 100644
+index 0c51d2a..0034604 100644
 --- a/include/configs/clearfog.h
 +++ b/include/configs/clearfog.h
-@@ -87,11 +87,6 @@
+@@ -79,11 +79,6 @@
  
  #define CONFIG_SYS_ALT_MEMTEST
  
@@ -30,10 +30,10 @@ index a8cda40..6abe313 100644
  /*
   * Select the boot device here
 diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
-index b28030c..4cb62e4 100644
+index 25562fa..aebfabe 100644
 --- a/include/configs/mv-common.h
 +++ b/include/configs/mv-common.h
-@@ -143,4 +143,88 @@
+@@ -139,4 +139,88 @@
  #define CONFIG_LZO
  #endif
  

0001-mx6sx-udoo_neo-Define-the-default-serial-console.patch

@@ -0,0 +1,28 @@
+From 47c6af021e3eb55cfa502e1387ac75f8e522e234 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Tue, 14 Feb 2017 12:14:16 +0000
+Subject: [PATCH 1/3] mx6sx: udoo_neo: Define the default serial console
+
+Standard boot processes including distro boot generally expect the
+default console to be defined.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ include/configs/udoo_neo.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
+index 23a3685..5b46272e 100644
+--- a/include/configs/udoo_neo.h
++++ b/include/configs/udoo_neo.h
+@@ -30,6 +30,7 @@
+ /* Linux only */
+ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+ #define CONFIG_EXTRA_ENV_SETTINGS \
++	"console=ttymxc0,115200\0" \
+ 	"fdt_high=0xffffffff\0" \
+ 	"initrd_high=0xffffffff\0" \
+ 	"fdtfile=undefined\0" \
+-- 
+2.9.3
+

0002-mx6sx-udoo_neo-use-different-load-address-for-ramdis.patch

@@ -0,0 +1,30 @@
+From cecf3efeb0f6b461447d833ffb4620f64e48c7e0 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Tue, 14 Feb 2017 12:17:12 +0000
+Subject: [PATCH 2/3] mx6sx: udoo_neo: use different load address for ramdisk
+
+The fdt_addr and ramdisk_addr_r are currently both defined to
+0x83000000 and that's not going to work well for anyone. Move
+the ramdisk_addr_r to 0x84000000.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ include/configs/udoo_neo.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
+index 5b46272e..1d737cc 100644
+--- a/include/configs/udoo_neo.h
++++ b/include/configs/udoo_neo.h
+@@ -52,7 +52,7 @@
+ 			"echo WARNING: Could not determine dtb to use; fi\0" \
+ 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+ 	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+-	"ramdisk_addr_r=0x83000000\0" \
++	"ramdisk_addr_r=0x84000000\0" \
+ 	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+ 	BOOTENV
+ 
+-- 
+2.9.3
+

0003-mx6sx-udoo_neo-Enable-distro-boot-options-in-config.patch

@@ -0,0 +1,46 @@
+From 2198e4bf9956e12cfb7c315ac523721152877020 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Tue, 14 Feb 2017 12:32:28 +0000
+Subject: [PATCH 3/3] mx6sx: udoo_neo: Enable distro boot options in config
+
+The include/configs/udoo_neo.h already includes the distro defaults
+include files so it seems the board was missed in the move to the
+config file, whether that in initial commit or conversion, so
+enable the option now and remove duplicated settings.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ configs/udoo_neo_defconfig | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig
+index f9b1337..aa2f59d 100644
+--- a/configs/udoo_neo_defconfig
++++ b/configs/udoo_neo_defconfig
+@@ -13,22 +13,13 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
+ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+ CONFIG_BOARD_EARLY_INIT_F=y
+ CONFIG_SPL=y
+-CONFIG_HUSH_PARSER=y
+-CONFIG_CMD_BOOTZ=y
++CONFIG_DISTRO_DEFAULTS=y
+ # CONFIG_CMD_IMLS is not set
+ # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
+-CONFIG_CMD_PART=y
+ CONFIG_CMD_GPIO=y
+ # CONFIG_CMD_SETEXPR is not set
+-CONFIG_CMD_DHCP=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_TIME=y
+-CONFIG_CMD_EXT2=y
+-CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+-CONFIG_CMD_FAT=y
+-CONFIG_CMD_FS_GENERIC=y
+-CONFIG_ISO_PARTITION=y
+-CONFIG_EFI_PARTITION=y
+ CONFIG_OF_LIBFDT=y
+-- 
+2.9.3
+

uboot-tools.spec

@@ -13,18 +13,20 @@ Source1:   armv7-boards
 Source2:   armv8-boards
 
 Patch1:    add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
-Patch2:    U-Boot-1-2-rsa-Fix-build-with-OpenSSL-1.1.x.patch
+#Patch2:    U-Boot-1-2-rsa-Fix-build-with-OpenSSL-1.1.x.patch
-Patch3:    U-Boot-2-2-rsa-Fix-deprecated-warnings-for-OpenSSL-1.1.x.patch
+#Patch3:    U-Boot-2-2-rsa-Fix-deprecated-warnings-for-OpenSSL-1.1.x.patch
 
-# Patch2:    port-utilite-to-distro-generic-boot-commands.patch
+Patch5:    0001-mx6sx-udoo_neo-Define-the-default-serial-console.patch
-# Patch3:    mvebu-enable-generic-distro-boot-config.patch
+Patch6:    0002-mx6sx-udoo_neo-use-different-load-address-for-ramdis.patch
+Patch7:    0003-mx6sx-udoo_neo-Enable-distro-boot-options-in-config.patch
+Patch8:    0001-arm-mvebu-enable-generic-distro-boot-config.patch
 
 BuildRequires:  bc
 BuildRequires:  dtc
 BuildRequires:  fedora-logos
 BuildRequires:  git
 BuildRequires:  netpbm-progs
-BuildRequires:  openssl-devel
+BuildRequires:  compat-openssl10-devel
 BuildRequires:  SDL-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
@@ -254,6 +256,9 @@ cp -p board/rockchip/evb_rk3399/README doc/README.evb_rk3399
 %changelog
 * Mon Feb 13 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.03-0.4.rc2
 - 2017.03 RC2
+- Temporarily drop OpenSSL 1.1 patches (need rebase)
+- Add fix for UDOO Neo distro boot
+- Rebase mvebu distro boot patch
 
 * Mon Feb 13 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.03-0.3.rc1
 - Add patches to fix build against OpenSSL 1.1