From 8cda6ee5e6f9e3fb3a2d0f43c6d302cad4a8ddea Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 4 Aug 2015 09:40:44 +0100 Subject: [PATCH] Update to 2015.10 RC1 --- ...-add-support-for-generic-distro-boot.patch | 22 +++++++------- ...-add-support-for-generic-distro-boot.patch | 12 ++++---- ...rds-to-use-config_distro_defaults-an.patch | 17 +++++------ ..._COMMAND-for-commands-that-may-be-ne.patch | 4 +-- ...lite-to-distro-generic-boot-commands.patch | 10 +++---- 0006-mx6-utilite-disable-logos.patch | 29 ------------------- sources | 2 +- uboot-tools.spec | 10 ++++--- 8 files changed, 38 insertions(+), 68 deletions(-) delete mode 100644 0006-mx6-utilite-disable-logos.patch diff --git a/0001-wandboard-add-support-for-generic-distro-boot.patch b/0001-wandboard-add-support-for-generic-distro-boot.patch index 6b39fde..f46272d 100644 --- a/0001-wandboard-add-support-for-generic-distro-boot.patch +++ b/0001-wandboard-add-support-for-generic-distro-boot.patch @@ -1,6 +1,6 @@ -From ee628ad871f52c14be04116280457fb0990cd143 Mon Sep 17 00:00:00 2001 +From 5a8f9d701fd16b4e1821b6699e18df683dbe9d7d Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Wed, 15 Jul 2015 11:30:24 +0100 +Date: Tue, 4 Aug 2015 09:35:43 +0100 Subject: [PATCH 1/5] wandboard: add support for generic distro boot --- @@ -8,7 +8,7 @@ Subject: [PATCH 1/5] wandboard: add support for generic distro boot 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h -index f05b55a..b3ad82a 100644 +index f4e9cf2..1e346c1 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -54,9 +54,6 @@ @@ -21,9 +21,9 @@ index f05b55a..b3ad82a 100644 #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR -@@ -89,17 +86,29 @@ - #define CONFIG_MXC_OCOTP - #endif +@@ -84,17 +81,29 @@ + #define CONFIG_IMX_HDMI + #define CONFIG_IMX_VIDEO_SKIP +#ifndef CONFIG_SPL_BUILD +#include @@ -55,7 +55,7 @@ index f05b55a..b3ad82a 100644 "ip_dyn=yes\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ -@@ -118,7 +127,7 @@ +@@ -113,7 +122,7 @@ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ "fi; " \ "fi\0" \ @@ -64,7 +64,7 @@ index f05b55a..b3ad82a 100644 "root=${mmcroot}; run videoargs\0" \ "videoargs=" \ "setenv nextcon 0; " \ -@@ -167,7 +176,7 @@ +@@ -162,7 +171,7 @@ "else " \ "bootz; " \ "fi;\0" \ @@ -73,7 +73,7 @@ index f05b55a..b3ad82a 100644 "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ -@@ -202,9 +211,11 @@ +@@ -197,9 +206,11 @@ "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine dtb to use; fi; \0" \ @@ -85,7 +85,7 @@ index f05b55a..b3ad82a 100644 "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ "run bootscript; " \ -@@ -216,6 +227,10 @@ +@@ -211,6 +222,10 @@ "fi; " \ "else run netboot; fi" @@ -97,5 +97,5 @@ index f05b55a..b3ad82a 100644 #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR -- -2.4.5 +2.5.0 diff --git a/0002-am33xx-add-support-for-generic-distro-boot.patch b/0002-am33xx-add-support-for-generic-distro-boot.patch index 2e3d3c8..987915d 100644 --- a/0002-am33xx-add-support-for-generic-distro-boot.patch +++ b/0002-am33xx-add-support-for-generic-distro-boot.patch @@ -1,6 +1,6 @@ -From 7ab7e76c7813e7d9db16eeb2bd2cf15e98da1726 Mon Sep 17 00:00:00 2001 +From 18836113635324d0272ac06c761b3fb419a90676 Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Tue, 23 Jun 2015 00:53:25 +0100 +Date: Tue, 4 Aug 2015 09:36:08 +0100 Subject: [PATCH 2/5] am33xx: add support for generic distro boot --- @@ -9,7 +9,7 @@ Subject: [PATCH 2/5] am33xx: add support for generic distro boot 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index 035c156..81f8331 100644 +index 633391b..f81e7a6 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -18,6 +18,21 @@ @@ -64,10 +64,10 @@ index 035c156..81f8331 100644 #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h -index 0aea7d1..d6073b2 100644 +index 6dc5ebd..64949b8 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h -@@ -54,6 +54,7 @@ +@@ -52,6 +52,7 @@ #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0x82000000\0" \ "kernel_addr_r=0x82000000\0" \ @@ -76,5 +76,5 @@ index 0aea7d1..d6073b2 100644 "fdt_addr_r=0x88000000\0" \ "rdaddr=0x88080000\0" \ -- -2.4.5 +2.5.0 diff --git a/0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch b/0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch index 09178fa..95fc263 100644 --- a/0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch +++ b/0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch @@ -1,22 +1,19 @@ -From 99afbef73d291faf6ba069d36eef7d7b1eef6514 Mon Sep 17 00:00:00 2001 +From 50a199d4ea2f6901e572a803e1bb33d250cd2acd Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Thu, 2 Jul 2015 23:26:44 +0100 +Date: Tue, 4 Aug 2015 09:36:49 +0100 Subject: [PATCH 3/5] Switch omap4 boards to use config_distro_defaults and - config_distro_bootcmd. + config_distro_bootcmd -Add pxefile_addr_r to DEFAULT_LINUX_BOOT_ENV, as pxefile_addr_r is used -to store the pxe boot configuation file in config_distro_defaults. -adjust adress of scriptaddr to be unique --- include/configs/ti_armv7_common.h | 3 ++- include/configs/ti_omap4_common.h | 41 ++++++++++++++++----------------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h -index d6073b2..3523e67 100644 +index 64949b8..523e2ec 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h -@@ -54,7 +54,8 @@ +@@ -52,7 +52,8 @@ #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0x82000000\0" \ "kernel_addr_r=0x82000000\0" \ @@ -27,7 +24,7 @@ index d6073b2..3523e67 100644 "fdt_addr_r=0x88000000\0" \ "rdaddr=0x88080000\0" \ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h -index e966134..51b7265 100644 +index b299aed..e0f2035 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -78,6 +78,18 @@ @@ -94,5 +91,5 @@ index e966134..51b7265 100644 /* * Defines for SPL -- -2.4.5 +2.5.0 diff --git a/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch b/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch index 5177852..aa057e7 100644 --- a/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch +++ b/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch @@ -1,4 +1,4 @@ -From 63e521287c2ebbce0a1830dd66cdb5d29a5e9ae6 Mon Sep 17 00:00:00 2001 +From 0fbd61016856c536998ce3ef248079cbf4de0777 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 2 Jul 2015 23:28:56 +0100 Subject: [PATCH 4/5] Add BOOTENV_INIT_COMMAND for commands that may be needed @@ -34,5 +34,5 @@ index 3a360ca4..dcad4c8 100644 "run bootcmd_${target}; " \ "done\0" -- -2.4.5 +2.5.0 diff --git a/0005-port-utilite-to-distro-generic-boot-commands.patch b/0005-port-utilite-to-distro-generic-boot-commands.patch index 724c0ef..95b6a18 100644 --- a/0005-port-utilite-to-distro-generic-boot-commands.patch +++ b/0005-port-utilite-to-distro-generic-boot-commands.patch @@ -1,6 +1,6 @@ -From 6084de3105dedfe50d8456cb4b6f3eaee362fa35 Mon Sep 17 00:00:00 2001 +From dec80e7e7b8ae019adf5fda70a5be838d11ae7ea Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Fri, 3 Jul 2015 00:08:05 +0100 +Date: Tue, 4 Aug 2015 09:37:38 +0100 Subject: [PATCH 5/5] port utilite to distro generic boot commands --- @@ -8,7 +8,7 @@ Subject: [PATCH 5/5] port utilite to distro generic boot commands 1 file changed, 27 insertions(+), 80 deletions(-) diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h -index 231f4ba..8a2e46c 100644 +index bbd9f38..2fb8b7f 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -11,6 +11,7 @@ @@ -19,7 +19,7 @@ index 231f4ba..8a2e46c 100644 #include "mx6_common.h" /* Machine config */ -@@ -66,97 +67,43 @@ +@@ -65,97 +66,43 @@ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) @@ -144,5 +144,5 @@ index 231f4ba..8a2e46c 100644 #define CONFIG_PREBOOT "usb start" -- -2.4.5 +2.5.0 diff --git a/0006-mx6-utilite-disable-logos.patch b/0006-mx6-utilite-disable-logos.patch deleted file mode 100644 index cd841ad..0000000 --- a/0006-mx6-utilite-disable-logos.patch +++ /dev/null @@ -1,29 +0,0 @@ -From afc8e9b8023aa2f7073c8a7fa7592be1debffa6c Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 15 Jul 2015 12:37:44 +0100 -Subject: [PATCH 6/6] mx6: utilite: disable logos - ---- - include/configs/cm_fx6.h | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h -index 8a2e46c..713d90a 100644 ---- a/include/configs/cm_fx6.h -+++ b/include/configs/cm_fx6.h -@@ -212,12 +212,4 @@ - #define CONFIG_CONSOLE_MUX - #define CONFIG_VIDEO_SW_CURSOR - --#define CONFIG_SPLASH_SCREEN --#define CONFIG_SPLASH_SOURCE --#define CONFIG_CMD_BMP --#define CONFIG_VIDEO_BMP_RLE8 -- --#define CONFIG_VIDEO_LOGO --#define CONFIG_VIDEO_BMP_LOGO -- - #endif /* __CONFIG_CM_FX6_H */ --- -2.4.5 - diff --git a/sources b/sources index baac71e..935a280 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3dac9a0b46fed77fc768ad3bd2d68c05 u-boot-2015.07.tar.bz2 +505994c8c19297fc505ef9a3135cff84 u-boot-2015.10-rc1.tar.bz2 diff --git a/uboot-tools.spec b/uboot-tools.spec index e22e5cc..1b8b848 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -#global candidate rc3 +%global candidate rc1 Name: uboot-tools -Version: 2015.07 -Release: 3%{?candidate:.%{candidate}}%{?dist} +Version: 2015.10 +Release: 0.1%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities Group: Development/Tools @@ -16,7 +16,6 @@ Patch2: 0002-am33xx-add-support-for-generic-distro-boot.patch Patch3: 0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch Patch4: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch Patch5: 0005-port-utilite-to-distro-generic-boot-commands.patch -Patch6: 0006-mx6-utilite-disable-logos.patch BuildRequires: bc BuildRequires: dtc @@ -166,6 +165,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir} %endif %changelog +* Tue Aug 4 2015 Peter Robinson 2015.10-0.1rc1 +- Update to 2015.10 RC1 + * Mon Aug 3 2015 Peter Robinson 2015.07-3 - Drop some unused u-boot binaries - Minor cleanups