mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
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:
@@ -135,7 +135,7 @@ void trap_restore(void)
|
||||
|
||||
int arch_initr_trap(void)
|
||||
{
|
||||
trap_init(CONFIG_SYS_SDRAM_BASE);
|
||||
trap_init(CFG_SYS_SDRAM_BASE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ void board_init_f(ulong dummy)
|
||||
|
||||
phys_size_t board_get_usable_ram_top(phys_size_t total_size)
|
||||
{
|
||||
return CONFIG_SYS_SDRAM_BASE + (256 * 1024 * 1024);
|
||||
return CFG_SYS_SDRAM_BASE + (256 * 1024 * 1024);
|
||||
}
|
||||
|
||||
int print_cpuinfo(void)
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
#if CONFIG_SYS_SDRAM_SIZE <= SZ_64M
|
||||
#if CFG_SYS_SDRAM_SIZE <= SZ_64M
|
||||
#define MSCC_RAM_TLB_SIZE SZ_64M
|
||||
#define MSCC_ATTRIB2 MMU_REGIO_INVAL
|
||||
#elif CONFIG_SYS_SDRAM_SIZE <= SZ_128M
|
||||
#elif CFG_SYS_SDRAM_SIZE <= SZ_128M
|
||||
#define MSCC_RAM_TLB_SIZE SZ_64M
|
||||
#define MSCC_ATTRIB2 MMU_REGIO_RW
|
||||
#elif CONFIG_SYS_SDRAM_SIZE <= SZ_256M
|
||||
#elif CFG_SYS_SDRAM_SIZE <= SZ_256M
|
||||
#define MSCC_RAM_TLB_SIZE SZ_256M
|
||||
#define MSCC_ATTRIB2 MMU_REGIO_INVAL
|
||||
#elif CONFIG_SYS_SDRAM_SIZE <= SZ_512M
|
||||
#elif CFG_SYS_SDRAM_SIZE <= SZ_512M
|
||||
#define MSCC_RAM_TLB_SIZE SZ_256M
|
||||
#define MSCC_ATTRIB2 MMU_REGIO_RW
|
||||
#else
|
||||
|
||||
@@ -67,6 +67,6 @@ int print_cpuinfo(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <mach/common.h>
|
||||
|
||||
#define MIPS_VCOREIII_MEMORY_DDR3
|
||||
#define MIPS_VCOREIII_DDR_SIZE CONFIG_SYS_SDRAM_SIZE
|
||||
#define MIPS_VCOREIII_DDR_SIZE CFG_SYS_SDRAM_SIZE
|
||||
|
||||
#if defined(CONFIG_DDRTYPE_H5TQ1G63BFA) /* Serval1 Refboard */
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "dram.h"
|
||||
|
||||
#ifndef CONFIG_SYS_INIT_SP_ADDR
|
||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \
|
||||
#define CONFIG_SYS_INIT_SP_ADDR (CFG_SYS_SDRAM_BASE + \
|
||||
CONFIG_SYS_INIT_SP_OFFSET)
|
||||
#endif
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size)
|
||||
{
|
||||
if (IS_ENABLED(CONFIG_RAM_OCTEON)) {
|
||||
/* Map a maximum of 256MiB - return not size but address */
|
||||
return CONFIG_SYS_SDRAM_BASE + min(gd->ram_size,
|
||||
return CFG_SYS_SDRAM_BASE + min(gd->ram_size,
|
||||
UBOOT_RAM_SIZE_MAX);
|
||||
} else {
|
||||
return gd->ram_top;
|
||||
|
||||
Reference in New Issue
Block a user