update to 2015.01 rc2
This commit is contained in:
parent
b2bcea9fe2
commit
af73c706e0
|
@ -1,27 +0,0 @@
|
|||
From 43a31dc85859cef2bc0b24ff2516d6fb069f4eec Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Tue, 14 Oct 2014 00:38:28 -0500
|
||||
Subject: [PATCH 01/13] 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.
|
||||
---
|
||||
fs/fat/fat.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
|
||||
index 561921f..13a8acc 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)
|
||||
/* Check for FAT12/FAT16/FAT32 filesystem */
|
||||
if (!memcmp(buffer + DOS_FS_TYPE_OFFSET, "FAT", 3))
|
||||
return 0;
|
||||
- if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT32", 5))
|
||||
+ if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT", 3))
|
||||
return 0;
|
||||
|
||||
cur_dev = NULL;
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
From 2ca45b547dedc76f403ed25405ddf9b69afa07a6 Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 13:20:53 -0700
|
||||
Subject: [PATCH 02/13] Allow checking in multiple partitions for
|
||||
scan_dev_for_boot.
|
||||
|
||||
---
|
||||
include/config_distro_bootcmd.h | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index be616e8..5e5e5e3 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -163,7 +163,7 @@
|
||||
"boot_prefixes=/ /boot/\0" \
|
||||
"boot_scripts=boot.scr.uimg boot.scr\0" \
|
||||
BOOTENV_BOOT_TARGETS \
|
||||
- "bootpart=1\0" \
|
||||
+ "boot_partitions=1\0" \
|
||||
\
|
||||
"boot_extlinux=" \
|
||||
"sysboot ${devtype} ${devnum}:${bootpart} any " \
|
||||
@@ -194,10 +194,13 @@
|
||||
"done\0" \
|
||||
\
|
||||
"scan_dev_for_boot=" \
|
||||
- "echo Scanning ${devtype} ${devnum}...; " \
|
||||
- "for prefix in ${boot_prefixes}; do " \
|
||||
- "run scan_dev_for_extlinux; " \
|
||||
- "run scan_dev_for_scripts; " \
|
||||
+ "for partition in ${boot_partitions}; do " \
|
||||
+ "echo Scanning ${devtype} ${devnum}:${partition}...; " \
|
||||
+ "setenv bootpart ${partition};" \
|
||||
+ "for prefix in ${boot_prefixes}; do " \
|
||||
+ "run scan_dev_for_extlinux; " \
|
||||
+ "run scan_dev_for_scripts; " \
|
||||
+ "done;" \
|
||||
"done\0" \
|
||||
\
|
||||
BOOT_TARGET_DEVICES(BOOTENV_DEV) \
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
From 1f21a89342cf8897aa140a75fe4302908baf2431 Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 12:55:58 -0700
|
||||
Subject: [PATCH 03/13] Allow overriding boot_partitions default value by
|
||||
setting BOOTENV_BOOT_PARTITIONS before including config_distro_bootcmd.
|
||||
|
||||
---
|
||||
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 5e5e5e3..a93354a 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -152,6 +152,10 @@
|
||||
#define BOOTENV_BOOT_TARGETS \
|
||||
"boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
|
||||
|
||||
+#ifndef BOOTENV_BOOT_PARTITIONS
|
||||
+#define BOOTENV_BOOT_PARTITIONS "1"
|
||||
+#endif
|
||||
+
|
||||
#define BOOTENV_DEV(devtypeu, devtypel, instance) \
|
||||
BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance)
|
||||
#define BOOTENV \
|
||||
@@ -163,7 +167,7 @@
|
||||
"boot_prefixes=/ /boot/\0" \
|
||||
"boot_scripts=boot.scr.uimg boot.scr\0" \
|
||||
BOOTENV_BOOT_TARGETS \
|
||||
- "boot_partitions=1\0" \
|
||||
+ "boot_partitions="BOOTENV_BOOT_PARTITIONS"\0" \
|
||||
\
|
||||
"boot_extlinux=" \
|
||||
"sysboot ${devtype} ${devnum}:${bootpart} any " \
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From 8ecd007b88f92de2e5c585f434d3dcffdfe6ee7e Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Tue, 30 Sep 2014 20:02:26 -0700
|
||||
Subject: [PATCH 04/13] 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 | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index a93354a..515a2f9 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -156,6 +156,10 @@
|
||||
#define BOOTENV_BOOT_PARTITIONS "1"
|
||||
#endif
|
||||
|
||||
+#ifndef BOOTENV_INIT_COMMAND
|
||||
+#define BOOTENV_INIT_COMMAND
|
||||
+#endif
|
||||
+
|
||||
#define BOOTENV_DEV(devtypeu, devtypel, instance) \
|
||||
BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance)
|
||||
#define BOOTENV \
|
||||
@@ -209,7 +213,8 @@
|
||||
\
|
||||
BOOT_TARGET_DEVICES(BOOTENV_DEV) \
|
||||
\
|
||||
- "bootcmd=" BOOTENV_SET_USB_NEED_INIT BOOTENV_SET_SCSI_NEED_INIT \
|
||||
+ "bootcmd=" BOOTENV_INIT_COMMAND \
|
||||
+ BOOTENV_SET_USB_NEED_INIT BOOTENV_SET_SCSI_NEED_INIT \
|
||||
"for target in ${boot_targets}; do " \
|
||||
"run bootcmd_${target}; " \
|
||||
"done\0"
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 92f36f70d6df4ce4024e8b0b9e88dc9b8b055e31 Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 14:04:01 -0700
|
||||
Subject: [PATCH 05/13] 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
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -160,6 +160,10 @@
|
||||
#define BOOTENV_INIT_COMMAND
|
||||
#endif
|
||||
|
||||
+#ifndef BOOTENV_POST_COMMAND
|
||||
+#define BOOTENV_POST_COMMAND
|
||||
+#endif
|
||||
+
|
||||
#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 \
|
||||
"for target in ${boot_targets}; do " \
|
||||
"run bootcmd_${target}; " \
|
||||
- "done\0"
|
||||
+ "done;" \
|
||||
+ BOOTENV_POST_COMMAND \
|
||||
+ "\0"
|
||||
|
||||
#endif /* _CONFIG_CMD_DISTRO_BOOTCMD_H */
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From d4ec2d9e7134d8deb403f82577b04c63e724ab08 Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Tue, 30 Sep 2014 20:34:19 -0700
|
||||
Subject: [PATCH 06/13] Only set CONFIG_BOOTDELAY if not already set.
|
||||
|
||||
---
|
||||
include/config_distro_defaults.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
|
||||
index 5d18a4b..fc67c42 100644
|
||||
--- a/include/config_distro_defaults.h
|
||||
+++ b/include/config_distro_defaults.h
|
||||
@@ -45,7 +45,9 @@
|
||||
|
||||
#define CONFIG_CMDLINE_EDITING
|
||||
#define CONFIG_AUTO_COMPLETE
|
||||
+#ifndef CONFIG_BOOTDELAY
|
||||
#define CONFIG_BOOTDELAY 2
|
||||
+#endif
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
#define CONFIG_MENU
|
||||
#define CONFIG_DOS_PARTITION
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
From e35f16a3b1d651e2ce0b07ec67572f55fafff092 Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 10:29:36 -0700
|
||||
Subject: [PATCH 07/13] Add support for loading environment from uEnv.txt in
|
||||
config_distro_bootcmd.
|
||||
|
||||
---
|
||||
include/config_distro_bootcmd.h | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 2503431..aaa010e 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -174,6 +174,7 @@
|
||||
BOOTENV_SHARED_IDE \
|
||||
"boot_prefixes=/ /boot/\0" \
|
||||
"boot_scripts=boot.scr.uimg boot.scr\0" \
|
||||
+ "boot_uenv_files=uEnv.txt\0" \
|
||||
BOOTENV_BOOT_TARGETS \
|
||||
"boot_partitions="BOOTENV_BOOT_PARTITIONS"\0" \
|
||||
\
|
||||
@@ -205,6 +206,25 @@
|
||||
"fi; " \
|
||||
"done\0" \
|
||||
\
|
||||
+ "import_uenv_file=" \
|
||||
+ "load ${devtype} ${devnum}:${bootpart} " \
|
||||
+ "${scriptaddr} ${prefix}${uenv_file}; " \
|
||||
+ "env import -t -r ${scriptaddr} ${filesize}\0; " \
|
||||
+ "if test -n $uenvcmd; then " \
|
||||
+ "echo Running uenvcmd ...;" \
|
||||
+ "run uenvcmd;" \
|
||||
+ "fi;\0" \
|
||||
+ \
|
||||
+ "scan_dev_for_uenv_files=" \
|
||||
+ "for uenv_file in ${boot_uenv_files}; do " \
|
||||
+ "if test -e ${devtype} ${devnum}:${bootpart} " \
|
||||
+ "${prefix}${uenv_file}; then " \
|
||||
+ "echo Found U-boot env file" \
|
||||
+ "${prefix}${uenv_file}; " \
|
||||
+ "run import_uenv_file; " \
|
||||
+ "fi; " \
|
||||
+ "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;" \
|
||||
"done\0" \
|
||||
\
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
From 455018f78aa4d96378c804f2883e86b5f986e7cb Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 13:28:18 -0700
|
||||
Subject: [PATCH 08/13] 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.
|
||||
|
||||
---
|
||||
include/configs/am335x_evm.h | 26 +++++++++++++++++---------
|
||||
include/configs/ti_armv7_common.h | 1 +
|
||||
2 files changed, 18 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
|
||||
index 476430d..4af8dc4 100644
|
||||
--- a/include/configs/am335x_evm.h
|
||||
+++ b/include/configs/am335x_evm.h
|
||||
@@ -18,6 +18,21 @@
|
||||
|
||||
#include <configs/ti_am335x_common.h>
|
||||
|
||||
+#include <config_distro_defaults.h>
|
||||
+
|
||||
+#define BOOTENV_BOOT_PARTITIONS "1 2"
|
||||
+
|
||||
+#define BOOTENV_INIT_COMMAND "run findfdt ;"
|
||||
+#ifdef CONFIG_NAND
|
||||
+#define BOOTENV_POST_COMMAND "run nandboot ;"
|
||||
+#endif
|
||||
+
|
||||
+#define BOOT_TARGET_DEVICES(func) \
|
||||
+ func(MMC, mmc, 0) \
|
||||
+ func(MMC, mmc, 1)
|
||||
+
|
||||
+#include <config_distro_bootcmd.h>
|
||||
+
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
# define CONFIG_FIT
|
||||
# define CONFIG_TIMESTAMP
|
||||
@@ -185,17 +200,10 @@
|
||||
"if test $fdtfile = undefined; then " \
|
||||
"echo WARNING: Could not determine device tree to use; fi; \0" \
|
||||
NANDARGS \
|
||||
- DFUARGS
|
||||
+ DFUARGS \
|
||||
+ BOOTENV
|
||||
#endif
|
||||
|
||||
-#define CONFIG_BOOTCOMMAND \
|
||||
- "run findfdt; " \
|
||||
- "run mmcboot;" \
|
||||
- "setenv mmcdev 1; " \
|
||||
- "setenv bootpart 1:2; " \
|
||||
- "run mmcboot;" \
|
||||
- "run nandboot;"
|
||||
-
|
||||
/* NS16550 Configuration */
|
||||
#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 85171db..f405fea 100644
|
||||
--- a/include/configs/ti_armv7_common.h
|
||||
+++ b/include/configs/ti_armv7_common.h
|
||||
@@ -54,6 +54,7 @@
|
||||
#define DEFAULT_LINUX_BOOT_ENV \
|
||||
"loadaddr=0x82000000\0" \
|
||||
"kernel_addr_r=0x82000000\0" \
|
||||
+ "scriptaddr=0x82000000\0" \
|
||||
"fdtaddr=0x88000000\0" \
|
||||
"fdt_addr_r=0x88000000\0" \
|
||||
"rdaddr=0x88080000\0" \
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,139 +0,0 @@
|
|||
From 28f99d4a43668b40960b2201468dbf6c5337c19a Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Tue, 14 Oct 2014 19:42:32 -0500
|
||||
Subject: [PATCH 09/13] wandboard: port to generic distro booting
|
||||
|
||||
set the variables and functions needed for generic distro booting.
|
||||
---
|
||||
include/configs/wandboard.h | 48 ++++++++++++++++++++++++---------------------
|
||||
1 file changed, 26 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
||||
index 9fb501a..5fd89ec 100644
|
||||
--- a/include/configs/wandboard.h
|
||||
+++ b/include/configs/wandboard.h
|
||||
@@ -51,8 +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)
|
||||
#define CONFIG_LOADADDR 0x12000000
|
||||
@@ -74,15 +72,8 @@
|
||||
#define CONFIG_CMD_MMC
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
-#define CONFIG_CMD_EXT2
|
||||
-#define CONFIG_CMD_FAT
|
||||
-#define CONFIG_DOS_PARTITION
|
||||
|
||||
/* Ethernet Configuration */
|
||||
-#define CONFIG_CMD_PING
|
||||
-#define CONFIG_CMD_DHCP
|
||||
-#define CONFIG_CMD_MII
|
||||
-#define CONFIG_CMD_NET
|
||||
#define CONFIG_FEC_MXC
|
||||
#define CONFIG_MII
|
||||
#define IMX_FEC_BASE ENET_BASE_ADDR
|
||||
@@ -115,6 +106,16 @@
|
||||
#define CONFIG_MXC_OCOTP
|
||||
#endif
|
||||
|
||||
+#ifndef CONFIG_SPL_BUILD
|
||||
+#include <config_distro_defaults.h>
|
||||
+#include <config_distro_bootcmd.h>
|
||||
+
|
||||
+#define BOOT_TARGET_DEVICES(func) \
|
||||
+ func(MMC, mmc, 0) \
|
||||
+ func(PXE, pxe, na) \
|
||||
+ func(DHCP, dhcp, na)
|
||||
+
|
||||
+
|
||||
#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
|
||||
#define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
|
||||
#elif defined(CONFIG_MX6Q)
|
||||
@@ -124,13 +125,16 @@
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"script=boot.scr\0" \
|
||||
"image=zImage\0" \
|
||||
- "console=ttymxc0\0" \
|
||||
+ "console=ttymxc0,115200\0" \
|
||||
"splashpos=m,m\0" \
|
||||
- "fdt_high=0xffffffff\0" \
|
||||
- "initrd_high=0xffffffff\0" \
|
||||
- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
||||
- "fdt_addr=0x18000000\0" \
|
||||
+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
||||
+ "fdt_addr_r=0x18000000\0" \
|
||||
"boot_fdt=try\0" \
|
||||
+ "pxefile_addr_r=0x17f00000\0" \
|
||||
+ "scriptaddr=0x17e00000\0" \
|
||||
+ "kernel_addr_r=0x11000000\0" \
|
||||
+ "ramdisk_addr_r=0x18100000\0" \
|
||||
+ "bootm_size=0x20000000\0" \
|
||||
"ip_dyn=yes\0" \
|
||||
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
||||
"mmcpart=1\0" \
|
||||
@@ -149,7 +153,7 @@
|
||||
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
||||
"fi; " \
|
||||
"fi\0" \
|
||||
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
|
||||
+ "mmcargs=setenv bootargs console=${console} " \
|
||||
"root=${mmcroot}; run videoargs\0" \
|
||||
"videoargs=" \
|
||||
"setenv nextcon 0; " \
|
||||
@@ -198,7 +202,7 @@
|
||||
"else " \
|
||||
"bootz; " \
|
||||
"fi;\0" \
|
||||
- "netargs=setenv bootargs console=${console},${baudrate} " \
|
||||
+ "netargs=setenv bootargs console=${console} " \
|
||||
"root=/dev/nfs " \
|
||||
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
||||
"netboot=echo Booting from net ...; " \
|
||||
@@ -221,7 +225,8 @@
|
||||
"fi; " \
|
||||
"else " \
|
||||
"bootz; " \
|
||||
- "fi;\0"
|
||||
+ "fi;\0" \
|
||||
+ BOOTENV
|
||||
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
"mmc dev ${mmcdev}; if mmc rescan; then " \
|
||||
@@ -235,6 +240,10 @@
|
||||
"fi; " \
|
||||
"else run netboot; fi"
|
||||
|
||||
+#else
|
||||
+#define BOOT_TARGET_DEVICES
|
||||
+#endif
|
||||
+
|
||||
/* Miscellaneous configurable options */
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
#define CONFIG_SYS_HUSH_PARSER
|
||||
@@ -248,8 +257,6 @@
|
||||
|
||||
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
||||
|
||||
-#define CONFIG_CMDLINE_EDITING
|
||||
-
|
||||
/* Physical Memory Map */
|
||||
#define CONFIG_NR_DRAM_BANKS 1
|
||||
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
||||
@@ -272,9 +279,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
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
From 1f69e87ebfe9b8f6bc3ad4e541a6ed22be8ee5a2 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Mon, 13 Oct 2014 23:17:32 -0500
|
||||
Subject: [PATCH 10/13] port the riotboard to distro generic configs, patch by
|
||||
pbrobinson
|
||||
|
||||
---
|
||||
include/configs/embestmx6boards.h | 39 ++++++++++++++++++++++++---------------
|
||||
1 file changed, 24 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
|
||||
index 185edbe..e75ee89 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)
|
||||
@@ -78,14 +78,7 @@
|
||||
#define CONFIG_CMD_MMC
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
-#define CONFIG_CMD_EXT2
|
||||
-#define CONFIG_CMD_FAT
|
||||
-#define CONFIG_DOS_PARTITION
|
||||
-
|
||||
-#define CONFIG_CMD_PING
|
||||
-#define CONFIG_CMD_DHCP
|
||||
-#define CONFIG_CMD_MII
|
||||
-#define CONFIG_CMD_NET
|
||||
+
|
||||
#define CONFIG_FEC_MXC
|
||||
#define CONFIG_MII
|
||||
#define IMX_FEC_BASE ENET_BASE_ADDR
|
||||
@@ -120,8 +113,6 @@
|
||||
#define CONFIG_CMD_SETEXPR
|
||||
#undef CONFIG_CMD_IMLS
|
||||
|
||||
-#define CONFIG_BOOTDELAY 1
|
||||
-
|
||||
#define CONFIG_LOADADDR 0x12000000
|
||||
#define CONFIG_SYS_TEXT_BASE 0x17800000
|
||||
|
||||
@@ -163,16 +154,29 @@
|
||||
#define SF_ENV ""
|
||||
#endif
|
||||
|
||||
+#ifndef CONFIG_SPL_BUILD
|
||||
+#include <config_distro_defaults.h>
|
||||
+#include <config_distro_bootcmd.h>
|
||||
+
|
||||
+#define BOOT_TARGET_DEVICES(func) \
|
||||
+ func(MMC, mmc, 0) \
|
||||
+ func(PXE, pxe, na) \
|
||||
+ func(DHCP, dhcp, na)
|
||||
+
|
||||
+
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"script=boot.scr\0" \
|
||||
"image=zImage\0" \
|
||||
- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
||||
- "fdt_addr=0x18000000\0" \
|
||||
+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
||||
+ "fdt_addr_r=0x18000000\0" \
|
||||
"boot_fdt=try\0" \
|
||||
+ "pxefile_addr_r=0x17f00000\0" \
|
||||
+ "scriptaddr=0x17e00000\0" \
|
||||
+ "kernel_addr_r=0x11000000\0" \
|
||||
+ "ramdisk_addr_r=0x18100000\0" \
|
||||
+ "bootm_size=0x20000000\0" \
|
||||
"ip_dyn=yes\0" \
|
||||
"console=" CONFIG_CONSOLE_DEV "\0" \
|
||||
- "fdt_high=0xffffffff\0" \
|
||||
- "initrd_high=0xffffffff\0" \
|
||||
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
||||
"mmcpart=1\0" \
|
||||
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
|
||||
@@ -252,6 +256,10 @@
|
||||
"fi; " \
|
||||
"else run netboot; fi"
|
||||
|
||||
+#else
|
||||
+#define BOOT_TARGET_DEVICES
|
||||
+#endif
|
||||
+
|
||||
#define CONFIG_ARP_TIMEOUT 200UL
|
||||
|
||||
/* Miscellaneous configurable options */
|
||||
@@ -335,4 +343,5 @@
|
||||
#define CONFIG_IMX_HDMI
|
||||
#define CONFIG_IMX_VIDEO_SKIP
|
||||
|
||||
+
|
||||
#endif /* __RIOTBOARD_CONFIG_H */
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,149 +0,0 @@
|
|||
From fb3ce7db4e100e9a051aaa19b96d33d67f02d1f2 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Mon, 13 Oct 2014 23:58:13 -0500
|
||||
Subject: [PATCH 11/13] port utilite to distro generic boot commands
|
||||
|
||||
---
|
||||
include/configs/cm_fx6.h | 112 +++++++++++------------------------------------
|
||||
1 file changed, 26 insertions(+), 86 deletions(-)
|
||||
|
||||
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
|
||||
index 7cf241e..3c7615f 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 */
|
||||
@@ -92,98 +91,39 @@
|
||||
#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 \
|
||||
- "kernel=uImage-cm-fx6\0" \
|
||||
- "autoload=no\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" \
|
||||
- "bootscr=boot.scr\0" \
|
||||
- "bootm_low=18000000\0" \
|
||||
- "video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32@50,if=RGB32\0" \
|
||||
- "video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
|
||||
"fdtfile=cm-fx6.dtb\0" \
|
||||
- "doboot=bootm ${loadaddr}\0" \
|
||||
- "loadfdt=false\0" \
|
||||
- "setboottypez=setenv kernel zImage-cm-fx6;" \
|
||||
- "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
|
||||
- "setenv loadfdt true;\0" \
|
||||
- "setboottypem=setenv kernel uImage-cm-fx6;" \
|
||||
- "setenv doboot bootm ${loadaddr};" \
|
||||
- "setenv loadfdt false;\0"\
|
||||
- "run_eboot=echo Starting EBOOT ...; "\
|
||||
- "mmc dev ${mmcdev} && " \
|
||||
- "mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
|
||||
- "mmcdev=2\0" \
|
||||
- "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
|
||||
- "loadmmcbootscript=load mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \
|
||||
- "mmcbootscript=echo Running bootscript from mmc ...; "\
|
||||
- "source ${loadaddr}\0" \
|
||||
- "mmcargs=setenv bootargs console=${console} " \
|
||||
- "root=${mmcroot} " \
|
||||
- "${video}\0" \
|
||||
- "mmcloadkernel=load mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
|
||||
- "mmcloadfdt=load mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
|
||||
- "mmcboot=echo Booting from mmc ...; " \
|
||||
- "run mmcargs; " \
|
||||
- "run doboot\0" \
|
||||
- "satadev=0\0" \
|
||||
- "sataroot=/dev/sda2 rw rootwait\0" \
|
||||
- "sataargs=setenv bootargs console=${console} " \
|
||||
- "root=${sataroot} " \
|
||||
- "${video}\0" \
|
||||
- "loadsatabootscript=load sata ${satadev} ${loadaddr} ${bootscr}\0" \
|
||||
- "satabootscript=echo Running bootscript from sata ...; " \
|
||||
- "source ${loadaddr}\0" \
|
||||
- "sataloadkernel=load sata ${satadev} ${loadaddr} ${kernel}\0" \
|
||||
- "sataloadfdt=load sata ${satadev} ${fdtaddr} ${fdtfile}\0" \
|
||||
- "sataboot=echo Booting from sata ...; "\
|
||||
- "run sataargs; " \
|
||||
- "run doboot\0" \
|
||||
- "nandroot=/dev/mtdblock4 rw\0" \
|
||||
- "nandrootfstype=ubifs\0" \
|
||||
- "nandargs=setenv bootargs console=${console} " \
|
||||
- "root=${nandroot} " \
|
||||
- "rootfstype=${nandrootfstype} " \
|
||||
- "${video}\0" \
|
||||
- "nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
|
||||
- "nandboot=echo Booting from nand ...; " \
|
||||
- "run nandargs; " \
|
||||
- "nand read ${loadaddr} 0 780000; " \
|
||||
- "if ${loadfdt}; then " \
|
||||
- "run nandloadfdt;" \
|
||||
- "fi; " \
|
||||
- "run doboot\0" \
|
||||
- "boot=mmc dev ${mmcdev}; " \
|
||||
- "if mmc rescan; then " \
|
||||
- "if run loadmmcbootscript; then " \
|
||||
- "run mmcbootscript;" \
|
||||
- "else " \
|
||||
- "if run mmcloadkernel; then " \
|
||||
- "if ${loadfdt}; then " \
|
||||
- "run mmcloadfdt;" \
|
||||
- "fi;" \
|
||||
- "run mmcboot;" \
|
||||
- "fi;" \
|
||||
- "fi;" \
|
||||
- "fi;" \
|
||||
- "if sata init; then " \
|
||||
- "if run loadsatabootscript; then " \
|
||||
- "run satabootscript;" \
|
||||
- "else "\
|
||||
- "if run sataloadkernel; then " \
|
||||
- "if ${loadfdt}; then " \
|
||||
- "run sataloadfdt; " \
|
||||
- "fi;" \
|
||||
- "run sataboot;" \
|
||||
- "fi;" \
|
||||
- "fi;" \
|
||||
- "fi;" \
|
||||
- "run nandboot\0"
|
||||
+ BOOTENV
|
||||
|
||||
-#define CONFIG_BOOTCOMMAND \
|
||||
- "run setboottypem; run boot"
|
||||
+#else /* ifndef CONFIG_SPL_BUILD */
|
||||
+#define CONFIG_EXTRA_ENV_SETTINGS
|
||||
+#endif
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_SPI
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
From 7624d0d511378fc8149703050aec2d78ce4217e1 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Mon, 27 Oct 2014 21:27:31 -0500
|
||||
Subject: [PATCH 12/13] 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
|
||||
---
|
||||
include/configs/ti_armv7_common.h | 3 ++-
|
||||
include/configs/ti_omap4_common.h | 40 +++++++++++++++++----------------------
|
||||
2 files changed, 19 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
|
||||
index f405fea..fa8bc1f 100644
|
||||
--- a/include/configs/ti_armv7_common.h
|
||||
+++ b/include/configs/ti_armv7_common.h
|
||||
@@ -54,7 +54,8 @@
|
||||
#define DEFAULT_LINUX_BOOT_ENV \
|
||||
"loadaddr=0x82000000\0" \
|
||||
"kernel_addr_r=0x82000000\0" \
|
||||
- "scriptaddr=0x82000000\0" \
|
||||
+ "pxefile_addr_r=0x87F00000\0" \
|
||||
+ "scriptaddr=0x87E00000\0" \
|
||||
"fdtaddr=0x88000000\0" \
|
||||
"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 b0f199e..c10d2c8 100644
|
||||
--- a/include/configs/ti_omap4_common.h
|
||||
+++ b/include/configs/ti_omap4_common.h
|
||||
@@ -82,6 +82,19 @@
|
||||
#undef CONFIG_CMD_NET
|
||||
#undef CONFIG_CMD_NFS
|
||||
|
||||
+
|
||||
+#ifndef CONFIG_SPL_BUILD
|
||||
+#include <config_distro_defaults.h>
|
||||
+#include <config_distro_bootcmd.h>
|
||||
+
|
||||
+#define BOOTENV_INIT_COMMAND "run findfdt ;"
|
||||
+
|
||||
+#define BOOT_TARGET_DEVICES(func) \
|
||||
+ func(MMC, mmc, 0) \
|
||||
+ func(USB, usb, 0) \
|
||||
+ func(PXE, pxe, na) \
|
||||
+ func(DHCP, dhcp, na)
|
||||
+
|
||||
/*
|
||||
* Environment setup
|
||||
*/
|
||||
@@ -129,30 +142,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" \
|
||||
+ BOOTENV
|
||||
|
||||
-#define CONFIG_BOOTCOMMAND \
|
||||
- "run findfdt; " \
|
||||
- "mmc dev ${mmcdev}; if mmc rescan; then " \
|
||||
- "echo SD/MMC found on device ${mmcdev};" \
|
||||
- "if run loadbootscript; then " \
|
||||
- "run bootscript; " \
|
||||
- "else " \
|
||||
- "if run loadbootenv; then " \
|
||||
- "run importbootenv; " \
|
||||
- "fi;" \
|
||||
- "if test -n ${uenvcmd}; then " \
|
||||
- "echo Running uenvcmd ...;" \
|
||||
- "run uenvcmd;" \
|
||||
- "fi;" \
|
||||
- "fi;" \
|
||||
- "if run loadimage; then " \
|
||||
- "run loadfdt;" \
|
||||
- "run mmcboot; " \
|
||||
- "fi; " \
|
||||
- "if run loaduimage; then " \
|
||||
- "run uimageboot;" \
|
||||
- "fi; " \
|
||||
- "fi"
|
||||
+#else
|
||||
+#define BOOT_TARGET_DEVICES
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Defines for SPL
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 105edd7a5c55db2f9abd927634aabeb90bc120f3 Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Warren <swarren@nvidia.com>
|
||||
Date: Fri, 22 Aug 2014 15:04:08 -0600
|
||||
Subject: [PATCH] ARM: tegra: add PCIe-related pins to the Jetson TK1 pinmux tables
|
||||
|
||||
This pinmux tables currently omit any configuration for PCIe clk_req,
|
||||
wake, and rst pins, which in turn causes intermittent failures in
|
||||
U-Boot's PCIe support. Import an updated version of the pinmux tables
|
||||
which rectifies this.
|
||||
|
||||
Signed-off-by: Stephen Warren <swarren@nvidia.com>
|
||||
Signed-off-by: Tom Warren <twarren@nvidia.com>
|
||||
---
|
||||
board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 5 +++++
|
||||
1 files changed, 5 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
|
||||
index d338818..de4eb35 100644
|
||||
--- a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
|
||||
+++ b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
|
||||
@@ -283,6 +283,11 @@ static const struct pmux_pingrp_config jetson_tk1_pingrps[] = {
|
||||
PINCFG(PCC2, DEFAULT, DOWN, NORMAL, INPUT, DEFAULT, DEFAULT),
|
||||
PINCFG(SDMMC4_CLK_PCC4, SDMMC4, NORMAL, NORMAL, INPUT, DEFAULT, DEFAULT),
|
||||
PINCFG(CLK2_REQ_PCC5, DEFAULT, NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
|
||||
+ PINCFG(PEX_L0_RST_N_PDD1, PE0, NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
|
||||
+ PINCFG(PEX_L0_CLKREQ_N_PDD2, PE0, UP, NORMAL, INPUT, DEFAULT, DEFAULT),
|
||||
+ PINCFG(PEX_WAKE_N_PDD3, PE, UP, NORMAL, INPUT, DEFAULT, DEFAULT),
|
||||
+ PINCFG(PEX_L1_RST_N_PDD5, PE1, NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
|
||||
+ PINCFG(PEX_L1_CLKREQ_N_PDD6, PE1, UP, NORMAL, INPUT, DEFAULT, DEFAULT),
|
||||
PINCFG(CLK3_OUT_PEE0, EXTPERIPH3, NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
|
||||
PINCFG(CLK3_REQ_PEE1, DEFAULT, NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
|
||||
PINCFG(DAP_MCLK1_REQ_PEE2, SATA, NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
|
||||
--
|
||||
1.7.2.5
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
From 19ce73f64ee92451cf28e8ebfa76eacb2f3fd50d Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Mon, 27 Oct 2014 21:38:32 -0500
|
||||
Subject: [PATCH 13/13] add back adding console= to the bootargs if not
|
||||
present.
|
||||
|
||||
better soloution is needed
|
||||
|
||||
not upstreamable
|
||||
---
|
||||
common/cmd_pxe.c | 20 ++++++++++++++++++--
|
||||
1 file changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
|
||||
index 7e32c95..4f3c15d 100644
|
||||
--- a/common/cmd_pxe.c
|
||||
+++ b/common/cmd_pxe.c
|
||||
@@ -673,18 +673,34 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label)
|
||||
if ((label->ipappend & 0x3) || label->append) {
|
||||
char bootargs[CONFIG_SYS_CBSIZE] = "";
|
||||
char finalbootargs[CONFIG_SYS_CBSIZE];
|
||||
+ char console[30] = "";
|
||||
+ /* check for a console line in the boot args passed in from the
|
||||
+ * config file. If there is no console line and the enviornment
|
||||
+ * has a console variable add it to the bootargs
|
||||
+ */
|
||||
+ if ( !strstr(label->append, "console=") ) {
|
||||
+ printf("no console= \n");
|
||||
+ if (getenv("console")) {
|
||||
+ sprintf(console, " console=%s",
|
||||
+ getenv("console"));
|
||||
+ }
|
||||
+ }
|
||||
|
||||
if (strlen(label->append ?: "") +
|
||||
- strlen(ip_str) + strlen(mac_str) + 1 > sizeof(bootargs)) {
|
||||
- printf("bootarg overflow %zd+%zd+%zd+1 > %zd\n",
|
||||
+ strlen(ip_str) + strlen(mac_str) + strlen(console) +
|
||||
+ 1 > sizeof(bootargs)) {
|
||||
+ printf("bootarg overflow %zd+%zd+%zd+%zd+1 > %zd\n",
|
||||
strlen(label->append ?: ""),
|
||||
strlen(ip_str), strlen(mac_str),
|
||||
+ strlen(console),
|
||||
sizeof(bootargs));
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (label->append)
|
||||
strcpy(bootargs, label->append);
|
||||
+ if (strlen(console) > 0)
|
||||
+ strcat(bootargs, console);
|
||||
strcat(bootargs, ip_str);
|
||||
strcat(bootargs, mac_str);
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
3ddcaee2f05b7c464778112ec83664b5 u-boot-2014.10.tar.bz2
|
||||
a1ba089cdefc50d032a0a5bfc66f6673 u-boot-2015.01-rc2.tar.bz2
|
||||
|
|
4
uEnv.txt
4
uEnv.txt
|
@ -1,4 +0,0 @@
|
|||
bootpart=0:3
|
||||
bootfile=boot.scr
|
||||
bootdir=/boot
|
||||
uenvcmd=ext2load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}
|
|
@ -1,15 +1,14 @@
|
|||
#global candidate
|
||||
%global candidate rc2
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2014.10
|
||||
Release: 5%{?candidate:.%{candidate}}%{?dist}
|
||||
Version: 2015.01
|
||||
Release: 0.1%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
|
||||
Group: Development/Tools
|
||||
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
|
||||
Source1: uEnv.txt
|
||||
|
||||
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
|
||||
|
@ -19,12 +18,11 @@ 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
|
||||
Patch9: 0009-wandboard-port-to-generic-distro-booting.patch
|
||||
Patch12: 0010-port-the-riotboard-to-distro-generic-configs-patch-b.patch
|
||||
Patch13: 0011-port-utilite-to-distro-generic-boot-commands.patch
|
||||
Patch14: 0012-tegra-fix-jetson-pcie.patch
|
||||
Patch15: 0012-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
|
||||
Patch16: 0013-add-back-adding-console-to-the-bootargs-if-not-prese.patch
|
||||
Patch9: 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
|
||||
|
||||
BuildRequires: dtc, openssl-devel
|
||||
BuildRequires: fedora-logos, netpbm-progs
|
||||
|
@ -478,6 +476,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Nov 26 2014 Dennis Gilmore <dennis@ausil.us> - 2015.01-0.1.rc2
|
||||
- update to 2015.01 rc2
|
||||
|
||||
* Tue Nov 11 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-5
|
||||
- switch the target used for beaglebone rhbz#1161619
|
||||
|
||||
|
|
Loading…
Reference in New Issue