110-wandboard-owrt-env.patch 2.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889
  1. --- a/include/configs/wandboard.h
  2. +++ b/include/configs/wandboard.h
  3. @@ -49,7 +49,7 @@
  4. #define CONFIG_CMD_BMODE
  5. #define CONFIG_CMD_SETEXPR
  6. -#define CONFIG_BOOTDELAY 5
  7. +#define CONFIG_BOOTDELAY 3
  8. #define CONFIG_SYS_MEMTEST_START 0x10000000
  9. #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
  10. @@ -102,13 +102,15 @@
  11. #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
  12. #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
  13. +#define CONFIG_OWRT_NAME "openwrt-imx6-imx6dl-wandboard-fit-uImage.itb"
  14. #elif defined(CONFIG_MX6Q)
  15. #define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb"
  16. +#define CONFIG_OWRT_NAME "openwrt-imx6-imx6q-wandboard-fit-uImage.itb"
  17. #endif
  18. #define CONFIG_EXTRA_ENV_SETTINGS \
  19. "script=boot.scr\0" \
  20. - "image=zImage\0" \
  21. + "image=" CONFIG_OWRT_NAME "\0" \
  22. "console=ttymxc0\0" \
  23. "splashpos=m,m\0" \
  24. "fdt_high=0xffffffff\0" \
  25. @@ -137,11 +139,11 @@
  26. "mmcargs=setenv bootargs console=${console},${baudrate} " \
  27. "root=${mmcroot}\0" \
  28. "loadbootscript=" \
  29. - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
  30. + "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
  31. "bootscript=echo Running bootscript from mmc ...; " \
  32. "source\0" \
  33. - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
  34. - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
  35. + "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
  36. + "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
  37. "mmcboot=echo Booting from mmc ...; " \
  38. "run mmcargs; " \
  39. "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
  40. @@ -155,31 +157,7 @@
  41. "fi; " \
  42. "fi; " \
  43. "else " \
  44. - "bootz; " \
  45. - "fi;\0" \
  46. - "netargs=setenv bootargs console=${console},${baudrate} " \
  47. - "root=/dev/nfs " \
  48. - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
  49. - "netboot=echo Booting from net ...; " \
  50. - "run netargs; " \
  51. - "if test ${ip_dyn} = yes; then " \
  52. - "setenv get_cmd dhcp; " \
  53. - "else " \
  54. - "setenv get_cmd tftp; " \
  55. - "fi; " \
  56. - "${get_cmd} ${image}; " \
  57. - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
  58. - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
  59. - "bootz ${loadaddr} - ${fdt_addr}; " \
  60. - "else " \
  61. - "if test ${boot_fdt} = try; then " \
  62. - "bootz; " \
  63. - "else " \
  64. - "echo WARN: Cannot load the DT; " \
  65. - "fi; " \
  66. - "fi; " \
  67. - "else " \
  68. - "bootz; " \
  69. + "bootm; " \
  70. "fi;\0"
  71. #define CONFIG_BOOTCOMMAND \
  72. @@ -189,10 +167,10 @@
  73. "else " \
  74. "if run loadimage; then " \
  75. "run mmcboot; " \
  76. - "else run netboot; " \
  77. + "else echo WARN: Can not boot the image; " \
  78. "fi; " \
  79. "fi; " \
  80. - "else run netboot; fi"
  81. + "fi"
  82. /* Miscellaneous configurable options */
  83. #define CONFIG_SYS_LONGHELP