summaryrefslogtreecommitdiffstats
path: root/0006-convert-wandboard-to-use-generic-boot-commands.patch
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2014-04-21 12:43:34 -0500
committerDennis Gilmore <dennis@ausil.us>2014-04-21 12:43:34 -0500
commit07dc9b8284fbe0405e3cf63740a6536e79cbc5db (patch)
tree36bf0e792fdcbd6c05c594e4fd37c10799a6f11f /0006-convert-wandboard-to-use-generic-boot-commands.patch
parentcc319d5762cc708575ec14cfd22cb1f79ce177eb (diff)
downloaduboot-tools-07dc9b8284fbe0405e3cf63740a6536e79cbc5db.tar.gz
uboot-tools-07dc9b8284fbe0405e3cf63740a6536e79cbc5db.tar.xz
uboot-tools-07dc9b8284fbe0405e3cf63740a6536e79cbc5db.zip
update to final 2014.04
- put all images into a single rpm - add udoo image
Diffstat (limited to '0006-convert-wandboard-to-use-generic-boot-commands.patch')
-rw-r--r--0006-convert-wandboard-to-use-generic-boot-commands.patch164
1 files changed, 0 insertions, 164 deletions
diff --git a/0006-convert-wandboard-to-use-generic-boot-commands.patch b/0006-convert-wandboard-to-use-generic-boot-commands.patch
deleted file mode 100644
index 8908f3d..0000000
--- a/0006-convert-wandboard-to-use-generic-boot-commands.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 3cc8719c60bb9d4bea7484c8f5533345390a6986 Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis@ausil.us>
-Date: Sat, 8 Mar 2014 10:59:00 -0600
-Subject: [PATCH 06/13] convert wandboard to use generic boot commands
-
----
- include/configs/wandboard.h | 91 +++++++--------------------------------------
- 1 file changed, 14 insertions(+), 77 deletions(-)
-
-diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
-index 6c74c72..6aaa439 100644
---- a/include/configs/wandboard.h
-+++ b/include/configs/wandboard.h
-@@ -41,6 +41,11 @@
- #define CONFIG_CONS_INDEX 1
- #define CONFIG_BAUDRATE 115200
-
-+#ifndef CONFIG_SPL_BUILD
-+#include <config_distro_defaults.h>
-+#include <config_distro_bootcmd.h>
-+#endif
-+
- /* Command definition */
- #include <config_cmd_default.h>
-
-@@ -49,8 +54,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
-@@ -66,15 +69,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
-@@ -111,11 +107,15 @@
- "image=zImage\0" \
- "console=ttymxc0\0" \
- "splashpos=m,m\0" \
-- "fdt_high=0xffffffff\0" \
-- "initrd_high=0xffffffff\0" \
-+ "fdt_high=0xa0000000\0" \
-+ "initrd_high=0xa0000000\0" \
- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
-- "fdt_addr=0x18000000\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" \
- "ip_dyn=yes\0" \
- "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
- "mmcpart=1\0" \
-@@ -134,70 +134,12 @@
- "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
- "fi; " \
- "fi\0" \
-- "mmcargs=setenv bootargs console=${console},${baudrate} " \
-- "root=${mmcroot}\0" \
-- "loadbootscript=" \
-- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-- "bootscript=echo Running bootscript from mmc ...; " \
-- "source\0" \
-- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-- "mmcboot=echo Booting from mmc ...; " \
-- "run mmcargs; " \
-- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-- "if run loadfdt; then " \
-- "bootz ${loadaddr} - ${fdt_addr}; " \
-- "else " \
-- "if test ${boot_fdt} = try; then " \
-- "bootz; " \
-- "else " \
-- "echo WARN: Cannot load the DT; " \
-- "fi; " \
-- "fi; " \
-- "else " \
-- "bootz; " \
-- "fi;\0" \
-- "netargs=setenv bootargs console=${console},${baudrate} " \
-- "root=/dev/nfs " \
-- "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-- "netboot=echo Booting from net ...; " \
-- "run netargs; " \
-- "if test ${ip_dyn} = yes; then " \
-- "setenv get_cmd dhcp; " \
-- "else " \
-- "setenv get_cmd tftp; " \
-- "fi; " \
-- "${get_cmd} ${image}; " \
-- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-- "bootz ${loadaddr} - ${fdt_addr}; " \
-- "else " \
-- "if test ${boot_fdt} = try; then " \
-- "bootz; " \
-- "else " \
-- "echo WARN: Cannot load the DT; " \
-- "fi; " \
-- "fi; " \
-- "else " \
-- "bootz; " \
-- "fi;\0"
-+ BOOTCMDS_COMMON
-
- #define CONFIG_BOOTCOMMAND \
-- "mmc dev ${mmcdev}; if mmc rescan; then " \
-- "if run loadbootscript; then " \
-- "run bootscript; " \
-- "else " \
-- "if run loadimage; then " \
-- "run mmcboot; " \
-- "else run netboot; " \
-- "fi; " \
-- "fi; " \
-- "else run netboot; fi"
-+ "for target in ${boot_targets}; do run bootcmd_${target}; done"
-
- /* Miscellaneous configurable options */
--#define CONFIG_SYS_LONGHELP
--#define CONFIG_SYS_HUSH_PARSER
--#define CONFIG_AUTO_COMPLETE
- #define CONFIG_SYS_CBSIZE 256
-
- /* Print Buffer Size */
-@@ -207,8 +149,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
-@@ -231,9 +171,6 @@
- #define CONFIG_ENV_OFFSET (6 * 64 * 1024)
- #define CONFIG_SYS_MMC_ENV_DEV 0
-
--#define CONFIG_OF_LIBFDT
--#define CONFIG_CMD_BOOTZ
--
- #ifndef CONFIG_SYS_DCACHE_OFF
- #define CONFIG_CMD_CACHE
- #endif
---
-1.9.0
-