refacter making directories for images
- make cm_fx6 image for utilite
This commit is contained in:
parent
4bad927947
commit
50452b4fd3
|
@ -1,44 +0,0 @@
|
||||||
From 5f854c52e79c0efa552625a494ebb01bd044dbea Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vagrant Cascadian <vagrant@debian.org>
|
|
||||||
Date: Wed, 1 Oct 2014 13:20:53 -0700
|
|
||||||
Subject: [PATCH 01/12] 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 2e18c03d8988e2873ff771675591905fdbdca6f9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vagrant Cascadian <vagrant@debian.org>
|
|
||||||
Date: Wed, 1 Oct 2014 12:55:58 -0700
|
|
||||||
Subject: [PATCH 02/12] 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 da59908a3db4c6221e6c825de3f11f1ef875e99d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vagrant Cascadian <vagrant@debian.org>
|
|
||||||
Date: Tue, 30 Sep 2014 20:02:26 -0700
|
|
||||||
Subject: [PATCH 03/12] 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 895199928ee42253714766421586bfba8132a7af Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vagrant Cascadian <vagrant@debian.org>
|
|
||||||
Date: Wed, 1 Oct 2014 14:04:01 -0700
|
|
||||||
Subject: [PATCH 04/12] 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 99a473134671c1f430269b9b16faaecfcfe9959f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vagrant Cascadian <vagrant@debian.org>
|
|
||||||
Date: Tue, 30 Sep 2014 20:34:19 -0700
|
|
||||||
Subject: [PATCH 05/12] 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 3661e50cfe0b4d5cf045be749e3cc4858acc4957 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vagrant Cascadian <vagrant@debian.org>
|
|
||||||
Date: Wed, 1 Oct 2014 10:29:36 -0700
|
|
||||||
Subject: [PATCH 06/12] 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 4326956e87cbfc913b19dd735b534610cd2b38e6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vagrant Cascadian <vagrant@debian.org>
|
|
||||||
Date: Wed, 1 Oct 2014 13:28:18 -0700
|
|
||||||
Subject: [PATCH 07/12] 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 e2f7ead..b25d990 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 "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 69b8812eec97af45dbd54699988f30044e40869e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dennis Gilmore <dennis@ausil.us>
|
|
||||||
Date: Wed, 10 Sep 2014 10:57:16 -0500
|
|
||||||
Subject: [PATCH 08/12] 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 7d96908..cd42523 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
|
|
||||||
@@ -110,6 +101,16 @@
|
|
||||||
#define CONFIG_IMX_HDMI
|
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
|
||||||
|
|
||||||
+#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)
|
|
||||||
@@ -119,13 +120,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" \
|
|
||||||
@@ -144,7 +148,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; " \
|
|
||||||
@@ -193,7 +197,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 ...; " \
|
|
||||||
@@ -216,7 +220,8 @@
|
|
||||||
"fi; " \
|
|
||||||
"else " \
|
|
||||||
"bootz; " \
|
|
||||||
- "fi;\0"
|
|
||||||
+ "fi;\0" \
|
|
||||||
+ BOOTENV
|
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND \
|
|
||||||
"mmc dev ${mmcdev}; if mmc rescan; then " \
|
|
||||||
@@ -230,6 +235,10 @@
|
|
||||||
"fi; " \
|
|
||||||
"else run netboot; fi"
|
|
||||||
|
|
||||||
+#else
|
|
||||||
+#define BOOT_TARGET_DEVICES
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* Miscellaneous configurable options */
|
|
||||||
#define CONFIG_SYS_LONGHELP
|
|
||||||
#define CONFIG_SYS_HUSH_PARSER
|
|
||||||
@@ -243,8 +252,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
|
|
||||||
@@ -267,9 +274,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,50 +0,0 @@
|
||||||
From 8f0930046dbe8d417650b5fb4e5049ffdc17371d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
Date: Tue, 30 Sep 2014 18:45:32 +0200
|
|
||||||
Subject: [PATCH 09/12] sunxi: Fix gmac not working reliable on the Bananapi
|
|
||||||
|
|
||||||
In order for the gmac nic to work reliable on the Bananapi, we need to set
|
|
||||||
bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain" of the GMAC clk register
|
|
||||||
(0x01c20164) to 3.
|
|
||||||
|
|
||||||
Without this about 9 out of 10 ethernet packets get lost, with this setting
|
|
||||||
there is no packet loss.
|
|
||||||
|
|
||||||
So far setting these bits is only necessary on the Bananapi, so this commit
|
|
||||||
solves this with a bit of #ifdef CONFIG_BANANAPI code. If in the future we
|
|
||||||
need to do something similar for other boards, we can create a specific
|
|
||||||
CONFIG_FOO option for this then.
|
|
||||||
|
|
||||||
Reported-by: Karsten Merker <merker@debian.org>
|
|
||||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
Tested-by: Karsten Merker <merker@debian.org>
|
|
||||||
Tested-by: Zoltan HERPAI <wigyori@openwrt.org>
|
|
||||||
Tested-by: Tony Zhang <tony.zhang@lemaker.org>
|
|
||||||
Acked-by: Ian Campbell <ijc@hellion.org.uk>
|
|
||||||
---
|
|
||||||
board/sunxi/gmac.c | 9 +++++++++
|
|
||||||
1 file changed, 9 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
|
|
||||||
index e7ff952..6348d27 100644
|
|
||||||
--- a/board/sunxi/gmac.c
|
|
||||||
+++ b/board/sunxi/gmac.c
|
|
||||||
@@ -24,6 +24,15 @@ int sunxi_gmac_initialize(bd_t *bis)
|
|
||||||
CCM_GMAC_CTRL_GPIT_MII);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * In order for the gmac nic to work reliable on the Bananapi, we
|
|
||||||
+ * need to set bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain"
|
|
||||||
+ * of the GMAC clk register to 3.
|
|
||||||
+ */
|
|
||||||
+#ifdef CONFIG_BANANAPI
|
|
||||||
+ setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* Configure pin mux settings for GMAC */
|
|
||||||
for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
|
|
||||||
#ifdef CONFIG_RGMII
|
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
|
@ -1,35 +0,0 @@
|
||||||
From 72005a3bb4c6c86ddcf811b265dc2a5a357c60a4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nikita Kiryanov <nikita@compulab.co.il>
|
|
||||||
Date: Wed, 17 Sep 2014 15:59:25 +0300
|
|
||||||
Subject: [PATCH 10/12] compulab: eeprom: add default eeprom bus
|
|
||||||
|
|
||||||
Add default eeprom bus setting.
|
|
||||||
This addresses the trimslice compile error that was introduced
|
|
||||||
with the addition of this setting.
|
|
||||||
|
|
||||||
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
|
|
||||||
Cc: Igor Grinberg <grinberg@compulab.co.il>
|
|
||||||
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
|
|
||||||
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
|
|
||||||
---
|
|
||||||
board/compulab/common/eeprom.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
|
|
||||||
index 85442cd..2df3ada 100644
|
|
||||||
--- a/board/compulab/common/eeprom.c
|
|
||||||
+++ b/board/compulab/common/eeprom.c
|
|
||||||
@@ -15,6 +15,10 @@
|
|
||||||
# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifndef CONFIG_SYS_I2C_EEPROM_BUS
|
|
||||||
+#define CONFIG_SYS_I2C_EEPROM_BUS 0
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#define EEPROM_LAYOUT_VER_OFFSET 44
|
|
||||||
#define BOARD_SERIAL_OFFSET 20
|
|
||||||
#define BOARD_SERIAL_OFFSET_LEGACY 8
|
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
|
@ -1,102 +0,0 @@
|
||||||
From a0c28ea3f2518734be16022ad25920dcd66e102c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dennis Gilmore <dennis@ausil.us>
|
|
||||||
Date: Mon, 13 Oct 2014 23:17:32 -0500
|
|
||||||
Subject: [PATCH 11/12] 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 210dde2aaf9a998e759c68bad0a4384559a398e3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dennis Gilmore <dennis@ausil.us>
|
|
||||||
Date: Mon, 13 Oct 2014 23:58:13 -0500
|
|
||||||
Subject: [PATCH 12/12] 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 10d02b4..1f0179e 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,12 +0,0 @@
|
||||||
diff -uNr u-boot-2012.04.01.orig/fs/fat/fat.c u-boot-2012.04.01/fs/fat/fat.c
|
|
||||||
--- u-boot-2012.04.01.orig/fs/fat/fat.c 2012-04-25 08:22:50.000000000 -0500
|
|
||||||
+++ u-boot-2012.04.01/fs/fat/fat.c 2012-06-19 14:06:16.605337811 -0500
|
|
||||||
@@ -90,7 +90,7 @@
|
|
||||||
/* 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;
|
|
|
@ -10,20 +10,21 @@ License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||||
URL: http://www.denx.de/wiki/U-Boot
|
URL: http://www.denx.de/wiki/U-Boot
|
||||||
Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
|
Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
|
||||||
Source1: uEnv.txt
|
Source1: uEnv.txt
|
||||||
Patch1: u-boot-fat.patch
|
|
||||||
|
|
||||||
Patch10: 0001-Allow-checking-in-multiple-partitions-for-scan_dev_f.patch
|
Patch1: 0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
|
||||||
Patch11: 0002-Allow-overriding-boot_partitions-default-value-by-se.patch
|
Patch2: 0002-Allow-checking-in-multiple-partitions-for-scan_dev_f.patch
|
||||||
Patch12: 0003-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
Patch3: 0003-Allow-overriding-boot_partitions-default-value-by-se.patch
|
||||||
Patch13: 0004-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
|
Patch4: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||||
Patch14: 0005-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
|
Patch5: 0005-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
|
||||||
Patch15: 0006-Add-support-for-loading-environment-from-uEnv.txt-in.patch
|
Patch6: 0006-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
|
||||||
Patch16: 0007-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
|
Patch7: 0007-Add-support-for-loading-environment-from-uEnv.txt-in.patch
|
||||||
Patch17: 0008-wandboard-port-to-generic-distro-booting.patch
|
Patch8: 0008-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
|
||||||
Patch18: 0009-sunxi-Fix-gmac-not-working-reliable-on-the-Bananapi.patch
|
Patch9: 0009-wandboard-port-to-generic-distro-booting.patch
|
||||||
Patch19: 0010-compulab-eeprom-add-default-eeprom-bus.patch
|
Patch10: 0010-sunxi-Fix-gmac-not-working-reliable-on-the-Bananapi.patch
|
||||||
Patch20: 0011-port-the-riotboard-to-distro-generic-configs-patch-b.patch
|
Patch11: 0011-compulab-eeprom-add-default-eeprom-bus.patch
|
||||||
Patch21: 0012-port-utilite-to-distro-generic-boot-commands.patch
|
Patch12: 0012-port-the-riotboard-to-distro-generic-configs-patch-b.patch
|
||||||
|
Patch13: 0013-port-utilite-to-distro-generic-boot-commands.patch
|
||||||
|
Patch14: 0009-sunxi-Fix-gmac-not-working-reliable-on-the-Bananapi.patch
|
||||||
|
|
||||||
BuildRequires: dtc, openssl-devel
|
BuildRequires: dtc, openssl-devel
|
||||||
BuildRequires: fedora-logos, netpbm-progs
|
BuildRequires: fedora-logos, netpbm-progs
|
||||||
|
@ -85,19 +86,16 @@ u-boot bootloader binaries for armv7 boards
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n u-boot-%{version}%{?candidate:-%{candidate}}
|
%setup -q -n u-boot-%{version}%{?candidate:-%{candidate}}
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%patch11 -p1
|
git init
|
||||||
%patch12 -p1
|
git config user.email "noone@example.com"
|
||||||
%patch13 -p1
|
git config user.name "no one"
|
||||||
%patch14 -p1
|
git add .
|
||||||
%patch15 -p1
|
git commit -a -q -m "%{version} baseline"
|
||||||
%patch16 -p1
|
git am %{patches} </dev/null
|
||||||
%patch17 -p1
|
git config --unset user.email
|
||||||
%patch18 -p1
|
git config --unset user.name
|
||||||
%patch19 -p1
|
|
||||||
%patch20 -p1
|
|
||||||
%patch21 -p1
|
|
||||||
|
|
||||||
|
|
||||||
mkdir builds
|
mkdir builds
|
||||||
|
@ -490,6 +488,7 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
||||||
* Fri Sep 19 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2014.10-0.3.rc2
|
* Fri Sep 19 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2014.10-0.3.rc2
|
||||||
- Add Jetson K1, RIoT Board
|
- Add Jetson K1, RIoT Board
|
||||||
- Minor spec cleanups
|
- Minor spec cleanups
|
||||||
|
- use git to apply patches
|
||||||
|
|
||||||
* Thu Sep 18 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-0.2.rc2
|
* Thu Sep 18 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-0.2.rc2
|
||||||
- Add Cubieboard, Cubieboard2, Banana Pi, Mele_A1000 and Mele_A1000G images
|
- Add Cubieboard, Cubieboard2, Banana Pi, Mele_A1000 and Mele_A1000G images
|
||||||
|
|
Loading…
Reference in New Issue