global: Move remaining CONFIG_SYS_SDRAM_* to CFG_SYS_SDRAM_*
The rest of the unmigrated CONFIG symbols in the CONFIG_SYS_SDRAM namespace do not easily transition to Kconfig. In many cases they likely should come from the device tree instead. Move these out of CONFIG namespace and in to CFG namespace. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
@@ -52,7 +52,7 @@ int set_km_env(void)
|
||||
char envval[16];
|
||||
char *p;
|
||||
|
||||
pnvramaddr = CONFIG_SYS_SDRAM_BASE + gd->ram_size -
|
||||
pnvramaddr = CFG_SYS_SDRAM_BASE + gd->ram_size -
|
||||
CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM - CONFIG_KM_PNVRAM;
|
||||
sprintf(envval, "0x%x", pnvramaddr);
|
||||
env_set("pnvramaddr", envval);
|
||||
@@ -65,7 +65,7 @@ int set_km_env(void)
|
||||
CONFIG_KM_PNVRAM) / 0x400;
|
||||
env_set_ulong("pram", pram);
|
||||
|
||||
varaddr = CONFIG_SYS_SDRAM_BASE + gd->ram_size -
|
||||
varaddr = CFG_SYS_SDRAM_BASE + gd->ram_size -
|
||||
CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM;
|
||||
env_set_hex("varaddr", varaddr);
|
||||
sprintf(envval, "0x%x", varaddr);
|
||||
|
||||
@@ -142,10 +142,10 @@ static int fixed_sdram(void)
|
||||
setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN);
|
||||
|
||||
disable_addr_trans();
|
||||
msize = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_SIZE);
|
||||
msize = get_ram_size(CFG_SYS_SDRAM_BASE, CFG_SYS_SDRAM_SIZE);
|
||||
enable_addr_trans();
|
||||
msize /= (1024 * 1024);
|
||||
if (CONFIG_SYS_SDRAM_SIZE >> 20 != msize) {
|
||||
if (CFG_SYS_SDRAM_SIZE >> 20 != msize) {
|
||||
for (ddr_size = msize << 20, ddr_size_log2 = 0;
|
||||
(ddr_size > 1);
|
||||
ddr_size = ddr_size >> 1, ddr_size_log2++)
|
||||
@@ -169,7 +169,7 @@ int dram_init(void)
|
||||
return -ENXIO;
|
||||
|
||||
out_be32(&im->sysconf.ddrlaw[0].bar,
|
||||
CONFIG_SYS_SDRAM_BASE & LAWBAR_BAR);
|
||||
CFG_SYS_SDRAM_BASE & LAWBAR_BAR);
|
||||
msize = fixed_sdram();
|
||||
|
||||
#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
|
||||
|
||||
@@ -84,7 +84,7 @@ int fsl_initdram(void)
|
||||
|
||||
int dram_init_banksize(void)
|
||||
{
|
||||
gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_dram[0].size = gd->ram_size;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -184,7 +184,7 @@ int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
|
||||
{
|
||||
/* Define only 1MiB range for mem_regions at the middle of the RAM */
|
||||
/* For 1GiB range mem_regions takes approx. 4min */
|
||||
*vstart = CONFIG_SYS_SDRAM_BASE + (gd->ram_size >> 1);
|
||||
*vstart = CFG_SYS_SDRAM_BASE + (gd->ram_size >> 1);
|
||||
*size = 1 << 20;
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user