diff options
| author | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2009-10-08 13:39:34 -0400 |
|---|---|---|
| committer | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2009-10-08 13:39:34 -0400 |
| commit | 0381be360308c4f5b03c05b676eddbbead46a877 (patch) | |
| tree | 8d92419e8ced5636062fe124e2d3c37999e45128 /include | |
| parent | 2ccd89c1bd6ab9a832c3b74ba559d9a6e9219ae1 (diff) | |
This patch originally from LogicPD OMAP35x Release 1.6.1 Original Patch Name: u-boot-2009.03-lv-som-12-isp1760.patch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-omap3/cpu.h | 1 | ||||
| -rw-r--r-- | include/configs/omap3_lv_som.h | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h index 0074cbe022..c2f27be03d 100644 --- a/include/asm-arm/arch-omap3/cpu.h +++ b/include/asm-arm/arch-omap3/cpu.h @@ -90,6 +90,7 @@ typedef struct ctrl_id { #define GPMC_CONFIG_CS0_BASE (GPMC_BASE + GPMC_CONFIG_CS0) #define GPMC_CONFIG_CS1_BASE (GPMC_BASE + GPMC_CONFIG_CS1) #define GPMC_CONFIG_CS2_BASE (GPMC_BASE + GPMC_CONFIG_CS2) +#define GPMC_CONFIG_CS6_BASE (GPMC_BASE + GPMC_CONFIG_CS6) #define GPMC_CONFIG_WP 0x10 #define GPMC_CONFIG_WIDTH 0x30 diff --git a/include/configs/omap3_lv_som.h b/include/configs/omap3_lv_som.h index b49cda6e3d..128f6dd703 100644 --- a/include/configs/omap3_lv_som.h +++ b/include/configs/omap3_lv_som.h @@ -183,13 +183,15 @@ "consoledev=ttyS0\0" \ "rootpath=/opt/nfs-exports/ltib-omap\0" \ "ramdisksize=89000\0" \ + "kernelimage=uImage\0" \ "nfsoptions=,wsize=1500,rsize=1500\0" \ - "nfsboot=setenv bootargs display=${display} console=${consoledev},${baudrate} root=/dev/nfs rw nfsroot=${serverip}:${rootpath}${nfsoptions} ip=dhcp ${otherbootargs};tftpboot ${loadaddr} uImage;bootm ${loadaddr}\0" \ - "ramboot=setenv bootargs display=${display} console=${consoledev},${baudrate} root=/dev/ram rw ramdisk_size=${ramdisksize} ${otherbootargs};tftpboot ${loadaddr} uImage;tftpboot ${rootfsaddr} rootfs.ext2.gz.uboot;bootm ${loadaddr} ${rootfsaddr}\0" \ + "nfsboot=setenv bootargs display=${display} console=${consoledev},${baudrate} root=/dev/nfs rw nfsroot=${serverip}:${rootpath}${nfsoptions} ip=dhcp ${otherbootargs};tftpboot ${loadaddr} ${kernelimage};bootm ${loadaddr}\0" \ + "ramboot=setenv bootargs display=${display} console=${consoledev},${baudrate} root=/dev/ram rw ramdisk_size=${ramdisksize} ${otherbootargs};tftpboot ${loadaddr} ${kernelimage};tftpboot ${rootfsaddr} rootfs.ext2.gz.uboot;bootm ${loadaddr} ${rootfsaddr}\0" \ "xipboot=setenv bootargs display=${display} console=${consoledev},${baudrate} root=/dev/ram rw ramdisk_size=${ramdisksize} ${otherbootargs};bootm ${loadaddr} ${rootfsaddr}\0" \ "rootdevice=/dev/mtdblock4\0" \ "rootfstype=yaffs\0" \ - "mtdboot=setenv bootargs display=${display} console=${consoledev},${baudrate} root=${rootdevice} rootfstype=${rootfstype} rw ${otherbootargs};bootm ${loadaddr}\0" + "mtdboot=setenv bootargs display=${display} console=${consoledev},${baudrate} root=${rootdevice} rootfstype=${rootfstype} rw ${otherbootargs};bootm ${loadaddr}\0" \ + "sdmtdboot=setenv bootargs display=${display} console=${consoledev},${baudrate} root=${rootdevice} rootfstype=${rootfstype} rw ${otherbootargs};mmcinit;fatload mmc0 ${loadaddr} ${kernelimage}; bootm ${loadaddr}\0" #define CONFIG_BOOTCOMMAND "run xipboot" |