mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-16 05:58:49 +00:00
global: Migrate CONFIG_MAX_RAM_BANK_SIZE to CFG
Perform a simple rename of CONFIG_MAX_RAM_BANK_SIZE to CFG_MAX_RAM_BANK_SIZE Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
1d457dbb91
commit
8a897c4f97
22 changed files with 24 additions and 24 deletions
|
@ -27,7 +27,7 @@ int dram_init(void)
|
||||||
/* dram_init must store complete ramsize in gd->ram_size */
|
/* dram_init must store complete ramsize in gd->ram_size */
|
||||||
gd->ram_size = get_ram_size(
|
gd->ram_size = get_ram_size(
|
||||||
(void *)CFG_SYS_SDRAM_BASE,
|
(void *)CFG_SYS_SDRAM_BASE,
|
||||||
CONFIG_MAX_RAM_BANK_SIZE);
|
CFG_MAX_RAM_BANK_SIZE);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ int dram_init(void)
|
||||||
/* dram_init must store complete ramsize in gd->ram_size */
|
/* dram_init must store complete ramsize in gd->ram_size */
|
||||||
gd->ram_size = get_ram_size(
|
gd->ram_size = get_ram_size(
|
||||||
(void *)CFG_SYS_SDRAM_BASE,
|
(void *)CFG_SYS_SDRAM_BASE,
|
||||||
CONFIG_MAX_RAM_BANK_SIZE);
|
CFG_MAX_RAM_BANK_SIZE);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -521,7 +521,7 @@ void board_init_f(ulong dummy)
|
||||||
/* dram_init must store complete ramsize in gd->ram_size */
|
/* dram_init must store complete ramsize in gd->ram_size */
|
||||||
gd->ram_size = get_ram_size(
|
gd->ram_size = get_ram_size(
|
||||||
(void *)CFG_SYS_SDRAM_BASE,
|
(void *)CFG_SYS_SDRAM_BASE,
|
||||||
CONFIG_MAX_RAM_BANK_SIZE);
|
CFG_MAX_RAM_BANK_SIZE);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -203,7 +203,7 @@ u32 get_sec_mem_start(void)
|
||||||
omap_sdram_size()
|
omap_sdram_size()
|
||||||
#else
|
#else
|
||||||
get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||||
CONFIG_MAX_RAM_BANK_SIZE)
|
CFG_MAX_RAM_BANK_SIZE)
|
||||||
#endif
|
#endif
|
||||||
- sec_mem_size));
|
- sec_mem_size));
|
||||||
return sec_mem_start;
|
return sec_mem_start;
|
||||||
|
|
|
@ -39,7 +39,7 @@ int dram_init (void)
|
||||||
/* dram_init must store complete ramsize in gd->ram_size */
|
/* dram_init must store complete ramsize in gd->ram_size */
|
||||||
gd->ram_size = get_ram_size(
|
gd->ram_size = get_ram_size(
|
||||||
(long *) orion5x_sdram_bar(0),
|
(long *) orion5x_sdram_bar(0),
|
||||||
CONFIG_MAX_RAM_BANK_SIZE);
|
CFG_MAX_RAM_BANK_SIZE);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ int dram_init_banksize(void)
|
||||||
gd->bd->bi_dram[i].start = orion5x_sdram_bar(i);
|
gd->bd->bi_dram[i].start = orion5x_sdram_bar(i);
|
||||||
gd->bd->bi_dram[i].size = get_ram_size(
|
gd->bd->bi_dram[i].size = get_ram_size(
|
||||||
(long *) (gd->bd->bi_dram[i].start),
|
(long *) (gd->bd->bi_dram[i].start),
|
||||||
CONFIG_MAX_RAM_BANK_SIZE);
|
CFG_MAX_RAM_BANK_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
#define MVCPU_WIN_ENABLE ORION5X_WIN_ENABLE
|
#define MVCPU_WIN_ENABLE ORION5X_WIN_ENABLE
|
||||||
#define MVCPU_WIN_DISABLE ORION5X_WIN_DISABLE
|
#define MVCPU_WIN_DISABLE ORION5X_WIN_DISABLE
|
||||||
|
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (64*1024*1024)
|
#define CFG_MAX_RAM_BANK_SIZE (64*1024*1024)
|
||||||
|
|
||||||
/* include here SoC variants. 5181, 5281, 6183 should go here when
|
/* include here SoC variants. 5181, 5281, 6183 should go here when
|
||||||
adding support for them, and this comment should then be updated. */
|
adding support for them, and this comment should then be updated. */
|
||||||
|
|
|
@ -167,7 +167,7 @@ void sdram_init(void)
|
||||||
|
|
||||||
/* Detect memory physically present */
|
/* Detect memory physically present */
|
||||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||||
CONFIG_MAX_RAM_BANK_SIZE);
|
CFG_MAX_RAM_BANK_SIZE);
|
||||||
|
|
||||||
/* Reconfigure memory for actual detected size */
|
/* Reconfigure memory for actual detected size */
|
||||||
switch (gd->ram_size) {
|
switch (gd->ram_size) {
|
||||||
|
|
|
@ -47,7 +47,7 @@ int dram_init(void)
|
||||||
ddr3_size = ddr3_init();
|
ddr3_size = ddr3_init();
|
||||||
|
|
||||||
gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
|
gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
|
||||||
CONFIG_MAX_RAM_BANK_SIZE);
|
CFG_MAX_RAM_BANK_SIZE);
|
||||||
#if defined(CONFIG_TI_AEMIF)
|
#if defined(CONFIG_TI_AEMIF)
|
||||||
if (!(board_is_k2g_ice() || board_is_k2g_i1()))
|
if (!(board_is_k2g_ice() || board_is_k2g_i1()))
|
||||||
aemif_init(ARRAY_SIZE(aemif_configs), aemif_configs);
|
aemif_init(ARRAY_SIZE(aemif_configs), aemif_configs);
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#ifndef __CONFIG_AM43XX_EVM_H
|
#ifndef __CONFIG_AM43XX_EVM_H
|
||||||
#define __CONFIG_AM43XX_EVM_H
|
#define __CONFIG_AM43XX_EVM_H
|
||||||
|
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */
|
#define CFG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */
|
||||||
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
|
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
|
||||||
|
|
||||||
#include <asm/arch/omap.h>
|
#include <asm/arch/omap.h>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#endif /* CONFIG_DM */
|
#endif /* CONFIG_DM */
|
||||||
|
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
||||||
|
|
||||||
/* Timer information */
|
/* Timer information */
|
||||||
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
|
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#ifndef __CONFIG_CM_T43_H
|
#ifndef __CONFIG_CM_T43_H
|
||||||
#define __CONFIG_CM_T43_H
|
#define __CONFIG_CM_T43_H
|
||||||
|
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */
|
#define CFG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */
|
||||||
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
|
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
|
||||||
|
|
||||||
#include <asm/arch/omap.h>
|
#include <asm/arch/omap.h>
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
*/
|
*/
|
||||||
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
|
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
|
||||||
#define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */
|
#define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
|
#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
|
||||||
/* memtest start addr */
|
/* memtest start addr */
|
||||||
|
|
||||||
/* memtest will be run on 16MB */
|
/* memtest will be run on 16MB */
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
"led1=64,0,1\0"
|
"led1=64,0,1\0"
|
||||||
|
|
||||||
/* Physical Memory Map */
|
/* Physical Memory Map */
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
||||||
|
|
||||||
/* Default env settings */
|
/* Default env settings */
|
||||||
#define CFG_EXTRA_ENV_SETTINGS \
|
#define CFG_EXTRA_ENV_SETTINGS \
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
"led5=63,0,1\0"
|
"led5=63,0,1\0"
|
||||||
|
|
||||||
/* Physical Memory Map */
|
/* Physical Memory Map */
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
||||||
|
|
||||||
#define EEPROM_ADDR_DDR3 0x90
|
#define EEPROM_ADDR_DDR3 0x90
|
||||||
#define EEPROM_ADDR_CHIP 0x120
|
#define EEPROM_ADDR_CHIP 0x120
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
*/
|
*/
|
||||||
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
|
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
|
||||||
#define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */
|
#define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
|
#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
|
||||||
|
|
||||||
/* memtest start addr */
|
/* memtest start addr */
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
*/
|
*/
|
||||||
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
|
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
|
||||||
#define PHYS_SDRAM_1_SIZE (128 << 20) /* SDRAM size 128MB */
|
#define PHYS_SDRAM_1_SIZE (128 << 20) /* SDRAM size 128MB */
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
|
#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
|
||||||
|
|
||||||
/* memtest start addr */
|
/* memtest start addr */
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
"led0=117,0,1\0" \
|
"led0=117,0,1\0" \
|
||||||
|
|
||||||
/* Physical Memory Map */
|
/* Physical Memory Map */
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */
|
#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */
|
||||||
|
|
||||||
/* Use common default */
|
/* Use common default */
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
"led5=63,0,1\0"
|
"led5=63,0,1\0"
|
||||||
|
|
||||||
/* Physical Memory Map */
|
/* Physical Memory Map */
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
||||||
|
|
||||||
#define EEPROM_ADDR_DDR3 0x90
|
#define EEPROM_ADDR_DDR3 0x90
|
||||||
#define EEPROM_ADDR_CHIP 0x120
|
#define EEPROM_ADDR_CHIP 0x120
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#define DDR_PLL_FREQ 303
|
#define DDR_PLL_FREQ 303
|
||||||
|
|
||||||
/* Physical Memory Map */
|
/* Physical Memory Map */
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MiB */
|
#define CFG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MiB */
|
||||||
|
|
||||||
/* Watchdog */
|
/* Watchdog */
|
||||||
#define WATCHDOG_TRIGGER_GPIO 14
|
#define WATCHDOG_TRIGGER_GPIO 14
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
"led1=64,0,1\0"
|
"led1=64,0,1\0"
|
||||||
|
|
||||||
/* Physical Memory Map */
|
/* Physical Memory Map */
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
||||||
|
|
||||||
#define EEPROM_ADDR_DDR3 0x90
|
#define EEPROM_ADDR_DDR3 0x90
|
||||||
#define EEPROM_ADDR_CHIP 0x120
|
#define EEPROM_ADDR_CHIP 0x120
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#define V_OSCK 24000000 /* Clock output from T2 */
|
#define V_OSCK 24000000 /* Clock output from T2 */
|
||||||
#define V_SCLK (V_OSCK >> 1)
|
#define V_SCLK (V_OSCK >> 1)
|
||||||
|
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */
|
#define CFG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */
|
||||||
#define CFG_SYS_SDRAM_BASE 0x80000000
|
#define CFG_SYS_SDRAM_BASE 0x80000000
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#ifndef __CONFIG_TI_AM335X_COMMON_H__
|
#ifndef __CONFIG_TI_AM335X_COMMON_H__
|
||||||
#define __CONFIG_TI_AM335X_COMMON_H__
|
#define __CONFIG_TI_AM335X_COMMON_H__
|
||||||
|
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
||||||
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
|
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
|
||||||
|
|
||||||
#include <asm/arch/omap.h>
|
#include <asm/arch/omap.h>
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
/* Memory Configuration */
|
/* Memory Configuration */
|
||||||
#define CFG_SYS_LPAE_SDRAM_BASE 0x800000000
|
#define CFG_SYS_LPAE_SDRAM_BASE 0x800000000
|
||||||
#define CONFIG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */
|
#define CFG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_MALLOC_F_LEN
|
#ifdef CONFIG_SYS_MALLOC_F_LEN
|
||||||
#define SPL_MALLOC_F_SIZE CONFIG_SYS_MALLOC_F_LEN
|
#define SPL_MALLOC_F_SIZE CONFIG_SYS_MALLOC_F_LEN
|
||||||
|
|
Loading…
Add table
Reference in a new issue