From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 03/16] board_f: Rename initdram() to dram_init()
Date: Fri, 31 Mar 2017 08:40:26 -0600 [thread overview]
Message-ID: <20170331144039.14587-4-sjg@chromium.org> (raw)
In-Reply-To: <20170331144039.14587-1-sjg@chromium.org>
This allows us to use the same DRAM init function on all archs.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/mips/mach-ath79/dram.c | 2 +-
arch/mips/mach-pic32/cpu.c | 2 +-
arch/mips/mach-pic32/include/mach/ddr.h | 2 +-
arch/powerpc/cpu/mpc5xxx/spl_boot.c | 4 ++--
arch/powerpc/cpu/mpc85xx/cpu.c | 4 ++--
arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 4 ++--
arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c | 4 ++--
arch/powerpc/cpu/ppc4xx/sdram.c | 4 ++--
arch/powerpc/cpu/ppc4xx/spl_boot.c | 2 +-
arch/xtensa/cpu/cpu.c | 5 +++++
board/Arcturus/ucp1020/spl.c | 2 +-
board/BuS/eb_cpu5282/eb_cpu5282.c | 2 +-
board/a3m071/a3m071.c | 2 +-
board/a4m072/a4m072.c | 2 +-
board/amcc/acadia/memory.c | 2 +-
board/amcc/bamboo/bamboo.c | 2 +-
board/amcc/bubinga/bubinga.c | 4 ++--
board/amcc/sequoia/sdram.c | 2 +-
board/amcc/walnut/walnut.c | 4 ++--
board/amcc/yosemite/yosemite.c | 2 +-
board/astro/mcf5373l/mcf5373l.c | 2 +-
board/canmb/canmb.c | 2 +-
board/cm5200/cm5200.c | 2 +-
board/cobra5272/cobra5272.c | 2 +-
board/davedenx/aria/aria.c | 2 +-
board/dbau1x00/dbau1x00.c | 2 +-
board/esd/mecp5123/mecp5123.c | 2 +-
board/esd/pmc440/sdram.c | 2 +-
board/esd/vme8349/vme8349.c | 2 +-
board/freescale/b4860qds/ddr.c | 2 +-
board/freescale/b4860qds/spl.c | 2 +-
board/freescale/c29xpcie/spl.c | 2 +-
board/freescale/corenet_ds/ddr.c | 2 +-
board/freescale/ls1043ardb/ddr.c | 2 +-
board/freescale/ls1046ardb/ddr.c | 2 +-
board/freescale/ls2080a/ddr.c | 2 +-
board/freescale/ls2080aqds/ddr.c | 2 +-
board/freescale/ls2080ardb/ddr.c | 2 +-
board/freescale/m5208evbe/m5208evbe.c | 2 +-
board/freescale/m52277evb/m52277evb.c | 2 +-
board/freescale/m5235evb/m5235evb.c | 2 +-
board/freescale/m5249evb/m5249evb.c | 2 +-
board/freescale/m5253demo/m5253demo.c | 2 +-
board/freescale/m5253evbe/m5253evbe.c | 2 +-
board/freescale/m5272c3/m5272c3.c | 2 +-
board/freescale/m5275evb/m5275evb.c | 2 +-
board/freescale/m5282evb/m5282evb.c | 2 +-
board/freescale/m53017evb/m53017evb.c | 2 +-
board/freescale/m5329evb/m5329evb.c | 2 +-
board/freescale/m5373evb/m5373evb.c | 2 +-
board/freescale/m54418twr/m54418twr.c | 2 +-
board/freescale/m54451evb/m54451evb.c | 2 +-
board/freescale/m54455evb/m54455evb.c | 2 +-
board/freescale/m547xevb/m547xevb.c | 2 +-
board/freescale/m548xevb/m548xevb.c | 2 +-
board/freescale/mpc5121ads/mpc5121ads.c | 2 +-
board/freescale/mpc8308rdb/sdram.c | 2 +-
board/freescale/mpc8313erdb/mpc8313erdb.c | 2 +-
board/freescale/mpc8313erdb/sdram.c | 2 +-
board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +-
board/freescale/mpc8315erdb/sdram.c | 2 +-
board/freescale/mpc8323erdb/mpc8323erdb.c | 2 +-
board/freescale/mpc832xemds/mpc832xemds.c | 2 +-
board/freescale/mpc8349emds/mpc8349emds.c | 2 +-
board/freescale/mpc8349itx/mpc8349itx.c | 2 +-
board/freescale/mpc837xemds/mpc837xemds.c | 2 +-
board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +-
board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +-
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +-
board/freescale/p1010rdb/spl.c | 2 +-
board/freescale/p1022ds/spl.c | 2 +-
board/freescale/p1_p2_rdb_pc/spl.c | 2 +-
board/freescale/p2041rdb/ddr.c | 2 +-
board/freescale/t102xqds/ddr.c | 2 +-
board/freescale/t102xqds/spl.c | 2 +-
board/freescale/t102xrdb/ddr.c | 2 +-
board/freescale/t102xrdb/spl.c | 2 +-
board/freescale/t1040qds/ddr.c | 2 +-
board/freescale/t104xrdb/ddr.c | 2 +-
board/freescale/t104xrdb/spl.c | 2 +-
board/freescale/t208xqds/ddr.c | 2 +-
board/freescale/t208xqds/spl.c | 2 +-
board/freescale/t208xrdb/ddr.c | 2 +-
board/freescale/t208xrdb/spl.c | 2 +-
board/freescale/t4qds/ddr.c | 2 +-
board/freescale/t4qds/spl.c | 2 +-
board/freescale/t4rdb/ddr.c | 2 +-
board/freescale/t4rdb/spl.c | 2 +-
board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c | 2 +-
board/gaisler/gr_ep2s60/gr_ep2s60.c | 2 +-
board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c | 2 +-
board/gaisler/grsim/grsim.c | 2 +-
board/gaisler/grsim_leon2/grsim_leon2.c | 2 +-
board/gdsys/mpc8308/sdram.c | 2 +-
board/ids/ids8313/ids8313.c | 2 +-
board/ifm/ac14xx/ac14xx.c | 2 +-
board/ifm/o2dnt2/o2dnt2.c | 2 +-
board/imgtec/boston/ddr.c | 2 +-
board/imgtec/malta/malta.c | 2 +-
board/imgtec/xilfpga/xilfpga.c | 2 +-
board/inka4x0/inka4x0.c | 2 +-
board/intercontrol/digsy_mtc/digsy_mtc.c | 2 +-
board/ipek01/ipek01.c | 2 +-
board/jupiter/jupiter.c | 2 +-
board/keymile/km82xx/km82xx.c | 2 +-
board/keymile/km83xx/km83xx.c | 2 +-
board/keymile/kmp204x/ddr.c | 2 +-
board/liebherr/lwmon5/sdram.c | 2 +-
board/micronas/vct/vct.c | 2 +-
board/motionpro/motionpro.c | 2 +-
board/mpc8308_p1m/sdram.c | 2 +-
board/mpl/mip405/mip405.c | 4 ++--
board/mpl/pati/pati.c | 2 +-
board/mpl/pip405/pip405.c | 4 ++--
board/munices/munices.c | 2 +-
board/openrisc/openrisc-generic/openrisc-generic.c | 2 +-
board/pb1x00/pb1x00.c | 2 +-
board/pdm360ng/pdm360ng.c | 2 +-
board/phytec/pcm030/pcm030.c | 2 +-
board/qemu-mips/qemu-mips.c | 2 +-
board/sbc8349/sbc8349.c | 2 +-
board/sbc8641d/sbc8641d.c | 2 +-
board/sysam/amcore/amcore.c | 2 +-
board/tqc/tqm5200/tqm5200.c | 2 +-
board/tqc/tqm834x/tqm834x.c | 2 +-
board/tqc/tqm8xx/tqm8xx.c | 2 +-
board/v38b/v38b.c | 2 +-
board/varisys/cyrus/ddr.c | 2 +-
board/ve8313/ve8313.c | 2 +-
board/xes/xpedite1000/xpedite1000.c | 2 +-
board/xes/xpedite517x/xpedite517x.c | 2 +-
board/xilinx/ppc405-generic/xilinx_ppc405_generic.c | 2 +-
board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 2 +-
common/board_f.c | 15 ---------------
drivers/ddr/fsl/main.c | 2 +-
135 files changed, 147 insertions(+), 157 deletions(-)
diff --git a/arch/mips/mach-ath79/dram.c b/arch/mips/mach-ath79/dram.c
index 1c73addcb3..2706812b91 100644
--- a/arch/mips/mach-ath79/dram.c
+++ b/arch/mips/mach-ath79/dram.c
@@ -11,7 +11,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int initdram(void)
+int dram_init(void)
{
ddr_tap_tuning();
gd->ram_size = get_ram_size((void *)KSEG1, SZ_256M);
diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
index c96e046848..c3194f0a39 100644
--- a/arch/mips/mach-pic32/cpu.c
+++ b/arch/mips/mach-pic32/cpu.c
@@ -110,7 +110,7 @@ static void ddr2_pmd_ungate(void)
}
/* initialize the DDR2 Controller and DDR2 PHY */
-int initdram(void)
+int dram_init(void)
{
ddr2_pmd_ungate();
ddr2_phy_init();
diff --git a/arch/mips/mach-pic32/include/mach/ddr.h b/arch/mips/mach-pic32/include/mach/ddr.h
index 00abfa3ca9..e7da807d66 100644
--- a/arch/mips/mach-pic32/include/mach/ddr.h
+++ b/arch/mips/mach-pic32/include/mach/ddr.h
@@ -8,7 +8,7 @@
#ifndef __MICROCHIP_PIC32_DDR_H
#define __MICROCHIP_PIC32_DDR_H
-/* called by initdram() function */
+/* called by dram_init() function */
void ddr2_phy_init(void);
void ddr2_ctrl_init(void);
phys_size_t ddr2_calculate_size(void);
diff --git a/arch/powerpc/cpu/mpc5xxx/spl_boot.c b/arch/powerpc/cpu/mpc5xxx/spl_boot.c
index 23d2010343..2d7f6c4a93 100644
--- a/arch/powerpc/cpu/mpc5xxx/spl_boot.c
+++ b/arch/powerpc/cpu/mpc5xxx/spl_boot.c
@@ -32,7 +32,7 @@ void board_init_f(ulong bootflag)
/*
* On MPC5200, the initial RAM (and gd) is located in the internal
* SRAM. So we can actually call the preloader console init code
- * before calling initdram(). This makes serial output (printf)
+ * before calling dram_init(). This makes serial output (printf)
* available very early, even before SDRAM init, which has been
* an U-Boot priciple from day 1.
*/
@@ -62,7 +62,7 @@ void board_init_f(ulong bootflag)
* First we need to initialize the SDRAM, so that the real
* U-Boot or the OS (Linux) can be loaded
*/
- initdram();
+ dram_init();
/* Clear bss */
memset(__bss_start, '\0', __bss_end - __bss_start);
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 64e0aa7518..e3ef4ae816 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -401,7 +401,7 @@ void mpc85xx_reginfo(void)
#ifndef CONFIG_FSL_CORENET
#if (defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_SPL)) && \
!defined(CONFIG_SYS_INIT_L2_ADDR)
-int initdram(void)
+int dram_init(void)
{
#if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD) || \
defined(CONFIG_ARCH_QEMU_E500)
@@ -413,7 +413,7 @@ int initdram(void)
return 0;
}
#else /* CONFIG_SYS_RAMBOOT */
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size = 0;
diff --git a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
index 87fd5e65e0..7f0672e516 100644
--- a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
@@ -416,7 +416,7 @@ static unsigned char spd_read(uchar chip, uint addr)
* banks appropriately. If Auto Memory Configuration is
* not used, it is assumed that no DIMM is plugged
*-----------------------------------------------------------------------------*/
-int initdram(void)
+int dram_init(void)
{
unsigned char iic0_dimm_addr[] = SPD_EEPROM_ADDRESS;
unsigned long dimm_populated[MAXDIMMS] = {SDRAM_NONE, SDRAM_NONE};
@@ -2861,7 +2861,7 @@ static void test(void)
* time parameters.
* Configures the PPC405EX(r) and PPC460EX/GT
*---------------------------------------------------------------------------*/
-int initdram(void)
+int dram_init(void)
{
unsigned long val;
diff --git a/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c b/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
index 14d0fd9154..67c950b2fb 100644
--- a/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
+++ b/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
@@ -1000,7 +1000,7 @@ static void program_ddr0_44(unsigned long dimm_ranks[],
* banks appropriately. If Auto Memory Configuration is
* not used, it is assumed that no DIMM is plugged
*-----------------------------------------------------------------------------*/
-int initdram(void)
+int dram_init(void)
{
unsigned char const iic0_dimm_addr[] = SPD_EEPROM_ADDRESS;
unsigned long dimm_ranks[MAXDIMMS];
@@ -1014,7 +1014,7 @@ int initdram(void)
unsigned long cas_latency = 0; /* to quiet initialization warning */
unsigned long dram_size;
- debug("\nEntering initdram()\n");
+ debug("\nEntering dram_init()\n");
/*------------------------------------------------------------------
* Stop the DDR-SDRAM controller.
diff --git a/arch/powerpc/cpu/ppc4xx/sdram.c b/arch/powerpc/cpu/ppc4xx/sdram.c
index a49bd69aba..c416bcebf6 100644
--- a/arch/powerpc/cpu/ppc4xx/sdram.c
+++ b/arch/powerpc/cpu/ppc4xx/sdram.c
@@ -150,7 +150,7 @@ static ulong compute_rtr(ulong speed, ulong rows, ulong refresh)
/*
* Autodetect onboard SDRAM on 405 platforms
*/
-int initdram(void)
+int dram_init(void)
{
ulong speed;
ulong sdtr1;
@@ -353,7 +353,7 @@ static void sdram_tr1_set(int ram_address, int* tr1_value)
* so this should be extended for other future boards
* using this routine!
*/
-int initdram(void)
+int dram_init(void)
{
int i;
int tr1_bank1;
diff --git a/arch/powerpc/cpu/ppc4xx/spl_boot.c b/arch/powerpc/cpu/ppc4xx/spl_boot.c
index f3aa46c4f1..b30f169e89 100644
--- a/arch/powerpc/cpu/ppc4xx/spl_boot.c
+++ b/arch/powerpc/cpu/ppc4xx/spl_boot.c
@@ -26,7 +26,7 @@ void board_init_f(ulong bootflag)
* First we need to initialize the SDRAM, so that the real
* U-Boot or the OS (Linux) can be loaded
*/
- initdram();
+ dram_init();
/* Clear bss */
memset(__bss_start, '\0', __bss_end - __bss_start);
diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c
index 6787a6182c..7044480597 100644
--- a/arch/xtensa/cpu/cpu.c
+++ b/arch/xtensa/cpu/cpu.c
@@ -47,3 +47,8 @@ int arch_cpu_init(void)
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
return 0;
}
+
+int dram_init(void)
+{
+ return 0;
+}
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 45e78c63a3..cd484fc44b 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -110,7 +110,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_NAND_BOOT
puts("Tertiary program loader running in sram...");
#else
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 3024a9c681..a00a83a4a5 100644
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -35,7 +35,7 @@ int checkboard (void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
int size, i;
diff --git a/board/a3m071/a3m071.c b/board/a3m071/a3m071.c
index c1120c4004..7f6536440a 100644
--- a/board/a3m071/a3m071.c
+++ b/board/a3m071/a3m071.c
@@ -76,7 +76,7 @@ static void sdram_start(int hi_addr)
* use of CONFIG_SYS_SDRAM_BASE. The code does not work if
* CONFIG_SYS_SDRAM_BASE is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/a4m072/a4m072.c b/board/a4m072/a4m072.c
index d4b30fd147..e4ada76d9d 100644
--- a/board/a4m072/a4m072.c
+++ b/board/a4m072/a4m072.c
@@ -73,7 +73,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
uint svr, pvr;
diff --git a/board/amcc/acadia/memory.c b/board/amcc/acadia/memory.c
index cd78a147b1..36500da6f4 100644
--- a/board/amcc/acadia/memory.c
+++ b/board/amcc/acadia/memory.c
@@ -43,7 +43,7 @@ static void cram_bcr_write(u32 wr_val)
return;
}
-int initdram(void)
+int dram_init(void)
{
int i;
u32 val;
diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c
index 453677aa66..6a50b393f4 100644
--- a/board/amcc/bamboo/bamboo.c
+++ b/board/amcc/bamboo/bamboo.c
@@ -438,7 +438,7 @@ int checkboard(void)
}
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = spd_sdram();
diff --git a/board/amcc/bubinga/bubinga.c b/board/amcc/bubinga/bubinga.c
index 725b9ca086..c73424d8c6 100644
--- a/board/amcc/bubinga/bubinga.c
+++ b/board/amcc/bubinga/bubinga.c
@@ -54,10 +54,10 @@ int checkboard(void)
}
/* -------------------------------------------------------------------------
- initdram() reads EEPROM via I2c. EEPROM contains all of
+ dram_init() reads EEPROM via I2c. EEPROM contains all of
the necessary info for SDRAM controller configuration
------------------------------------------------------------------------- */
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = spd_sdram();
diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c
index 9bedb5bc8e..0e0a3aa0db 100644
--- a/board/amcc/sequoia/sdram.c
+++ b/board/amcc/sequoia/sdram.c
@@ -33,7 +33,7 @@ extern void denali_core_search_data_eye(void);
* initdram -- 440EPx's DDR controller is a DENALI Core
*
************************************************************************/
-int initdram(void)
+int dram_init(void)
{
#if !defined(CONFIG_SYS_RAMBOOT)
ulong speed = get_bus_freq(0);
diff --git a/board/amcc/walnut/walnut.c b/board/amcc/walnut/walnut.c
index 2a2441e101..b21daa0af8 100644
--- a/board/amcc/walnut/walnut.c
+++ b/board/amcc/walnut/walnut.c
@@ -73,10 +73,10 @@ int checkboard(void)
}
/*
- * initdram() reads EEPROM via I2c. EEPROM contains all of
+ * dram_init() reads EEPROM via I2c. EEPROM contains all of
* the necessary info for SDRAM controller configuration
*/
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = spd_sdram();
diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c
index fde371d919..bcaf3437ec 100644
--- a/board/amcc/yosemite/yosemite.c
+++ b/board/amcc/yosemite/yosemite.c
@@ -286,7 +286,7 @@ void sdram_tr1_set(int ram_address, int* tr1_value)
*tr1_value = (first_good + last_bad) / 2;
}
-int initdram(void)
+int dram_init(void)
{
register uint reg;
int tr1_bank1, tr1_bank2;
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index da281e87fc..d011ae5723 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -27,7 +27,7 @@ int checkboard(void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
#if !defined(CONFIG_MONITOR_IS_IN_RAM)
sdram_t *sdp = (sdram_t *)(MMAP_SDRAM);
diff --git a/board/canmb/canmb.c b/board/canmb/canmb.c
index 41194ecb7e..77abe3721a 100644
--- a/board/canmb/canmb.c
+++ b/board/canmb/canmb.c
@@ -67,7 +67,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c
index be0d65c694..7b862355c8 100644
--- a/board/cm5200/cm5200.c
+++ b/board/cm5200/cm5200.c
@@ -97,7 +97,7 @@ static mem_conf_t* get_mem_config(int board_type)
/*
* Initalize SDRAM - configure SDRAM controller, detect memory size.
*/
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
#ifndef CONFIG_SYS_RAMBOOT
diff --git a/board/cobra5272/cobra5272.c b/board/cobra5272/cobra5272.c
index 48366763c1..0ceaa1f772 100644
--- a/board/cobra5272/cobra5272.c
+++ b/board/cobra5272/cobra5272.c
@@ -17,7 +17,7 @@ int checkboard (void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
volatile sdramctrl_t *sdp = (sdramctrl_t *) (MMAP_SDRAM);
diff --git a/board/davedenx/aria/aria.c b/board/davedenx/aria/aria.c
index f0be2cbb9b..e3441cad4e 100644
--- a/board/davedenx/aria/aria.c
+++ b/board/davedenx/aria/aria.c
@@ -18,7 +18,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = fixed_sdram(NULL, NULL, 0);
diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c
index ea7cb744db..81285d7470 100644
--- a/board/dbau1x00/dbau1x00.c
+++ b/board/dbau1x00/dbau1x00.c
@@ -13,7 +13,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int initdram(void)
+int dram_init(void)
{
/* Sdram is setup by assembler code */
/* If memory could be changed, we should return the true value here */
diff --git a/board/esd/mecp5123/mecp5123.c b/board/esd/mecp5123/mecp5123.c
index 80963fefa5..66dc407bae 100644
--- a/board/esd/mecp5123/mecp5123.c
+++ b/board/esd/mecp5123/mecp5123.c
@@ -62,7 +62,7 @@ int board_early_init_f(void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = get_ram_size(0, fixed_sdram(NULL, NULL, 0));
diff --git a/board/esd/pmc440/sdram.c b/board/esd/pmc440/sdram.c
index e962d4c4bb..e361d54a29 100644
--- a/board/esd/pmc440/sdram.c
+++ b/board/esd/pmc440/sdram.c
@@ -107,7 +107,7 @@ int initdram_by_rb(int rows, int banks)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t size;
int n;
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index 0e7f8b130a..36a55195df 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -30,7 +30,7 @@ DECLARE_GLOBAL_DATA_PTR;
void ddr_enable_ecc(unsigned int dram_size);
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize = 0;
diff --git a/board/freescale/b4860qds/ddr.c b/board/freescale/b4860qds/ddr.c
index 085323132c..5cc2f73a16 100644
--- a/board/freescale/b4860qds/ddr.c
+++ b/board/freescale/b4860qds/ddr.c
@@ -176,7 +176,7 @@ found:
popts->cpo_sample = 0x3e;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c
index a27ad7fa84..60d7f0d48a 100644
--- a/board/freescale/b4860qds/spl.c
+++ b/board/freescale/b4860qds/spl.c
@@ -108,7 +108,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
puts("\n\n");
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_NAND_BOOT
nand_boot();
diff --git a/board/freescale/c29xpcie/spl.c b/board/freescale/c29xpcie/spl.c
index 86d55bf2ac..94093f11a8 100644
--- a/board/freescale/c29xpcie/spl.c
+++ b/board/freescale/c29xpcie/spl.c
@@ -67,7 +67,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init_all();
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_NAND_BOOT
puts("TPL\n");
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index ad93abf9f4..496d8415ec 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -260,7 +260,7 @@ found:
popts->ddr_cdr1 = DDR_CDR1_DHC_EN;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index 2f133db0a6..62474b67af 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -170,7 +170,7 @@ int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
}
#endif
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index d1290e27f8..fdf5b1a29a 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -96,7 +96,7 @@ found:
popts->cpo_sample = 0x70;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index d340c4162d..d8d094c052 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -158,7 +158,7 @@ int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
return 0;
}
#endif
-int initdram(void)
+int dram_init(void)
{
puts("Initializing DDR....");
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 1e9145d6ab..b65a76a6fc 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -155,7 +155,7 @@ found:
}
}
-int initdram(void)
+int dram_init(void)
{
#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
gd->ram_size = fsl_ddr_sdram_size();
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 029ea61b95..1164df17b6 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -158,7 +158,7 @@ found:
}
}
-int initdram(void)
+int dram_init(void)
{
#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
gd->ram_size = fsl_ddr_sdram_size();
diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/freescale/m5208evbe/m5208evbe.c
index edf486acc8..4b841c6221 100644
--- a/board/freescale/m5208evbe/m5208evbe.c
+++ b/board/freescale/m5208evbe/m5208evbe.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
u32 dramsize, i;
diff --git a/board/freescale/m52277evb/m52277evb.c b/board/freescale/m52277evb/m52277evb.c
index 2873643582..e4dfb6fda0 100644
--- a/board/freescale/m52277evb/m52277evb.c
+++ b/board/freescale/m52277evb/m52277evb.c
@@ -21,7 +21,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
u32 dramsize;
diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c
index 1d82e93786..93403f6748 100644
--- a/board/freescale/m5235evb/m5235evb.c
+++ b/board/freescale/m5235evb/m5235evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
gpio_t *gpio = (gpio_t *)(MMAP_GPIO);
diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c
index d3c2acd089..7c9b599d66 100644
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -31,7 +31,7 @@ int checkboard (void) {
};
-int initdram(void)
+int dram_init(void)
{
unsigned long junk = 0xa5a59696;
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 1c100e6d8c..c2cc2d76e4 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
u32 dramsize = 0;
diff --git a/board/freescale/m5253evbe/m5253evbe.c b/board/freescale/m5253evbe/m5253evbe.c
index eae499fa9d..c1ed431190 100644
--- a/board/freescale/m5253evbe/m5253evbe.c
+++ b/board/freescale/m5253evbe/m5253evbe.c
@@ -21,7 +21,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
/*
* Check to see if the SDRAM has already been initialized
diff --git a/board/freescale/m5272c3/m5272c3.c b/board/freescale/m5272c3/m5272c3.c
index bbe06ba9df..efff465d0f 100644
--- a/board/freescale/m5272c3/m5272c3.c
+++ b/board/freescale/m5272c3/m5272c3.c
@@ -19,7 +19,7 @@ int checkboard (void) {
return 0;
};
-int initdram(void)
+int dram_init(void)
{
sdramctrl_t * sdp = (sdramctrl_t *)(MMAP_SDRAM);
diff --git a/board/freescale/m5275evb/m5275evb.c b/board/freescale/m5275evb/m5275evb.c
index 48ad4a86b9..5a9831d619 100644
--- a/board/freescale/m5275evb/m5275evb.c
+++ b/board/freescale/m5275evb/m5275evb.c
@@ -25,7 +25,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
sdramctrl_t *sdp = (sdramctrl_t *)(MMAP_SDRAM);
gpio_t *gpio_reg = (gpio_t *)(MMAP_GPIO);
diff --git a/board/freescale/m5282evb/m5282evb.c b/board/freescale/m5282evb/m5282evb.c
index 7f3c04c379..eb618b54f4 100644
--- a/board/freescale/m5282evb/m5282evb.c
+++ b/board/freescale/m5282evb/m5282evb.c
@@ -16,7 +16,7 @@ int checkboard (void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
u32 dramsize, i, dramclk;
diff --git a/board/freescale/m53017evb/m53017evb.c b/board/freescale/m53017evb/m53017evb.c
index b0c27b4967..71cca35e02 100644
--- a/board/freescale/m53017evb/m53017evb.c
+++ b/board/freescale/m53017evb/m53017evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
u32 dramsize, i;
diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c
index 5609a7b376..4e0b4e4bd8 100644
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
u32 dramsize, i;
diff --git a/board/freescale/m5373evb/m5373evb.c b/board/freescale/m5373evb/m5373evb.c
index 48a262c12f..f2ed298f0f 100644
--- a/board/freescale/m5373evb/m5373evb.c
+++ b/board/freescale/m5373evb/m5373evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
u32 dramsize, i;
diff --git a/board/freescale/m54418twr/m54418twr.c b/board/freescale/m54418twr/m54418twr.c
index 3f1100c355..433539486e 100644
--- a/board/freescale/m54418twr/m54418twr.c
+++ b/board/freescale/m54418twr/m54418twr.c
@@ -25,7 +25,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
u32 dramsize;
diff --git a/board/freescale/m54451evb/m54451evb.c b/board/freescale/m54451evb/m54451evb.c
index 653a11352c..050624bf92 100644
--- a/board/freescale/m54451evb/m54451evb.c
+++ b/board/freescale/m54451evb/m54451evb.c
@@ -26,7 +26,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
u32 dramsize;
#ifdef CONFIG_CF_SBF
diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c
index b9850c1a2a..d6b0650b99 100644
--- a/board/freescale/m54455evb/m54455evb.c
+++ b/board/freescale/m54455evb/m54455evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
u32 dramsize;
#ifdef CONFIG_CF_SBF
diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c
index fc674522f6..d28f43da04 100644
--- a/board/freescale/m547xevb/m547xevb.c
+++ b/board/freescale/m547xevb/m547xevb.c
@@ -23,7 +23,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
siu_t *siu = (siu_t *) (MMAP_SIU);
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c
index c268ec6a60..56060b68b6 100644
--- a/board/freescale/m548xevb/m548xevb.c
+++ b/board/freescale/m548xevb/m548xevb.c
@@ -23,7 +23,7 @@ int checkboard(void)
return 0;
};
-int initdram(void)
+int dram_init(void)
{
siu_t *siu = (siu_t *) (MMAP_SIU);
sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
diff --git a/board/freescale/mpc5121ads/mpc5121ads.c b/board/freescale/mpc5121ads/mpc5121ads.c
index a0e5d91c8f..f87579f193 100644
--- a/board/freescale/mpc5121ads/mpc5121ads.c
+++ b/board/freescale/mpc5121ads/mpc5121ads.c
@@ -95,7 +95,7 @@ int is_micron(void){
return(ismicron);
}
-int initdram(void)
+int dram_init(void)
{
u32 msize = 0;
/*
diff --git a/board/freescale/mpc8308rdb/sdram.c b/board/freescale/mpc8308rdb/sdram.c
index aac56c3983..81e155a401 100644
--- a/board/freescale/mpc8308rdb/sdram.c
+++ b/board/freescale/mpc8308rdb/sdram.c
@@ -65,7 +65,7 @@ static long fixed_sdram(void)
return get_ram_size(CONFIG_SYS_DDR_SDRAM_BASE, msize);
}
-int initdram(void)
+int dram_init(void)
{
immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize;
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index e3a5941f20..8974378326 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -134,7 +134,7 @@ void board_init_f(ulong bootflag)
CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
puts("NAND boot... ");
timer_init();
- initdram();
+ dram_init();
relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC_SP, (gd_t *)gd,
CONFIG_SYS_NAND_U_BOOT_RELOC);
}
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index 4e5dfe6f15..a4128cbd11 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -97,7 +97,7 @@ static long fixed_sdram(void)
return msize;
}
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (volatile immap_t *)CONFIG_SYS_IMMR;
volatile fsl_lbc_t *lbc = &im->im_lbc;
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index 7779b6daed..22f1565b4c 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -222,7 +222,7 @@ void board_init_f(ulong bootflag)
CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
puts("NAND boot... ");
timer_init();
- initdram();
+ dram_init();
relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000, (gd_t *)gd,
CONFIG_SYS_NAND_U_BOOT_RELOC);
}
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index 947ffabbb5..b69c86bb81 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -92,7 +92,7 @@ static long fixed_sdram(void)
}
#endif /* CONFIG_SYS_RAMBOOT */
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (volatile immap_t *)CONFIG_SYS_IMMR;
u32 msize;
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index e7d8b99738..f30a1510ee 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -70,7 +70,7 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
int fixed_sdram(void);
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
u32 msize = 0;
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index 907ad09dc8..b49e03e4f9 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -90,7 +90,7 @@ int board_early_init_r(void)
int fixed_sdram(void);
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
u32 msize = 0;
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 595bce16d1..5f502e2a65 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -48,7 +48,7 @@ int board_early_init_f (void)
#define ns2clk(ns) (ns / (1000000000 / CONFIG_8349_CLKIN) + 1)
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
phys_size_t msize = 0;
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index 27f0ccd9a6..895e9ffda6 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -118,7 +118,7 @@ volatile static struct pci_controller hose[] = {
};
#endif /* CONFIG_PCI */
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
u32 msize = 0;
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index a3af246854..233049227f 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -218,7 +218,7 @@ extern void ddr_enable_ecc(unsigned int dram_size);
#endif
int fixed_sdram(void);
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
u32 msize = 0;
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 2f5431ee21..319f0479e2 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -62,7 +62,7 @@ void ddr_enable_ecc(unsigned int dram_size);
#endif
int fixed_sdram(void);
-int initdram(void)
+int dram_init(void)
{
immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
u32 msize = 0;
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 0422208133..d97562c849 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -118,7 +118,7 @@ int checkboard(void)
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size = 0;
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index 07cb08b6b8..2604a51e91 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -39,7 +39,7 @@ int checkboard(void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size = 0;
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 0565367937..2cebc2c002 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -94,7 +94,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init_all();
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_NAND_BOOT
puts("\nTertiary program loader running in sram...");
#else
diff --git a/board/freescale/p1022ds/spl.c b/board/freescale/p1022ds/spl.c
index 1f490dc943..a117dc3a2c 100644
--- a/board/freescale/p1022ds/spl.c
+++ b/board/freescale/p1022ds/spl.c
@@ -111,7 +111,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_NAND_BOOT
puts("Tertiary program loader running in sram...");
#else
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 67637390be..1cf3497aa6 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -108,7 +108,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_NAND_BOOT
puts("Tertiary program loader running in sram...");
#else
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 3df8d21725..1ab98fc089 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -118,7 +118,7 @@ found:
popts->ddr_cdr1 = DDR_CDR1_DHC_EN;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size = 0;
diff --git a/board/freescale/t102xqds/ddr.c b/board/freescale/t102xqds/ddr.c
index 93003c25d8..d822d3f806 100644
--- a/board/freescale/t102xqds/ddr.c
+++ b/board/freescale/t102xqds/ddr.c
@@ -169,7 +169,7 @@ void board_mem_sleep_setup(void)
}
#endif
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c
index c847b01e7e..b987ecea1d 100644
--- a/board/freescale/t102xqds/spl.c
+++ b/board/freescale/t102xqds/spl.c
@@ -142,7 +142,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init_all();
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 773aa77781..49460a02d1 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -229,7 +229,7 @@ void board_mem_sleep_setup(void)
}
#endif
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 5be71628af..dc6d9eeef6 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -129,7 +129,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init_all();
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t1040qds/ddr.c b/board/freescale/t1040qds/ddr.c
index d23787d43a..8f7909dc68 100644
--- a/board/freescale/t1040qds/ddr.c
+++ b/board/freescale/t1040qds/ddr.c
@@ -117,7 +117,7 @@ void board_mem_sleep_setup(void)
}
#endif
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index b99ab95397..4e55844abe 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -120,7 +120,7 @@ void board_mem_sleep_setup(void)
}
#endif
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 899691a779..2e43307b2d 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -125,7 +125,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
puts("\n\n");
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index adc109042b..ba65049709 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -104,7 +104,7 @@ found:
popts->cpo_sample = 0x64;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index 3e713dc2c3..d7d716b690 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -128,7 +128,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init_all();
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index b4ad615846..50dc69a443 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -97,7 +97,7 @@ found:
popts->cpo_sample = 0x54;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index a5f940c6f6..b43140148b 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -98,7 +98,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init_all();
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t4qds/ddr.c b/board/freescale/t4qds/ddr.c
index 84ff792225..740897015e 100644
--- a/board/freescale/t4qds/ddr.c
+++ b/board/freescale/t4qds/ddr.c
@@ -112,7 +112,7 @@ found:
popts->cpo_sample = 0x63;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t4qds/spl.c b/board/freescale/t4qds/spl.c
index 05feedecc2..9ecdaedda3 100644
--- a/board/freescale/t4qds/spl.c
+++ b/board/freescale/t4qds/spl.c
@@ -133,7 +133,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init_all();
- initdram();
+ dram_init();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index d03baa3f45..8415527ec2 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -105,7 +105,7 @@ found:
popts->cpo_sample = 0x64;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index e96f3d38c5..5feab1cfcd 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -91,7 +91,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
i2c_init_all();
- initdram();
+ dram_init();
mmc_boot();
}
diff --git a/board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c b/board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c
index 4ceb48b09d..f1868550c7 100644
--- a/board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c
+++ b/board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c
@@ -10,7 +10,7 @@
#include <config.h>
#include <asm/leon.h>
-int initdram(void)
+int dram_init(void)
{
/* Does not set gd->ram_size here */
diff --git a/board/gaisler/gr_ep2s60/gr_ep2s60.c b/board/gaisler/gr_ep2s60/gr_ep2s60.c
index 12d8c1025c..a73d89db2f 100644
--- a/board/gaisler/gr_ep2s60/gr_ep2s60.c
+++ b/board/gaisler/gr_ep2s60/gr_ep2s60.c
@@ -10,7 +10,7 @@
#include <config.h>
#include <asm/leon.h>
-int initdram(void)
+int dram_init(void)
{
/* Does not set gd->ram_size here */
diff --git a/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c b/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c
index 02beb5c926..d86047a785 100644
--- a/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c
+++ b/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c
@@ -9,7 +9,7 @@
#include <config.h>
#include <asm/leon.h>
-int initdram(void)
+int dram_init(void)
{
/* Does not set gd->ram_size here */
diff --git a/board/gaisler/grsim/grsim.c b/board/gaisler/grsim/grsim.c
index aa9ba50877..99262b0813 100644
--- a/board/gaisler/grsim/grsim.c
+++ b/board/gaisler/grsim/grsim.c
@@ -10,7 +10,7 @@
#include <common.h>
#include <asm/leon.h>
-int initdram(void)
+int dram_init(void)
{
/* Does not set gd->ram_size here */
diff --git a/board/gaisler/grsim_leon2/grsim_leon2.c b/board/gaisler/grsim_leon2/grsim_leon2.c
index 384db3d84b..c6c4bb4270 100644
--- a/board/gaisler/grsim_leon2/grsim_leon2.c
+++ b/board/gaisler/grsim_leon2/grsim_leon2.c
@@ -10,7 +10,7 @@
#include <common.h>
#include <asm/leon.h>
-int initdram(void)
+int dram_init(void)
{
/* Does not set gd->ram_size here */
diff --git a/board/gdsys/mpc8308/sdram.c b/board/gdsys/mpc8308/sdram.c
index 5b67a013da..5d2ec89b8c 100644
--- a/board/gdsys/mpc8308/sdram.c
+++ b/board/gdsys/mpc8308/sdram.c
@@ -66,7 +66,7 @@ static long fixed_sdram(void)
return get_ram_size(CONFIG_SYS_DDR_SDRAM_BASE, msize);
}
-int initdram(void)
+int dram_init(void)
{
immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize;
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index d8e6701fac..4433e8c77e 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -119,7 +119,7 @@ static int setup_sdram(void)
return msize;
}
-int initdram(void)
+int dram_init(void)
{
immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
fsl_lbc_t *lbc = &im->im_lbc;
diff --git a/board/ifm/ac14xx/ac14xx.c b/board/ifm/ac14xx/ac14xx.c
index 129eb47b0e..348613736d 100644
--- a/board/ifm/ac14xx/ac14xx.c
+++ b/board/ifm/ac14xx/ac14xx.c
@@ -310,7 +310,7 @@ u32 sdram_init_seq[] = {
/* EMPTY, optional, we don't do it */
};
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = fixed_sdram(NULL, sdram_init_seq,
ARRAY_SIZE(sdram_init_seq));
diff --git a/board/ifm/o2dnt2/o2dnt2.c b/board/ifm/o2dnt2/o2dnt2.c
index 4f81007ead..72a8469f1c 100644
--- a/board/ifm/o2dnt2/o2dnt2.c
+++ b/board/ifm/o2dnt2/o2dnt2.c
@@ -66,7 +66,7 @@ static void sdram_start(int hi_addr)
* use of CONFIG_SYS_SDRAM_BASE. The code does not work if
* CONFIG_SYS_SDRAM_BASE is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
struct mpc5xxx_mmap_ctl *mmap_ctl =
(struct mpc5xxx_mmap_ctl *)CONFIG_SYS_MBAR;
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index b92ff2aa88..3479b98b88 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -12,7 +12,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int initdram(void)
+int dram_init(void)
{
u32 ddrconf0 = __raw_readl((uint32_t *)BOSTON_PLAT_DDRCONF0);
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index f8c65b0e46..de81aa01f0 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -85,7 +85,7 @@ static enum sys_con malta_sys_con(void)
}
}
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = CONFIG_SYS_MEM_SIZE;
diff --git a/board/imgtec/xilfpga/xilfpga.c b/board/imgtec/xilfpga/xilfpga.c
index 8aa7c10bff..841d61459d 100644
--- a/board/imgtec/xilfpga/xilfpga.c
+++ b/board/imgtec/xilfpga/xilfpga.c
@@ -14,7 +14,7 @@
DECLARE_GLOBAL_DATA_PTR;
/* initialize the DDR Controller and PHY */
-int initdram(void)
+int dram_init(void)
{
/* MIG IP block is smart and doesn't need SW
* to do any init */
diff --git a/board/inka4x0/inka4x0.c b/board/inka4x0/inka4x0.c
index 2dd9799ea7..2e7c681934 100644
--- a/board/inka4x0/inka4x0.c
+++ b/board/inka4x0/inka4x0.c
@@ -79,7 +79,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
volatile struct mpc5xxx_mmap_ctl *mm =
(struct mpc5xxx_mmap_ctl *) CONFIG_SYS_MBAR;
diff --git a/board/intercontrol/digsy_mtc/digsy_mtc.c b/board/intercontrol/digsy_mtc/digsy_mtc.c
index 922d9ef0a1..0854754fb0 100644
--- a/board/intercontrol/digsy_mtc/digsy_mtc.c
+++ b/board/intercontrol/digsy_mtc/digsy_mtc.c
@@ -79,7 +79,7 @@ static void sdram_start(int hi_addr)
* CONFIG_SYS_SDRAM_BASE is something other than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/ipek01/ipek01.c b/board/ipek01/ipek01.c
index ca99332e51..68759ca930 100644
--- a/board/ipek01/ipek01.c
+++ b/board/ipek01/ipek01.c
@@ -80,7 +80,7 @@ static void sdram_start (int hi_addr)
* CONFIG_SYS_SDRAM_BASE is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
struct mpc5xxx_mmap_ctl *mmap_ctl =
(struct mpc5xxx_mmap_ctl *)CONFIG_SYS_MBAR;
diff --git a/board/jupiter/jupiter.c b/board/jupiter/jupiter.c
index d134691361..e534fd18cb 100644
--- a/board/jupiter/jupiter.c
+++ b/board/jupiter/jupiter.c
@@ -78,7 +78,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c
index bbabbcfc0b..51b4571d40 100644
--- a/board/keymile/km82xx/km82xx.c
+++ b/board/keymile/km82xx/km82xx.c
@@ -291,7 +291,7 @@ static long probe_sdram(memctl8260_t *memctl)
#endif /* CONFIG_SYS_SDRAM_LIST */
-int initdram(void)
+int dram_init(void)
{
immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
memctl8260_t *memctl = &immap->im_memctl;
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index f83fa06e93..8020c379fd 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -330,7 +330,7 @@ static int fixed_sdram(void)
return msize;
}
-int initdram(void)
+int dram_init(void)
{
immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize = 0;
diff --git a/board/keymile/kmp204x/ddr.c b/board/keymile/kmp204x/ddr.c
index 006b809654..6f82e15f82 100644
--- a/board/keymile/kmp204x/ddr.c
+++ b/board/keymile/kmp204x/ddr.c
@@ -50,7 +50,7 @@ void fsl_ddr_board_options(memctl_options_t *popts,
popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR_ODT_75ohm;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size = 0;
diff --git a/board/liebherr/lwmon5/sdram.c b/board/liebherr/lwmon5/sdram.c
index f7251e567f..275bd7a4c7 100644
--- a/board/liebherr/lwmon5/sdram.c
+++ b/board/liebherr/lwmon5/sdram.c
@@ -147,7 +147,7 @@ static void program_ecc(u32 start_address,
* initdram -- 440EPx's DDR controller is a DENALI Core
*
************************************************************************/
-int initdram(void)
+int dram_init(void)
{
/* CL=4 */
mtsdram(DDR0_02, 0x00000000);
diff --git a/board/micronas/vct/vct.c b/board/micronas/vct/vct.c
index 02824eaf4f..8bf8d5f4e8 100644
--- a/board/micronas/vct/vct.c
+++ b/board/micronas/vct/vct.c
@@ -61,7 +61,7 @@ void _machine_restart(void)
* SDRAM is already configured by the bootstrap code, only return the
* auto-detected size here
*/
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_MBYTES_SDRAM << 20);
diff --git a/board/motionpro/motionpro.c b/board/motionpro/motionpro.c
index a2520bc3bc..7883a179e8 100644
--- a/board/motionpro/motionpro.c
+++ b/board/motionpro/motionpro.c
@@ -118,7 +118,7 @@ static void sdram_start(int hi_addr)
/*
* Initalize SDRAM - configure SDRAM controller, detect memory size.
*/
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
#ifndef CONFIG_SYS_RAMBOOT
diff --git a/board/mpc8308_p1m/sdram.c b/board/mpc8308_p1m/sdram.c
index e0f4671b17..05c477d389 100644
--- a/board/mpc8308_p1m/sdram.c
+++ b/board/mpc8308_p1m/sdram.c
@@ -61,7 +61,7 @@ static long fixed_sdram(void)
return get_ram_size(CONFIG_SYS_DDR_SDRAM_BASE, msize);
}
-int initdram(void)
+int dram_init(void)
{
immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize;
diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c
index e6422965f9..4d8671fe67 100644
--- a/board/mpl/mip405/mip405.c
+++ b/board/mpl/mip405/mip405.c
@@ -615,14 +615,14 @@ int checkboard (void)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
/*
- initdram() reads EEPROM via I2c. EEPROM contains all of
+ dram_init() reads EEPROM via I2c. EEPROM contains all of
the necessary info for SDRAM controller configuration
*/
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
static int test_dram (unsigned long ramsize);
-int initdram(void)
+int dram_init(void)
{
unsigned long bank_reg[4], tmp, bank_size;
diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c
index 7b7b93f682..1288f743cc 100644
--- a/board/mpl/pati/pati.c
+++ b/board/mpl/pati/pati.c
@@ -135,7 +135,7 @@ extern int mem_test (unsigned long start, unsigned long ramsize, int quiet);
/*
* Get RAM size.
*/
-int initdram(void)
+int dram_init(void)
{
unsigned char board_rev;
unsigned long reg;
diff --git a/board/mpl/pip405/pip405.c b/board/mpl/pip405/pip405.c
index c07d8f88b9..408518d648 100644
--- a/board/mpl/pip405/pip405.c
+++ b/board/mpl/pip405/pip405.c
@@ -605,14 +605,14 @@ int checkboard (void)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
/*
- initdram() reads EEPROM via I2c. EEPROM contains all of
+ dram_init() reads EEPROM via I2c. EEPROM contains all of
the necessary info for SDRAM controller configuration
*/
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
static int test_dram (unsigned long ramsize);
-int initdram(void)
+int dram_init(void)
{
unsigned long bank_reg[4], tmp, bank_size;
int i, ds;
diff --git a/board/munices/munices.c b/board/munices/munices.c
index 8f1a5a8341..9571f2b44a 100644
--- a/board/munices/munices.c
+++ b/board/munices/munices.c
@@ -60,7 +60,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/openrisc/openrisc-generic/openrisc-generic.c b/board/openrisc/openrisc-generic/openrisc-generic.c
index 8f9b98dbca..6a79548490 100644
--- a/board/openrisc/openrisc-generic/openrisc-generic.c
+++ b/board/openrisc/openrisc-generic/openrisc-generic.c
@@ -21,7 +21,7 @@ int checkboard(void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
return 0;
}
diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c
index e473531fd3..1c0540a989 100644
--- a/board/pb1x00/pb1x00.c
+++ b/board/pb1x00/pb1x00.c
@@ -13,7 +13,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int initdram(void)
+int dram_init(void)
{
/* Sdram is setup by assembler code */
/* If memory could be changed, we should return the true value here */
diff --git a/board/pdm360ng/pdm360ng.c b/board/pdm360ng/pdm360ng.c
index c833aec9b2..9db31d3312 100644
--- a/board/pdm360ng/pdm360ng.c
+++ b/board/pdm360ng/pdm360ng.c
@@ -48,7 +48,7 @@ sdram_conf_t mddrc_config[] = {
},
};
-int initdram(void)
+int dram_init(void)
{
int i;
u32 msize = 0;
diff --git a/board/phytec/pcm030/pcm030.c b/board/phytec/pcm030/pcm030.c
index 19d87169ee..619bbfab7e 100644
--- a/board/phytec/pcm030/pcm030.c
+++ b/board/phytec/pcm030/pcm030.c
@@ -75,7 +75,7 @@ static void sdram_start(int hi_addr)
* is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
volatile struct mpc5xxx_mmap_ctl *mm =
(struct mpc5xxx_mmap_ctl *)CONFIG_SYS_MBAR;
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index 2638ea67d3..583acc2e44 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -13,7 +13,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int initdram(void)
+int dram_init(void)
{
/* Sdram is setup by assembler code */
/* If memory could be changed, we should return the true value here */
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index f01cd7ed52..a3395ed680 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -37,7 +37,7 @@ int board_early_init_f (void)
#define ns2clk(ns) (ns / (1000000000 / CONFIG_8349_CLKIN) + 1)
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize = 0;
diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index 44842d5af1..08ced102b6 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -39,7 +39,7 @@ int checkboard (void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
long dram_size = 0;
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
index e2b9123bac..fab789ee6c 100644
--- a/board/sysam/amcore/amcore.c
+++ b/board/sysam/amcore/amcore.c
@@ -51,7 +51,7 @@ void fudelay(int usec)
asm volatile ("nop");
}
-int initdram(void)
+int dram_init(void)
{
u32 dramsize, RC;
diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index baf3208740..8615dda447 100644
--- a/board/tqc/tqm5200/tqm5200.c
+++ b/board/tqc/tqm5200/tqm5200.c
@@ -133,7 +133,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 0968e494a5..4642342bfb 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -66,7 +66,7 @@ int board_early_init_r (void) {
/**************************************************************************
* DRAM initalization and size detection
*/
-int initdram(void)
+int dram_init(void)
{
long bank_size;
long size;
diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c
index 489a22c161..58bd7fae47 100644
--- a/board/tqc/tqm8xx/tqm8xx.c
+++ b/board/tqc/tqm8xx/tqm8xx.c
@@ -126,7 +126,7 @@ int checkboard (void)
/* ------------------------------------------------------------------------- */
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
diff --git a/board/v38b/v38b.c b/board/v38b/v38b.c
index c271fb5873..73227c1b15 100644
--- a/board/v38b/v38b.c
+++ b/board/v38b/v38b.c
@@ -57,7 +57,7 @@ static void sdram_start(int hi_addr)
#endif /* !CONFIG_SYS_RAMBOOT */
-int initdram(void)
+int dram_init(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index abf4e93265..2ba7b3a3ea 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -168,7 +168,7 @@ found:
popts->ddr_cdr1 = DDR_CDR1_DHC_EN;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size;
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 37441c7a46..3818ab96b3 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -88,7 +88,7 @@ static long fixed_sdram(void)
return msize;
}
-int initdram(void)
+int dram_init(void)
{
volatile immap_t *im = (volatile immap_t *)CONFIG_SYS_IMMR;
volatile fsl_lbc_t *lbc = &im->im_lbc;
diff --git a/board/xes/xpedite1000/xpedite1000.c b/board/xes/xpedite1000/xpedite1000.c
index df5a7a0539..ef646fa4a1 100644
--- a/board/xes/xpedite1000/xpedite1000.c
+++ b/board/xes/xpedite1000/xpedite1000.c
@@ -116,7 +116,7 @@ int checkboard(void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = spd_sdram();
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index e436c28f78..19b96f636d 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -58,7 +58,7 @@ int board_early_init_r(void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
phys_size_t dram_size = fsl_ddr_sdram();
diff --git a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c
index 6148a4b69c..be6b4dc5b9 100644
--- a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c
+++ b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c
@@ -23,7 +23,7 @@ int checkboard(void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = get_ram_size(XPAR_DDR2_SDRAM_MEM_BASEADDR,
CONFIG_SYS_SDRAM_SIZE_MB * 1024 * 1024);
diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
index d7e6aee706..07a3ab7f82 100644
--- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
+++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
@@ -19,7 +19,7 @@ int checkboard(void)
return 0;
}
-int initdram(void)
+int dram_init(void)
{
gd->ram_size = get_ram_size(XPAR_DDR2_SDRAM_MEM_BASEADDR,
CONFIG_SYS_SDRAM_SIZE_MB * 1024 * 1024);
diff --git a/common/board_f.c b/common/board_f.c
index 3cd53737d3..90c9a55173 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -177,13 +177,6 @@ static int announce_dram_init(void)
return 0;
}
-#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_M68K)
-static int init_func_ram(void)
-{
- return initdram();
-}
-#endif
-
static int show_dram_config(void)
{
unsigned long long size;
@@ -867,15 +860,7 @@ static const init_fnc_t init_sequence_f[] = {
init_func_spi,
#endif
announce_dram_init,
- /* TODO: unify all these dram functions? */
-#if defined(CONFIG_ARM) || defined(CONFIG_X86) || defined(CONFIG_NDS32) || \
- defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) || \
- defined(CONFIG_SH)
dram_init, /* configure available RAM banks */
-#endif
-#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_M68K)
- init_func_ram,
-#endif
#ifdef CONFIG_POST
post_init_f,
#endif
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 9aa3eecd34..f0382506f7 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -796,7 +796,7 @@ phys_size_t __fsl_ddr_sdram(fsl_ddr_info_t *pinfo)
/*
* fsl_ddr_sdram(void) -- this is the main function to be
- * called by initdram() in the board file.
+ * called by dram_init() in the board file.
*
* It returns amount of memory configured in bytes.
*/
--
2.12.2.564.g063fe858b8-goog
next prev parent reply other threads:[~2017-03-31 14:40 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-31 14:40 [U-Boot] [PATCH 00/16] Clean up board_f sequence a little more Simon Glass
2017-03-31 14:40 ` [U-Boot] [PATCH 01/16] board_f: Drop board_type parameter from initdram() Simon Glass
2017-04-03 6:19 ` Stefan Roese
2017-04-03 15:56 ` york sun
2017-04-06 16:25 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 02/16] board_f: Drop return value " Simon Glass
2017-04-03 6:25 ` Stefan Roese
2017-04-03 15:56 ` york sun
2017-04-06 16:25 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` Simon Glass [this message]
2017-04-03 6:25 ` [U-Boot] [PATCH 03/16] board_f: Rename initdram() to dram_init() Stefan Roese
2017-04-03 15:56 ` york sun
2017-04-05 20:36 ` [U-Boot] [U-Boot, " Tom Rini
2017-04-05 21:11 ` Simon Glass
2017-03-31 14:40 ` [U-Boot] [PATCH 04/16] xtensa: Place relocated U-Boot in the normal place Simon Glass
2017-04-06 16:25 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 05/16] board_f: Use a single condition for reserve_logbuffer() Simon Glass
2017-04-06 16:25 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 06/16] board_f: Move the extra #ifdef condition into reserve_mmu() Simon Glass
2017-04-03 15:55 ` york sun
2017-04-06 16:25 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 07/16] board_f: Put video memory reservation in one function Simon Glass
2017-04-06 16:25 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 08/16] board_f: Drop CONFIG_SPL_BUILD check Simon Glass
2017-04-03 15:55 ` york sun
2017-04-06 16:25 ` [U-Boot] [U-Boot,08/16] " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 09/16] board_f: Drop setup_dram_config() wrapper Simon Glass
2017-04-03 6:25 ` Stefan Roese
2017-04-06 16:25 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 10/16] Move dram_init_banksize() to a common header Simon Glass
2017-04-06 16:25 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 11/16] board_f: Drop unused headers Simon Glass
2017-04-03 15:55 ` york sun
2017-04-06 16:25 ` [U-Boot] [U-Boot,11/16] " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 12/16] board_f: Move errno.h down to the bottom Simon Glass
2017-04-03 15:55 ` york sun
2017-04-06 16:26 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 13/16] powerpc: Move setup_board_extra() into a PPC file Simon Glass
2017-04-03 6:26 ` Stefan Roese
2017-04-06 16:26 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 14/16] board_f: Make init_helpers generic Simon Glass
2017-04-06 16:26 ` [U-Boot] [U-Boot,14/16] " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 15/16] board_f: Make relocation functions generic Simon Glass
2017-04-06 16:26 ` [U-Boot] [U-Boot, " Tom Rini
2017-03-31 14:40 ` [U-Boot] [PATCH 16/16] board_f: powerpc: Drop unused headers Simon Glass
2017-04-03 6:26 ` Stefan Roese
2017-04-03 15:56 ` york sun
2017-04-06 16:26 ` [U-Boot] [U-Boot,16/16] " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170331144039.14587-4-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.