This series continues the effort to remove #ifdefs from the board_f init sequence. It follows on from the first series.
With both series applied the number of references to CONFIG in board_f.c drops from 178 to 137:
strings common/board_f.c |grep -c CONFIG
Simon Glass (16): board_f: Drop board_type parameter from initdram() board_f: Drop return value from initdram() board_f: Rename initdram() to dram_init() xtensa: Place relocated U-Boot in the normal place board_f: Use a single condition for reserve_logbuffer() board_f: Move the extra #ifdef condition into reserve_mmu() board_f: Put video memory reservation in one function board_f: Drop CONFIG_SPL_BUILD check board_f: Drop setup_dram_config() wrapper Move dram_init_banksize() to a common header board_f: Drop unused headers board_f: Move errno.h down to the bottom powerpc: Move setup_board_extra() into a PPC file board_f: Make init_helpers generic board_f: Make relocation functions generic board_f: powerpc: Drop unused headers
arch/arc/include/asm/init_helpers.h | 12 -- arch/arc/include/asm/relocate.h | 16 -- arch/arm/cpu/arm926ejs/armada100/dram.c | 4 +- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 6 +- arch/arm/include/asm/u-boot-arm.h | 1 - arch/arm/mach-davinci/misc.c | 4 +- arch/arm/mach-meson/board.c | 4 +- arch/arm/mach-mvebu/arm64-common.c | 8 +- arch/arm/mach-mvebu/dram.c | 4 +- arch/arm/mach-omap2/am33xx/emif4.c | 4 +- arch/arm/mach-omap2/omap3/emif4.c | 4 +- arch/arm/mach-omap2/omap3/sdrc.c | 4 +- arch/arm/mach-orion5x/dram.c | 4 +- arch/arm/mach-tegra/board2.c | 4 +- arch/arm/mach-tegra/tegra186/nvtboot_mem.c | 4 +- arch/arm/mach-uniphier/dram_init.c | 4 +- arch/mips/mach-ath79/dram.c | 8 +- arch/mips/mach-pic32/cpu.c | 6 +- arch/mips/mach-pic32/include/mach/ddr.h | 2 +- arch/powerpc/cpu/mpc5xxx/spl_boot.c | 4 +- arch/powerpc/cpu/mpc85xx/cpu.c | 14 +- arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 18 ++- arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c | 10 +- arch/powerpc/cpu/ppc4xx/sdram.c | 18 ++- arch/powerpc/cpu/ppc4xx/spl_boot.c | 2 +- arch/powerpc/lib/Makefile | 1 + arch/powerpc/lib/setup.c | 32 ++++ arch/x86/cpu/broadwell/sdram.c | 4 +- arch/x86/cpu/coreboot/sdram.c | 4 +- arch/x86/cpu/efi/sdram.c | 4 +- arch/x86/cpu/ivybridge/sdram.c | 4 +- arch/x86/cpu/qemu/dram.c | 4 +- arch/x86/cpu/quark/dram.c | 4 +- arch/x86/include/asm/relocate.h | 17 --- arch/x86/include/asm/u-boot-x86.h | 1 - arch/x86/lib/efi/efi.c | 6 +- arch/x86/lib/fsp/fsp_dram.c | 4 +- arch/x86/lib/relocate.c | 2 +- arch/x86/lib/spl.c | 2 +- arch/xtensa/cpu/cpu.c | 5 + arch/xtensa/include/asm/relocate.h | 14 -- arch/xtensa/lib/relocate.c | 2 +- board/AndesTech/adp-ag101p/adp-ag101p.c | 4 +- board/Arcturus/ucp1020/spl.c | 2 +- board/BuS/eb_cpu5282/eb_cpu5282.c | 6 +- board/a3m071/a3m071.c | 6 +- board/a4m072/a4m072.c | 8 +- board/amcc/acadia/memory.c | 8 +- board/amcc/bamboo/bamboo.c | 8 +- board/amcc/bubinga/bubinga.c | 10 +- board/amcc/sequoia/sdram.c | 8 +- board/amcc/walnut/walnut.c | 10 +- board/amcc/yosemite/yosemite.c | 7 +- board/armadeus/apf27/apf27.c | 4 +- board/armltd/vexpress/vexpress_common.c | 4 +- board/armltd/vexpress64/vexpress64.c | 4 +- board/astro/mcf5373l/mcf5373l.c | 6 +- board/beckhoff/mx53cx9020/mx53cx9020.c | 4 +- board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 4 +- board/broadcom/bcm28155_ap/bcm28155_ap.c | 4 +- board/broadcom/bcm_ep/board.c | 4 +- board/broadcom/bcmns2/northstar2.c | 4 +- board/cadence/xtfpga/xtfpga.c | 4 +- board/canmb/canmb.c | 8 +- board/cirrus/edb93xx/edb93xx.c | 4 +- board/cm5200/cm5200.c | 8 +- board/cobra5272/cobra5272.c | 7 +- board/compulab/cm_fx6/cm_fx6.c | 4 +- board/davedenx/aria/aria.c | 6 +- board/dbau1x00/dbau1x00.c | 8 +- board/denx/m53evk/m53evk.c | 4 +- board/esd/mecp5123/mecp5123.c | 6 +- board/esd/meesc/meesc.c | 4 +- board/esd/pmc440/sdram.c | 12 +- board/esd/vme8349/vme8349.c | 10 +- board/freescale/b4860qds/ddr.c | 6 +- board/freescale/b4860qds/spl.c | 2 +- board/freescale/c29xpcie/spl.c | 2 +- board/freescale/corenet_ds/ddr.c | 6 +- board/freescale/ls1021aqds/ddr.c | 10 +- board/freescale/ls1021aqds/ls1021aqds.c | 4 +- board/freescale/ls1043aqds/ddr.c | 6 +- board/freescale/ls1043aqds/ls1043aqds.c | 2 +- board/freescale/ls1043ardb/ddr.c | 6 +- board/freescale/ls1046aqds/ddr.c | 6 +- board/freescale/ls1046aqds/ls1046aqds.c | 2 +- board/freescale/ls1046ardb/ddr.c | 6 +- board/freescale/ls2080a/ddr.c | 8 +- board/freescale/ls2080aqds/ddr.c | 10 +- board/freescale/ls2080ardb/ddr.c | 10 +- board/freescale/m5208evbe/m5208evbe.c | 6 +- board/freescale/m52277evb/m52277evb.c | 6 +- board/freescale/m5235evb/m5235evb.c | 6 +- board/freescale/m5249evb/m5249evb.c | 9 +- board/freescale/m5253demo/m5253demo.c | 8 +- board/freescale/m5253evbe/m5253evbe.c | 8 +- board/freescale/m5272c3/m5272c3.c | 8 +- board/freescale/m5275evb/m5275evb.c | 8 +- board/freescale/m5282evb/m5282evb.c | 6 +- board/freescale/m53017evb/m53017evb.c | 6 +- board/freescale/m5329evb/m5329evb.c | 6 +- board/freescale/m5373evb/m5373evb.c | 6 +- board/freescale/m54418twr/m54418twr.c | 6 +- board/freescale/m54451evb/m54451evb.c | 6 +- board/freescale/m54455evb/m54455evb.c | 6 +- board/freescale/m547xevb/m547xevb.c | 6 +- board/freescale/m548xevb/m548xevb.c | 6 +- board/freescale/mpc5121ads/mpc5121ads.c | 6 +- board/freescale/mpc8308rdb/sdram.c | 8 +- board/freescale/mpc8313erdb/mpc8313erdb.c | 2 +- board/freescale/mpc8313erdb/sdram.c | 8 +- board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +- board/freescale/mpc8315erdb/sdram.c | 10 +- board/freescale/mpc8323erdb/mpc8323erdb.c | 12 +- board/freescale/mpc832xemds/mpc832xemds.c | 12 +- board/freescale/mpc8349emds/mpc8349emds.c | 12 +- board/freescale/mpc8349itx/mpc8349itx.c | 10 +- board/freescale/mpc837xemds/mpc837xemds.c | 10 +- board/freescale/mpc837xerdb/mpc837xerdb.c | 10 +- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 9 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 9 +- board/freescale/mx35pdk/mx35pdk.c | 4 +- board/freescale/mx53ard/mx53ard.c | 4 +- board/freescale/mx53loco/mx53loco.c | 4 +- board/freescale/mx53smd/mx53smd.c | 4 +- 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 | 10 +- board/freescale/t102xqds/ddr.c | 6 +- board/freescale/t102xqds/spl.c | 2 +- board/freescale/t102xrdb/ddr.c | 6 +- board/freescale/t102xrdb/spl.c | 2 +- board/freescale/t1040qds/ddr.c | 6 +- board/freescale/t104xrdb/ddr.c | 6 +- board/freescale/t104xrdb/spl.c | 2 +- board/freescale/t208xqds/ddr.c | 6 +- board/freescale/t208xqds/spl.c | 2 +- board/freescale/t208xrdb/ddr.c | 6 +- board/freescale/t208xrdb/spl.c | 2 +- board/freescale/t4qds/ddr.c | 6 +- board/freescale/t4qds/spl.c | 2 +- board/freescale/t4rdb/ddr.c | 6 +- board/freescale/t4rdb/spl.c | 2 +- board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c | 6 +- board/gaisler/gr_ep2s60/gr_ep2s60.c | 6 +- board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c | 6 +- board/gaisler/grsim/grsim.c | 6 +- board/gaisler/grsim_leon2/grsim_leon2.c | 6 +- board/gdsys/mpc8308/sdram.c | 8 +- board/hisilicon/hikey/hikey.c | 4 +- board/ids/ids8313/ids8313.c | 8 +- board/ifm/ac14xx/ac14xx.c | 7 +- board/ifm/o2dnt2/o2dnt2.c | 6 +- board/imgtec/boston/ddr.c | 9 +- board/imgtec/malta/malta.c | 8 +- board/imgtec/xilfpga/xilfpga.c | 8 +- board/inka4x0/inka4x0.c | 8 +- board/intercontrol/digsy_mtc/digsy_mtc.c | 6 +- board/ipek01/ipek01.c | 6 +- board/jupiter/jupiter.c | 8 +- board/keymile/km82xx/km82xx.c | 8 +- board/keymile/km83xx/km83xx.c | 10 +- board/keymile/kmp204x/ddr.c | 8 +- board/liebherr/lwmon5/sdram.c | 8 +- board/micronas/vct/vct.c | 8 +- board/mini-box/picosam9g45/picosam9g45.c | 4 +- board/motionpro/motionpro.c | 8 +- board/mpc8308_p1m/sdram.c | 8 +- board/mpl/mip405/mip405.c | 8 +- board/mpl/pati/pati.c | 10 +- board/mpl/pip405/pip405.c | 8 +- board/munices/munices.c | 8 +- board/openrisc/openrisc-generic/openrisc-generic.c | 2 +- board/pb1x00/pb1x00.c | 8 +- board/pdm360ng/pdm360ng.c | 6 +- board/phytec/pcm030/pcm030.c | 8 +- board/qemu-mips/qemu-mips.c | 8 +- board/qualcomm/dragonboard410c/dragonboard410c.c | 4 +- board/rockchip/evb_rk3328/evb-rk3328.c | 4 +- board/rockchip/evb_rk3399/evb-rk3399.c | 4 +- board/ronetix/pm9261/pm9261.c | 4 +- board/ronetix/pm9263/pm9263.c | 4 +- board/ronetix/pm9g45/pm9g45.c | 4 +- board/samsung/arndale/arndale.c | 4 +- board/samsung/common/board.c | 4 +- board/samsung/goni/goni.c | 4 +- board/samsung/smdkc100/smdkc100.c | 4 +- board/samsung/smdkv310/smdkv310.c | 4 +- board/sbc8349/sbc8349.c | 10 +- board/sbc8641d/sbc8641d.c | 8 +- board/spear/common/spr_misc.c | 4 +- board/st/stih410-b2260/board.c | 4 +- board/st/stv0991/stv0991.c | 4 +- board/sysam/amcore/amcore.c | 9 +- board/ti/dra7xx/evm.c | 4 +- board/tqc/tqm5200/tqm5200.c | 8 +- board/tqc/tqm834x/tqm834x.c | 6 +- board/tqc/tqm8xx/tqm8xx.c | 7 +- board/v38b/v38b.c | 7 +- board/varisys/cyrus/ddr.c | 6 +- board/ve8313/ve8313.c | 6 +- board/xes/xpedite1000/xpedite1000.c | 6 +- board/xes/xpedite517x/xpedite517x.c | 8 +- .../xilinx/microblaze-generic/microblaze-generic.c | 4 +- .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 8 +- .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 8 +- board/xilinx/zynq/board.c | 4 +- board/xilinx/zynqmp/zynqmp.c | 4 +- board/zipitz2/zipitz2.c | 4 +- common/board_f.c | 162 ++++----------------- common/board_r.c | 4 +- drivers/ddr/fsl/main.c | 4 +- include/asm-generic/global_data.h | 6 + include/common.h | 26 +++- {arch/x86/include/asm => include}/init_helpers.h | 7 +- include/relocate.h | 39 +++++ 217 files changed, 976 insertions(+), 581 deletions(-) delete mode 100644 arch/arc/include/asm/init_helpers.h delete mode 100644 arch/arc/include/asm/relocate.h create mode 100644 arch/powerpc/lib/setup.c delete mode 100644 arch/x86/include/asm/relocate.h delete mode 100644 arch/xtensa/include/asm/relocate.h rename {arch/x86/include/asm => include}/init_helpers.h (56%) create mode 100644 include/relocate.h