diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 20:24:28 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 20:24:28 (GMT) |
commit | cac423a730d3506154744485af1bbc1cd3a1e6a8 (patch) | |
tree | 358b627972d9125de573c623f33e2da789f1de51 /include/configs/omap5_common.h | |
parent | c1b43ac7699640c8086bd73faa798bc9722d32c9 (diff) | |
parent | 47c6ea076eb51e624f8744d93db5cd70b97dc25d (diff) | |
download | u-boot-cac423a730d3506154744485af1bbc1cd3a1e6a8.tar.xz |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/omap5_common.h')
-rw-r--r-- | include/configs/omap5_common.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h index c21c387..deb5e9f 100644 --- a/include/configs/omap5_common.h +++ b/include/configs/omap5_common.h @@ -86,6 +86,9 @@ #define CONFIG_BAUDRATE 115200 +/* CPU */ +#define CONFIG_ARCH_CPU_INIT + /* I2C */ #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000 @@ -150,10 +153,12 @@ "usbtty=cdc_acm\0" \ "vram=16M\0" \ "partitions=" PARTS_DEFAULT "\0" \ + "optargs=\0" \ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ "mmcrootfstype=ext4 rootwait\0" \ "mmcargs=setenv bootargs console=${console} " \ + "${optargs} " \ "vram=${vram} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ |