package/boot/uboot-imx6/patches/110-wandboard-owrt-env.patch

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