Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 07:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc: Move CONFIG_SYS_DDR_SIZE to CONFIG_SYS_SDRAM_SIZE

Browse source 
We have a number of CONFIG_SYS_xxx_SIZE options to describe the amount
main memory available.  Rework CONFIG_SYS_DDR_SIZE, which described a
size in number of MiB to use CONFIG_SYS_SDRAM_SIZE which is most often
used as a number of bytes.  Use shifts of this option when required.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-07-23 13:04:56 -04:00
parent b72713dc0b
commit 9a56ab96aa
7 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
board/freescale/mpc837xerdb/mpc837xerdb.c
View file

@ -97,7 +97,7 @@ int dram_init(void)
int fixed_sdram(void) int fixed_sdram(void)
{ {
immap_t *im = (immap_t *) CONFIG_SYS_IMMR; immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
u32 msize = CONFIG_SYS_DDR_SIZE * 1024 * 1024; u32 msize = CONFIG_SYS_SDRAM_SIZE;
u32 msize_log2 = __ilog2(msize); u32 msize_log2 = __ilog2(msize);
im->sysconf.ddrlaw[0].bar = CONFIG_SYS_SDRAM_BASE & 0xfffff000; im->sysconf.ddrlaw[0].bar = CONFIG_SYS_SDRAM_BASE & 0xfffff000;
@ -127,7 +127,7 @@ int fixed_sdram(void)
im->ddr.sdram_cfg |= SDRAM_CFG_MEM_EN; im->ddr.sdram_cfg |= SDRAM_CFG_MEM_EN;
udelay(2000); udelay(2000);
return CONFIG_SYS_DDR_SIZE; return CONFIG_SYS_SDRAM_SIZE >> 20;
} }
#endif /*!CONFIG_SYS_SPD_EEPROM */ #endif /*!CONFIG_SYS_SPD_EEPROM */

2
board/gdsys/mpc8308/sdram.c
View file

@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR;
static long fixed_sdram(void) static long fixed_sdram(void)
{ {
immap_t *im = (immap_t *)CONFIG_SYS_IMMR; immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize = CONFIG_SYS_DDR_SIZE * 1024 * 1024; u32 msize = CONFIG_SYS_SDRAM_SIZE;
u32 msize_log2 = __ilog2(msize); u32 msize_log2 = __ilog2(msize);
out_be32(&im->sysconf.ddrlaw[0].bar, out_be32(&im->sysconf.ddrlaw[0].bar,

4
board/ids/ids8313/ids8313.c
View file

@ -56,7 +56,7 @@ int checkboard(void)
int fixed_sdram(unsigned long config) int fixed_sdram(unsigned long config)
{ {
immap_t *im = (immap_t *)CONFIG_SYS_IMMR; immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize = CONFIG_SYS_DDR_SIZE << 20; u32 msize = CONFIG_SYS_SDRAM_SIZE;
#ifndef CONFIG_SYS_RAMBOOT #ifndef CONFIG_SYS_RAMBOOT
u32 msize_log2 = __ilog2(msize); u32 msize_log2 = __ilog2(msize);
@ -109,7 +109,7 @@ int fixed_sdram(unsigned long config)
static int setup_sdram(void) static int setup_sdram(void)
{ {
u32 msize = CONFIG_SYS_DDR_SIZE << 20; u32 msize = CONFIG_SYS_SDRAM_SIZE;
long int size_01, size_02; long int size_01, size_02;
size_01 = fixed_sdram(CONFIG_SYS_DDR_CONFIG); size_01 = fixed_sdram(CONFIG_SYS_DDR_CONFIG);

5
board/keymile/km83xx/km83xx.c
View file

@ -141,12 +141,11 @@ static int fixed_sdram(void)
udelay(200); udelay(200);
setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN); setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN);
msize = CONFIG_SYS_DDR_SIZE << 20;
disable_addr_trans(); disable_addr_trans();
msize = get_ram_size(CONFIG_SYS_SDRAM_BASE, msize); msize = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_SIZE);
enable_addr_trans(); enable_addr_trans();
msize /= (1024 * 1024); msize /= (1024 * 1024);
if (CONFIG_SYS_DDR_SIZE != msize) { if (CONFIG_SYS_SDRAM_SIZE >> 20 != msize) {
for (ddr_size = msize << 20, ddr_size_log2 = 0; for (ddr_size = msize << 20, ddr_size_log2 = 0;
(ddr_size > 1); (ddr_size > 1);
ddr_size = ddr_size >> 1, ddr_size_log2++) ddr_size = ddr_size >> 1, ddr_size_log2++)

2
include/configs/MPC837XERDB.h
View file

@ -69,7 +69,7 @@
/* /*
* Manually set up DDR parameters * Manually set up DDR parameters
*/ */
#define CONFIG_SYS_DDR_SIZE 256 /* MB */ #define CONFIG_SYS_SDRAM_SIZE 0x10000000 /* 256 MiB */
#define CONFIG_SYS_DDR_CS0_BNDS 0x0000000f #define CONFIG_SYS_DDR_CS0_BNDS 0x0000000f
#define CONFIG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN \ #define CONFIG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN \
| CSCONFIG_ODT_WR_ONLY_CURRENT \ | CSCONFIG_ODT_WR_ONLY_CURRENT \

2
include/configs/ids8313.h
View file

@ -41,7 +41,7 @@
* Manually set up DDR parameters, * Manually set up DDR parameters,
* as this board has not the SPD connected to I2C. * as this board has not the SPD connected to I2C.
*/ */
#define CONFIG_SYS_DDR_SIZE 256 /* MB */ #define CONFIG_SYS_SDRAM_SIZE 0x10000000 /* 256 MiB */
#define CONFIG_SYS_DDR_CONFIG (CSCONFIG_EN |\ #define CONFIG_SYS_DDR_CONFIG (CSCONFIG_EN |\
0x00010000 |\ 0x00010000 |\
CSCONFIG_ROW_BIT_13 |\ CSCONFIG_ROW_BIT_13 |\

2
include/configs/km/km-mpc83xx.h
View file

@ -18,7 +18,7 @@
/* /*
* Manually set up DDR parameters * Manually set up DDR parameters
*/ */
#define CONFIG_SYS_DDR_SIZE 2048 /* MB */ #define CONFIG_SYS_SDRAM_SIZE 0x80000000 /* 2048 MiB */
/* /*
* The reserved memory * The reserved memory