diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-08-29 23:06:31 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-08-29 23:06:31 +0000 |
| commit | 766d4089cde790f2c36c5aa17e9732af0108e285 (patch) | |
| tree | bef2c41bd01fd1eeb83bc7a96f80b01364721ac1 /package/boot/uboot-imx6/patches/110-wandboard-owrt-env-patch | |
| parent | 8901997bbca7da712299a4f642727e4d3006f824 (diff) | |
| download | upstream-766d4089cde790f2c36c5aa17e9732af0108e285.tar.gz upstream-766d4089cde790f2c36c5aa17e9732af0108e285.tar.bz2 upstream-766d4089cde790f2c36c5aa17e9732af0108e285.zip | |
[package] uboot-imx6: update to v2013.07
Update includes upstream support for Wandboard Quad too.
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37858 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/boot/uboot-imx6/patches/110-wandboard-owrt-env-patch')
| -rw-r--r-- | package/boot/uboot-imx6/patches/110-wandboard-owrt-env-patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/package/boot/uboot-imx6/patches/110-wandboard-owrt-env-patch b/package/boot/uboot-imx6/patches/110-wandboard-owrt-env-patch deleted file mode 100644 index e14f56394f..0000000000 --- a/package/boot/uboot-imx6/patches/110-wandboard-owrt-env-patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/include/configs/wandboard.h -+++ b/include/configs/wandboard.h -@@ -47,7 +47,7 @@ - - #undef CONFIG_CMD_IMLS - --#define CONFIG_BOOTDELAY 5 -+#define CONFIG_BOOTDELAY 3 - - #define CONFIG_SYS_MEMTEST_START 0x10000000 - #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -@@ -83,13 +83,15 @@ - - #if defined(CONFIG_MX6DL) - #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" -+#define CONFIG_OWRT_NAME "openwrt-imx6dl-wandboard-uImage.itb" - #elif defined(CONFIG_MX6S) - #define CONFIG_DEFAULT_FDT_FILE "imx6s-wandboard.dtb" -+#define CONFIG_OWRT_NAME "openwrt-imx6s-wandboard-uImage.itb" - #endif - - #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ -- "uimage=uImage\0" \ -+ "uimage=" CONFIG_OWRT_NAME "\0" \ - "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ -@@ -103,11 +105,11 @@ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=${mmcroot}\0" \ - "loadbootscript=" \ -- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ -+ "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ -- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ -+ "loadfdt=ext2load 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 " \ -@@ -122,30 +124,6 @@ - "fi; " \ - "else " \ - "bootm; " \ -- "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} ${uimage}; " \ -- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -- "bootm ${loadaddr} - ${fdt_addr}; " \ -- "else " \ -- "if test ${boot_fdt} = try; then " \ -- "bootm; " \ -- "else " \ -- "echo WARN: Cannot load the DT; " \ -- "fi; " \ -- "fi; " \ -- "else " \ -- "bootm; " \ - "fi;\0" - - #define CONFIG_BOOTCOMMAND \ -@@ -155,10 +133,10 @@ - "else " \ - "if run loaduimage; then " \ - "run mmcboot; " \ -- "else run netboot; " \ -+ "else echo WARN: Can not boot the image; " \ - "fi; " \ - "fi; " \ -- "else run netboot; fi" -+ "fi" - - /* Miscellaneous configurable options */ - #define CONFIG_SYS_LONGHELP |