Pandora Sourcecodes - openembedded.git/blob

   1 From 8da9e2bac6daf2d61d7ca9d689790fc9ce5de9cb Mon Sep 17 00:00:00 2001
   2 From: Steve Sakoman <steve@sakoman.com>
   3 Date: Fri, 7 May 2010 07:40:26 -0700
   4 Subject: [PATCH 41/50] OMAP3: Beagle: enable support for second and third mmc channels
   5
   6 Based on 629a01965677e680ffa1fe76579ace7f69dd45b9, but removed BOOTDELAY change.
   7 ---
   8  include/configs/omap3_beagle.h |    8 +++++---
   9  1 files changed, 5 insertions(+), 3 deletions(-)
  10
  11 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
  12 index 8ad52aa..e4c88f2 100644
  13 --- a/include/configs/omap3_beagle.h
  14 +++ b/include/configs/omap3_beagle.h
  15 @@ -95,6 +95,7 @@
  16                                         115200}
  17  #define CONFIG_MMC                     1
  18  #define CONFIG_OMAP3_MMC               1
  19 +#define CONFIG_SYS_MMC_SET_DEV         1
  20  #define CONFIG_DOS_PARTITION           1
  21
  22  /* DDR - I use Micron DDR */
  23 @@ -194,6 +195,7 @@
  24         "vram=12M\0" \
  25         "dvimode=640x480MR-16@60\0" \
  26         "defaultdisplay=dvi\0" \
  27 +       "mmcdev=1\0" \
  28         "mmcroot=/dev/mmcblk0p2 rw\0" \
  29         "mmcrootfstype=ext3 rootwait\0" \
  30         "nandroot=/dev/mtdblock4 rw\0" \
  31 @@ -214,10 +216,10 @@
  32                 "omapdss.def_disp=${defaultdisplay} " \
  33                 "root=${nandroot} " \
  34                 "rootfstype=${nandrootfstype}\0" \
  35 -       "loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \
  36 +       "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
  37         "bootscript=echo Running bootscript from mmc ...; " \
  38                 "source ${loadaddr}\0" \
  39 -       "loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
  40 +       "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
  41         "mmcboot=echo Booting from mmc ...; " \
  42                 "run mmcargs; " \
  43                 "bootm ${loadaddr}\0" \
  44 @@ -227,7 +229,7 @@
  45                 "bootm ${loadaddr}\0" \
  46
  47  #define CONFIG_BOOTCOMMAND \
  48 -       "if mmc init; then " \
  49 +       "if mmc init ${mmcdev}; then " \
  50                 "if run loadbootscript; then " \
  51                         "run bootscript; " \
  52                 "else " \
  53 --
  54 1.6.6.1
  55