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

   1 From a81c7686f8c0c4fc6e88228f215092c00d4714c1 Mon Sep 17 00:00:00 2001
   2 From: Daiane Angolini <daiane.angolini@freescale.com>
   3 Date: Tue, 30 Oct 2012 07:47:59 -0500
   4 Subject: [PATCH] mx6q_sabreauto: Fix the patch for the default environment
   5  variable
   6
   7 Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
   8 ---
   9  include/configs/mx6q_sabreauto.h |   41 ++++++++++++++++++++++---------------
  10  1 files changed, 24 insertions(+), 17 deletions(-)
  11
  12 diff --git a/include/configs/mx6q_sabreauto.h b/include/configs/mx6q_sabreauto.h
  13 index 5f8f02c..5910eca 100644
  14 --- a/include/configs/mx6q_sabreauto.h
  15 +++ b/include/configs/mx6q_sabreauto.h
  16 @@ -121,23 +121,30 @@
  17  #define CONFIG_RD_LOADADDR     (CONFIG_LOADADDR + 0x300000)
  18
  19  #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
  20 -               "netdev=eth0\0"                                         \
  21 -               "ethprime=FEC0\0"                                       \
  22 -               "uboot=u-boot.bin\0"                    \
  23 -               "kernel=uImage\0"                               \
  24 -               "nfsroot=/opt/eldk/arm\0"                               \
  25 -               "bootargs_base=setenv bootargs console=ttymxc3,115200\0"\
  26 -               "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
  27 -                       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
  28 -               "bootcmd_net=run bootargs_base bootargs_nfs; "          \
  29 -                       "tftpboot ${loadaddr} ${kernel}; bootm\0"       \
  30 -               "bootargs_mmc=setenv bootargs ${bootargs} "     \
  31 -                       "root=/dev/mmcblk0p1 rootwait\0"                \
  32 -               "bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
  33 -               "mmc dev 2; "   \
  34 -               "mmc read ${loadaddr} 0x800 0x2000; bootm\0"    \
  35 -               "bootcmd=run bootcmd_mmc\0"                             \
  36 -
  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  #define CONFIG_ARP_TIMEOUT     200UL
  63
  64 --
  65 1.7.5.4
  66