diff --git a/0001-mx6sx-udoo_neo-Define-the-default-serial-console.patch b/0001-mx6sx-udoo_neo-Define-the-default-serial-console.patch deleted file mode 100644 index ead2c29..0000000 --- a/0001-mx6sx-udoo_neo-Define-the-default-serial-console.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 47c6af021e3eb55cfa502e1387ac75f8e522e234 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -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 ---- - 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 - diff --git a/0002-mx6sx-udoo_neo-use-different-load-address-for-ramdis.patch b/0002-mx6sx-udoo_neo-use-different-load-address-for-ramdis.patch deleted file mode 100644 index 69e7eb5..0000000 --- a/0002-mx6sx-udoo_neo-use-different-load-address-for-ramdis.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cecf3efeb0f6b461447d833ffb4620f64e48c7e0 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -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 ---- - 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 - diff --git a/0003-mx6sx-udoo_neo-Enable-distro-boot-options-in-config.patch b/0003-mx6sx-udoo_neo-Enable-distro-boot-options-in-config.patch deleted file mode 100644 index 80df875..0000000 --- a/0003-mx6sx-udoo_neo-Enable-distro-boot-options-in-config.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2198e4bf9956e12cfb7c315ac523721152877020 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -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 ---- - 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 - diff --git a/sources b/sources index e3d4e6a..c7da101 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2017.03-rc2.tar.bz2) = 0b50b77977c388570e375aa55c5e8d84dcb0d7167d398152c7a0caa21d38093876ef11d7ba144e6ec0f9b1423b71c39015bdb768e4e678058de7eaee925f4c80 +SHA512 (u-boot-2017.03-rc3.tar.bz2) = 12a1fe34f16d873077e87ed3a3f4013489315ecea8cfeb4b342b5a8e181c7010e2fe211a1d572bed546d14c5f9b3e67c5ece5be15ff75a81acfdc0f427db601a diff --git a/uboot-tools.spec b/uboot-tools.spec index acf27e8..8c0def5 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc2 +%global candidate rc3 Name: uboot-tools Version: 2017.03 -Release: 0.5%{?candidate:.%{candidate}}%{?dist} +Release: 0.6%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities Group: Development/Tools @@ -17,10 +17,7 @@ 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 Patch4: tools-kwbimage-fix-build-with-OpenSSL-1.1.x.patch -Patch5: 0001-mx6sx-udoo_neo-Define-the-default-serial-console.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 +# Patch5: 0001-arm-mvebu-enable-generic-distro-boot-config.patch BuildRequires: bc BuildRequires: dtc @@ -255,6 +252,9 @@ cp -p board/rockchip/evb_rk3399/README doc/README.evb_rk3399 %endif %changelog +* Tue Feb 28 2017 Peter Robinson 2017.03-0.6.rc3 +- 2017.03 RC3 + * Wed Feb 15 2017 Peter Robinson 2017.03-0.5.rc2 - Rebase OpenSSL 1.1 patches