mirror of
https://xff.cz/git/u-boot/
synced 2025-12-26 14:20:23 +01: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:
@@ -150,7 +150,7 @@ int board_init(void)
|
||||
#if defined(CONFIG_HW_WATCHDOG)
|
||||
hw_watchdog_init();
|
||||
#endif
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -40,8 +40,8 @@ int dram_init(void)
|
||||
MCFSDRAMC_DCR = MCFSDRAMC_DCR_RTIM_6 |
|
||||
MCFSDRAMC_DCR_RC((15 * CONFIG_SYS_CLK / 1000000) >> 4);
|
||||
asm (" nop");
|
||||
#ifdef CONFIG_SYS_SDRAM_BASE0
|
||||
MCFSDRAMC_DACR0 = MCFSDRAMC_DACR_BASE(CONFIG_SYS_SDRAM_BASE0)|
|
||||
#ifdef CFG_SYS_SDRAM_BASE0
|
||||
MCFSDRAMC_DACR0 = MCFSDRAMC_DACR_BASE(CFG_SYS_SDRAM_BASE0)|
|
||||
MCFSDRAMC_DACR_CASL(1) | MCFSDRAMC_DACR_CBM(3) |
|
||||
MCFSDRAMC_DACR_PS_32;
|
||||
asm (" nop");
|
||||
@@ -54,7 +54,7 @@ int dram_init(void)
|
||||
for (i = 0; i < 10; i++)
|
||||
asm (" nop");
|
||||
|
||||
*(unsigned long *)(CONFIG_SYS_SDRAM_BASE0) = 0xA5A5A5A5;
|
||||
*(unsigned long *)(CFG_SYS_SDRAM_BASE0) = 0xA5A5A5A5;
|
||||
asm (" nop");
|
||||
MCFSDRAMC_DACR0 |= MCFSDRAMC_DACR_RE;
|
||||
asm (" nop");
|
||||
@@ -65,12 +65,12 @@ int dram_init(void)
|
||||
MCFSDRAMC_DACR0 |= MCFSDRAMC_DACR_IMRS;
|
||||
asm (" nop");
|
||||
/* write SDRAM mode register */
|
||||
*(unsigned long *)(CONFIG_SYS_SDRAM_BASE0 + 0x80440) = 0xA5A5A5A5;
|
||||
*(unsigned long *)(CFG_SYS_SDRAM_BASE0 + 0x80440) = 0xA5A5A5A5;
|
||||
asm (" nop");
|
||||
size += CONFIG_SYS_SDRAM_SIZE0 * 1024 * 1024;
|
||||
size += CFG_SYS_SDRAM_SIZE0 * 1024 * 1024;
|
||||
#endif
|
||||
#ifdef CONFIG_SYS_SDRAM_BASE1xx
|
||||
MCFSDRAMC_DACR1 = MCFSDRAMC_DACR_BASE (CONFIG_SYS_SDRAM_BASE1)
|
||||
#ifdef CFG_SYS_SDRAM_BASE1xx
|
||||
MCFSDRAMC_DACR1 = MCFSDRAMC_DACR_BASE (CFG_SYS_SDRAM_BASE1)
|
||||
| MCFSDRAMC_DACR_CASL (1)
|
||||
| MCFSDRAMC_DACR_CBM (3)
|
||||
| MCFSDRAMC_DACR_PS_16;
|
||||
@@ -79,15 +79,15 @@ int dram_init(void)
|
||||
|
||||
MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_IP;
|
||||
|
||||
*(unsigned short *) (CONFIG_SYS_SDRAM_BASE1) = 0xA5A5;
|
||||
*(unsigned short *) (CFG_SYS_SDRAM_BASE1) = 0xA5A5;
|
||||
MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_RE;
|
||||
|
||||
for (i = 0; i < 2000; i++)
|
||||
asm (" nop");
|
||||
|
||||
MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_IMRS;
|
||||
*(unsigned int *) (CONFIG_SYS_SDRAM_BASE1 + 0x220) = 0xA5A5;
|
||||
size += CONFIG_SYS_SDRAM_SIZE1 * 1024 * 1024;
|
||||
*(unsigned int *) (CFG_SYS_SDRAM_BASE1 + 0x220) = 0xA5A5;
|
||||
size += CFG_SYS_SDRAM_SIZE1 * 1024 * 1024;
|
||||
#endif
|
||||
gd->ram_size = size;
|
||||
|
||||
|
||||
@@ -139,7 +139,7 @@ int board_fix_fdt(void *blob)
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ int timer_init(void)
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = smc_dram_size(0);
|
||||
gd->ram_size -= CONFIG_SYS_SDRAM_BASE;
|
||||
gd->ram_size -= CFG_SYS_SDRAM_BASE;
|
||||
mem_map_fill();
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -105,7 +105,7 @@ int timer_init(void)
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = smc_dram_size(0);
|
||||
gd->ram_size -= CONFIG_SYS_SDRAM_BASE;
|
||||
gd->ram_size -= CFG_SYS_SDRAM_BASE;
|
||||
|
||||
mem_map_fill();
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ int board_early_init_r(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ int misc_init_r (void)
|
||||
|
||||
int dram_init (void)
|
||||
{
|
||||
gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
|
||||
#ifdef CONFIG_CM_SPD_DETECT
|
||||
{
|
||||
extern void dram_query(void);
|
||||
@@ -160,12 +160,12 @@ extern void dram_query(void);
|
||||
*
|
||||
*/
|
||||
sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4;
|
||||
gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE +
|
||||
gd->ram_size = get_ram_size((long *) CFG_SYS_SDRAM_BASE +
|
||||
REMAPPED_FLASH_SZ,
|
||||
0x01000000 << sdram_shift);
|
||||
}
|
||||
#else
|
||||
gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE +
|
||||
gd->ram_size = get_ram_size((long *) CFG_SYS_SDRAM_BASE +
|
||||
REMAPPED_FLASH_SZ,
|
||||
PHYS_SDRAM_1_SIZE);
|
||||
#endif /* CM_SPD_DETECT */
|
||||
|
||||
@@ -73,7 +73,7 @@ static void flash__init(void)
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size =
|
||||
get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, PHYS_SDRAM_1_SIZE);
|
||||
get_ram_size((long *)CFG_SYS_SDRAM_BASE, PHYS_SDRAM_1_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -39,12 +39,12 @@ int dram_init(void)
|
||||
* GPIO configuration for bus should be set correctly from reset,
|
||||
* so we do not care! First, set up address space: at this point,
|
||||
* we should be running from internal SRAM;
|
||||
* so use CONFIG_SYS_SDRAM_BASE as the base address for SDRAM,
|
||||
* so use CFG_SYS_SDRAM_BASE as the base address for SDRAM,
|
||||
* and do not care where it is
|
||||
*/
|
||||
__raw_writel((CONFIG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000018,
|
||||
__raw_writel((CFG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000018,
|
||||
&sdp->cs0);
|
||||
__raw_writel((CONFIG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000000,
|
||||
__raw_writel((CFG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000000,
|
||||
&sdp->cs1);
|
||||
/*
|
||||
* I am not sure from the data sheet, but it seems burst length
|
||||
@@ -72,7 +72,7 @@ int dram_init(void)
|
||||
*/
|
||||
__raw_writel(0x71462C00, &sdp->ctrl);
|
||||
/* Dummy write to start SDRAM */
|
||||
writel(0, CONFIG_SYS_SDRAM_BASE);
|
||||
writel(0, CFG_SYS_SDRAM_BASE);
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -82,8 +82,8 @@ int dram_init(void)
|
||||
* (Do not rely on the SDCS register(s) being set to 0x00000000
|
||||
* during reset as stated in the data sheet.)
|
||||
*/
|
||||
gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
|
||||
0x80000000 - CONFIG_SYS_SDRAM_BASE);
|
||||
gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
|
||||
0x80000000 - CFG_SYS_SDRAM_BASE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
at91sam9260ek_nand_hw_init();
|
||||
@@ -92,8 +92,8 @@ int board_init(void)
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size(
|
||||
(void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
(void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -156,7 +156,7 @@ int board_init(void)
|
||||
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9261EK;
|
||||
#endif
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
at91sam9261ek_nand_hw_init();
|
||||
@@ -176,8 +176,8 @@ int board_eth_init(struct bd_info *bis)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ int board_init(void)
|
||||
/* arch number of AT91SAM9263EK-Board */
|
||||
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9263EK;
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
at91sam9263ek_nand_hw_init();
|
||||
@@ -108,8 +108,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -168,7 +168,7 @@ int board_init(void)
|
||||
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9M10G45EK;
|
||||
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
at91sam9m10g45ek_nand_hw_init();
|
||||
@@ -181,8 +181,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *) CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_NAND_ATMEL
|
||||
at91sam9n12ek_nand_hw_init();
|
||||
@@ -114,8 +114,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ int board_init(void)
|
||||
/* arch number of AT91SAM9RLEK-Board */
|
||||
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9RLEK;
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
at91sam9rlek_nand_hw_init();
|
||||
@@ -104,7 +104,7 @@ int board_init(void)
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size(
|
||||
(void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
(void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -115,7 +115,7 @@ int board_init(void)
|
||||
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9X5EK;
|
||||
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
at91sam9x5ek_nand_hw_init();
|
||||
@@ -129,8 +129,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *) CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -120,7 +120,7 @@ int misc_init_r(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
sam9x60ek_nand_hw_init();
|
||||
@@ -130,7 +130,7 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
rgb_leds_init();
|
||||
|
||||
@@ -84,8 +84,8 @@ int misc_init_r(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
rgb_leds_init();
|
||||
|
||||
@@ -63,8 +63,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -115,7 +115,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
rgb_leds_init();
|
||||
|
||||
@@ -130,8 +130,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_NAND_ATMEL
|
||||
sama5d3_xplained_nand_hw_init();
|
||||
@@ -110,8 +110,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_NAND_ATMEL
|
||||
sama5d3xek_nand_hw_init();
|
||||
@@ -166,8 +166,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@ int misc_init_r(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_NAND_ATMEL
|
||||
sama5d4_xplained_nand_hw_init();
|
||||
@@ -135,8 +135,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_NAND_ATMEL
|
||||
sama5d4ek_nand_hw_init();
|
||||
@@ -121,8 +121,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ int misc_init_r(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
board_leds_init();
|
||||
|
||||
@@ -76,7 +76,7 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -307,7 +307,7 @@ int board_init(void)
|
||||
gd->bd->bi_arch_number = MACH_TYPE_SNAPPER_9260;
|
||||
|
||||
/* Address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
ret = gurnard_nand_hw_init();
|
||||
@@ -407,8 +407,8 @@ int board_eth_init(struct bd_info *bis)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -182,7 +182,7 @@ int board_init(void)
|
||||
hw_watchdog_init();
|
||||
#endif
|
||||
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_MTD_RAW_NAND
|
||||
gpmc_init();
|
||||
|
||||
@@ -449,7 +449,7 @@ int board_init(void)
|
||||
if (read_eeprom() < 0)
|
||||
puts("EEPROM Content Invalid.\n");
|
||||
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
#if defined(CONFIG_NOR) || defined(CONFIG_MTD_RAW_NAND)
|
||||
gpmc_init();
|
||||
#endif
|
||||
|
||||
@@ -26,7 +26,7 @@ int board_init(void)
|
||||
* Address of boot parameters passed to kernel
|
||||
* Use default offset 0x100
|
||||
*/
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -36,14 +36,14 @@ int board_init(void)
|
||||
*/
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
@@ -95,7 +95,7 @@ static void usb_a9263_macb_hw_init(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
usb_a9263_nand_hw_init();
|
||||
@@ -111,8 +111,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ int dram_init(void)
|
||||
/* Dummy write to start SDRAM */
|
||||
*((volatile unsigned long *) 0) = 0;
|
||||
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
|
||||
return 0;
|
||||
};
|
||||
|
||||
@@ -45,7 +45,7 @@ int power_init_board(void)
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
gpmc_init();
|
||||
set_i2c_pin_mux();
|
||||
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
||||
|
||||
@@ -119,7 +119,7 @@ void sdram_init(void)
|
||||
unsigned long ram_size;
|
||||
|
||||
config_ddr(0, &ioregs_ddr3, NULL, NULL, &ddr3_emif_regs, 0);
|
||||
ram_size = get_ram_size((long int *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
|
||||
ram_size = get_ram_size((long int *)CFG_SYS_SDRAM_BASE, 0x80000000);
|
||||
if (ram_size == 0x80000000 ||
|
||||
ram_size == 0x40000000 ||
|
||||
ram_size == 0x20000000)
|
||||
@@ -127,7 +127,7 @@ void sdram_init(void)
|
||||
|
||||
ddr3_emif_regs.sdram_config = 0x638453B2;
|
||||
config_ddr(0, &ioregs_ddr3, NULL, NULL, &ddr3_emif_regs, 0);
|
||||
ram_size = get_ram_size((long int *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
|
||||
ram_size = get_ram_size((long int *)CFG_SYS_SDRAM_BASE, 0x80000000);
|
||||
if (ram_size == 0x08000000)
|
||||
return;
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ int dram_init(void)
|
||||
out_be32(&memctl->memc_mcr, 0x80002038);
|
||||
udelay(200);
|
||||
|
||||
gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
|
||||
gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
|
||||
SDRAM_MAX_SIZE);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -29,13 +29,13 @@ board_early_init_f(void)
|
||||
int
|
||||
board_init(void)
|
||||
{
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x2000;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x2000;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, SZ_64M);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, SZ_64M);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -286,7 +286,7 @@ int board_init(void)
|
||||
hw_watchdog_init();
|
||||
#endif
|
||||
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -85,8 +85,8 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size(
|
||||
(void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
(void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ int board_init(void)
|
||||
at91_periph_clk_enable(ATMEL_ID_PIOC);
|
||||
|
||||
/* Set adress of boot parameters. */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
/* Initialize UARTs and power management. */
|
||||
ethernut5_power_init();
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
|
||||
@@ -126,7 +126,7 @@ void *board_fdt_blob_setup(int *err)
|
||||
{
|
||||
*err = 0;
|
||||
/* QEMU loads a generated DTB for us at the start of RAM. */
|
||||
return (void *)CONFIG_SYS_SDRAM_BASE;
|
||||
return (void *)CFG_SYS_SDRAM_BASE;
|
||||
}
|
||||
|
||||
void enable_caches(void)
|
||||
|
||||
@@ -264,7 +264,7 @@ int board_init(void)
|
||||
meesc_ethercat_hw_init();
|
||||
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
meesc_nand_hw_init();
|
||||
|
||||
@@ -61,7 +61,7 @@ static void dp_ddr_restore(void)
|
||||
|
||||
/* get the address of ddr date from SPARECR3 */
|
||||
src = (u64 *)in_le32(&scfg->sparecr[2]);
|
||||
dst = (u64 *)CONFIG_SYS_SDRAM_BASE;
|
||||
dst = (u64 *)CFG_SYS_SDRAM_BASE;
|
||||
|
||||
for (i = 0; i < DDR_BUFF_LEN / 8; i++)
|
||||
*dst++ = *src++;
|
||||
|
||||
@@ -50,7 +50,7 @@ static void dp_ddr_restore(void)
|
||||
|
||||
/* get the address of ddr date from SPARECR3 */
|
||||
src = (u64 *)(in_be32(&scfg->sparecr[2]) + DDR_BUFF_LEN - 8);
|
||||
dst = (u64 *)(CONFIG_SYS_SDRAM_BASE + DDR_BUFF_LEN - 8);
|
||||
dst = (u64 *)(CFG_SYS_SDRAM_BASE + DDR_BUFF_LEN - 8);
|
||||
|
||||
for (i = 0; i < DDR_BUFF_LEN / 8; i++)
|
||||
*dst-- = *src--;
|
||||
|
||||
@@ -102,7 +102,7 @@ int dram_init(void)
|
||||
else
|
||||
gd->ram_size = SYS_SDRAM_SIZE_512;
|
||||
#else
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE;
|
||||
#endif
|
||||
}
|
||||
return 0;
|
||||
@@ -139,7 +139,7 @@ int dram_init(void)
|
||||
gd->ram_size = SYS_SDRAM_SIZE_512;
|
||||
}
|
||||
#else
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE;
|
||||
#endif
|
||||
mmdc_init(&mparam);
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ int dram_init(void)
|
||||
{
|
||||
gd->ram_size = tfa_get_dram_size();
|
||||
if (!gd->ram_size)
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -90,7 +90,7 @@ int dram_init(void)
|
||||
};
|
||||
|
||||
mmdc_init(&mparam);
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE;
|
||||
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
|
||||
/* This will break-before-make MMU for DDR */
|
||||
update_early_mmu_table();
|
||||
|
||||
@@ -113,7 +113,7 @@ int dram_init(void)
|
||||
{
|
||||
gd->ram_size = tfa_get_dram_size();
|
||||
if (!gd->ram_size)
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -140,7 +140,7 @@ int dram_init(void)
|
||||
mmdc_init(&mparam);
|
||||
#endif
|
||||
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE;
|
||||
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
|
||||
/* This will break-before-make MMU for DDR */
|
||||
update_early_mmu_table();
|
||||
|
||||
@@ -192,7 +192,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;
|
||||
|
||||
@@ -47,7 +47,7 @@ static void ddrmc_init(void)
|
||||
if (is_warm_boot()) {
|
||||
out_be32(&ddr->sdram_cfg_2,
|
||||
DDR_SDRAM_CFG_2 & ~SDRAM_CFG2_D_INIT);
|
||||
out_be32(&ddr->init_addr, CONFIG_SYS_SDRAM_BASE);
|
||||
out_be32(&ddr->init_addr, CFG_SYS_SDRAM_BASE);
|
||||
out_be32(&ddr->init_ext_addr, (1 << 31));
|
||||
|
||||
/* DRAM VRef will not be trained */
|
||||
|
||||
@@ -162,7 +162,7 @@ void ddrmc_init(void)
|
||||
if (is_warm_boot()) {
|
||||
out_be32(&ddr->sdram_cfg_2,
|
||||
DDR_SDRAM_CFG_2 & ~SDRAM_CFG2_D_INIT);
|
||||
out_be32(&ddr->init_addr, CONFIG_SYS_SDRAM_BASE);
|
||||
out_be32(&ddr->init_addr, CFG_SYS_SDRAM_BASE);
|
||||
out_be32(&ddr->init_ext_addr, (1 << 31));
|
||||
|
||||
/* DRAM VRef will not be trained */
|
||||
|
||||
@@ -29,7 +29,7 @@ int dram_init(void)
|
||||
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
|
||||
u32 dramsize, i;
|
||||
|
||||
dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
|
||||
dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
|
||||
|
||||
for (i = 0x13; i < 0x20; i++) {
|
||||
if (dramsize == (1 << i))
|
||||
@@ -37,35 +37,35 @@ int dram_init(void)
|
||||
}
|
||||
i--;
|
||||
|
||||
out_be32(&sdram->cs0, CONFIG_SYS_SDRAM_BASE | i);
|
||||
#ifdef CONFIG_SYS_SDRAM_BASE1
|
||||
out_be32(&sdram->cs1, CONFIG_SYS_SDRAM_BASE | i);
|
||||
out_be32(&sdram->cs0, CFG_SYS_SDRAM_BASE | i);
|
||||
#ifdef CFG_SYS_SDRAM_BASE1
|
||||
out_be32(&sdram->cs1, CFG_SYS_SDRAM_BASE | i);
|
||||
#endif
|
||||
out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
|
||||
out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
|
||||
out_be32(&sdram->cfg1, CFG_SYS_SDRAM_CFG1);
|
||||
out_be32(&sdram->cfg2, CFG_SYS_SDRAM_CFG2);
|
||||
|
||||
udelay(500);
|
||||
|
||||
/* Issue PALL */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
|
||||
asm("nop");
|
||||
|
||||
/* Perform two refresh cycles */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
|
||||
asm("nop");
|
||||
|
||||
/* Issue LEMR */
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE);
|
||||
asm("nop");
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_EMOD);
|
||||
asm("nop");
|
||||
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
|
||||
asm("nop");
|
||||
|
||||
out_be32(&sdram->ctrl,
|
||||
(CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000F00);
|
||||
(CFG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000F00);
|
||||
asm("nop");
|
||||
|
||||
udelay(100);
|
||||
|
||||
@@ -44,7 +44,7 @@ int dram_init(void)
|
||||
GPIO_PAR_SDRAM_SRAS | GPIO_PAR_SDRAM_SCKE |
|
||||
GPIO_PAR_SDRAM_SDCS(3));
|
||||
|
||||
dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
|
||||
dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
|
||||
for (i = 0x13; i < 0x20; i++) {
|
||||
if (dramsize == (1 << i))
|
||||
break;
|
||||
@@ -61,7 +61,7 @@ int dram_init(void)
|
||||
|
||||
/* Initialize DACR0 */
|
||||
out_be32(&sdram->dacr0,
|
||||
SDRAMC_DARCn_BA(CONFIG_SYS_SDRAM_BASE) |
|
||||
SDRAMC_DARCn_BA(CFG_SYS_SDRAM_BASE) |
|
||||
SDRAMC_DARCn_CASL_C1 | SDRAMC_DARCn_CBM_CMD20 |
|
||||
SDRAMC_DARCn_PS_32);
|
||||
asm("nop");
|
||||
@@ -80,7 +80,7 @@ int dram_init(void)
|
||||
}
|
||||
|
||||
/* Write to this block to initiate precharge */
|
||||
*(u32 *) (CONFIG_SYS_SDRAM_BASE) = 0xA5A59696;
|
||||
*(u32 *) (CFG_SYS_SDRAM_BASE) = 0xA5A59696;
|
||||
|
||||
/* Set RE (bit 15) in DACR */
|
||||
setbits_be32(&sdram->dacr0, SDRAMC_DARCn_RE);
|
||||
@@ -95,7 +95,7 @@ int dram_init(void)
|
||||
asm("nop");
|
||||
|
||||
/* Write to the SDRAM Mode Register */
|
||||
*(u32 *) (CONFIG_SYS_SDRAM_BASE + 0x400) = 0xA5A59696;
|
||||
*(u32 *) (CFG_SYS_SDRAM_BASE + 0x400) = 0xA5A59696;
|
||||
}
|
||||
|
||||
gd->ram_size = dramsize;
|
||||
|
||||
@@ -86,7 +86,7 @@ int dram_init(void)
|
||||
mbar_writeLong(MCFSIM_DACR0, 0x0000b364); /* Enable DACR0[IMRS] (bit 6); RE remains enabled */
|
||||
*((volatile unsigned long *) 0x800) = junk; /* Access RAM to initialize the mode register */
|
||||
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
|
||||
return 0;
|
||||
};
|
||||
|
||||
@@ -47,7 +47,7 @@ int dram_init(void)
|
||||
__asm__("nop");
|
||||
|
||||
/* Initialize DMR0 */
|
||||
dramsize = (CONFIG_SYS_SDRAM_SIZE << 20);
|
||||
dramsize = (CFG_SYS_SDRAM_SIZE << 20);
|
||||
temp = (dramsize - 1) & 0xFFFC0000;
|
||||
mbar_writeLong(MCFSIM_DMR0, temp | 1);
|
||||
__asm__("nop");
|
||||
@@ -57,7 +57,7 @@ int dram_init(void)
|
||||
__asm__("nop");
|
||||
|
||||
/* Write to this block to initiate precharge */
|
||||
*(u32 *) (CONFIG_SYS_SDRAM_BASE) = 0xa5a5a5a5;
|
||||
*(u32 *) (CFG_SYS_SDRAM_BASE) = 0xa5a5a5a5;
|
||||
mb();
|
||||
__asm__("nop");
|
||||
|
||||
@@ -74,7 +74,7 @@ int dram_init(void)
|
||||
mbar_readLong(MCFSIM_DACR0) | 0x0040);
|
||||
__asm__("nop");
|
||||
|
||||
*(u32 *) (CONFIG_SYS_SDRAM_BASE + 0x800) = 0xa5a5a5a5;
|
||||
*(u32 *) (CFG_SYS_SDRAM_BASE + 0x800) = 0xa5a5a5a5;
|
||||
mb();
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ int dram_init(void)
|
||||
/* Dummy write to start SDRAM */
|
||||
*((volatile unsigned long *)0) = 0;
|
||||
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
|
||||
return 0;
|
||||
};
|
||||
|
||||
@@ -35,7 +35,7 @@ int dram_init(void)
|
||||
out_be16(&gpio_reg->par_sdram, 0x3FF);
|
||||
|
||||
/* Set up chip select */
|
||||
out_be32(&sdp->sdbar0, CONFIG_SYS_SDRAM_BASE);
|
||||
out_be32(&sdp->sdbar0, CFG_SYS_SDRAM_BASE);
|
||||
out_be32(&sdp->sdbmr0, MCF_SDRAMC_SDMRn_BAM_32M | MCF_SDRAMC_SDMRn_V);
|
||||
|
||||
/* Set up timing */
|
||||
@@ -49,34 +49,34 @@ int dram_init(void)
|
||||
setbits_be32(&sdp->sdcr, MCF_SDRAMC_SDCR_IPALL);
|
||||
|
||||
/* Dummy write to start SDRAM */
|
||||
*((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
*((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
|
||||
/* Send LEMR */
|
||||
setbits_be32(&sdp->sdmr,
|
||||
MCF_SDRAMC_SDMR_BNKAD_LEMR | MCF_SDRAMC_SDMR_AD(0x0) |
|
||||
MCF_SDRAMC_SDMR_CMD);
|
||||
*((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
*((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
|
||||
/* Send LMR */
|
||||
out_be32(&sdp->sdmr, 0x058d0000);
|
||||
*((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
*((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
|
||||
/* Stop sending commands */
|
||||
clrbits_be32(&sdp->sdmr, MCF_SDRAMC_SDMR_CMD);
|
||||
|
||||
/* Set precharge */
|
||||
setbits_be32(&sdp->sdcr, MCF_SDRAMC_SDCR_IPALL);
|
||||
*((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
*((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
|
||||
/* Stop manual precharge, send 2 IREF */
|
||||
clrbits_be32(&sdp->sdcr, MCF_SDRAMC_SDCR_IPALL);
|
||||
setbits_be32(&sdp->sdcr, MCF_SDRAMC_SDCR_IREF);
|
||||
*((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
*((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
*((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
*((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
|
||||
|
||||
out_be32(&sdp->sdmr, 0x018d0000);
|
||||
*((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
*((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
|
||||
|
||||
/* Stop sending commands */
|
||||
clrbits_be32(&sdp->sdmr, MCF_SDRAMC_SDMR_CMD);
|
||||
@@ -91,7 +91,7 @@ int dram_init(void)
|
||||
| MCF_SDRAMC_SDCR_RCNT((SDRAM_TREFI/(PERIOD*64)) - 1 + 1)
|
||||
| MCF_SDRAMC_SDCR_DQS_OE(0x3));
|
||||
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
|
||||
return 0;
|
||||
};
|
||||
|
||||
@@ -21,7 +21,7 @@ int dram_init(void)
|
||||
{
|
||||
u32 dramsize, i, dramclk;
|
||||
|
||||
dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
|
||||
dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
|
||||
for (i = 0x13; i < 0x20; i++) {
|
||||
if (dramsize == (1 << i))
|
||||
break;
|
||||
@@ -40,7 +40,7 @@ int dram_init(void)
|
||||
|
||||
/* Initialize DACR0 */
|
||||
MCFSDRAMC_DACR0 = (0
|
||||
| MCFSDRAMC_DACR_BASE(CONFIG_SYS_SDRAM_BASE)
|
||||
| MCFSDRAMC_DACR_BASE(CFG_SYS_SDRAM_BASE)
|
||||
| MCFSDRAMC_DACR_CASL(1)
|
||||
| MCFSDRAMC_DACR_CBM(3)
|
||||
| MCFSDRAMC_DACR_PS_32);
|
||||
@@ -62,7 +62,7 @@ int dram_init(void)
|
||||
}
|
||||
|
||||
/* Write to this block to initiate precharge */
|
||||
*(u32 *)(CONFIG_SYS_SDRAM_BASE) = 0xA5A59696;
|
||||
*(u32 *)(CFG_SYS_SDRAM_BASE) = 0xA5A59696;
|
||||
asm("nop");
|
||||
|
||||
/* Set RE (bit 15) in DACR */
|
||||
@@ -79,7 +79,7 @@ int dram_init(void)
|
||||
asm("nop");
|
||||
|
||||
/* Write to the SDRAM Mode Register */
|
||||
*(u32 *)(CONFIG_SYS_SDRAM_BASE + 0x400) = 0xA5A59696;
|
||||
*(u32 *)(CFG_SYS_SDRAM_BASE + 0x400) = 0xA5A59696;
|
||||
}
|
||||
gd->ram_size = dramsize;
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ CONFIG_SYS_CSn_BASE -- defines the Chip Select Base register
|
||||
CONFIG_SYS_CSn_MASK -- defines the Chip Select Mask register
|
||||
CONFIG_SYS_CSn_CTRL -- defines the Chip Select Control register
|
||||
|
||||
CONFIG_SYS_SDRAM_BASE -- defines the DRAM Base
|
||||
CFG_SYS_SDRAM_BASE -- defines the DRAM Base
|
||||
|
||||
2. MEMORY MAP UNDER U-BOOT AND LINUX KERNEL
|
||||
===========================================
|
||||
|
||||
@@ -29,7 +29,7 @@ int dram_init(void)
|
||||
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
|
||||
u32 dramsize, i;
|
||||
|
||||
dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
|
||||
dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
|
||||
|
||||
for (i = 0x13; i < 0x20; i++) {
|
||||
if (dramsize == (1 << i))
|
||||
@@ -37,35 +37,35 @@ int dram_init(void)
|
||||
}
|
||||
i--;
|
||||
|
||||
out_be32(&sdram->cs0, CONFIG_SYS_SDRAM_BASE | i);
|
||||
#ifdef CONFIG_SYS_SDRAM_BASE1
|
||||
out_be32(&sdram->cs1, CONFIG_SYS_SDRAM_BASE | i);
|
||||
out_be32(&sdram->cs0, CFG_SYS_SDRAM_BASE | i);
|
||||
#ifdef CFG_SYS_SDRAM_BASE1
|
||||
out_be32(&sdram->cs1, CFG_SYS_SDRAM_BASE | i);
|
||||
#endif
|
||||
out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
|
||||
out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
|
||||
out_be32(&sdram->cfg1, CFG_SYS_SDRAM_CFG1);
|
||||
out_be32(&sdram->cfg2, CFG_SYS_SDRAM_CFG2);
|
||||
|
||||
udelay(500);
|
||||
|
||||
/* Issue PALL */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
|
||||
asm("nop");
|
||||
|
||||
/* Perform two refresh cycles */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
|
||||
asm("nop");
|
||||
|
||||
/* Issue LEMR */
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE);
|
||||
asm("nop");
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_EMOD);
|
||||
asm("nop");
|
||||
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
|
||||
asm("nop");
|
||||
|
||||
out_be32(&sdram->ctrl,
|
||||
(CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
|
||||
(CFG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
|
||||
asm("nop");
|
||||
|
||||
udelay(100);
|
||||
|
||||
@@ -29,7 +29,7 @@ int dram_init(void)
|
||||
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
|
||||
u32 dramsize, i;
|
||||
|
||||
dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
|
||||
dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
|
||||
|
||||
for (i = 0x13; i < 0x20; i++) {
|
||||
if (dramsize == (1 << i))
|
||||
@@ -37,30 +37,30 @@ int dram_init(void)
|
||||
}
|
||||
i--;
|
||||
|
||||
out_be32(&sdram->cs0, CONFIG_SYS_SDRAM_BASE | i);
|
||||
out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
|
||||
out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
|
||||
out_be32(&sdram->cs0, CFG_SYS_SDRAM_BASE | i);
|
||||
out_be32(&sdram->cfg1, CFG_SYS_SDRAM_CFG1);
|
||||
out_be32(&sdram->cfg2, CFG_SYS_SDRAM_CFG2);
|
||||
|
||||
/* Issue PALL */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
|
||||
|
||||
/* Issue LEMR */
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE | 0x04000000);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_EMOD);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE | 0x04000000);
|
||||
|
||||
udelay(500);
|
||||
|
||||
/* Issue PALL */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
|
||||
|
||||
/* Perform two refresh cycles */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
|
||||
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE);
|
||||
|
||||
out_be32(&sdram->ctrl,
|
||||
(CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
|
||||
(CFG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
|
||||
|
||||
udelay(100);
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ CONFIG_SYS_CSn_BASE -- defines the Chip Select Base register
|
||||
CONFIG_SYS_CSn_MASK -- defines the Chip Select Mask register
|
||||
CONFIG_SYS_CSn_CTRL -- defines the Chip Select Control register
|
||||
|
||||
CONFIG_SYS_SDRAM_BASE -- defines the DRAM Base
|
||||
CFG_SYS_SDRAM_BASE -- defines the DRAM Base
|
||||
|
||||
2. MEMORY MAP UNDER U-BOOT AND LINUX KERNEL
|
||||
===========================================
|
||||
|
||||
@@ -29,7 +29,7 @@ int dram_init(void)
|
||||
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
|
||||
u32 dramsize, i;
|
||||
|
||||
dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
|
||||
dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
|
||||
|
||||
for (i = 0x13; i < 0x20; i++) {
|
||||
if (dramsize == (1 << i))
|
||||
@@ -37,30 +37,30 @@ int dram_init(void)
|
||||
}
|
||||
i--;
|
||||
|
||||
out_be32(&sdram->cs0, CONFIG_SYS_SDRAM_BASE | i);
|
||||
out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
|
||||
out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
|
||||
out_be32(&sdram->cs0, CFG_SYS_SDRAM_BASE | i);
|
||||
out_be32(&sdram->cfg1, CFG_SYS_SDRAM_CFG1);
|
||||
out_be32(&sdram->cfg2, CFG_SYS_SDRAM_CFG2);
|
||||
|
||||
/* Issue PALL */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
|
||||
|
||||
/* Issue LEMR */
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE | 0x04000000);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_EMOD);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE | 0x04000000);
|
||||
|
||||
udelay(500);
|
||||
|
||||
/* Issue PALL */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
|
||||
|
||||
/* Perform two refresh cycles */
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
|
||||
out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
|
||||
|
||||
out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
|
||||
out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE);
|
||||
|
||||
out_be32(&sdram->ctrl,
|
||||
(CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
|
||||
(CFG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
|
||||
|
||||
udelay(100);
|
||||
|
||||
|
||||
@@ -97,10 +97,10 @@ int dram_init(void)
|
||||
int fixed_sdram(void)
|
||||
{
|
||||
immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
u32 msize = CONFIG_SYS_SDRAM_SIZE;
|
||||
u32 msize = CFG_SYS_SDRAM_SIZE;
|
||||
u32 msize_log2 = __ilog2(msize);
|
||||
|
||||
im->sysconf.ddrlaw[0].bar = CONFIG_SYS_SDRAM_BASE & 0xfffff000;
|
||||
im->sysconf.ddrlaw[0].bar = CFG_SYS_SDRAM_BASE & 0xfffff000;
|
||||
im->sysconf.ddrlaw[0].ar = LBLAWAR_EN | (msize_log2 - 1);
|
||||
|
||||
im->sysconf.ddrcdr = CONFIG_SYS_DDRCDR_VALUE;
|
||||
@@ -127,7 +127,7 @@ int fixed_sdram(void)
|
||||
|
||||
im->ddr.sdram_cfg |= SDRAM_CFG_MEM_EN;
|
||||
udelay(2000);
|
||||
return CONFIG_SYS_SDRAM_SIZE >> 20;
|
||||
return CFG_SYS_SDRAM_SIZE >> 20;
|
||||
}
|
||||
#endif /*!CONFIG_SYS_SPD_EEPROM */
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
int dram_init(void)
|
||||
{
|
||||
/* dram_init must store complete ramsize in gd->ram_size */
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
PHYS_SDRAM_1_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -244,7 +244,7 @@ phys_size_t fixed_sdram(void)
|
||||
printf("Configuring DDR for %s MT/s data rate\n",
|
||||
strmhz(buf, sysinfo.freq_ddrbus));
|
||||
|
||||
ddr_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
ddr_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
|
||||
|
||||
fsl_ddr_set_memctl_regs(&ddr_cfg_regs, 0, 0);
|
||||
|
||||
|
||||
@@ -507,7 +507,7 @@ int splash_screen_prepare(void)
|
||||
/* u-boot dram initialize */
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -518,10 +518,10 @@ int dram_init_banksize(void)
|
||||
unsigned int reg_val = readl(SCR_USER_SIG6_READ);
|
||||
|
||||
/* set global data memory */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x00000100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x00000100;
|
||||
|
||||
gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_dram[0].size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_dram[0].size = CFG_SYS_SDRAM_SIZE;
|
||||
|
||||
/* Number of Row: 14 bits */
|
||||
if ((reg_val >> 28) == 14)
|
||||
|
||||
@@ -45,15 +45,15 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* Address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -34,11 +34,11 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
static long fixed_sdram(void)
|
||||
{
|
||||
immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
|
||||
u32 msize = CONFIG_SYS_SDRAM_SIZE;
|
||||
u32 msize = CFG_SYS_SDRAM_SIZE;
|
||||
u32 msize_log2 = __ilog2(msize);
|
||||
|
||||
out_be32(&im->sysconf.ddrlaw[0].bar,
|
||||
CONFIG_SYS_SDRAM_BASE & 0xfffff000);
|
||||
CFG_SYS_SDRAM_BASE & 0xfffff000);
|
||||
out_be32(&im->sysconf.ddrlaw[0].ar, LBLAWAR_EN | (msize_log2 - 1));
|
||||
out_be32(&im->sysconf.ddrcdr, CONFIG_SYS_DDRCDR_VALUE);
|
||||
|
||||
@@ -66,7 +66,7 @@ static long fixed_sdram(void)
|
||||
setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN);
|
||||
sync();
|
||||
|
||||
return get_ram_size(CONFIG_SYS_SDRAM_BASE, msize);
|
||||
return get_ram_size(CFG_SYS_SDRAM_BASE, msize);
|
||||
}
|
||||
|
||||
int dram_init(void)
|
||||
|
||||
@@ -95,7 +95,7 @@ int board_init(void)
|
||||
hw_watchdog_init();
|
||||
#endif
|
||||
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
gpmc_init();
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -27,7 +27,7 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size)
|
||||
{
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
if (gd->ram_top < CONFIG_SYS_SDRAM_BASE) {
|
||||
if (gd->ram_top < CFG_SYS_SDRAM_BASE) {
|
||||
/* 2GB wrapped around to 0 */
|
||||
return CKSEG0ADDR(256 << 20);
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ _msc01:
|
||||
/* setup basic address decode */
|
||||
PTR_LI t0, CKSEG1ADDR(MALTA_MSC01_BIU_BASE)
|
||||
li t1, 0x0
|
||||
li t2, -CONFIG_SYS_SDRAM_SIZE
|
||||
li t2, -CFG_SYS_SDRAM_SIZE
|
||||
sw t1, MSC01_BIU_MCBAS1L_OFS(t0)
|
||||
sw t2, MSC01_BIU_MCMSK1L_OFS(t0)
|
||||
sw t1, MSC01_BIU_MCBAS2L_OFS(t0)
|
||||
@@ -168,7 +168,7 @@ _msc01:
|
||||
sw t3, MSC01_PCI_SC2PIOMAPL_OFS(t0)
|
||||
|
||||
/* setup PCI_BAR0 memory window */
|
||||
li t1, -CONFIG_SYS_SDRAM_SIZE
|
||||
li t1, -CFG_SYS_SDRAM_SIZE
|
||||
sw t1, MSC01_PCI_BAR0_OFS(t0)
|
||||
|
||||
/* setup PCI to SysCon/CPU translation */
|
||||
|
||||
@@ -94,7 +94,7 @@ static enum sys_con malta_sys_con(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ int dram_init(void)
|
||||
{
|
||||
/* MIG IP block is smart and doesn't need SW
|
||||
* to do any init */
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE; /* in bytes */
|
||||
gd->ram_size = CFG_SYS_SDRAM_SIZE; /* in bytes */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -412,7 +412,7 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, 1 << 30);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, 1 << 30);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ int spl_start_uboot(void)
|
||||
*/
|
||||
int board_init(void)
|
||||
{
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
gpmc_init();
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#if !CONFIG_IS_ENABLED(DM_SPI)
|
||||
vinco_spi0_hw_init();
|
||||
@@ -188,8 +188,8 @@ int board_init(void)
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
CONFIG_SYS_SDRAM_SIZE);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CFG_SYS_SDRAM_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
int board_init(void)
|
||||
{
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
debug("gd->fdt_blob is %p\n", gd->fdt_blob);
|
||||
return 0;
|
||||
|
||||
@@ -28,7 +28,7 @@ int board_early_init_r(void)
|
||||
ICPU_GENERAL_CTRL_IF_SI_OWNER(2));
|
||||
|
||||
/* Address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ int board_early_init_r(void)
|
||||
writel(0, BASE_CFG + ICPU_SW_MODE);
|
||||
|
||||
/* Address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ int board_early_init_r(void)
|
||||
ICPU_GENERAL_CTRL_IF_SI_OWNER(2));
|
||||
|
||||
/* Address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ int board_early_init_r(void)
|
||||
writel(0, BASE_CFG + ICPU_SW_MODE);
|
||||
|
||||
/* Address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ int board_early_init_r(void)
|
||||
writel(0, BASE_CFG + ICPU_SW_MODE);
|
||||
|
||||
/* Address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ void sdram_init(void)
|
||||
0);
|
||||
|
||||
/* Detect memory physically present */
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
|
||||
CONFIG_MAX_RAM_BANK_SIZE);
|
||||
|
||||
/* Reconfigure memory for actual detected size */
|
||||
@@ -269,7 +269,7 @@ void set_mux_conf_regs(void)
|
||||
*/
|
||||
int board_init(void)
|
||||
{
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ int dram_init(void)
|
||||
ddr_init();
|
||||
|
||||
gd->mem_clk = 0;
|
||||
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, 0x7b000000);
|
||||
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, 0x7b000000);
|
||||
|
||||
sec_init();
|
||||
debug("PBF relocate done\n");
|
||||
|
||||
@@ -70,7 +70,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
/* Force ethernet PHY out of reset */
|
||||
gpio_request(ETHERNET_PHY_RESET, "phy_reset");
|
||||
|
||||
@@ -312,7 +312,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
/* Force ethernet PHY out of reset */
|
||||
gpio_request(ETHERNET_PHY_RESET, "phy_reset");
|
||||
|
||||
@@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
gd->bd->bi_boot_params = (CONFIG_SYS_SDRAM_BASE + 0x100);
|
||||
gd->bd->bi_boot_params = (CFG_SYS_SDRAM_BASE + 0x100);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
/* Force ethernet PHY out of reset */
|
||||
gpio_request(ETHERNET_PHY_RESET, "phy_reset");
|
||||
|
||||
@@ -89,7 +89,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
/* Force ethernet PHY out of reset */
|
||||
gpio_request(ETHERNET_PHY_RESET, "phy_reset");
|
||||
|
||||
@@ -78,7 +78,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
/* Force ethernet PHY out of reset */
|
||||
gpio_request(ETHERNET_PHY_RESET, "phy_reset");
|
||||
|
||||
@@ -71,7 +71,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
/* Force ethernet PHY out of reset */
|
||||
gpio_request(ETHERNET_PHY_RESET, "phy_reset");
|
||||
|
||||
@@ -88,7 +88,7 @@ int board_early_init_f(void)
|
||||
int board_init(void)
|
||||
{
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
cpld_init();
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user