From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 01/16] board_f: Drop board_type parameter from initdram()
Date: Fri, 31 Mar 2017 08:40:24 -0600 [thread overview]
Message-ID: <20170331144039.14587-2-sjg@chromium.org> (raw)
In-Reply-To: <20170331144039.14587-1-sjg@chromium.org>
It looks like only cm5200 and tqm8xx use this feature, so we don't really
need it in generic code. Drop it and have the users access gd->board_type
directly.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +-
arch/mips/mach-ath79/dram.c | 2 +-
arch/mips/mach-pic32/cpu.c | 2 +-
arch/powerpc/cpu/mpc5xxx/spl_boot.c | 2 +-
arch/powerpc/cpu/mpc85xx/cpu.c | 4 ++--
arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 4 ++--
arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c | 2 +-
arch/powerpc/cpu/ppc4xx/sdram.c | 4 ++--
arch/powerpc/cpu/ppc4xx/spl_boot.c | 2 +-
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 | 4 ++--
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/ls1021aqds/ddr.c | 2 +-
board/freescale/ls1021aqds/ls1021aqds.c | 2 +-
board/freescale/ls1043aqds/ddr.c | 2 +-
board/freescale/ls1043aqds/ls1043aqds.c | 2 +-
board/freescale/ls1043ardb/ddr.c | 2 +-
board/freescale/ls1046aqds/ddr.c | 2 +-
board/freescale/ls1046aqds/ls1046aqds.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 | 3 ++-
board/freescale/m5253demo/m5253demo.c | 2 +-
board/freescale/m5253evbe/m5253evbe.c | 2 +-
board/freescale/m5272c3/m5272c3.c | 3 ++-
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 | 3 +--
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 3 +--
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 | 3 ++-
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 | 8 +-------
include/asm-generic/global_data.h | 6 ++++++
include/common.h | 2 +-
141 files changed, 157 insertions(+), 156 deletions(-)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 7e66ee08b5..583254519b 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -821,7 +821,7 @@ void update_early_mmu_table(void)
__weak int dram_init(void)
{
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
/* This will break-before-make MMU for DDR */
update_early_mmu_table();
diff --git a/arch/mips/mach-ath79/dram.c b/arch/mips/mach-ath79/dram.c
index c29e98c2f4..5ef43a059d 100644
--- a/arch/mips/mach-ath79/dram.c
+++ b/arch/mips/mach-ath79/dram.c
@@ -9,7 +9,7 @@
#include <asm/addrspace.h>
#include <mach/ddr.h>
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
ddr_tap_tuning();
return get_ram_size((void *)KSEG1, SZ_256M);
diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
index ac33391921..f15b58d849 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 */
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
ddr2_pmd_ungate();
ddr2_phy_init();
diff --git a/arch/powerpc/cpu/mpc5xxx/spl_boot.c b/arch/powerpc/cpu/mpc5xxx/spl_boot.c
index e182dfbd45..23d2010343 100644
--- a/arch/powerpc/cpu/mpc5xxx/spl_boot.c
+++ b/arch/powerpc/cpu/mpc5xxx/spl_boot.c
@@ -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(0);
+ initdram();
/* 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 cc30fa6e17..192634d41c 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)
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
#if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD) || \
defined(CONFIG_ARCH_QEMU_E500)
@@ -411,7 +411,7 @@ phys_size_t initdram(int board_type)
#endif
}
#else /* CONFIG_SYS_RAMBOOT */
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 7202c3fc46..3b79efb246 100644
--- a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
@@ -414,7 +414,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
*-----------------------------------------------------------------------------*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
unsigned char iic0_dimm_addr[] = SPD_EEPROM_ADDRESS;
unsigned long dimm_populated[MAXDIMMS] = {SDRAM_NONE, SDRAM_NONE};
@@ -2855,7 +2855,7 @@ static void test(void)
* time parameters.
* Configures the PPC405EX(r) and PPC460EX/GT
*---------------------------------------------------------------------------*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 455136c68c..3b072b7791 100644
--- a/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
+++ b/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
@@ -998,7 +998,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
*-----------------------------------------------------------------------------*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
unsigned char const iic0_dimm_addr[] = SPD_EEPROM_ADDRESS;
unsigned long dimm_ranks[MAXDIMMS];
diff --git a/arch/powerpc/cpu/ppc4xx/sdram.c b/arch/powerpc/cpu/ppc4xx/sdram.c
index cd63456e70..2d805717a7 100644
--- a/arch/powerpc/cpu/ppc4xx/sdram.c
+++ b/arch/powerpc/cpu/ppc4xx/sdram.c
@@ -148,7 +148,7 @@ static ulong compute_rtr(ulong speed, ulong rows, ulong refresh)
/*
* Autodetect onboard SDRAM on 405 platforms
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
ulong speed;
ulong sdtr1;
@@ -349,7 +349,7 @@ static void sdram_tr1_set(int ram_address, int* tr1_value)
* so this should be extended for other future boards
* using this routine!
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 318f23b646..f3aa46c4f1 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(0);
+ initdram();
/* Clear bss */
memset(__bss_start, '\0', __bss_end - __bss_start);
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 3a775be9ae..8a7fa1d97c 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
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#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 b1740ee9b9..292752450d 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;
}
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
int size, i;
diff --git a/board/a3m071/a3m071.c b/board/a3m071/a3m071.c
index 55d0bc80c0..b11ff980b8 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.
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/a4m072/a4m072.c b/board/a4m072/a4m072.c
index 20d8b80f7e..88d4942ce7 100644
--- a/board/a4m072/a4m072.c
+++ b/board/a4m072/a4m072.c
@@ -71,7 +71,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
ulong dramsize = 0;
uint svr, pvr;
diff --git a/board/amcc/acadia/memory.c b/board/amcc/acadia/memory.c
index 9673118857..841bcfa4bf 100644
--- a/board/amcc/acadia/memory.c
+++ b/board/amcc/acadia/memory.c
@@ -41,7 +41,7 @@ static void cram_bcr_write(u32 wr_val)
return;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
int i;
u32 val;
diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c
index 2838f9a1ed..ae69f5a1b1 100644
--- a/board/amcc/bamboo/bamboo.c
+++ b/board/amcc/bamboo/bamboo.c
@@ -436,7 +436,7 @@ int checkboard(void)
}
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
return spd_sdram();
}
diff --git a/board/amcc/bubinga/bubinga.c b/board/amcc/bubinga/bubinga.c
index 9043de62d3..e3567173c2 100644
--- a/board/amcc/bubinga/bubinga.c
+++ b/board/amcc/bubinga/bubinga.c
@@ -52,10 +52,10 @@ int checkboard(void)
}
/* -------------------------------------------------------------------------
- initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of
+ initdram() reads EEPROM via I2c. EEPROM contains all of
the necessary info for SDRAM controller configuration
------------------------------------------------------------------------- */
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return spd_sdram();
}
diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c
index 67640d7edf..bb5c5ee449 100644
--- a/board/amcc/sequoia/sdram.c
+++ b/board/amcc/sequoia/sdram.c
@@ -31,7 +31,7 @@ extern void denali_core_search_data_eye(void);
* initdram -- 440EPx's DDR controller is a DENALI Core
*
************************************************************************/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(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 c9482094f6..ca933d71a6 100644
--- a/board/amcc/walnut/walnut.c
+++ b/board/amcc/walnut/walnut.c
@@ -71,10 +71,10 @@ int checkboard(void)
}
/*
- * initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of
+ * initdram() reads EEPROM via I2c. EEPROM contains all of
* the necessary info for SDRAM controller configuration
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return spd_sdram();
}
diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c
index 56b5191d66..f61978c5d5 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;
}
-phys_size_t initdram(int board)
+phys_size_t initdram(void)
{
register uint reg;
int tr1_bank1, tr1_bank2;
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index 7ec7cb378f..70fcd61998 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -27,7 +27,7 @@ int checkboard(void)
return 0;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 15c934d29b..ba9930d370 100644
--- a/board/canmb/canmb.c
+++ b/board/canmb/canmb.c
@@ -65,7 +65,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c
index fce998d00f..2ac9fd9cd1 100644
--- a/board/cm5200/cm5200.c
+++ b/board/cm5200/cm5200.c
@@ -97,14 +97,14 @@ static mem_conf_t* get_mem_config(int board_type)
/*
* Initalize SDRAM - configure SDRAM controller, detect memory size.
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
ulong dramsize = 0;
#ifndef CONFIG_SYS_RAMBOOT
ulong test1, test2;
mem_conf_t *mem_conf;
- mem_conf = get_mem_config(board_type);
+ mem_conf = get_mem_config(gd->board_type);
/* configure SDRAM start/end for detection */
*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x0000001e; /* 2G at 0x0 */
diff --git a/board/cobra5272/cobra5272.c b/board/cobra5272/cobra5272.c
index 0f3bcc592a..9d4554da1f 100644
--- a/board/cobra5272/cobra5272.c
+++ b/board/cobra5272/cobra5272.c
@@ -16,7 +16,7 @@ int checkboard (void)
return 0;
};
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
volatile sdramctrl_t *sdp = (sdramctrl_t *) (MMAP_SDRAM);
diff --git a/board/davedenx/aria/aria.c b/board/davedenx/aria/aria.c
index 1b6c40f8d5..709c65ba0d 100644
--- a/board/davedenx/aria/aria.c
+++ b/board/davedenx/aria/aria.c
@@ -18,7 +18,7 @@
DECLARE_GLOBAL_DATA_PTR;
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
return fixed_sdram(NULL, NULL, 0);
}
diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c
index 75e6f0ef5a..cf2f88047d 100644
--- a/board/dbau1x00/dbau1x00.c
+++ b/board/dbau1x00/dbau1x00.c
@@ -11,7 +11,7 @@
#include <asm/mipsregs.h>
#include <asm/io.h>
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 656f0fa83f..b8eb32b1fb 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;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return get_ram_size(0, fixed_sdram(NULL, NULL, 0));
}
diff --git a/board/esd/pmc440/sdram.c b/board/esd/pmc440/sdram.c
index e7f8115870..82ee289aa6 100644
--- a/board/esd/pmc440/sdram.c
+++ b/board/esd/pmc440/sdram.c
@@ -105,7 +105,7 @@ int initdram_by_rb(int rows, int banks)
return 0;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t size;
int n;
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index f8f1834b59..bf6ee7a73d 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -28,7 +28,7 @@
void ddr_enable_ecc(unsigned int dram_size);
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 99cd88466d..d070104618 100644
--- a/board/freescale/b4860qds/ddr.c
+++ b/board/freescale/b4860qds/ddr.c
@@ -176,7 +176,7 @@ found:
popts->cpo_sample = 0x3e;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c
index 35b812cb18..17e2ba8953 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");
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#ifdef CONFIG_SPL_NAND_BOOT
nand_boot();
diff --git a/board/freescale/c29xpcie/spl.c b/board/freescale/c29xpcie/spl.c
index 6613216950..785c859bee 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();
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#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 9c1a4c2f7c..75de247a51 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;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index 2f66ba9e7f..99a4984fbc 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -164,7 +164,7 @@ void board_mem_sleep_setup(void)
}
#endif
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index 79078d237b..57314e2c9f 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -162,7 +162,7 @@ int dram_init(void)
* before accessing DDR SPD.
*/
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
return 0;
}
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index c740062887..817c91a34a 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -108,7 +108,7 @@ found:
#endif
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 6507c09143..755aef384e 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -153,7 +153,7 @@ int dram_init(void)
* before accessing DDR SPD.
*/
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
/* This will break-before-make MMU for DDR */
update_early_mmu_table();
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index f90b85df1a..b5c5b2ede3 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
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index dc4d689adc..6a5cbbf739 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -92,7 +92,7 @@ found:
popts->cpo_sample = 0x70;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index af3f70a38b..f30dd23351 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -149,7 +149,7 @@ int dram_init(void)
* before accessing DDR SPD.
*/
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
/* This will break-before-make MMU for DDR */
update_early_mmu_table();
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index efe2ba6eb1..1e99538022 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -96,7 +96,7 @@ found:
popts->cpo_sample = 0x70;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 5ed9e1461b..0bff922f07 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
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 0408c0fc25..bd32c54fc1 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -155,7 +155,7 @@ found:
}
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 2851d5b443..b00e575ea2 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -158,7 +158,7 @@ found:
}
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/freescale/m5208evbe/m5208evbe.c
index 1df128b268..6122750882 100644
--- a/board/freescale/m5208evbe/m5208evbe.c
+++ b/board/freescale/m5208evbe/m5208evbe.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 a1127e52a3..571e1a6528 100644
--- a/board/freescale/m52277evb/m52277evb.c
+++ b/board/freescale/m52277evb/m52277evb.c
@@ -21,7 +21,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
u32 dramsize;
diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c
index 68c1631f81..7aa0edfdc1 100644
--- a/board/freescale/m5235evb/m5235evb.c
+++ b/board/freescale/m5235evb/m5235evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 7ae842c3d3..b8544292a7 100644
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -29,7 +29,8 @@ int checkboard (void) {
};
-phys_size_t initdram (int board_type) {
+phys_size_t initdram(void)
+{
unsigned long junk = 0xa5a59696;
/*
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 7e516bfa40..fef2ca6af6 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -20,7 +20,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
u32 dramsize = 0;
diff --git a/board/freescale/m5253evbe/m5253evbe.c b/board/freescale/m5253evbe/m5253evbe.c
index 15ff755a56..3f4cdfbaf1 100644
--- a/board/freescale/m5253evbe/m5253evbe.c
+++ b/board/freescale/m5253evbe/m5253evbe.c
@@ -19,7 +19,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 3ed4a7da93..9fab24ebb9 100644
--- a/board/freescale/m5272c3/m5272c3.c
+++ b/board/freescale/m5272c3/m5272c3.c
@@ -18,7 +18,8 @@ int checkboard (void) {
return 0;
};
-phys_size_t initdram (int board_type) {
+phys_size_t initdram(void)
+{
sdramctrl_t * sdp = (sdramctrl_t *)(MMAP_SDRAM);
out_be16(&sdp->sdram_sdtr, 0xf539);
diff --git a/board/freescale/m5275evb/m5275evb.c b/board/freescale/m5275evb/m5275evb.c
index 16083d1bc0..00ce582249 100644
--- a/board/freescale/m5275evb/m5275evb.c
+++ b/board/freescale/m5275evb/m5275evb.c
@@ -23,7 +23,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 39f12fb4aa..19e56957bd 100644
--- a/board/freescale/m5282evb/m5282evb.c
+++ b/board/freescale/m5282evb/m5282evb.c
@@ -16,7 +16,7 @@ int checkboard (void)
return 0;
}
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
u32 dramsize, i, dramclk;
diff --git a/board/freescale/m53017evb/m53017evb.c b/board/freescale/m53017evb/m53017evb.c
index dbe886b03a..821e663b91 100644
--- a/board/freescale/m53017evb/m53017evb.c
+++ b/board/freescale/m53017evb/m53017evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 1f77adf4c2..c4613a4cbd 100644
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 bfcc4b23b0..f1ddee1378 100644
--- a/board/freescale/m5373evb/m5373evb.c
+++ b/board/freescale/m5373evb/m5373evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 5375d1675d..c3bee185d8 100644
--- a/board/freescale/m54418twr/m54418twr.c
+++ b/board/freescale/m54418twr/m54418twr.c
@@ -25,7 +25,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
u32 dramsize;
diff --git a/board/freescale/m54451evb/m54451evb.c b/board/freescale/m54451evb/m54451evb.c
index d2ad42c085..a4d11b6815 100644
--- a/board/freescale/m54451evb/m54451evb.c
+++ b/board/freescale/m54451evb/m54451evb.c
@@ -26,7 +26,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
u32 dramsize;
#ifdef CONFIG_CF_SBF
diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c
index 76b4322a19..3bdcc332b6 100644
--- a/board/freescale/m54455evb/m54455evb.c
+++ b/board/freescale/m54455evb/m54455evb.c
@@ -22,7 +22,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
u32 dramsize;
#ifdef CONFIG_CF_SBF
diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c
index 1e3cb6179f..e84a5ac4eb 100644
--- a/board/freescale/m547xevb/m547xevb.c
+++ b/board/freescale/m547xevb/m547xevb.c
@@ -23,7 +23,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 05361550b3..06f9a5ede0 100644
--- a/board/freescale/m548xevb/m548xevb.c
+++ b/board/freescale/m548xevb/m548xevb.c
@@ -23,7 +23,7 @@ int checkboard(void)
return 0;
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 7c44282ca2..e134091468 100644
--- a/board/freescale/mpc5121ads/mpc5121ads.c
+++ b/board/freescale/mpc5121ads/mpc5121ads.c
@@ -95,7 +95,7 @@ int is_micron(void){
return(ismicron);
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
u32 msize = 0;
/*
diff --git a/board/freescale/mpc8308rdb/sdram.c b/board/freescale/mpc8308rdb/sdram.c
index 89b665e649..ed1e84e003 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);
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 693dff651a..e3a5941f20 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(0);
+ initdram();
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 6282c3d920..ce6fce5399 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -97,7 +97,7 @@ static long fixed_sdram(void)
return msize;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 1da6e2166d..7779b6daed 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(0);
+ initdram();
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 6c9431202f..fd8968c71c 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 */
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 0a0152ad9e..f9f9a410c5 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -68,7 +68,7 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
int fixed_sdram(void);
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 adf425486e..d66ad33bf5 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -88,7 +88,7 @@ int board_early_init_r(void)
int fixed_sdram(void);
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 02b5040ef4..3bcfe03065 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -46,7 +46,7 @@ int board_early_init_f (void)
#define ns2clk(ns) (ns / (1000000000 / CONFIG_8349_CLKIN) + 1)
-phys_size_t initdram (int board_type)
+phys_size_t initdram(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 22a1d99c88..01eac0260f 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -116,7 +116,7 @@ volatile static struct pci_controller hose[] = {
};
#endif /* CONFIG_PCI */
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 045841d57b..0463940bae 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -216,7 +216,7 @@ extern void ddr_enable_ecc(unsigned int dram_size);
#endif
int fixed_sdram(void);
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 07c0599858..d81778549c 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -60,7 +60,7 @@ void ddr_enable_ecc(unsigned int dram_size);
#endif
int fixed_sdram(void);
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 95e398c9f4..7668226321 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -116,8 +116,7 @@ int checkboard(void)
}
-phys_size_t
-initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size = 0;
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index 94633b5c99..1076442516 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -37,8 +37,7 @@ int checkboard(void)
return 0;
}
-phys_size_t
-initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size = 0;
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 05c76f2e45..05da1dac7d 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();
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#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 ef38551600..77ed2577f9 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
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#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 2af5576ff7..3357702dba 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
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#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 b2493e1f61..b07bd98fb1 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -116,7 +116,7 @@ found:
popts->ddr_cdr1 = DDR_CDR1_DHC_EN;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size = 0;
diff --git a/board/freescale/t102xqds/ddr.c b/board/freescale/t102xqds/ddr.c
index b6b1191990..507929bb70 100644
--- a/board/freescale/t102xqds/ddr.c
+++ b/board/freescale/t102xqds/ddr.c
@@ -169,7 +169,7 @@ void board_mem_sleep_setup(void)
}
#endif
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c
index 3e96b33c40..a1481e9b63 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();
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index e66657869c..56f98ac2f9 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -229,7 +229,7 @@ void board_mem_sleep_setup(void)
}
#endif
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index b70c2c5d79..f70a337512 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();
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t1040qds/ddr.c b/board/freescale/t1040qds/ddr.c
index cb58d1e524..a5d3e54cfe 100644
--- a/board/freescale/t1040qds/ddr.c
+++ b/board/freescale/t1040qds/ddr.c
@@ -117,7 +117,7 @@ void board_mem_sleep_setup(void)
}
#endif
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 302f19be69..4a09cae782 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -120,7 +120,7 @@ void board_mem_sleep_setup(void)
}
#endif
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 4402e0f4b0..076641c1ec 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");
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index d6e4554a80..044ac18562 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -104,7 +104,7 @@ found:
popts->cpo_sample = 0x64;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index 334f5083b8..caa4de3e7f 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();
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 3487261b9d..bcb536ae1b 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -97,7 +97,7 @@ found:
popts->cpo_sample = 0x54;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index aa8e9285fe..44be70be87 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();
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t4qds/ddr.c b/board/freescale/t4qds/ddr.c
index 842073b6c6..24b1872560 100644
--- a/board/freescale/t4qds/ddr.c
+++ b/board/freescale/t4qds/ddr.c
@@ -112,7 +112,7 @@ found:
popts->cpo_sample = 0x63;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t4qds/spl.c b/board/freescale/t4qds/spl.c
index 5e946dc84f..bda0003565 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();
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 7b05821cf7..8596ccde1b 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -105,7 +105,7 @@ found:
popts->cpo_sample = 0x64;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index a32e34ef96..d3a86e6599 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();
- gd->ram_size = initdram(0);
+ gd->ram_size = initdram();
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 d26212ea82..ecdc7e72d3 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>
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 1;
}
diff --git a/board/gaisler/gr_ep2s60/gr_ep2s60.c b/board/gaisler/gr_ep2s60/gr_ep2s60.c
index 98fb45fdb8..66fe5a53b0 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>
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 1;
}
diff --git a/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c b/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c
index 32fbbe2d75..1725459af8 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>
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 1;
}
diff --git a/board/gaisler/grsim/grsim.c b/board/gaisler/grsim/grsim.c
index fd73920b62..fa097377df 100644
--- a/board/gaisler/grsim/grsim.c
+++ b/board/gaisler/grsim/grsim.c
@@ -10,7 +10,7 @@
#include <common.h>
#include <asm/leon.h>
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 1;
}
diff --git a/board/gaisler/grsim_leon2/grsim_leon2.c b/board/gaisler/grsim_leon2/grsim_leon2.c
index 882b0a4247..12df6bd7ef 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>
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 1;
}
diff --git a/board/gdsys/mpc8308/sdram.c b/board/gdsys/mpc8308/sdram.c
index 0fce8cfbab..b7b31fb024 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);
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 e7838dcd2a..b40e4b30e8 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -119,7 +119,7 @@ static int setup_sdram(void)
return msize;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 75bf1bb33c..b107dd196c 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 */
};
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 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 4fc6809ad6..7452d2b1f0 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.
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 ceffef61ef..c841bf02a3 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -10,7 +10,7 @@
#include "boston-regs.h"
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 495504372a..c269d0a5a3 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -83,7 +83,7 @@ static enum sys_con malta_sys_con(void)
}
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return CONFIG_SYS_MEM_SIZE;
}
diff --git a/board/imgtec/xilfpga/xilfpga.c b/board/imgtec/xilfpga/xilfpga.c
index 77a1952c93..dc0a088ecb 100644
--- a/board/imgtec/xilfpga/xilfpga.c
+++ b/board/imgtec/xilfpga/xilfpga.c
@@ -12,7 +12,7 @@
#include <common.h>
/* initialize the DDR Controller and PHY */
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 0a32f0e1b9..47c3955c6d 100644
--- a/board/inka4x0/inka4x0.c
+++ b/board/inka4x0/inka4x0.c
@@ -77,7 +77,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(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 05d673dc89..9bada940b7 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.
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/ipek01/ipek01.c b/board/ipek01/ipek01.c
index 2e62355c48..ab94c65499 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.
*/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(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 d56902bcd2..ae569d0fc0 100644
--- a/board/jupiter/jupiter.c
+++ b/board/jupiter/jupiter.c
@@ -76,7 +76,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c
index c2a7a5f995..12fd05d2f4 100644
--- a/board/keymile/km82xx/km82xx.c
+++ b/board/keymile/km82xx/km82xx.c
@@ -289,7 +289,7 @@ static long probe_sdram(memctl8260_t *memctl)
#endif /* CONFIG_SYS_SDRAM_LIST */
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 154f97457b..111a8a7995 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -328,7 +328,7 @@ static int fixed_sdram(void)
return msize;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 77af184c82..98fb1adfdd 100644
--- a/board/keymile/kmp204x/ddr.c
+++ b/board/keymile/kmp204x/ddr.c
@@ -48,7 +48,7 @@ void fsl_ddr_board_options(memctl_options_t *popts,
popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR_ODT_75ohm;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size = 0;
diff --git a/board/liebherr/lwmon5/sdram.c b/board/liebherr/lwmon5/sdram.c
index bcb344940b..1932e06fd6 100644
--- a/board/liebherr/lwmon5/sdram.c
+++ b/board/liebherr/lwmon5/sdram.c
@@ -145,7 +145,7 @@ static void program_ecc(u32 start_address,
* initdram -- 440EPx's DDR controller is a DENALI Core
*
************************************************************************/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
/* CL=4 */
mtsdram(DDR0_02, 0x00000000);
diff --git a/board/micronas/vct/vct.c b/board/micronas/vct/vct.c
index 0745ceeb7f..f4a6521e94 100644
--- a/board/micronas/vct/vct.c
+++ b/board/micronas/vct/vct.c
@@ -59,7 +59,7 @@ void _machine_restart(void)
* SDRAM is already configured by the bootstrap code, only return the
* auto-detected size here
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 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 7fa81b8677..3e2fe653bd 100644
--- a/board/motionpro/motionpro.c
+++ b/board/motionpro/motionpro.c
@@ -116,7 +116,7 @@ static void sdram_start(int hi_addr)
/*
* Initalize SDRAM - configure SDRAM controller, detect memory size.
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
ulong dramsize = 0;
#ifndef CONFIG_SYS_RAMBOOT
diff --git a/board/mpc8308_p1m/sdram.c b/board/mpc8308_p1m/sdram.c
index da36f63fdd..96d60c95ee 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);
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 8b9892b868..e2961d1d4a 100644
--- a/board/mpl/mip405/mip405.c
+++ b/board/mpl/mip405/mip405.c
@@ -615,14 +615,14 @@ int checkboard (void)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
/*
- initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of
+ initdram() reads EEPROM via I2c. EEPROM contains all of
the necessary info for SDRAM controller configuration
*/
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
static int test_dram (unsigned long ramsize);
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
unsigned long bank_reg[4], tmp, bank_size;
diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c
index ddc21083d8..951010a6a3 100644
--- a/board/mpl/pati/pati.c
+++ b/board/mpl/pati/pati.c
@@ -133,7 +133,7 @@ extern int mem_test (unsigned long start, unsigned long ramsize, int quiet);
/*
* Get RAM size.
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
unsigned char board_rev;
unsigned long reg;
diff --git a/board/mpl/pip405/pip405.c b/board/mpl/pip405/pip405.c
index 1bd2fbfc58..07b30ed293 100644
--- a/board/mpl/pip405/pip405.c
+++ b/board/mpl/pip405/pip405.c
@@ -605,14 +605,14 @@ int checkboard (void)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
/*
- initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of
+ initdram() reads EEPROM via I2c. EEPROM contains all of
the necessary info for SDRAM controller configuration
*/
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
static int test_dram (unsigned long ramsize);
-phys_size_t initdram (int board_type)
+phys_size_t initdram(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 8f292ea8e2..b88160c8a8 100644
--- a/board/munices/munices.c
+++ b/board/munices/munices.c
@@ -58,7 +58,7 @@ static void sdram_start (int hi_addr)
* is something else than 0x00000000.
*/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(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 4f82600bbb..d4a964f14f 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;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 0;
}
diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c
index eb92914a79..baa5723f4a 100644
--- a/board/pb1x00/pb1x00.c
+++ b/board/pb1x00/pb1x00.c
@@ -11,7 +11,7 @@
#include <asm/mipsregs.h>
#include <asm/io.h>
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 d91d427c6b..ef19daf3c9 100644
--- a/board/pdm360ng/pdm360ng.c
+++ b/board/pdm360ng/pdm360ng.c
@@ -48,7 +48,7 @@ sdram_conf_t mddrc_config[] = {
},
};
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
int i;
u32 msize = 0;
diff --git a/board/phytec/pcm030/pcm030.c b/board/phytec/pcm030/pcm030.c
index 8a9de0d963..470bd70792 100644
--- a/board/phytec/pcm030/pcm030.c
+++ b/board/phytec/pcm030/pcm030.c
@@ -73,7 +73,7 @@ static void sdram_start(int hi_addr)
* is something else than 0x00000000.
*/
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 563044eb0c..3cdc91cf43 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -11,7 +11,7 @@
#include <asm/io.h>
#include <netdev.h>
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 72786d2ace..b20de4c3c3 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -35,7 +35,7 @@ int board_early_init_f (void)
#define ns2clk(ns) (ns / (1000000000 / CONFIG_8349_CLKIN) + 1)
-phys_size_t initdram (int board_type)
+phys_size_t initdram(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 6bdf1a28e9..a541d25cc3 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -37,7 +37,7 @@ int checkboard (void)
return 0;
}
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
long dram_size = 0;
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
index 77b5000de6..b7f6380bec 100644
--- a/board/sysam/amcore/amcore.c
+++ b/board/sysam/amcore/amcore.c
@@ -49,7 +49,7 @@ void fudelay(int usec)
asm volatile ("nop");
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
u32 dramsize, RC;
diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index fef9d2b29a..1e843d5b03 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.
*/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index eca218c9cf..a05ae2a170 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
*/
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
long bank_size;
long size;
diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c
index 6d17830575..99357302f6 100644
--- a/board/tqc/tqm8xx/tqm8xx.c
+++ b/board/tqc/tqm8xx/tqm8xx.c
@@ -126,13 +126,14 @@ int checkboard (void)
/* ------------------------------------------------------------------------- */
-phys_size_t initdram (int board_type)
+phys_size_t initdram(void)
{
volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
long int size8, size9, size10;
long int size_b0 = 0;
long int size_b1 = 0;
+ int board_type = gd->board_type;
upmconfig (UPMA, (uint *) sdram_table,
sizeof (sdram_table) / sizeof (uint));
diff --git a/board/v38b/v38b.c b/board/v38b/v38b.c
index a337729916..20490a3157 100644
--- a/board/v38b/v38b.c
+++ b/board/v38b/v38b.c
@@ -56,7 +56,7 @@ static void sdram_start(int hi_addr)
#endif /* !CONFIG_SYS_RAMBOOT */
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index bb1d29a94c..da6f5ad253 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;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
phys_size_t dram_size;
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 7f24a30688..5349a583fc 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -88,7 +88,7 @@ static long fixed_sdram(void)
return msize;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 3b8a6683eb..ff64483cf4 100644
--- a/board/xes/xpedite1000/xpedite1000.c
+++ b/board/xes/xpedite1000/xpedite1000.c
@@ -116,7 +116,7 @@ int checkboard(void)
return 0;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return spd_sdram();
}
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 0028870db0..9ec99a1e28 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -56,7 +56,7 @@ int board_early_init_r(void)
return 0;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(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 3729f07624..dfdd3f2310 100644
--- a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c
+++ b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c
@@ -21,7 +21,7 @@ int checkboard(void)
return 0;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 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 d823352930..67fd668157 100644
--- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
+++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
@@ -17,7 +17,7 @@ int checkboard(void)
return 0;
}
-phys_size_t initdram(int board_type)
+phys_size_t initdram(void)
{
return 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 7ec45299d7..b1b994cea6 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -180,13 +180,7 @@ static int announce_dram_init(void)
#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_M68K)
static int init_func_ram(void)
{
-#ifdef CONFIG_BOARD_TYPES
- int board_type = gd->board_type;
-#else
- int board_type = 0; /* use dummy arg */
-#endif
-
- gd->ram_size = initdram(board_type);
+ gd->ram_size = initdram();
if (gd->ram_size > 0)
return 0;
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 5b356dd231..1a77c982fa 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -110,6 +110,12 @@ typedef struct global_data {
} gd_t;
#endif
+#ifdef CONFIG_BOARD_TYPES
+#define gd_board_type() gd->board_type
+#else
+#define gd_board_type() 0
+#endif
+
/*
* Global Data Flags - the top 16 bits are reserved for arch-specific flags
*/
diff --git a/include/common.h b/include/common.h
index bc486489a2..330d3962b5 100644
--- a/include/common.h
+++ b/include/common.h
@@ -212,7 +212,7 @@ int timer_init(void);
int cpu_init(void);
/* */
-phys_size_t initdram (int);
+phys_size_t initdram(void);
#include <display_options.h>
--
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 ` Simon Glass [this message]
2017-04-03 6:19 ` [U-Boot] [PATCH 01/16] board_f: Drop board_type parameter from initdram() 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 ` [U-Boot] [PATCH 03/16] board_f: Rename initdram() to dram_init() Simon Glass
2017-04-03 6:25 ` 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-2-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.