recipes-bsp/u-boot/u-boot/0013-OMAP3-BeagleBoard-updated-default-configuration.patch

   1 From da8fa305fd10331958cd18c9c27c9e062b886fc4 Mon Sep 17 00:00:00 2001
   2 From: Jason Kridner <jkridner@beagleboard.org>
   3 Date: Wed, 21 Jul 2010 07:41:25 -0500
   4 Subject: [PATCH 13/16] OMAP3: BeagleBoard: updated default configuration
   5
   6 * Decrease bootdelay to 3, use VGA for default resolution
   7 * Add CONFIG_SYS_MEMTEST_SCRATCH to point to a scratch memory area.
   8 * Add camera to default bootargs
   9 * Move ramdisk parameters. This will make it easier to reprogram the ramdisk size.
  10 * Improved boot env var setting
  11     * Enabled evaluation of expressions with 'setexpr'
  12     * Made room for a 64MB ramdisk by moving from 0x81600000 to 0x81000000
  13     * Removed expression from 'ramroot' that wouldn't be evaluated
  14     * Doubled console I/O buffer size from 256 to 512
  15     * Doubled maximum command arguments size from 16 to 32
  16 * Enable multibus support for I2C
  17 * Added USER button switch from uEnv.txt to user.txt
  18 * Enable LEDs
  19     Added LED driver using status_led.  USR0 is set to monitor
  20     the boot status.  USR1 is set to be the GREEN LED.
  21 ---
  22  include/configs/omap3_beagle.h |   62 ++++++++++++++++++++++++++++++++-------
  23  1 files changed, 51 insertions(+), 11 deletions(-)
  24
  25 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
  26 index 9d569a5..73d4d4e 100644
  27 --- a/include/configs/omap3_beagle.h
  28 +++ b/include/configs/omap3_beagle.h
  29 @@ -108,9 +108,27 @@
  30  #define CONFIG_OMAP_HSMMC              1
  31  #define CONFIG_DOS_PARTITION           1
  32
  33 +/* Status LED */
  34 +#define CONFIG_STATUS_LED              1
  35 +#define CONFIG_BOARD_SPECIFIC_LED      1
  36 +#define STATUS_LED_BIT                 0x01
  37 +#define STATUS_LED_STATE               STATUS_LED_ON
  38 +#define STATUS_LED_PERIOD              (CONFIG_SYS_HZ / 2)
  39 +#define STATUS_LED_BIT1                        0x02
  40 +#define STATUS_LED_STATE1              STATUS_LED_ON
  41 +#define STATUS_LED_PERIOD1             (CONFIG_SYS_HZ / 2)
  42 +#define STATUS_LED_BOOT                        STATUS_LED_BIT
  43 +#define STATUS_LED_GREEN               STATUS_LED_BIT1
  44 +
  45  /* DDR - I use Micron DDR */
  46  #define CONFIG_OMAP3_MICRON_DDR                1
  47
  48 +/* Enable Multi Bus support for I2C */
  49 +#define CONFIG_I2C_MULTI_BUS           1
  50 +
  51 +/* Probe all devices */
  52 +#define CONFIG_SYS_I2C_NOPROBES                {0x0, 0x0}
  53 +
  54  /* USB */
  55  #define CONFIG_MUSB_UDC                        1
  56  #define CONFIG_USB_OMAP3               1
  57 @@ -138,6 +156,9 @@
  58  #define CONFIG_CMD_I2C         /* I2C serial bus support       */
  59  #define CONFIG_CMD_MMC         /* MMC support                  */
  60  #define CONFIG_CMD_NAND                /* NAND support                 */
  61 +#define CONFIG_CMD_LED         /* LED support                  */
  62 +#define CONFIG_VIDEO_OMAP3     /* DSS Support                  */
  63 +#define CONFIG_CMD_SETEXPR     /* Evaluate expressions         */
  64
  65  #undef CONFIG_CMD_FLASH                /* flinfo, erase, protect       */
  66  #undef CONFIG_CMD_FPGA         /* FPGA configuration Support   */
  67 @@ -184,45 +205,56 @@
  68                                                         /* partition */
  69
  70  /* Environment information */
  71 -#define CONFIG_BOOTDELAY               10
  72 +#define CONFIG_BOOTDELAY               3
  73
  74  #define CONFIG_EXTRA_ENV_SETTINGS \
  75 -       "loadaddr=0x82000000\0" \
  76 +       "loadaddr=0x80200000\0" \
  77 +       "rdaddr=0x81000000\0" \
  78         "usbtty=cdc_acm\0" \
  79         "console=ttyS2,115200n8\0" \
  80         "mpurate=auto\0" \
  81         "buddy=none "\
  82 +       "optargs=\0" \
  83 +       "camera=lbcm3m1\0" \
  84         "vram=12M\0" \
  85 -       "dvimode=1024x768MR-16@60\0" \
  86 +       "dvimode=640x480MR-16@60\0" \
  87         "defaultdisplay=dvi\0" \
  88         "mmcdev=0\0" \
  89         "mmcroot=/dev/mmcblk0p2 rw\0" \
  90         "mmcrootfstype=ext3 rootwait\0" \
  91         "nandroot=/dev/mtdblock4 rw\0" \
  92         "nandrootfstype=jffs2\0" \
  93 +       "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \
  94 +       "ramrootfstype=ext2\0" \
  95         "mmcargs=setenv bootargs console=${console} " \
  96 +               "${optargs} " \
  97                 "mpurate=${mpurate} " \
  98                 "buddy=${buddy} "\
  99 +               "camera=${camera} "\
 100                 "vram=${vram} " \
 101                 "omapfb.mode=dvi:${dvimode} " \
 102                 "omapdss.def_disp=${defaultdisplay} " \
 103                 "root=${mmcroot} " \
 104                 "rootfstype=${mmcrootfstype}\0" \
 105         "nandargs=setenv bootargs console=${console} " \
 106 +               "${optargs} " \
 107                 "mpurate=${mpurate} " \
 108                 "buddy=${buddy} "\
 109 +               "camera=${camera} "\
 110                 "vram=${vram} " \
 111                 "omapfb.mode=dvi:${dvimode} " \
 112                 "omapdss.def_disp=${defaultdisplay} " \
 113                 "root=${nandroot} " \
 114                 "rootfstype=${nandrootfstype}\0" \
 115 -       "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
 116 +       "bootenv=uEnv.txt\0" \
 117 +       "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
 118         "importbootenv=echo Importing environment from mmc ...; " \
 119                 "env import -t $loadaddr $filesize\0" \
 120         "ramargs=setenv bootargs console=${console} " \
 121                 "${optargs} " \
 122                 "mpurate=${mpurate} " \
 123                 "buddy=${buddy} "\
 124 +               "camera=${camera} "\
 125                 "vram=${vram} " \
 126                 "omapfb.mode=dvi:${dvimode} " \
 127                 "omapdss.def_disp=${defaultdisplay} " \
 128 @@ -237,11 +269,18 @@
 129                 "run nandargs; " \
 130                 "nand read ${loadaddr} 280000 400000; " \
 131                 "bootm ${loadaddr}\0" \
 132 +       "ramboot=echo Booting from ramdisk ...; " \
 133 +               "run ramargs; " \
 134 +               "bootm ${loadaddr}\0" \
 135
 136  #define CONFIG_BOOTCOMMAND \
 137         "if mmc rescan ${mmcdev}; then " \
 138 +               "if userbutton; then " \
 139 +                       "setenv bootenv user.txt;" \
 140 +               "fi;" \
 141                 "echo SD/MMC found on device ${mmcdev};" \
 142                 "if run loadbootenv; then " \
 143 +                       "echo Loaded environment from ${bootenv};" \
 144                         "run importbootenv;" \
 145                 "fi;" \
 146                 "if test -n $uenvcmd; then " \
 147 @@ -252,7 +291,7 @@
 148                         "run mmcboot;" \
 149                 "fi;" \
 150         "fi;" \
 151 -       "run nandboot;" \
 152 +       "run nandboot;"
 153
 154  #define CONFIG_AUTO_COMPLETE           1
 155  /*
 156 @@ -262,18 +301,19 @@
 157  #define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser */
 158  #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 159  #define CONFIG_SYS_PROMPT              "OMAP3 beagleboard.org # "
 160 -#define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size */
 161 +#define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 162  /* Print Buffer Size */
 163  #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
 164                                         sizeof(CONFIG_SYS_PROMPT) + 16)
 165 -#define CONFIG_SYS_MAXARGS             16      /* max number of command args */
 166 +#define CONFIG_SYS_MAXARGS             32      /* max number of command args */
 167  /* Boot Argument Buffer Size */
 168  #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
 169
 170 -#define CONFIG_SYS_MEMTEST_START       (OMAP34XX_SDRC_CS0)     /* memtest */
 171 -                                                               /* works on */
 172 -#define CONFIG_SYS_MEMTEST_END         (OMAP34XX_SDRC_CS0 + \
 173 -                                       0x01F00000) /* 31MB */
 174 +#define CONFIG_SYS_ALT_MEMTEST         1
 175 +#define CONFIG_SYS_MEMTEST_START       (0x82000000)            /* memtest */
 176 +                                                               /* defaults */
 177 +#define CONFIG_SYS_MEMTEST_END         (0x87FFFFFF)            /* 128MB */
 178 +#define CONFIG_SYS_MEMTEST_SCRATCH     (0x81000000)    /* dummy address */
 179
 180  #define CONFIG_SYS_LOAD_ADDR           (OMAP34XX_SDRC_CS0)     /* default */
 181                                                         /* load address */
 182 --
 183 1.6.6.1
 184