diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-05-20 21:01:18 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-05-20 21:01:18 +0000 |
| commit | b10140d8320840695e96a77b9cb1d255b22a602a (patch) | |
| tree | 1c68406786d416712f9ae78d51c177db8335da6c /package/boot/uboot-imx6/patches/110-wandboard-owrt-env.patch | |
| parent | 44c890b6f1ce9dab0b680e4385177ab0baf7fb71 (diff) | |
| download | upstream-b10140d8320840695e96a77b9cb1d255b22a602a.tar.gz upstream-b10140d8320840695e96a77b9cb1d255b22a602a.tar.bz2 upstream-b10140d8320840695e96a77b9cb1d255b22a602a.zip | |
uboot-imx6: update to 2014.04
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 40805
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 | 34 |
1 files changed, 18 insertions, 16 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 index 9357892930..7bef453cb5 100644 --- a/package/boot/uboot-imx6/patches/110-wandboard-owrt-env.patch +++ b/package/boot/uboot-imx6/patches/110-wandboard-owrt-env.patch @@ -1,6 +1,6 @@ --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR @@ -9,24 +9,24 @@ #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -@@ -101,13 +101,15 @@ +@@ -102,13 +102,15 @@ #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" -+#define CONFIG_OWRT_NAME "openwrt-imx6-imx6dl-wandboard-fit-uImage.itb" ++#define CONFIG_OWRT_NAME "openwrt-imx6-imx6dl-wandboard-fit-uImage.itb" #elif defined(CONFIG_MX6Q) #define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb" -+#define CONFIG_OWRT_NAME "openwrt-imx6-imx6q-wandboard-fit-uImage.itb" ++#define CONFIG_OWRT_NAME "openwrt-imx6-imx6q-wandboard-fit-uImage.itb" #endif #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ -- "uimage=uImage\0" \ -+ "uimage=" CONFIG_OWRT_NAME "\0" \ +- "image=zImage\0" \ ++ "image=" CONFIG_OWRT_NAME "\0" \ "console=ttymxc0\0" \ "splashpos=m,m\0" \ "fdt_high=0xffffffff\0" \ -@@ -136,11 +138,11 @@ +@@ -137,11 +139,11 @@ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ @@ -34,17 +34,18 @@ + "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ -- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ +- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\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 " \ -@@ -155,30 +157,6 @@ +@@ -155,31 +157,7 @@ + "fi; " \ "fi; " \ "else " \ - "bootm; " \ +- "bootz; " \ - "fi;\0" \ - "netargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/nfs " \ @@ -56,25 +57,26 @@ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ -- "${get_cmd} ${uimage}; " \ +- "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -- "bootm ${loadaddr} - ${fdt_addr}; " \ +- "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -- "bootm; " \ +- "bootz; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi; " \ - "else " \ -- "bootm; " \ +- "bootz; " \ ++ "bootm; " \ "fi;\0" #define CONFIG_BOOTCOMMAND \ -@@ -188,10 +166,10 @@ +@@ -189,10 +167,10 @@ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ - "else run netboot; " \ + "else echo WARN: Can not boot the image; " \ |