summaryrefslogtreecommitdiff
path: root/include/configs/ti_armv7_common.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-04-03 15:17:15 -0400
committerTom Rini <trini@ti.com>2014-04-17 17:24:38 -0400
commitdf4dbb5df6ab1c1d27b3fd4acbaad69b47095daf (patch)
treeb6480401e0874bba32c6ac8dadb858eef8de94bc /include/configs/ti_armv7_common.h
parent0dd54619ca6316d75c26c09e3c86e2b8e2697d23 (diff)
TI:omap3: Convert omap3_beagle to ti_omap3_common.h
Convert to using the common config files. This requires a little more flexibility in the common files than we had been using before. Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/ti_armv7_common.h')
-rw-r--r--include/configs/ti_armv7_common.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 2aa35407fd..485427276a 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -111,7 +111,9 @@
*/
#ifdef CONFIG_NAND
#define CONFIG_NAND_OMAP_GPMC
+#ifndef CONFIG_SYS_NAND_BASE
#define CONFIG_SYS_NAND_BASE 0x8000000
+#endif
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_CMD_NAND
#endif
@@ -209,12 +211,18 @@
* We have the SPL malloc pool at the end of the BSS area.
*/
#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR
+#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0x80800000
+#endif
+#ifndef CONFIG_SPL_BSS_START_ADDR
#define CONFIG_SPL_BSS_START_ADDR 0x80a00000
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */
+#endif
+#ifndef CONFIG_SYS_SPL_MALLOC_START
#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SPL_BSS_START_ADDR + \
CONFIG_SPL_BSS_MAX_SIZE)
#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN
+#endif
/* RAW SD card / eMMC locations. */
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */