diff options
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 | 90 |
1 files changed, 90 insertions, 0 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 new file mode 100644 index 0000000000..6869c85d0f --- /dev/null +++ b/package/boot/uboot-imx6/patches/110-wandboard-owrt-env.patch @@ -0,0 +1,90 @@ +--- a/include/configs/wandboard.h ++++ b/include/configs/wandboard.h +@@ -51,7 +51,7 @@ + #define CONFIG_CMD_BMODE + #define CONFIG_CMD_SETEXPR + +-#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) +@@ -103,15 +103,18 @@ + + #if defined(CONFIG_MX6DL) + #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" ++#define CONFIG_OWRT_NAME "openwrt-imx6dl-wandboard-uImage.itb" + #elif defined(CONFIG_MX6Q) + #define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb" ++#define CONFIG_OWRT_NAME "openwrt-imx6q-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" \ +@@ -139,11 +142,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 " \ +@@ -158,30 +161,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 \ +@@ -191,10 +170,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 |