diff options
| author | Nishanth Menon <nm@ti.com> | 2015-07-22 18:05:45 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-27 15:03:10 -0400 |
| commit | e07cff1158b9070c89362b6abd296d1a5f750740 (patch) | |
| tree | fe691f31508aab3341d88d5ebc998b18c0480716 /include/configs/ti_armv7_common.h | |
| parent | e8428d6ffae66501d9968b13d3a737a928735f67 (diff) | |
| download | talos-obmc-uboot-e07cff1158b9070c89362b6abd296d1a5f750740.tar.gz talos-obmc-uboot-e07cff1158b9070c89362b6abd296d1a5f750740.zip | |
configs: ti_armv7_keystone2: start using armv7_common
Try to maintain as much commonality by conditionally including stuff
in armv7_common as necessary and removing the common defines from
keystone2 header.
Note: as part of this change, all keystone2 platforms will now start
using the generic u-boot prompt instead of the custom prompt.
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/ti_armv7_common.h')
| -rw-r--r-- | include/configs/ti_armv7_common.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 7bc2d6e836..6dc5ebdd34 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -74,8 +74,11 @@ #define CONFIG_NR_DRAM_BANKS 1 #endif #define CONFIG_SYS_SDRAM_BASE 0x80000000 + +#ifndef CONFIG_SYS_INIT_SP_ADDR #define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ GENERATED_GBL_DATA_SIZE) +#endif /* Timer information. */ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ @@ -140,7 +143,7 @@ * mtdparts, both for ease of use in U-Boot and for passing information * on to the Linux kernel. */ -#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NOR) || defined(CONFIG_NAND) +#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NOR) || defined(CONFIG_NAND) || defined(CONFIG_NAND_DAVINCI) #define CONFIG_MTD_DEVICE /* Required for mtdparts */ #define CONFIG_CMD_MTDPARTS #endif |
