diff options
Diffstat (limited to 'recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-BeagleBoard-updated-default-configuration.patch')
| -rw-r--r-- | recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-BeagleBoard-updated-default-configuration.patch | 184 |
1 files changed, 184 insertions, 0 deletions
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-BeagleBoard-updated-default-configuration.patch b/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-BeagleBoard-updated-default-configuration.patch new file mode 100644 index 0000000000..9c9a3fd4b7 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-BeagleBoard-updated-default-configuration.patch @@ -0,0 +1,184 @@ +From da8fa305fd10331958cd18c9c27c9e062b886fc4 Mon Sep 17 00:00:00 2001 +From: Jason Kridner <jkridner@beagleboard.org> +Date: Wed, 21 Jul 2010 07:41:25 -0500 +Subject: [PATCH 13/16] OMAP3: BeagleBoard: updated default configuration + +* Decrease bootdelay to 3, use VGA for default resolution +* Add CONFIG_SYS_MEMTEST_SCRATCH to point to a scratch memory area. +* Add camera to default bootargs +* Move ramdisk parameters. This will make it easier to reprogram the ramdisk size. +* Improved boot env var setting + * Enabled evaluation of expressions with 'setexpr' + * Made room for a 64MB ramdisk by moving from 0x81600000 to 0x81000000 + * Removed expression from 'ramroot' that wouldn't be evaluated + * Doubled console I/O buffer size from 256 to 512 + * Doubled maximum command arguments size from 16 to 32 +* Enable multibus support for I2C +* Added USER button switch from uEnv.txt to user.txt +* Enable LEDs + Added LED driver using status_led. USR0 is set to monitor + the boot status. USR1 is set to be the GREEN LED. +--- + include/configs/omap3_beagle.h | 62 ++++++++++++++++++++++++++++++++------- + 1 files changed, 51 insertions(+), 11 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 9d569a5..73d4d4e 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -108,9 +108,27 @@ + #define CONFIG_OMAP_HSMMC 1 + #define CONFIG_DOS_PARTITION 1 + ++/* Status LED */ ++#define CONFIG_STATUS_LED 1 ++#define CONFIG_BOARD_SPECIFIC_LED 1 ++#define STATUS_LED_BIT 0x01 ++#define STATUS_LED_STATE STATUS_LED_ON ++#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) ++#define STATUS_LED_BIT1 0x02 ++#define STATUS_LED_STATE1 STATUS_LED_ON ++#define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2) ++#define STATUS_LED_BOOT STATUS_LED_BIT ++#define STATUS_LED_GREEN STATUS_LED_BIT1 ++ + /* DDR - I use Micron DDR */ + #define CONFIG_OMAP3_MICRON_DDR 1 + ++/* Enable Multi Bus support for I2C */ ++#define CONFIG_I2C_MULTI_BUS 1 ++ ++/* Probe all devices */ ++#define CONFIG_SYS_I2C_NOPROBES {0x0, 0x0} ++ + /* USB */ + #define CONFIG_MUSB_UDC 1 + #define CONFIG_USB_OMAP3 1 +@@ -138,6 +156,9 @@ + #define CONFIG_CMD_I2C /* I2C serial bus support */ + #define CONFIG_CMD_MMC /* MMC support */ + #define CONFIG_CMD_NAND /* NAND support */ ++#define CONFIG_CMD_LED /* LED support */ ++#define CONFIG_VIDEO_OMAP3 /* DSS Support */ ++#define CONFIG_CMD_SETEXPR /* Evaluate expressions */ + + #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ + #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ +@@ -184,45 +205,56 @@ + /* partition */ + + /* Environment information */ +-#define CONFIG_BOOTDELAY 10 ++#define CONFIG_BOOTDELAY 3 + + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "loadaddr=0x82000000\0" \ ++ "loadaddr=0x80200000\0" \ ++ "rdaddr=0x81000000\0" \ + "usbtty=cdc_acm\0" \ + "console=ttyS2,115200n8\0" \ + "mpurate=auto\0" \ + "buddy=none "\ ++ "optargs=\0" \ ++ "camera=lbcm3m1\0" \ + "vram=12M\0" \ +- "dvimode=1024x768MR-16@60\0" \ ++ "dvimode=640x480MR-16@60\0" \ + "defaultdisplay=dvi\0" \ + "mmcdev=0\0" \ + "mmcroot=/dev/mmcblk0p2 rw\0" \ + "mmcrootfstype=ext3 rootwait\0" \ + "nandroot=/dev/mtdblock4 rw\0" \ + "nandrootfstype=jffs2\0" \ ++ "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \ ++ "ramrootfstype=ext2\0" \ + "mmcargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ + "mpurate=${mpurate} " \ + "buddy=${buddy} "\ ++ "camera=${camera} "\ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ + "root=${mmcroot} " \ + "rootfstype=${mmcrootfstype}\0" \ + "nandargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ + "mpurate=${mpurate} " \ + "buddy=${buddy} "\ ++ "camera=${camera} "\ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ +- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ ++ "bootenv=uEnv.txt\0" \ ++ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ + "ramargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "mpurate=${mpurate} " \ + "buddy=${buddy} "\ ++ "camera=${camera} "\ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ +@@ -237,11 +269,18 @@ + "run nandargs; " \ + "nand read ${loadaddr} 280000 400000; " \ + "bootm ${loadaddr}\0" \ ++ "ramboot=echo Booting from ramdisk ...; " \ ++ "run ramargs; " \ ++ "bootm ${loadaddr}\0" \ + + #define CONFIG_BOOTCOMMAND \ + "if mmc rescan ${mmcdev}; then " \ ++ "if userbutton; then " \ ++ "setenv bootenv user.txt;" \ ++ "fi;" \ + "echo SD/MMC found on device ${mmcdev};" \ + "if run loadbootenv; then " \ ++ "echo Loaded environment from ${bootenv};" \ + "run importbootenv;" \ + "fi;" \ + "if test -n $uenvcmd; then " \ +@@ -252,7 +291,7 @@ + "run mmcboot;" \ + "fi;" \ + "fi;" \ +- "run nandboot;" \ ++ "run nandboot;" + + #define CONFIG_AUTO_COMPLETE 1 + /* +@@ -262,18 +301,19 @@ + #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ + #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + #define CONFIG_SYS_PROMPT "OMAP3 beagleboard.org # " +-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ ++#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ + /* Print Buffer Size */ + #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ + sizeof(CONFIG_SYS_PROMPT) + 16) +-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ ++#define CONFIG_SYS_MAXARGS 32 /* max number of command args */ + /* Boot Argument Buffer Size */ + #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) + +-#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) /* memtest */ +- /* works on */ +-#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \ +- 0x01F00000) /* 31MB */ ++#define CONFIG_SYS_ALT_MEMTEST 1 ++#define CONFIG_SYS_MEMTEST_START (0x82000000) /* memtest */ ++ /* defaults */ ++#define CONFIG_SYS_MEMTEST_END (0x87FFFFFF) /* 128MB */ ++#define CONFIG_SYS_MEMTEST_SCRATCH (0x81000000) /* dummy address */ + + #define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0) /* default */ + /* load address */ +-- +1.6.6.1 + |