[uboot-tools] - Update to 2015.04 rc3 - Enable AllWinner: OLinuXino-Lime2 Mele_M3 - Enable i.MX6: novena hummingbo
Peter Robinson
pbrobinson at fedoraproject.org
Fri Mar 6 13:06:47 UTC 2015
commit 7a2a3182c937436f6d3e6856611deb858e0a43be
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Fri Mar 6 13:05:47 2015 +0000
- Update to 2015.04 rc3
- Enable AllWinner: OLinuXino-Lime2 Mele_M3
- Enable i.MX6: novena hummingboard
- Enable TI: Beagle-X15
...sure-that-the-filesystem-is-a-type-of-fat.patch | 8 +-
..._POST_COMMAND-which-is-appended-to-the-en.patch | 27 ++--
...ing-in-multiple-partitions-for-scan_dev_f.patch | 44 ------
...iding-boot_partitions-default-value-by-se.patch | 37 -----
...y-set-CONFIG_BOOTDELAY-if-not-already-set.patch | 10 +-
..._INIT_COMMAND-for-commands-that-may-be-ne.patch | 39 ------
...5x_evm.h-to-use-config_distro_defaults-an.patch | 18 +--
...ding-console-to-the-bootargs-if-not-prese.patch | 14 +-
...-wandboard-port-to-generic-distro-booting.patch | 12 +-
...4-boards-to-use-config_distro_defaults-an.patch | 29 ++--
...t-utilite-to-distro-generic-boot-commands.patch | 149 +++++++++++++++++++++
0009-RiOT-board-set-console-speed.patch | 25 ++++
...otboard-to-distro-generic-configs-patch-b.patch | 102 --------------
...-for-loading-environment-from-uEnv.txt-in.patch | 34 +++--
...t-utilite-to-distro-generic-boot-commands.patch | 149 ---------------------
..._INIT_COMMAND-for-commands-that-may-be-ne.patch | 38 ++++++
...x-compiler-gcc5.h-to-fix-builds-with-gcc5.patch | 93 -------------
sources | 2 +-
uboot-tools.spec | 82 +++++++-----
19 files changed, 339 insertions(+), 573 deletions(-)
---
diff --git a/0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch b/0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
index 683e361..3cf793b 100644
--- a/0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
+++ b/0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
@@ -1,7 +1,7 @@
-From 28767d1753be5582e9e16fd5e253f7b9c8114221 Mon Sep 17 00:00:00 2001
+From 0ddef6baeedc39a496858b4c01903df078af1a7d Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Tue, 14 Oct 2014 00:38:28 -0500
-Subject: [PATCH 01/14] make sure that the filesystem is a type of fat
+Subject: [PATCH 01/11] make sure that the filesystem is a type of fat
parted marks the partition table as being fat32 though we may pyt a fat16
filesystem on it.
@@ -10,7 +10,7 @@ filesystem on it.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
-index 04a51db..aa2c78d 100644
+index bccc3e3..15f84ad 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -74,7 +74,7 @@ int fat_set_blk_dev(block_dev_desc_t *dev_desc, disk_partition_t *info)
@@ -23,5 +23,5 @@ index 04a51db..aa2c78d 100644
cur_dev = NULL;
--
-2.1.0
+2.3.1
diff --git a/0005-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch b/0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
similarity index 58%
rename from 0005-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
rename to 0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
index ef56092..df3d9f1 100644
--- a/0005-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
+++ b/0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
@@ -1,20 +1,20 @@
-From b3b47482c9ebf2b9dd5a37f66b6a391c83d05d16 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant at debian.org>
-Date: Wed, 1 Oct 2014 14:04:01 -0700
-Subject: [PATCH 05/14] Add BOOTENV_POST_COMMAND, which is appended to the end
- of bootcmd.
+From 14598c51bc66832804633984539f335ef199932c Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 10:29:28 +0000
+Subject: [PATCH 02/11] Add BOOTENV_POST_COMMAND, which is appended to the end
+ of bootcmd
---
include/config_distro_bootcmd.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index 515a2f9..2503431 100644
+index 07a0b3b..3292375 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
-@@ -160,6 +160,10 @@
- #define BOOTENV_INIT_COMMAND
- #endif
+@@ -148,6 +148,10 @@
+ #define BOOTENV_BOOT_TARGETS \
+ "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
+#ifndef BOOTENV_POST_COMMAND
+#define BOOTENV_POST_COMMAND
@@ -23,8 +23,8 @@ index 515a2f9..2503431 100644
#define BOOTENV_DEV(devtypeu, devtypel, instance) \
BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance)
#define BOOTENV \
-@@ -217,6 +221,8 @@
- BOOTENV_SET_USB_NEED_INIT BOOTENV_SET_SCSI_NEED_INIT \
+@@ -210,7 +214,9 @@
+ "distro_bootcmd=" BOOTENV_SET_SCSI_NEED_INIT \
"for target in ${boot_targets}; do " \
"run bootcmd_${target}; " \
- "done\0"
@@ -32,7 +32,8 @@ index 515a2f9..2503431 100644
+ BOOTENV_POST_COMMAND \
+ "\0"
- #endif /* _CONFIG_CMD_DISTRO_BOOTCMD_H */
+ #ifndef CONFIG_BOOTCOMMAND
+ #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
--
-2.1.0
+2.3.1
diff --git a/0006-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch b/0003-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
similarity index 70%
rename from 0006-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
rename to 0003-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
index 0883dbf..ec16c25 100644
--- a/0006-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
+++ b/0003-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
@@ -1,7 +1,7 @@
-From 1926334c8e35b650931aa1a758e3d2a8ad9f5761 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant at debian.org>
-Date: Tue, 30 Sep 2014 20:34:19 -0700
-Subject: [PATCH 06/14] Only set CONFIG_BOOTDELAY if not already set.
+From 006758f3cd6d24d7390133a52134b2e78b9c781f Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 10:30:06 +0000
+Subject: [PATCH 03/11] Only set CONFIG_BOOTDELAY if not already set.
---
include/config_distro_defaults.h | 2 ++
@@ -22,5 +22,5 @@ index 1ecc0bb..b23eb04 100644
#define CONFIG_MENU
#define CONFIG_DOS_PARTITION
--
-2.1.0
+2.3.1
diff --git a/0008-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch b/0004-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
similarity index 84%
rename from 0008-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
rename to 0004-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
index bb211a4..ff3d2f5 100644
--- a/0008-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
+++ b/0004-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
@@ -1,7 +1,7 @@
-From 7c1db0713f15ecc37bc520783f61afc785443289 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant at debian.org>
-Date: Wed, 1 Oct 2014 13:28:18 -0700
-Subject: [PATCH 08/14] Switch am335x_evm.h to use config_distro_defaults and
+From bfba958bb582b73ea1c6bcdf8ccfca1a39511a9d Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 10:31:19 +0000
+Subject: [PATCH 04/11] Switch am335x_evm.h to use config_distro_defaults and
config_distro_bootcmd. Add scriptaddr to DEFAULT_LINUX_BOOT_ENV, as
scriptaddr is used for boot scripts in config_distro_defaults.
@@ -11,7 +11,7 @@ Subject: [PATCH 08/14] Switch am335x_evm.h to use config_distro_defaults and
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index 560e3bf..cfc6ec5 100644
+index f1c270c..c702d8b 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -18,6 +18,21 @@
@@ -34,9 +34,9 @@ index 560e3bf..cfc6ec5 100644
+#include <config_distro_bootcmd.h>
+
#ifndef CONFIG_SPL_BUILD
+ #ifndef CONFIG_FIT
# define CONFIG_FIT
- # define CONFIG_TIMESTAMP
-@@ -185,17 +200,10 @@
+@@ -181,17 +196,10 @@
"if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine device tree to use; fi; \0" \
NANDARGS \
@@ -57,7 +57,7 @@ index 560e3bf..cfc6ec5 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 a8790c2..dae582f 100644
+index 2bd1164..e409c7f 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -54,6 +54,7 @@
@@ -69,5 +69,5 @@ index a8790c2..dae582f 100644
"fdt_addr_r=0x88000000\0" \
"rdaddr=0x88080000\0" \
--
-2.1.0
+2.3.1
diff --git a/0011-add-back-adding-console-to-the-bootargs-if-not-prese.patch b/0005-add-back-adding-console-to-the-bootargs-if-not-prese.patch
similarity index 85%
rename from 0011-add-back-adding-console-to-the-bootargs-if-not-prese.patch
rename to 0005-add-back-adding-console-to-the-bootargs-if-not-prese.patch
index fcfc992..d494bbe 100644
--- a/0011-add-back-adding-console-to-the-bootargs-if-not-prese.patch
+++ b/0005-add-back-adding-console-to-the-bootargs-if-not-prese.patch
@@ -1,12 +1,10 @@
-From 6376d21b8a647613789d5e5eac42d84d524c3c3d Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis at ausil.us>
-Date: Mon, 27 Oct 2014 21:38:32 -0500
-Subject: [PATCH 11/14] add back adding console= to the bootargs if not
+From dddde5d4c96f1f64b066e77ad774a7dda863904d Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 10:32:40 +0000
+Subject: [PATCH 05/11] add back adding console= to the bootargs if not
present.
-better soloution is needed
-
-not upstreamable
+A better soloution is needed, not upstreamable
---
common/cmd_pxe.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
@@ -53,5 +51,5 @@ index 7e32c95..4f3c15d 100644
strcat(bootargs, mac_str);
--
-2.1.0
+2.3.1
diff --git a/0012-wandboard-port-to-generic-distro-booting.patch b/0006-wandboard-port-to-generic-distro-booting.patch
similarity index 93%
rename from 0012-wandboard-port-to-generic-distro-booting.patch
rename to 0006-wandboard-port-to-generic-distro-booting.patch
index 48f1920..06941d5 100644
--- a/0012-wandboard-port-to-generic-distro-booting.patch
+++ b/0006-wandboard-port-to-generic-distro-booting.patch
@@ -1,7 +1,7 @@
-From aa5e3817bf1030b310d4686cd1ab51e2865601cb Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis at ausil.us>
-Date: Tue, 25 Nov 2014 23:08:38 -0600
-Subject: [PATCH 12/14] wandboard: port to generic distro booting
+From f1dfa1551a4b222f0c551f0b028cbeda3aebc491 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 10:33:25 +0000
+Subject: [PATCH 06/11] wandboard: port to generic distro booting
set the variables and functions needed for generic distro booting.
---
@@ -9,7 +9,7 @@ set the variables and functions needed for generic distro booting.
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
-index 809017c..4950ed7 100644
+index 117d1f7..1d8459c 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -51,8 +51,6 @@
@@ -140,5 +140,5 @@ index 809017c..4950ed7 100644
#define CONFIG_CMD_CACHE
#endif
--
-2.1.0
+2.3.1
diff --git a/0013-Switch-omap4-boards-to-use-config_distro_defaults-an.patch b/0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
similarity index 75%
rename from 0013-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
rename to 0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
index cfb35dc..674d77c 100644
--- a/0013-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
+++ b/0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
@@ -1,19 +1,19 @@
-From aa26cb59a0bf02e45b81efefae404c7578261abd Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis at ausil.us>
-Date: Tue, 25 Nov 2014 23:09:49 -0600
-Subject: [PATCH 13/14] Switch omap4 boards to use config_distro_defaults and
+From 07a6e8cf586b2cf541edabb5d11d0789833a4d99 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 10:38:05 +0000
+Subject: [PATCH 07/11] Switch omap4 boards to use config_distro_defaults and
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
+ 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 | 40 +++++++++++++++++----------------------
- 2 files changed, 19 insertions(+), 24 deletions(-)
+ include/configs/ti_omap4_common.h | 39 ++++++++++++++++-----------------------
+ 2 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
-index dae582f..d1c2eb1 100644
+index e409c7f..f280534 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -54,7 +54,8 @@
@@ -27,14 +27,13 @@ index dae582f..d1c2eb1 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 1c93aab..b3a328c 100644
+index 1c93aab..5402793 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
-@@ -82,6 +82,19 @@
+@@ -82,6 +82,18 @@
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
-+
+#ifndef CONFIG_SPL_BUILD
+#include <config_distro_defaults.h>
+#include <config_distro_bootcmd.h>
@@ -50,7 +49,7 @@ index 1c93aab..b3a328c 100644
/*
* Environment setup
*/
-@@ -129,30 +142,11 @@
+@@ -129,30 +141,11 @@
"if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine device tree to use; fi; \0" \
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
@@ -86,5 +85,5 @@ index 1c93aab..b3a328c 100644
/*
* Defines for SPL
--
-2.1.0
+2.3.1
diff --git a/0008-port-utilite-to-distro-generic-boot-commands.patch b/0008-port-utilite-to-distro-generic-boot-commands.patch
new file mode 100644
index 0000000..51cd046
--- /dev/null
+++ b/0008-port-utilite-to-distro-generic-boot-commands.patch
@@ -0,0 +1,149 @@
+From da76356b5c9df13e3e948fc1409b0a0921e8d158 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 10:45:22 +0000
+Subject: [PATCH 08/11] port utilite to distro generic boot commands
+
+---
+ include/configs/cm_fx6.h | 109 ++++++++++++-----------------------------------
+ 1 file changed, 27 insertions(+), 82 deletions(-)
+
+diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
+index 4207504..58dd5e1 100644
+--- a/include/configs/cm_fx6.h
++++ b/include/configs/cm_fx6.h
+@@ -12,7 +12,6 @@
+ #define __CONFIG_CM_FX6_H
+
+ #include <asm/arch/imx-regs.h>
+-#include <config_distro_defaults.h>
+ #include "mx6_common.h"
+
+ /* Machine config */
+@@ -95,97 +94,43 @@
+ #define CONFIG_ENV_SIZE (8 * 1024)
+ #define CONFIG_ENV_OFFSET (768 * 1024)
+
++#ifndef CONFIG_SPL_BUILD
++#include <config_distro_defaults.h>
++#include <config_distro_bootcmd.h>
++
++#ifdef CONFIG_AHCI
++#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
++#else
++#define BOOT_TARGET_DEVICES_SCSI(func)
++#endif
++
++#define BOOT_TARGET_DEVICES(func) \
++ func(MMC, mmc, 2) \
++ BOOT_TARGET_DEVICES_SCSI(func) \
++ func(PXE, pxe, na) \
++ func(DHCP, dhcp, na)
++
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ "stdin=serial,usbkbd\0" \
+ "stdout=serial,vga\0" \
+ "stderr=serial,vga\0" \
+ "panel=HDMI\0" \
+- "autoload=no\0" \
+- "kernel=uImage-cm-fx6\0" \
+- "script=boot.scr\0" \
+ "dtb=cm-fx6.dtb\0" \
+- "bootm_low=18000000\0" \
+ "loadaddr=0x10800000\0" \
+ "fdtaddr=0x11000000\0" \
++ "fdt_addr_r=0x18000000\0" \
++ "pxefile_addr_r=0x17f00000\0" \
++ "scriptaddr=0x17e00000\0" \
++ "kernel_addr_r=0x11000000\0" \
++ "ramdisk_addr_r=0x18100000\0" \
++ "bootm_size=0x20000000\0" \
+ "console=ttymxc3,115200\0" \
+ "ethprime=FEC0\0" \
+- "video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32 at 50,if=RGB32\0" \
+- "video_dvi=mxcfb0:dev=dvi,1280x800M-32 at 50,if=RGB32\0" \
+- "doboot=bootm ${loadaddr}\0" \
+- "doloadfdt=false\0" \
+- "setboottypez=setenv kernel zImage-cm-fx6;" \
+- "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
+- "setenv doloadfdt true;\0" \
+- "setboottypem=setenv kernel uImage-cm-fx6;" \
+- "setenv doboot bootm ${loadaddr};" \
+- "setenv doloadfdt false;\0"\
+- "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
+- "sataroot=/dev/sda2 rw rootwait\0" \
+- "nandroot=/dev/mtdblock4 rw\0" \
+- "nandrootfstype=ubifs\0" \
+- "mmcargs=setenv bootargs console=${console} root=${mmcroot} " \
+- "${video}\0" \
+- "sataargs=setenv bootargs console=${console} root=${sataroot} " \
+- "${video}\0" \
+- "nandargs=setenv bootargs console=${console} " \
+- "root=${nandroot} " \
+- "rootfstype=${nandrootfstype} " \
+- "${video}\0" \
+- "nandboot=if run nandloadkernel; then " \
+- "run nandloadfdt;" \
+- "run setboottypem;" \
+- "run storagebootcmd;" \
+- "run setboottypez;" \
+- "run storagebootcmd;" \
+- "fi;\0" \
+- "run_eboot=echo Starting EBOOT ...; "\
+- "mmc dev 2 && " \
+- "mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
+- "loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0"\
+- "loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0"\
+- "loadfdt=load ${storagetype} ${storagedev} ${fdtaddr} ${dtb};\0" \
+- "bootscript=echo Running bootscript from ${storagetype} ...;" \
+- "source ${loadaddr};\0" \
+- "nandloadkernel=nand read ${loadaddr} 0 780000;\0" \
+- "nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
+- "setupmmcboot=setenv storagetype mmc; setenv storagedev 2;\0" \
+- "setupsataboot=setenv storagetype sata; setenv storagedev 0;\0" \
+- "setupnandboot=setenv storagetype nand;\0" \
+- "setupusbboot=setenv storagetype usb; setenv storagedev 0;\0" \
+- "storagebootcmd=echo Booting from ${storagetype} ...;" \
+- "run ${storagetype}args; run doboot;\0" \
+- "trybootk=if run loadkernel; then " \
+- "if ${doloadfdt}; then " \
+- "run loadfdt;" \
+- "fi;" \
+- "run storagebootcmd;" \
+- "fi;\0" \
+- "trybootsmz=if run loadscript; then " \
+- "run bootscript;" \
+- "fi;" \
+- "run setboottypem;" \
+- "run trybootk;" \
+- "run setboottypez;" \
+- "run trybootk;\0"
+-
+-#define CONFIG_BOOTCOMMAND \
+- "run setupmmcboot;" \
+- "mmc dev ${storagedev};" \
+- "if mmc rescan; then " \
+- "run trybootsmz;" \
+- "fi;" \
+- "run setupusbboot;" \
+- "if usb start; then "\
+- "if run loadscript; then " \
+- "run bootscript;" \
+- "fi;" \
+- "fi;" \
+- "run setupsataboot;" \
+- "if sata init; then " \
+- "run trybootsmz;" \
+- "fi;" \
+- "run setupnandboot;" \
+- "run nandboot;"
++ BOOTENV
++
++#else /* ifndef CONFIG_SPL_BUILD */
++#define CONFIG_EXTRA_ENV_SETTINGS
++#endif
+
+ #define CONFIG_PREBOOT "usb start"
+
+--
+2.3.1
+
diff --git a/0009-RiOT-board-set-console-speed.patch b/0009-RiOT-board-set-console-speed.patch
new file mode 100644
index 0000000..14d7be2
--- /dev/null
+++ b/0009-RiOT-board-set-console-speed.patch
@@ -0,0 +1,25 @@
+From 222035e0351121f9feb92daa782756f73c4927d9 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 10:49:53 +0000
+Subject: [PATCH 09/11] RiOT board: set console speed
+
+---
+ include/configs/embestmx6boards.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
+index b4b3ae8..b8696a3 100644
+--- a/include/configs/embestmx6boards.h
++++ b/include/configs/embestmx6boards.h
+@@ -22,7 +22,7 @@
+ #define CONFIG_SYS_GENERIC_BOARD
+
+ #define CONFIG_MXC_UART_BASE UART2_BASE
+-#define CONFIG_CONSOLE_DEV "ttymxc1"
++#define CONFIG_CONSOLE_DEV "ttymxc1,115200"
+ #define CONFIG_MMCROOT "/dev/mmcblk1p2"
+
+ #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
+--
+2.3.1
+
diff --git a/0007-Add-support-for-loading-environment-from-uEnv.txt-in.patch b/0010-Add-support-for-loading-environment-from-uEnv.txt-in.patch
similarity index 68%
rename from 0007-Add-support-for-loading-environment-from-uEnv.txt-in.patch
rename to 0010-Add-support-for-loading-environment-from-uEnv.txt-in.patch
index 0b4f86f..a44d416 100644
--- a/0007-Add-support-for-loading-environment-from-uEnv.txt-in.patch
+++ b/0010-Add-support-for-loading-environment-from-uEnv.txt-in.patch
@@ -1,7 +1,7 @@
-From c33de75d88ff0e7e7da9e28576b8457ea125da42 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant at debian.org>
-Date: Wed, 1 Oct 2014 10:29:36 -0700
-Subject: [PATCH 07/14] Add support for loading environment from uEnv.txt in
+From f113d6b6c7077fbf807e18f569d302ea2223c5ad Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 10:52:53 +0000
+Subject: [PATCH 10/11] Add support for loading environment from uEnv.txt in
config_distro_bootcmd.
---
@@ -9,18 +9,18 @@ Subject: [PATCH 07/14] Add support for loading environment from uEnv.txt in
1 file changed, 21 insertions(+)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index 2503431..aaa010e 100644
+index 3292375..5c6cec1 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
-@@ -174,6 +174,7 @@
- BOOTENV_SHARED_IDE \
+@@ -163,6 +163,7 @@
"boot_prefixes=/ /boot/\0" \
"boot_scripts=boot.scr.uimg boot.scr\0" \
+ "boot_script_dhcp=boot.scr.uimg\0" \
+ "boot_uenv_files=uEnv.txt\0" \
BOOTENV_BOOT_TARGETS \
- "boot_partitions="BOOTENV_BOOT_PARTITIONS"\0" \
\
-@@ -205,6 +206,25 @@
+ "boot_extlinux=" \
+@@ -193,11 +194,31 @@
"fi; " \
"done\0" \
\
@@ -44,16 +44,14 @@ index 2503431..aaa010e 100644
+ "done\0" \
+ \
"scan_dev_for_boot=" \
- "for partition in ${boot_partitions}; do " \
- "echo Scanning ${devtype} ${devnum}:${partition}...; " \
-@@ -212,6 +232,7 @@
- "for prefix in ${boot_prefixes}; do " \
- "run scan_dev_for_extlinux; " \
- "run scan_dev_for_scripts; " \
-+ "run scan_dev_for_uenv_files; " \
- "done;" \
+ "echo Scanning ${devtype} ${devnum}:${bootpart}...; " \
+ "for prefix in ${boot_prefixes}; do " \
+ "run scan_dev_for_extlinux; " \
+ "run scan_dev_for_scripts; " \
++ "run scan_dev_for_uenv_files; " \
"done\0" \
\
+ "scan_dev_for_boot_part=" \
--
-2.1.0
+2.3.1
diff --git a/0011-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch b/0011-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
new file mode 100644
index 0000000..7c85d79
--- /dev/null
+++ b/0011-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
@@ -0,0 +1,38 @@
+From 330ef191351986782a12d2e9f695715ffda3508f Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson at gmail.com>
+Date: Fri, 6 Mar 2015 11:11:51 +0000
+Subject: [PATCH 11/11] Add BOOTENV_INIT_COMMAND for commands that may be
+ needed to run before bootcmd, such as setting the fdt file variables for
+ platfroms that detect on boot.
+
+---
+ include/config_distro_bootcmd.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
+index 5c6cec1..608b65f 100644
+--- a/include/config_distro_bootcmd.h
++++ b/include/config_distro_bootcmd.h
+@@ -148,6 +148,10 @@
+ #define BOOTENV_BOOT_TARGETS \
+ "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
+
++#ifndef BOOTENV_INIT_COMMAND
++#define BOOTENV_INIT_COMMAND
++#endif
++
+ #ifndef BOOTENV_POST_COMMAND
+ #define BOOTENV_POST_COMMAND
+ #endif
+@@ -232,7 +236,7 @@
+ \
+ BOOT_TARGET_DEVICES(BOOTENV_DEV) \
+ \
+- "distro_bootcmd=" BOOTENV_SET_SCSI_NEED_INIT \
++ "distro_bootcmd=" BOOTENV_INIT_COMMAND BOOTENV_SET_SCSI_NEED_INIT \
+ "for target in ${boot_targets}; do " \
+ "run bootcmd_${target}; " \
+ "done;" \
+--
+2.3.1
+
diff --git a/sources b/sources
index a61dfca..d0d25b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f08dc9e98a71652bd6968888ed6ec95 u-boot-2015.01.tar.bz2
+78d9056e2cec620910f3d5dada0b6a32 u-boot-2015.04-rc3.tar.bz2
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 7b247bb..b749c6c 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -1,8 +1,8 @@
-#global candidate
+%global candidate rc3
Name: uboot-tools
-Version: 2015.01
-Release: 4%{?candidate:.%{candidate}}%{?dist}
+Version: 2015.04
+Release: 0.1%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
Group: Development/Tools
@@ -10,20 +10,17 @@ License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
URL: http://www.denx.de/wiki/U-Boot
Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
-Patch1: 0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
-Patch2: 0002-Allow-checking-in-multiple-partitions-for-scan_dev_f.patch
-Patch3: 0003-Allow-overriding-boot_partitions-default-value-by-se.patch
-Patch4: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
-Patch5: 0005-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
-Patch6: 0006-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
-Patch7: 0007-Add-support-for-loading-environment-from-uEnv.txt-in.patch
-Patch8: 0008-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
-#atch9: 0009-port-the-riotboard-to-distro-generic-configs-patch-b.patch
-Patch10: 0010-port-utilite-to-distro-generic-boot-commands.patch
-Patch11: 0011-add-back-adding-console-to-the-bootargs-if-not-prese.patch
-Patch12: 0012-wandboard-port-to-generic-distro-booting.patch
-Patch13: 0013-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
-Patch14: 0014-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
+Patch1: 0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
+Patch2: 0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
+Patch3: 0003-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
+Patch4: 0004-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
+Patch5: 0005-add-back-adding-console-to-the-bootargs-if-not-prese.patch
+Patch6: 0006-wandboard-port-to-generic-distro-booting.patch
+Patch7: 0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
+Patch8: 0008-port-utilite-to-distro-generic-boot-commands.patch
+Patch9: 0009-RiOT-board-set-console-speed.patch
+Patch10: 0010-Add-support-for-loading-environment-from-uEnv.txt-in.patch
+Patch11: 0011-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
BuildRequires: dtc, openssl-devel
BuildRequires: fedora-logos, netpbm-progs
@@ -144,14 +141,14 @@ make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Cubietruck
make mrproper
-make Mele_A1000G_defconfig
+make Mele_A1000_defconfig
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Mele_A1000G
+cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Mele_A1000
make mrproper
-make Mele_A1000_defconfig
+make Mele_M3_defconfig
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Mele_A1000
+cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Mele_M3
make mrproper
make Mini-X_defconfig
@@ -159,14 +156,14 @@ make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Mini-X
make mrproper
-make Mini-X-1Gb_defconfig
+make A10-OLinuXino-Lime_defconfig
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Mini-X-1Gb
+cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A10-OLinuXino-Lime
make mrproper
-make A10-OLinuXino-Lime_defconfig
+make A20-OLinuXino-Lime2_defconfig
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A10-OLinuXino-Lime
+cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A10-OLinuXino-Lime2
make mrproper
make A10s-OLinuXino-M_defconfig
@@ -202,6 +199,16 @@ cp -p u-boot.img builds/u-boot.img.cm_fx6
cp -p SPL builds/SPL.cm_fx6
make mrproper
+make hummingboard_solo_defconfig
+make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
+cp -p u-boot.imx builds/u-boot.imx.hummingboard
+make mrproper
+
+make novena_defconfig
+make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
+cp -p u-boot.imx builds/u-boot.imx.novena
+make mrproper
+
make riotboard_defconfig
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
cp -p u-boot.imx builds/u-boot.imx.riotboard
@@ -308,6 +315,12 @@ cp -p MLO builds/MLO.uevm
cp -p u-boot.img builds/u-boot.img.uevm
make mrproper
+make beagle_x15_defconfig
+make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
+cp -p MLO builds/MLO.beagle-x15
+cp -p u-boot.img builds/u-boot.img.beagle-x15
+make mrproper
+
%endif
make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" defconfig V=1
@@ -332,13 +345,13 @@ install -p -m 0644 builds/u-boot.bin.vexpress_aemv8a $RPM_BUILD_ROOT%{_datadir}/
%ifarch %{arm}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
-for board in A10-OLinuXino-Lime A10s-OLinuXino-M A13-OLinuXino A13-OLinuXinoM A20-OLinuXino_MICRO arndale Bananapi beagle beaglebone cm_fx6 Cubieboard Cubieboard2 Cubietruck highbank jetson-tk1 Mele_A1000 Mele_A1000G Mini-X Mini-X-1Gb origen panda paz00 riotboard smdkv310 snow snowball trimslice udoo_quad uevm vexpress wandboard_dl wandboard_quad wandboard_solo db-mv784mp-gp
+for board in A10-OLinuXino-Lime A10s-OLinuXino-M A13-OLinuXino A13-OLinuXinoM A20-OLinuXino_MICRO arndale Bananapi beagle beaglebone cm_fx6 Cubieboard Cubieboard2 Cubietruck highbank jetson-tk1 Mele_A1000 Mini-X origen panda paz00 riotboard smdkv310 snow snowball trimslice udoo_quad uevm vexpress wandboard_dl wandboard_quad wandboard_solo db-mv784mp-gp
do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
done
# AllWinner
-for board in Bananapi Cubieboard Cubieboard2 Cubietruck Mele_A1000 Mele_A1000G Mini-X Mini-X-1Gb A10-OLinuXino-Lime A10s-OLinuXino-M A13-OLinuXino A13-OLinuXinoM A20-OLinuXino_MICRO
+for board in Bananapi Cubieboard Cubieboard2 Cubietruck Mele_A1000 Mini-X A10-OLinuXino-Lime A10s-OLinuXino-M A13-OLinuXino A13-OLinuXinoM A20-OLinuXino_MICRO
do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
install -p -m 0644 builds/u-boot-sunxi-with-spl.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-sunxi-with-spl.bin
@@ -354,7 +367,7 @@ install -p -m 0644 builds/u-boot.img.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/u
install -p -m 0644 builds/SPL.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/SPL
done
-for board in riotboard udoo_quad wandboard_dl wandboard_quad wandboard_solo
+for board in hummingboard novena riotboard udoo_quad wandboard_dl wandboard_quad wandboard_solo
do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
install -p -m 0644 builds/u-boot.imx.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.imx
@@ -451,10 +464,10 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
%{_datadir}/uboot/Cubieboard2/
%{_datadir}/uboot/Cubietruck/
%{_datadir}/uboot/Mele_A1000/
-%{_datadir}/uboot/Mele_A1000G/
+%{_datadir}/uboot/Mele_M3/
%{_datadir}/uboot/Mini-X/
-%{_datadir}/uboot/Mini-X-1Gb/
%{_datadir}/uboot/A10-OLinuXino-Lime/
+%{_datadir}/uboot/A10-OLinuXino-Lime2/
%{_datadir}/uboot/A10s-OLinuXino-M/
%{_datadir}/uboot/A13-OLinuXino/
%{_datadir}/uboot/A13-OLinuXinoM/
@@ -463,6 +476,8 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
%{_datadir}/uboot/highbank/
# FreeScale
%{_datadir}/uboot/cm_fx6/
+%{_datadir}/uboot/hummingboard/
+%{_datadir}/uboot/novena/
%{_datadir}/uboot/riotboard/
%{_datadir}/uboot/wandboard_dl/
%{_datadir}/uboot/wandboard_quad/
@@ -480,6 +495,7 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
%{_datadir}/uboot/snowball/
# TI
%{_datadir}/uboot/beagle/
+%{_datadir}/uboot/beagle-x15/
%{_datadir}/uboot/beaglebone/
%{_datadir}/uboot/origen/
%{_datadir}/uboot/panda/
@@ -489,6 +505,12 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
%endif
%changelog
+* Fri Mar 6 2015 Peter Robinson <pbrobinson at fedoraproject.org> 2015.04-0.1.rc3
+- Update to 2015.04 rc3
+- Enable AllWinner: OLinuXino-Lime2 Mele_M3
+- Enable i.MX6: novena hummingboard
+- Enable TI: Beagle-X15
+
* Sat Feb 21 2015 Till Maas <opensource at till.name> - 2015.01-4
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
More information about the scm-commits
mailing list