diff options
| author | Dennis Gilmore <dennis@ausil.us> | 2013-10-19 07:13:06 -0500 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2013-10-19 07:13:06 -0500 |
| commit | 741142d41f3f9d5b54b5730d739825caa1fc7373 (patch) | |
| tree | 45569a6fb69af9f153d95de1b72323e94cffe5ae | |
| parent | 0605737fd61f27876f756efaf2cb7c316e630c93 (diff) | |
| download | uboot-tools-741142d41f3f9d5b54b5730d739825caa1fc7373.tar.gz uboot-tools-741142d41f3f9d5b54b5730d739825caa1fc7373.tar.xz uboot-tools-741142d41f3f9d5b54b5730d739825caa1fc7373.zip | |
add missing patch
| -rw-r--r-- | 0016-WANDBOARD-use-ext2load-to-load-dtbs.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/0016-WANDBOARD-use-ext2load-to-load-dtbs.patch b/0016-WANDBOARD-use-ext2load-to-load-dtbs.patch new file mode 100644 index 0000000..95b30f3 --- /dev/null +++ b/0016-WANDBOARD-use-ext2load-to-load-dtbs.patch @@ -0,0 +1,69 @@ +From cf5beda60dcf4751d519f5c99321014ff2c566c8 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore <dennis@ausil.us> +Date: Sat, 19 Oct 2013 06:47:29 -0500 +Subject: [PATCH 16/16] WANDBOARD: use ext2load to load dtbs wrap some of the + generic distro defined options in ifdef to avoid duplicate defines + +--- + include/configs/wandboard.h | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h +index 135835f..b81092b 100644 +--- a/include/configs/wandboard.h ++++ b/include/configs/wandboard.h +@@ -51,7 +51,6 @@ + #define CONFIG_CMD_BMODE + #define CONFIG_CMD_SETEXPR + +-#define CONFIG_BOOTDELAY 5 + + #define CONFIG_SYS_MEMTEST_START 0x10000000 + #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) +@@ -68,6 +67,10 @@ + #define CONFIG_CMD_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_BOUNCE_BUFFER ++ ++#ifndef DISTRO_DEFAULTS ++#define CONFIG_BOOTDELAY 5 ++ + #define CONFIG_CMD_EXT2 + #define CONFIG_CMD_FAT + #define CONFIG_DOS_PARTITION +@@ -77,6 +80,13 @@ + #define CONFIG_CMD_DHCP + #define CONFIG_CMD_MII + #define CONFIG_CMD_NET ++ ++#define CONFIG_OF_LIBFDT ++#define CONFIG_CMD_BOOTZ ++ ++#endif ++ ++/* Ethernet Configuration */ + #define CONFIG_FEC_MXC + #define CONFIG_MII + #define IMX_FEC_BASE ENET_BASE_ADDR +@@ -130,7 +140,7 @@ + "bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \ + "bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \ + "bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \ +- "bootcmd_disk=load ${boot_ifc} ${bootdevice} ${fdt_addr} /boot/dtb/${fdt_file}; load ${boot_ifc} ${bootdevice} ${fdt_addr} /dtb/${fdt_file};run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \ ++ "bootcmd_disk=ext2load ${boot_ifc} ${bootdevice} ${fdt_addr} /boot/dtb/${fdt_file}; ext2load ${boot_ifc} ${bootdevice} ${fdt_addr} /dtb/${fdt_file};run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \ + "bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \ + "bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \ + "bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \ +@@ -258,9 +268,6 @@ + #define CONFIG_ENV_OFFSET (6 * 64 * 1024) + #define CONFIG_SYS_MMC_ENV_DEV 0 + +-#define CONFIG_OF_LIBFDT +-#define CONFIG_CMD_BOOTZ +- + #ifndef CONFIG_SYS_DCACHE_OFF + #define CONFIG_CMD_CACHE + #endif +-- +1.8.3.1 + |