From: Enric Balletbò i Serra Date: Fri, 6 Dec 2013 20:30:21 +0000 (+0100) Subject: TI: armv7: Do not define the number DRAM banks if is already defined. X-Git-Tag: v2014.04-rc1~77^2~40^2~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c6a7fce1138596b9e91727c32da2c2faa3bb481f;p=oweals%2Fu-boot.git TI: armv7: Do not define the number DRAM banks if is already defined. If CONFIG_NR_DRAM_BANKS is not defined, we say (for simplicity) that we have 1 bank, but for some boards should be interesting that we can define CONFIG_NR_DRAM_BANKS. To handle this possibility just define the number of DRAM banks if is not already defined. This is useful for some OMAP3 boards where the DRAM initialitzation is only at u-boot level. Signed-off-by: Enric Balletbo i Serra --- diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index f4e42eff13..69d69a5421 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -45,11 +45,15 @@ #define CONFIG_BOOTDELAY 1 /* - * DDR information. We say (for simplicity) that we have 1 bank, - * always, even when we have more. We always start at 0x80000000, - * and we place the initial stack pointer in our SRAM. + * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, + * we say (for simplicity) that we have 1 bank, always, even when + * we have more. We always start at 0x80000000, and we place the + * initial stack pointer in our SRAM. Otherwise, we can define + * CONFIG_NR_DRAM_BANKS before including this file. */ +#ifndef CONFIG_NR_DRAM_BANKS #define CONFIG_NR_DRAM_BANKS 1 +#endif #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ GENERATED_GBL_DATA_SIZE)