code.ossystems Code Review - meta-freescale.git/blob

   1 From 970f04b228a60c805cce41ef8403ba2c8cb56d97 Mon Sep 17 00:00:00 2001
   2 From: Otavio Salvador <otavio@ossystems.com.br>
   3 Date: Wed, 13 Feb 2013 15:15:28 -0200
   4 Subject: [PATCH] mx6q_sabresd: Change default environment to work with OE
   5
   6 Upstream-Status: Inappropriate [configuration]
   7
   8 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
   9 ---
  10  include/configs/mx6q_sabresd.h | 40 ++++++++++++++++++++++++----------------
  11  1 file changed, 24 insertions(+), 16 deletions(-)
  12
  13 diff --git a/include/configs/mx6q_sabresd.h b/include/configs/mx6q_sabresd.h
  14 index 6f07961..db31a34 100644
  15 --- a/include/configs/mx6q_sabresd.h
  16 +++ b/include/configs/mx6q_sabresd.h
  17 @@ -116,22 +116,30 @@
  18  #define CONFIG_RD_LOADADDR     (0x1300000)
  19
  20  #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
  21 -               "netdev=eth0\0"                                         \
  22 -               "ethprime=FEC0\0"                                       \
  23 -               "uboot=u-boot.bin\0"                    \
  24 -               "kernel=uImage\0"                               \
  25 -               "nfsroot=/opt/eldk/arm\0"                               \
  26 -               "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\
  27 -               "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
  28 -                       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
  29 -               "bootcmd_net=run bootargs_base bootargs_nfs; "          \
  30 -                       "tftpboot ${loadaddr} ${kernel}; bootm\0"       \
  31 -               "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp "     \
  32 -                       "root=/dev/mmcblk0p1 rootwait\0"                \
  33 -               "bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
  34 -               "mmc dev 3; "   \
  35 -               "mmc read ${loadaddr} 0x800 0x2000; bootm\0"    \
  36 -               "bootcmd=run bootcmd_net\0"                             \
  37 +        "script=boot.scr\0" \
  38 +        "uimage=uImage\0" \
  39 +        "mmcdev=2\0" \
  40 +        "mmcpart=1\0" \
  41 +        "mmcroot=/dev/mmcblk0p2 rw\0" \
  42 +        "mmcrootfstype=ext3 rootwait\0" \
  43 +        "mmcargs=setenv bootargs console=ttymxc3,${baudrate} " \
  44 +        "root=${mmcroot} " \
  45 +        "rootfstype=${mmcrootfstype}\0" \
  46 +        "loadbootscript=" \
  47 +        "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
  48 +        "bootscript=echo Running bootscript from mmc ...; " \
  49 +        "source\0" \
  50 +        "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
  51 +        "mmcboot=echo Booting from mmc ...; " \
  52 +        "run mmcargs; " \
  53 +        "bootm\0" \
  54 +        "netargs=setenv bootargs console=ttymxc3,${baudrate} " \
  55 +        "root=/dev/nfs " \
  56 +        "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
  57 +        "netboot=echo Booting from net ...; " \
  58 +        "run netargs; " \
  59 +        "dhcp ${uimage}; bootm\0" \
  60 +        "bootcmd=run loaduimage; run mmcboot;\0" \
  61
  62
  63  #define CONFIG_ARP_TIMEOUT     200UL
  64 --
  65 1.8.1
  66