[uboot-tools/f20] update to final 2013.10 release
Dennis Gilmore
ausil at fedoraproject.org
Sat Oct 19 12:02:11 UTC 2013
commit 1621de7ecd065bff9a0fc1e2499727843fa635c8
Author: Dennis Gilmore <dennis at ausil.us>
Date: Sat Oct 19 07:02:07 2013 -0500
update to final 2013.10 release
...istro-default-commands-and-config-options.patch | 2 +-
...d-option-to-include-generic-distro-config.patch | 4 +-
...-boards-to-use-the-generic-distro-support.patch | 2 +-
...rd-to-use-generic-commands-and-set-needed.patch | 6 +-
0005-set-the-default-wandboard-boot-commands.patch | 8 +-
...lt-boot-commands-on-omap4-to-use-extlinux.patch | 63 -----------------
...set-omap4-to-use-extlinux.conf-by-default.patch | 2 +-
...le-CONFIG_CMD_BOOTMENU-for-distro-configs.patch | 24 ------
...emove-CONFIG_MENU_SHOW-from-distro-config.patch | 18 +++---
...FIT-image-support-since-it-fails-to-build.patch | 12 ++--
0009-add-defualt-DHCP-config-options.patch | 4 +-
...from-distro-default-not-all-systems-suppo.patch | 8 +-
...eagleboard-to-used-generic-distro-configs.patch | 6 +-
...et-omap5-up-to-use-generic-distro-configs.patch | 64 -----------------
...2-setup-beagleboard-to-load-extlinux.conf.patch | 6 +-
0012-setup-omap5-to-load-extlinux.conf.patch | 47 ------------
...up-distro-common-variables-on-beaglebones.patch | 74 ++++++++++++++++++++
0014-Use-SPDX-header-in-distro-config.patch | 27 +++++++
...djust-addrs-to-work-with-calculated-value.patch | 47 ++++++++++++
...ddress-variables-needed-for-distro-config.patch | 59 ----------------
0016-WANDBOARD-use-ext2load-to-load-dtbs.patch | 69 ++++++++++++++++++
0016-setup-am335x_evm-to-load-extlinux.conf.patch | 47 ------------
sources | 2 +-
uboot-tools.spec | 24 ++++---
24 files changed, 271 insertions(+), 354 deletions(-)
---
diff --git a/0001-add-distro-default-commands-and-config-options.patch b/0001-add-distro-default-commands-and-config-options.patch
index 6120625..2dc8605 100644
--- a/0001-add-distro-default-commands-and-config-options.patch
+++ b/0001-add-distro-default-commands-and-config-options.patch
@@ -1,4 +1,4 @@
-From b2a3024f46c5a7ea60db45b85b4d92de85c23968 Mon Sep 17 00:00:00 2001
+From 9172c5926e6875a59a8d1cc82d30b2118ab7308b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Wed, 7 Aug 2013 23:00:42 -0500
Subject: [PATCH 01/16] add distro default commands and config options
diff --git a/0002-add-option-to-include-generic-distro-config.patch b/0002-add-option-to-include-generic-distro-config.patch
index 4802fdc..62388f7 100644
--- a/0002-add-option-to-include-generic-distro-config.patch
+++ b/0002-add-option-to-include-generic-distro-config.patch
@@ -1,4 +1,4 @@
-From 2ee3bdd54d7dbfabf512a5496ad9794be45849f2 Mon Sep 17 00:00:00 2001
+From 3c3c10fad1f61f8ad01414c868080e0e1bb5fc91 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sun, 1 Sep 2013 21:42:48 -0500
Subject: [PATCH 02/16] add option to include generic distro config
@@ -8,7 +8,7 @@ Subject: [PATCH 02/16] add option to include generic distro config
1 file changed, 5 insertions(+)
diff --git a/include/common.h b/include/common.h
-index 8addf43..113df4a 100644
+index 409515f..b97a52d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -99,6 +99,11 @@ typedef volatile unsigned char vu_char;
diff --git a/0003-set-omap4-boards-to-use-the-generic-distro-support.patch b/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
index bbb3db0..ea03238 100644
--- a/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
+++ b/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
@@ -1,4 +1,4 @@
-From ad30cfb1284981c5c3f1d3bb92e1ef417546947e Mon Sep 17 00:00:00 2001
+From f12653a82d5417114fb422ae3e3883b96ec31ea5 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 2 Sep 2013 11:26:39 -0500
Subject: [PATCH 03/16] set omap4 boards to use the generic distro support
diff --git a/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch b/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
index a6f9438..3feaa48 100644
--- a/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
+++ b/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
@@ -1,4 +1,4 @@
-From 15199560752c0b46c4201f8d96a001123e3eb766 Mon Sep 17 00:00:00 2001
+From 4fe19544ffda98c8ab9eea55d29f8c9179716e88 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 2 Sep 2013 11:33:46 -0500
Subject: [PATCH 04/16] set wandboard to use generic commands and set needed
@@ -9,7 +9,7 @@ Subject: [PATCH 04/16] set wandboard to use generic commands and set needed
1 file changed, 7 insertions(+)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
-index 665cfc3..75827cd 100644
+index 442a984..423d94e 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -40,6 +40,9 @@
@@ -22,7 +22,7 @@ index 665cfc3..75827cd 100644
/* Command definition */
#include <config_cmd_default.h>
-@@ -116,6 +119,10 @@
+@@ -114,6 +117,10 @@
"initrd_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr=0x11000000\0" \
diff --git a/0005-set-the-default-wandboard-boot-commands.patch b/0005-set-the-default-wandboard-boot-commands.patch
index 47c12a3..5b2e9d8 100644
--- a/0005-set-the-default-wandboard-boot-commands.patch
+++ b/0005-set-the-default-wandboard-boot-commands.patch
@@ -1,4 +1,4 @@
-From 1ed999468cef0281272f13bc1377f3f9937d6441 Mon Sep 17 00:00:00 2001
+From e213040f9253ebf299a1dd491443419e9d37d7b8 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 2 Sep 2013 11:44:40 -0500
Subject: [PATCH 05/16] set the default wandboard boot commands
@@ -8,10 +8,10 @@ Subject: [PATCH 05/16] set the default wandboard boot commands
1 file changed, 18 insertions(+)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
-index 75827cd..4796cdb 100644
+index 423d94e..ae16694 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
-@@ -124,6 +124,23 @@
+@@ -122,6 +122,23 @@
"ramdisk_addr_r=0x32000000\0" \
"fdt_addr_r=0x12000000\0" \
"boot_fdt=try\0" \
@@ -35,7 +35,7 @@ index 75827cd..4796cdb 100644
"ip_dyn=yes\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
-@@ -192,6 +209,7 @@
+@@ -190,6 +207,7 @@
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \
diff --git a/0006-set-omap4-to-use-extlinux.conf-by-default.patch b/0006-set-omap4-to-use-extlinux.conf-by-default.patch
index 7f74368..8c2f6fa 100644
--- a/0006-set-omap4-to-use-extlinux.conf-by-default.patch
+++ b/0006-set-omap4-to-use-extlinux.conf-by-default.patch
@@ -1,4 +1,4 @@
-From 92177bae56489e1f9dd87740a37fbb5f3e15face Mon Sep 17 00:00:00 2001
+From 534d6c5a71f1b853d83b0e07ea9c1f272884998b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 2 Sep 2013 12:35:16 -0500
Subject: [PATCH 06/16] set omap4 to use extlinux.conf by default
diff --git a/0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch b/0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch
similarity index 52%
copy from 0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch
copy to 0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch
index 96fbe1d..d1bbfab 100644
--- a/0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch
+++ b/0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch
@@ -1,24 +1,24 @@
-From 07771da98733fae6a6939a78b0971bcc24e9748f Mon Sep 17 00:00:00 2001
+From d1b689f0beec17c0531189fb15b076082f0f282e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
-Date: Mon, 2 Sep 2013 15:56:16 -0500
-Subject: [PATCH 08/16] DISABLE FIT image support since it fails to build
+Date: Thu, 17 Oct 2013 17:54:26 -0500
+Subject: [PATCH 07/16] remove CONFIG_MENU_SHOW from distro config
---
include/config_distro_default.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/config_distro_default.h b/include/config_distro_default.h
-index 99bb4b1..44731ad 100644
+index b892868..aa7500e 100644
--- a/include/config_distro_default.h
+++ b/include/config_distro_default.h
-@@ -40,7 +40,6 @@
- #define CONFIG_AUTO_COMPLETE
- #define CONFIG_BOOTDELAY 2
+@@ -41,7 +41,6 @@
#define CONFIG_SYS_LONGHELP
--#define CONFIG_FIT
+ #define CONFIG_FIT
#define CONFIG_MENU
- #define CONFIG_MENU_SHOW
+-#define CONFIG_MENU_SHOW
#define CONFIG_DOS_PARTITION
+ #define CONFIG_EFI_PARTITION
+ #define CONFIG_SUPPORT_RAW_INITRD
--
1.8.3.1
diff --git a/0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch b/0008-disable-FIT-image-support-since-it-fails-to-build.patch
similarity index 65%
rename from 0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch
rename to 0008-disable-FIT-image-support-since-it-fails-to-build.patch
index 96fbe1d..584a270 100644
--- a/0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch
+++ b/0008-disable-FIT-image-support-since-it-fails-to-build.patch
@@ -1,24 +1,24 @@
-From 07771da98733fae6a6939a78b0971bcc24e9748f Mon Sep 17 00:00:00 2001
+From 2394d596e963d5532f3ff00e097ebcf5c8338610 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
-Date: Mon, 2 Sep 2013 15:56:16 -0500
-Subject: [PATCH 08/16] DISABLE FIT image support since it fails to build
+Date: Thu, 17 Oct 2013 17:55:53 -0500
+Subject: [PATCH 08/16] disable FIT image support since it fails to build
---
include/config_distro_default.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/config_distro_default.h b/include/config_distro_default.h
-index 99bb4b1..44731ad 100644
+index aa7500e..56a5557 100644
--- a/include/config_distro_default.h
+++ b/include/config_distro_default.h
-@@ -40,7 +40,6 @@
+@@ -39,7 +39,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_BOOTDELAY 2
#define CONFIG_SYS_LONGHELP
-#define CONFIG_FIT
#define CONFIG_MENU
- #define CONFIG_MENU_SHOW
#define CONFIG_DOS_PARTITION
+ #define CONFIG_EFI_PARTITION
--
1.8.3.1
diff --git a/0009-add-defualt-DHCP-config-options.patch b/0009-add-defualt-DHCP-config-options.patch
index 1418611..72512a0 100644
--- a/0009-add-defualt-DHCP-config-options.patch
+++ b/0009-add-defualt-DHCP-config-options.patch
@@ -1,4 +1,4 @@
-From 10785df495adbfea7856800a93a2ac14fddbd559 Mon Sep 17 00:00:00 2001
+From c50183e7caa3a26d90cc41b43fd705a9a6a7afdd Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 2 Sep 2013 18:26:17 -0500
Subject: [PATCH 09/16] add defualt DHCP config options
@@ -8,7 +8,7 @@ Subject: [PATCH 09/16] add defualt DHCP config options
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/config_distro_default.h b/include/config_distro_default.h
-index 44731ad..8c786d2 100644
+index 56a5557..7f4c310 100644
--- a/include/config_distro_default.h
+++ b/include/config_distro_default.h
@@ -14,8 +14,12 @@
diff --git a/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch b/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
index 1482fd1..80ce8d0 100644
--- a/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
+++ b/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
@@ -1,4 +1,4 @@
-From d0bf7b6dd3ebe7d9bbf2a84cbb3e8d80f576115c Mon Sep 17 00:00:00 2001
+From a86c59b6fa841a1c59ecd6849367021c7283b49b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 2 Sep 2013 18:26:55 -0500
Subject: [PATCH 10/16] remove USB from distro default, not all systems support
@@ -9,10 +9,10 @@ Subject: [PATCH 10/16] remove USB from distro default, not all systems support
1 file changed, 2 deletions(-)
diff --git a/include/config_distro_default.h b/include/config_distro_default.h
-index 8c786d2..65a0c17 100644
+index 7f4c310..132da4f 100644
--- a/include/config_distro_default.h
+++ b/include/config_distro_default.h
-@@ -38,7 +38,6 @@
+@@ -37,7 +37,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
#define CONFIG_CMD_PXE
@@ -20,7 +20,7 @@ index 8c786d2..65a0c17 100644
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-@@ -50,6 +49,5 @@
+@@ -48,6 +47,5 @@
#define CONFIG_EFI_PARTITION
#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SYS_HUSH_PARSER
diff --git a/0013-Setup-beagleboard-to-used-generic-distro-configs.patch b/0011-Setup-beagleboard-to-used-generic-distro-configs.patch
similarity index 91%
rename from 0013-Setup-beagleboard-to-used-generic-distro-configs.patch
rename to 0011-Setup-beagleboard-to-used-generic-distro-configs.patch
index 20a577b..33e0b85 100644
--- a/0013-Setup-beagleboard-to-used-generic-distro-configs.patch
+++ b/0011-Setup-beagleboard-to-used-generic-distro-configs.patch
@@ -1,14 +1,14 @@
-From 697cda9d70d6eb5aff2a3984ecf51967e74a9592 Mon Sep 17 00:00:00 2001
+From 0893da22f56bda219e6437057a1145932a8311ac Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 2 Sep 2013 21:47:40 -0500
-Subject: [PATCH 13/16] Setup beagleboard to used generic distro configs
+Subject: [PATCH 11/16] Setup beagleboard to used generic distro configs
---
include/configs/omap3_beagle.h | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index c1245e7..11426c5 100644
+index 9fcd50b..2dbb5d9 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -130,6 +130,9 @@
diff --git a/0014-setup-beagleboard-to-load-extlinux.conf.patch b/0012-setup-beagleboard-to-load-extlinux.conf.patch
similarity index 93%
rename from 0014-setup-beagleboard-to-load-extlinux.conf.patch
rename to 0012-setup-beagleboard-to-load-extlinux.conf.patch
index 5f7f131..ca4d531 100644
--- a/0014-setup-beagleboard-to-load-extlinux.conf.patch
+++ b/0012-setup-beagleboard-to-load-extlinux.conf.patch
@@ -1,14 +1,14 @@
-From 57ed04c0f92c8eb06af2984001b9792fcbdc653b Mon Sep 17 00:00:00 2001
+From b76a0828e3c62e74f59eda1d128dc9518c44f4ab Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 2 Sep 2013 21:55:37 -0500
-Subject: [PATCH 14/16] setup beagleboard to load extlinux.conf
+Subject: [PATCH 12/16] setup beagleboard to load extlinux.conf
---
include/configs/omap3_beagle.h | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index 11426c5..80587bb 100644
+index 2dbb5d9..f97c244 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -255,6 +255,22 @@
diff --git a/0013-setup-distro-common-variables-on-beaglebones.patch b/0013-setup-distro-common-variables-on-beaglebones.patch
new file mode 100644
index 0000000..3c79f33
--- /dev/null
+++ b/0013-setup-distro-common-variables-on-beaglebones.patch
@@ -0,0 +1,74 @@
+From c1ce44384122a284dad8efb084fe6f1c047633ea Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 17 Oct 2013 18:21:54 -0500
+Subject: [PATCH 13/16] setup distro common variables on beaglebones
+
+---
+ include/configs/am335x_evm.h | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index c2ba7e3..25f5893 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -57,10 +57,13 @@
+ #ifndef CONFIG_SPL_BUILD
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ "loadaddr=0x80200000\0" \
+- "fdtaddr=0x80F80000\0" \
++ "pxefile_addr_r=0x80500000\0" \
++ "kernel_addr_r=0x80600000\0" \
++ "ramdisk_addr_r=0x82600000\0" \
++ "fdt_addr_r=0x80300000\0" \
++ "fdt_addr=0x80400000\0" \
+ "fdt_high=0xffffffff\0" \
+ "boot_fdt=try\0" \
+- "rdaddr=0x81000000\0" \
+ "bootpart=0:2\0" \
+ "bootdir=/boot\0" \
+ "bootfile=zImage\0" \
+@@ -76,7 +79,7 @@
+ "nfsopts=nolock\0" \
+ "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
+ "::off\0" \
+- "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
++ "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${ramdisk_addr_r},64M\0" \
+ "ramrootfstype=ext2\0" \
+ "mmcargs=setenv bootargs console=${console} " \
+ "${optargs} " \
+@@ -105,13 +108,13 @@
+ "${optargs} " \
+ "root=${ramroot} " \
+ "rootfstype=${ramrootfstype}\0" \
+- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
++ "loadramdisk=load mmc ${mmcdev} ${ramdisk_addr_r} ramdisk.gz\0" \
+ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
++ "loadfdt=load mmc ${bootpart} ${fdt_addr_r} ${bootdir}/${fdtfile}\0" \
+ "mmcloados=run mmcargs; " \
+ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+ "if run loadfdt; then " \
+- "bootz ${loadaddr} - ${fdtaddr}; " \
++ "bootz ${loadaddr} - ${fdt_addr_r}; " \
+ "else " \
+ "if test ${boot_fdt} = try; then " \
+ "bootz; " \
+@@ -146,12 +149,12 @@
+ "setenv autoload no; " \
+ "dhcp; " \
+ "tftp ${loadaddr} ${bootfile}; " \
+- "tftp ${fdtaddr} ${fdtfile}; " \
++ "tftp ${fdt_addr_r} ${fdtfile}; " \
+ "run netargs; " \
+- "bootz ${loadaddr} - ${fdtaddr}\0" \
++ "bootz ${loadaddr} - ${fdt_addr_r}\0" \
+ "ramboot=echo Booting from ramdisk ...; " \
+ "run ramargs; " \
+- "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
++ "bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
+ "findfdt="\
+ "if test $board_name = A335BONE; then " \
+ "setenv fdtfile am335x-bone.dtb; fi; " \
+--
+1.8.3.1
+
diff --git a/0014-Use-SPDX-header-in-distro-config.patch b/0014-Use-SPDX-header-in-distro-config.patch
new file mode 100644
index 0000000..ddf31ec
--- /dev/null
+++ b/0014-Use-SPDX-header-in-distro-config.patch
@@ -0,0 +1,27 @@
+From f5c7ad35415218c20b904edf1981a33a47bcdf92 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 17 Oct 2013 18:55:25 -0500
+Subject: [PATCH 14/16] Use SPDX header in distro config
+
+---
+ include/config_distro_default.h | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index 132da4f..bd9b4a0 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -1,9 +1,7 @@
+ /*
+ * Copyright 2013 Red Hat, Inc.
+ *
+- * This file is licensed under the terms of the GNU General Public
+- * License Version 2. This file is licensed "as is" without any
+- * warranty of any kind, whether express or implied.
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+ #ifndef _CONFIG_CMD_DISTRO_DEFAULT_H
+--
+1.8.3.1
+
diff --git a/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch b/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch
new file mode 100644
index 0000000..369b82e
--- /dev/null
+++ b/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch
@@ -0,0 +1,47 @@
+From db994bffd3db0a6d02fa049eca0ff83720e22e73 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 17 Oct 2013 19:12:52 -0500
+Subject: [PATCH 15/16] WANDBOARD: adjust addrs to work with calculated values.
+ add scr_addr_r so the fall back to boot.scr has somewhere to be loaded have
+ pxe boot load a fdt have sysboot load a fdt
+
+---
+ include/configs/wandboard.h | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
+index ae16694..135835f 100644
+--- a/include/configs/wandboard.h
++++ b/include/configs/wandboard.h
+@@ -116,20 +116,21 @@
+ "fdt_high=0xffffffff\0" \
+ "initrd_high=0xffffffff\0" \
+ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+- "fdt_addr=0x11000000\0" \
+- "pxefile_addr_r=0x13000000\0" \
+- "kernel_addr_r=0x14000000\0" \
+- "ramdisk_addr_r=0x32000000\0" \
+- "fdt_addr_r=0x12000000\0" \
++ "fdt_addr=0x11100000\0" \
++ "fdt_addr_r=0x11200000\0" \
++ "pxefile_addr_r=0x11300000\0" \
++ "scr_addr_r=0x11400000\0" \
++ "kernel_addr_r=0x11500000\0" \
++ "ramdisk_addr_r=0x13500000\0" \
+ "boot_fdt=try\0" \
+ "bootcmd_setup=mmc rescan\0" \
+- "bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++ "bootcmd_pxe=setenv bootfile \"\" ;dhcp; tftp ${fdt_addr} /dtb/${fdt_file}; pxe get; pxe boot\0" \
+ "bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
+ "bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
+ "bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
+ "bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
+ "bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
+- "bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++ "bootcmd_disk=load ${boot_ifc} ${bootdevice} ${fdt_addr} /boot/dtb/${fdt_file}; load ${boot_ifc} ${bootdevice} ${fdt_addr} /dtb/${fdt_file};run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
+ "bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \
+ "bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
+ "bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \
+--
+1.8.3.1
+
diff --git a/0016-WANDBOARD-use-ext2load-to-load-dtbs.patch b/0016-WANDBOARD-use-ext2load-to-load-dtbs.patch
new file mode 100644
index 0000000..95b30f3
--- /dev/null
+++ b/0016-WANDBOARD-use-ext2load-to-load-dtbs.patch
@@ -0,0 +1,69 @@
+From cf5beda60dcf4751d519f5c99321014ff2c566c8 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Sat, 19 Oct 2013 06:47:29 -0500
+Subject: [PATCH 16/16] WANDBOARD: use ext2load to load dtbs wrap some of the
+ generic distro defined options in ifdef to avoid duplicate defines
+
+---
+ include/configs/wandboard.h | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
+index 135835f..b81092b 100644
+--- a/include/configs/wandboard.h
++++ b/include/configs/wandboard.h
+@@ -51,7 +51,6 @@
+ #define CONFIG_CMD_BMODE
+ #define CONFIG_CMD_SETEXPR
+
+-#define CONFIG_BOOTDELAY 5
+
+ #define CONFIG_SYS_MEMTEST_START 0x10000000
+ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
+@@ -68,6 +67,10 @@
+ #define CONFIG_CMD_MMC
+ #define CONFIG_GENERIC_MMC
+ #define CONFIG_BOUNCE_BUFFER
++
++#ifndef DISTRO_DEFAULTS
++#define CONFIG_BOOTDELAY 5
++
+ #define CONFIG_CMD_EXT2
+ #define CONFIG_CMD_FAT
+ #define CONFIG_DOS_PARTITION
+@@ -77,6 +80,13 @@
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_MII
+ #define CONFIG_CMD_NET
++
++#define CONFIG_OF_LIBFDT
++#define CONFIG_CMD_BOOTZ
++
++#endif
++
++/* Ethernet Configuration */
+ #define CONFIG_FEC_MXC
+ #define CONFIG_MII
+ #define IMX_FEC_BASE ENET_BASE_ADDR
+@@ -130,7 +140,7 @@
+ "bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
+ "bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
+ "bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
+- "bootcmd_disk=load ${boot_ifc} ${bootdevice} ${fdt_addr} /boot/dtb/${fdt_file}; load ${boot_ifc} ${bootdevice} ${fdt_addr} /dtb/${fdt_file};run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++ "bootcmd_disk=ext2load ${boot_ifc} ${bootdevice} ${fdt_addr} /boot/dtb/${fdt_file}; ext2load ${boot_ifc} ${bootdevice} ${fdt_addr} /dtb/${fdt_file};run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
+ "bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \
+ "bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
+ "bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \
+@@ -258,9 +268,6 @@
+ #define CONFIG_ENV_OFFSET (6 * 64 * 1024)
+ #define CONFIG_SYS_MMC_ENV_DEV 0
+
+-#define CONFIG_OF_LIBFDT
+-#define CONFIG_CMD_BOOTZ
+-
+ #ifndef CONFIG_SYS_DCACHE_OFF
+ #define CONFIG_CMD_CACHE
+ #endif
+--
+1.8.3.1
+
diff --git a/sources b/sources
index 4de373b..a19d0c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19ea10dfb5a5f48a621ff33e720ce546 u-boot-2013.10-rc4.tar.bz2
+a076a044b64371edc52f7e562b13f6b2 u-boot-2013.10.tar.bz2
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 68b9e99..baae48f 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -1,8 +1,8 @@
-%global candidate rc4
+#global candidate rc4
Name: uboot-tools
Version: 2013.10
-Release: 0.5%{?candidate:.%{candidate}}%{?dist}
+Release: 1%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
Group: Development/Tools
@@ -26,16 +26,17 @@ Patch12: 0003-set-omap4-boards-to-use-the-generic-distro-support.patch
Patch13: 0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
Patch14: 0005-set-the-default-wandboard-boot-commands.patch
Patch15: 0006-set-omap4-to-use-extlinux.conf-by-default.patch
-Patch16: 0007-enable-CONFIG_CMD_BOOTMENU-for-distro-configs.patch
-Patch17: 0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch
+Patch16: 0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch
+Patch17: 0008-disable-FIT-image-support-since-it-fails-to-build.patch
Patch18: 0009-add-defualt-DHCP-config-options.patch
Patch19: 0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
-Patch20: 0011-set-omap5-up-to-use-generic-distro-configs.patch
-Patch21: 0012-setup-omap5-to-load-extlinux.conf.patch
-Patch22: 0013-Setup-beagleboard-to-used-generic-distro-configs.patch
-Patch23: 0014-setup-beagleboard-to-load-extlinux.conf.patch
-Patch24: 0015-setup-address-variables-needed-for-distro-config.patch
-Patch25: 0016-setup-am335x_evm-to-load-extlinux.conf.patch
+Patch20: 0011-Setup-beagleboard-to-used-generic-distro-configs.patch
+Patch21: 0012-setup-beagleboard-to-load-extlinux.conf.patch
+Patch22: 0013-setup-distro-common-variables-on-beaglebones.patch
+Patch23: 0014-Use-SPDX-header-in-distro-config.patch
+Patch24: 0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch
+Patch25: 0016-WANDBOARD-use-ext2load-to-load-dtbs.patch
+
# Panda ES memory timing issue
#Patch50: omap4-panda-memtiming.patch
@@ -434,6 +435,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Oct 19 2013 Dennis Gilmore <dennis at ausil.us> - 2013.10-1
+- update to final 2013.10 release
+
* Fri Oct 04 2013 Dennis Gilmore <dennis at ausil.us> - 2013.10-0.5.rc4
- update to 2013.10-rc4
More information about the scm-commits
mailing list