]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
global: Move remaining CONFIG_SYS_SDRAM_* to CFG_SYS_SDRAM_*
authorTom Rini <trini@konsulko.com>
Wed, 16 Nov 2022 18:10:37 +0000 (13:10 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 5 Dec 2022 21:06:07 +0000 (16:06 -0500)
The rest of the unmigrated CONFIG symbols in the CONFIG_SYS_SDRAM
namespace do not easily transition to Kconfig. In many cases they likely
should come from the device tree instead. Move these out of CONFIG
namespace and in to CFG namespace.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
589 files changed:
README
arch/arc/lib/cache.c
arch/arc/lib/cpu.c
arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
arch/arm/cpu/armv8/fsl-layerscape/cpu.c
arch/arm/dts/rockchip-optee.dtsi
arch/arm/include/asm/emif.h
arch/arm/include/asm/iproc-common/configs.h
arch/arm/mach-aspeed/ast2500/board_common.c
arch/arm/mach-aspeed/ast2600/board_common.c
arch/arm/mach-at91/arm920t/lowlevel_init.S
arch/arm/mach-at91/arm926ejs/lowlevel_init.S
arch/arm/mach-davinci/misc.c
arch/arm/mach-exynos/dmc_init_ddr3.c
arch/arm/mach-imx/imx8m/soc.c
arch/arm/mach-imx/imx8ulp/soc.c
arch/arm/mach-imx/mx6/litesom.c
arch/arm/mach-imx/mx6/opos6ul.c
arch/arm/mach-imx/spl.c
arch/arm/mach-k3/common.c
arch/arm/mach-k3/r5_mpu.c
arch/arm/mach-keystone/ddr3.c
arch/arm/mach-mediatek/mt7623/init.c
arch/arm/mach-mediatek/mt7981/init.c
arch/arm/mach-mediatek/mt7986/init.c
arch/arm/mach-mvebu/alleycat5/cpu.c
arch/arm/mach-mvebu/arm64-common.c
arch/arm/mach-mvebu/armada8k/dram.c
arch/arm/mach-omap2/am33xx/board.c
arch/arm/mach-omap2/emif-common.c
arch/arm/mach-omap2/sec-common.c
arch/arm/mach-owl/soc.c
arch/arm/mach-rockchip/sdram.c
arch/arm/mach-socfpga/board.c
arch/arm/mach-sunxi/dram_helpers.c
arch/arm/mach-sunxi/dram_suniv.c
arch/arm/mach-sunxi/dram_sunxi_dw.c
arch/arm/mach-tegra/board2.c
arch/arm/mach-zynq/cpu.c
arch/m68k/cpu/mcf532x/speed.c
arch/m68k/include/asm/immap.h
arch/m68k/lib/traps.c
arch/mips/lib/traps.c
arch/mips/mach-jz47xx/jz4780/jz4780.c
arch/mips/mach-mscc/cpu.c
arch/mips/mach-mscc/dram.c
arch/mips/mach-mscc/include/mach/ddr.h
arch/mips/mach-mtmips/mt7621/spl/start.S
arch/mips/mach-octeon/dram.c
arch/nios2/cpu/cpu.c
arch/powerpc/cpu/mpc83xx/spd_sdram.c
arch/powerpc/cpu/mpc85xx/cpu.c
arch/powerpc/cpu/mpc85xx/mp.c
arch/powerpc/cpu/mpc8xxx/pamu_table.c
arch/powerpc/lib/bootm.c
arch/sandbox/cpu/state.c
arch/sandbox/dts/sandbox.dts
arch/sandbox/dts/sandbox64.dts
arch/sh/cpu/u-boot.lds
arch/sh/lib/board.c
arch/sh/lib/bootm.c
arch/xtensa/cpu/cpu.c
board/BuR/brppt1/board.c
board/BuS/eb_cpu5282/eb_cpu5282.c
board/CZ.NIC/turris_mox/turris_mox.c
board/Marvell/mvebu_alleycat-5/board.c
board/Marvell/mvebu_armada-37xx/board.c
board/Marvell/mvebu_armada-8k/board.c
board/Marvell/octeontx/board.c
board/Marvell/octeontx2/board.c
board/Marvell/octeontx2_cn913x/board.c
board/armltd/integrator/integrator.c
board/armltd/vexpress/vexpress_common.c
board/astro/mcf5373l/mcf5373l.c
board/atmel/at91sam9260ek/at91sam9260ek.c
board/atmel/at91sam9261ek/at91sam9261ek.c
board/atmel/at91sam9263ek/at91sam9263ek.c
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
board/atmel/at91sam9n12ek/at91sam9n12ek.c
board/atmel/at91sam9rlek/at91sam9rlek.c
board/atmel/at91sam9x5ek/at91sam9x5ek.c
board/atmel/sam9x60ek/sam9x60ek.c
board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
board/atmel/sama5d2_icp/sama5d2_icp.c
board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
board/atmel/sama5d3_xplained/sama5d3_xplained.c
board/atmel/sama5d3xek/sama5d3xek.c
board/atmel/sama5d4_xplained/sama5d4_xplained.c
board/atmel/sama5d4ek/sama5d4ek.c
board/atmel/sama7g5ek/sama7g5ek.c
board/bluewater/gurnard/gurnard.c
board/bosch/guardian/board.c
board/bosch/shc/board.c
board/broadcom/bcm_ep/board.c
board/calao/usb_a9263/usb_a9263.c
board/cobra5272/cobra5272.c
board/compulab/cm_t43/cm_t43.c
board/compulab/cm_t43/spl.c
board/cssi/MCR3000/MCR3000.c
board/ea/ea-lpc3250devkitv2/ea-lpc3250devkitv2.c
board/eets/pdu001/board.c
board/egnite/ethernut5/ethernut5.c
board/emulation/qemu-arm/qemu-arm.c
board/esd/meesc/meesc.c
board/freescale/common/arm_sleep.c
board/freescale/common/mpc85xx_sleep.c
board/freescale/ls1012afrdm/ls1012afrdm.c
board/freescale/ls1012aqds/ls1012aqds.c
board/freescale/ls1012ardb/ls1012ardb.c
board/freescale/ls1021aqds/ddr.c
board/freescale/ls1021atsn/ls1021atsn.c
board/freescale/ls1021atwr/ls1021atwr.c
board/freescale/m5208evbe/m5208evbe.c
board/freescale/m5235evb/m5235evb.c
board/freescale/m5249evb/m5249evb.c
board/freescale/m5253demo/m5253demo.c
board/freescale/m5272c3/m5272c3.c
board/freescale/m5275evb/m5275evb.c
board/freescale/m5282evb/m5282evb.c
board/freescale/m53017evb/README
board/freescale/m53017evb/m53017evb.c
board/freescale/m5329evb/m5329evb.c
board/freescale/m5373evb/README
board/freescale/m5373evb/m5373evb.c
board/freescale/mpc837xerdb/mpc837xerdb.c
board/freescale/mx51evk/mx51evk.c
board/freescale/p1_p2_rdb_pc/ddr.c
board/friendlyarm/nanopi2/board.c
board/gardena/smart-gateway-at91sam/board.c
board/gdsys/mpc8308/sdram.c
board/grinn/chiliboard/board.c
board/imgtec/boston/ddr.c
board/imgtec/malta/lowlevel_init.S
board/imgtec/malta/malta.c
board/imgtec/xilfpga/xilfpga.c
board/inversepath/usbarmory/usbarmory.c
board/isee/igep003x/board.c
board/keymile/common/common.c
board/keymile/km83xx/km83xx.c
board/keymile/pg-wcom-ls102xa/ddr.c
board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
board/l+g/vinco/vinco.c
board/mediatek/mt7622/mt7622_rfb.c
board/mediatek/mt7623/mt7623_rfb.c
board/mediatek/mt7629/mt7629_rfb.c
board/mediatek/mt8518/mt8518_ap1.c
board/mscc/jr2/jr2.c
board/mscc/luton/luton.c
board/mscc/ocelot/ocelot.c
board/mscc/serval/serval.c
board/mscc/servalt/servalt.c
board/phytec/phycore_am335x_r2/board.c
board/phytium/pomelo/pomelo.c
board/renesas/alt/alt.c
board/renesas/blanche/blanche.c
board/renesas/gose/gose.c
board/renesas/grpeach/grpeach.c
board/renesas/koelsch/koelsch.c
board/renesas/lager/lager.c
board/renesas/porter/porter.c
board/renesas/silk/silk.c
board/renesas/stout/stout.c
board/ronetix/pm9g45/pm9g45.c
board/samsung/arndale/arndale.c
board/samsung/common/board.c
board/sandbox/sandbox.c
board/siemens/common/board.c
board/siemens/corvus/board.c
board/siemens/iot2050/board.c
board/siemens/smartweb/smartweb.c
board/siemens/taurus/taurus.c
board/sipeed/maix/maix.c
board/socrates/sdram.c
board/softing/vining_fpga/socfpga.c
board/solidrun/mx6cuboxi/mx6cuboxi.c
board/sysam/amcore/amcore.c
board/sysam/stmark2/stmark2.c
board/tbs/tbs2910/tbs2910.c
board/tcl/sl50/board.c
board/ti/am335x/board.c
board/ti/am43xx/board.c
board/ti/am57xx/board.c
board/ti/am65x/evm.c
board/ti/dra7xx/evm.c
board/ti/j721e/evm.c
board/ti/j721s2/evm.c
board/ti/ks2_evm/board.c
board/ti/ti816x/evm.c
board/timll/devkit3250/devkit3250.c
board/toradex/apalis_imx6/apalis_imx6.c
board/toradex/colibri_imx6/colibri_imx6.c
board/vscom/baltos/board.c
board/work-microwave/work_92105/work_92105.c
board/xilinx/zynq/board.c
board/xilinx/zynqmp/zynqmp.c
boot/image-board.c
cmd/ti/ddr3.c
common/board_f.c
doc/arch/m68k.rst
doc/arch/nios2.rst
drivers/ddr/fsl/arm_ddr_gen3.c
drivers/ddr/fsl/fsl_ddr_gen4.c
drivers/ddr/fsl/main.c
drivers/ddr/fsl/mpc85xx_ddr_gen3.c
drivers/ddr/marvell/axp/ddr3_axp.h
drivers/pci/Kconfig
drivers/pci/pci-rcar-gen2.c
drivers/pci/pci_sh7751.c
drivers/pci/pcie_dw_mvebu.c
drivers/pci/pcie_layerscape.h
drivers/ram/aspeed/sdram_ast2500.c
drivers/ram/aspeed/sdram_ast2600.c
drivers/ram/mediatek/ddr3-mt7629.c
drivers/ram/octeon/octeon_ddr.c
drivers/ram/rockchip/dmc-rk3368.c
drivers/ram/rockchip/sdram_common.c
drivers/ram/rockchip/sdram_px30.c
drivers/ram/rockchip/sdram_rk3066.c
drivers/ram/rockchip/sdram_rk3128.c
drivers/ram/rockchip/sdram_rk3188.c
drivers/ram/rockchip/sdram_rk322x.c
drivers/ram/rockchip/sdram_rk3288.c
drivers/ram/rockchip/sdram_rk3308.c
drivers/ram/rockchip/sdram_rk3328.c
drivers/ram/rockchip/sdram_rk3399.c
drivers/ram/rockchip/sdram_rk3568.c
drivers/usb/host/ehci-rmobile.c
drivers/video/sunxi/sunxi_display.c
include/configs/10m50_devboard.h
include/configs/3c120_devboard.h
include/configs/M5208EVBE.h
include/configs/M5235EVB.h
include/configs/M5249EVB.h
include/configs/M5253DEMO.h
include/configs/M5272C3.h
include/configs/M5275EVB.h
include/configs/M5282EVB.h
include/configs/M53017EVB.h
include/configs/M5329EVB.h
include/configs/M5373EVB.h
include/configs/MCR3000.h
include/configs/MPC837XERDB.h
include/configs/MPC8548CDS.h
include/configs/P1010RDB.h
include/configs/P2041RDB.h
include/configs/SBx81LIFKW.h
include/configs/SBx81LIFXCAT.h
include/configs/T102xRDB.h
include/configs/T104xRDB.h
include/configs/T208xQDS.h
include/configs/T208xRDB.h
include/configs/T4240RDB.h
include/configs/am62x_evm.h
include/configs/am64x_evm.h
include/configs/am65x_evm.h
include/configs/amcore.h
include/configs/ap121.h
include/configs/ap143.h
include/configs/ap152.h
include/configs/apalis-imx8.h
include/configs/apalis_imx6.h
include/configs/arbel.h
include/configs/aristainetos2.h
include/configs/aspeed-common.h
include/configs/astro_mcf5373l.h
include/configs/at91sam9260ek.h
include/configs/at91sam9261ek.h
include/configs/at91sam9263ek.h
include/configs/at91sam9m10g45ek.h
include/configs/at91sam9n12ek.h
include/configs/at91sam9rlek.h
include/configs/at91sam9x5ek.h
include/configs/ax25-ae350.h
include/configs/axs10x.h
include/configs/bcm947622.h
include/configs/bcm94908.h
include/configs/bcm94912.h
include/configs/bcm963138.h
include/configs/bcm963146.h
include/configs/bcm963148.h
include/configs/bcm963158.h
include/configs/bcm963178.h
include/configs/bcm96756.h
include/configs/bcm96813.h
include/configs/bcm96846.h
include/configs/bcm96855.h
include/configs/bcm96856.h
include/configs/bcm96858.h
include/configs/bcm96878.h
include/configs/bcm_ns3.h
include/configs/bcmstb.h
include/configs/bitmain_antminer_s9.h
include/configs/bk4r1.h
include/configs/bmips_bcm3380.h
include/configs/bmips_bcm6318.h
include/configs/bmips_bcm63268.h
include/configs/bmips_bcm6328.h
include/configs/bmips_bcm6338.h
include/configs/bmips_bcm6348.h
include/configs/bmips_bcm6358.h
include/configs/bmips_bcm6362.h
include/configs/bmips_bcm6368.h
include/configs/bmips_bcm6838.h
include/configs/boston.h
include/configs/brppt2.h
include/configs/bur_am335x_common.h
include/configs/capricorn-common.h
include/configs/cgtqmx8.h
include/configs/ci20.h
include/configs/cl-som-imx7.h
include/configs/cm_fx6.h
include/configs/cobra5272.h
include/configs/colibri-imx6ull.h
include/configs/colibri-imx8x.h
include/configs/colibri_imx6.h
include/configs/colibri_imx7.h
include/configs/colibri_vf.h
include/configs/corstone1000.h
include/configs/corvus.h
include/configs/da850evm.h
include/configs/dart_6ul.h
include/configs/devkit3250.h
include/configs/dh_imx6.h
include/configs/display5.h
include/configs/dragonboard410c.h
include/configs/dragonboard820c.h
include/configs/durian.h
include/configs/ea-lpc3250devkitv2.h
include/configs/eb_cpu5282.h
include/configs/el6x_common.h
include/configs/embestmx6boards.h
include/configs/emsdp.h
include/configs/espresso7420.h
include/configs/ethernut5.h
include/configs/exynos5-common.h
include/configs/exynos5250-common.h
include/configs/exynos7420-common.h
include/configs/exynos78x0-common.h
include/configs/gardena-smart-gateway-at91sam.h
include/configs/gardena-smart-gateway-mt7688.h
include/configs/gazerbeam.h
include/configs/ge_b1x5v2.h
include/configs/ge_bx50v3.h
include/configs/grpeach.h
include/configs/gw_ventana.h
include/configs/gxp.h
include/configs/highbank.h
include/configs/hikey.h
include/configs/hikey960.h
include/configs/hsdk-4xd.h
include/configs/hsdk.h
include/configs/imgtec_xilfpga.h
include/configs/imx27lite-common.h
include/configs/imx6-engicam.h
include/configs/imx6_logic.h
include/configs/imx6dl-mamoj.h
include/configs/imx6q-bosch-acc.h
include/configs/imx6ulz_smm_m2.h
include/configs/imx7-cm.h
include/configs/imx8mm-cl-iot-gate.h
include/configs/imx8mm_beacon.h
include/configs/imx8mm_data_modul_edm_sbc.h
include/configs/imx8mm_evk.h
include/configs/imx8mm_icore_mx8mm.h
include/configs/imx8mm_venice.h
include/configs/imx8mn_beacon.h
include/configs/imx8mn_bsh_smm_s2_common.h
include/configs/imx8mn_evk.h
include/configs/imx8mn_var_som.h
include/configs/imx8mn_venice.h
include/configs/imx8mp_dhcom_pdk2.h
include/configs/imx8mp_evk.h
include/configs/imx8mp_icore_mx8mp.h
include/configs/imx8mp_rsb3720.h
include/configs/imx8mp_venice.h
include/configs/imx8mq_cm.h
include/configs/imx8mq_evk.h
include/configs/imx8mq_phanbell.h
include/configs/imx8qm_mek.h
include/configs/imx8qm_rom7720.h
include/configs/imx8qxp_mek.h
include/configs/imx8ulp_evk.h
include/configs/imx93_evk.h
include/configs/integrator-common.h
include/configs/iot_devkit.h
include/configs/j721e_evm.h
include/configs/j721s2_evm.h
include/configs/km/km-mpc83xx.h
include/configs/km/pg-wcom-ls102xa.h
include/configs/kmcent2.h
include/configs/kontron-sl-mx6ul.h
include/configs/kontron-sl-mx8mm.h
include/configs/kontron_pitx_imx8m.h
include/configs/kontron_sl28.h
include/configs/kp_imx53.h
include/configs/kp_imx6q_tpc.h
include/configs/legoev3.h
include/configs/librem5.h
include/configs/linkit-smart-7688.h
include/configs/liteboard.h
include/configs/ls1012a2g5rdb.h
include/configs/ls1012a_common.h
include/configs/ls1012afrdm.h
include/configs/ls1012aqds.h
include/configs/ls1012ardb.h
include/configs/ls1021aiot.h
include/configs/ls1021aqds.h
include/configs/ls1021atsn.h
include/configs/ls1021atwr.h
include/configs/ls1028a_common.h
include/configs/ls1043a_common.h
include/configs/ls1046a_common.h
include/configs/ls1088a_common.h
include/configs/ls2080a_common.h
include/configs/lx2160a_common.h
include/configs/m53menlo.h
include/configs/malta.h
include/configs/maxbcm.h
include/configs/mccmon6.h
include/configs/meerkat96.h
include/configs/meesc.h
include/configs/meson64.h
include/configs/microchip_mpfs_icicle.h
include/configs/msc_sm2s_imx8mp.h
include/configs/mt7620.h
include/configs/mt7621.h
include/configs/mt7622.h
include/configs/mt7623.h
include/configs/mt7628.h
include/configs/mt7629.h
include/configs/mt7981.h
include/configs/mt7986.h
include/configs/mt8518.h
include/configs/mv-common.h
include/configs/mvebu_alleycat-5.h
include/configs/mvebu_armada-37xx.h
include/configs/mvebu_armada-8k.h
include/configs/mx23_olinuxino.h
include/configs/mx23evk.h
include/configs/mx28evk.h
include/configs/mx51evk.h
include/configs/mx53cx9020.h
include/configs/mx53loco.h
include/configs/mx53ppd.h
include/configs/mx6cuboxi.h
include/configs/mx6memcal.h
include/configs/mx6sabre_common.h
include/configs/mx6slevk.h
include/configs/mx6sllevk.h
include/configs/mx6sxsabreauto.h
include/configs/mx6sxsabresd.h
include/configs/mx6ul_14x14_evk.h
include/configs/mx6ullevk.h
include/configs/mx7dsabresd.h
include/configs/mx7ulp_com.h
include/configs/mx7ulp_evk.h
include/configs/mys_6ulx.h
include/configs/nitrogen6x.h
include/configs/nokia_rx51.h
include/configs/novena.h
include/configs/npi_imx6ull.h
include/configs/nsim.h
include/configs/o4-imx6ull-nano.h
include/configs/octeon_common.h
include/configs/octeontx2_common.h
include/configs/octeontx_common.h
include/configs/odroid.h
include/configs/odroid_xu3.h
include/configs/omapl138_lcdk.h
include/configs/openpiton-riscv64.h
include/configs/opos6uldev.h
include/configs/origen.h
include/configs/owl-common.h
include/configs/p1_p2_rdb_pc.h
include/configs/pcl063.h
include/configs/pcl063_ull.h
include/configs/pcm052.h
include/configs/pcm058.h
include/configs/peach-pi.h
include/configs/peach-pit.h
include/configs/phycore_imx8mm.h
include/configs/phycore_imx8mp.h
include/configs/pic32mzdask.h
include/configs/pico-imx6.h
include/configs/pico-imx6ul.h
include/configs/pico-imx7d.h
include/configs/pico-imx8mq.h
include/configs/pm9261.h
include/configs/pm9263.h
include/configs/pm9g45.h
include/configs/poleg.h
include/configs/pomelo.h
include/configs/presidio_asic.h
include/configs/px30_common.h
include/configs/qemu-arm.h
include/configs/qemu-ppce500.h
include/configs/qemu-riscv.h
include/configs/r2dplus.h
include/configs/rcar-gen2-common.h
include/configs/rcar-gen3-common.h
include/configs/rk3036_common.h
include/configs/rk3066_common.h
include/configs/rk3128_common.h
include/configs/rk3188_common.h
include/configs/rk322x_common.h
include/configs/rk3288_common.h
include/configs/rk3308_common.h
include/configs/rk3328_common.h
include/configs/rk3368_common.h
include/configs/rk3399_common.h
include/configs/rk3568_common.h
include/configs/rpi.h
include/configs/rv1108_common.h
include/configs/s5p4418_nanopi2.h
include/configs/s5p_goni.h
include/configs/s5pc210_universal.h
include/configs/sam9x60_curiosity.h
include/configs/sam9x60ek.h
include/configs/sama5d27_wlsom1_ek.h
include/configs/sama5d2_icp.h
include/configs/sama5d2_ptc_ek.h
include/configs/sama5d3_xplained.h
include/configs/sama5d3xek.h
include/configs/sama5d4_xplained.h
include/configs/sama5d4ek.h
include/configs/sama7g5ek.h
include/configs/sandbox.h
include/configs/siemens-am33x-common.h
include/configs/sifive-unleashed.h
include/configs/sifive-unmatched.h
include/configs/sipeed-maix.h
include/configs/smartweb.h
include/configs/smdk5420.h
include/configs/smdkc100.h
include/configs/smdkv310.h
include/configs/smegw01.h
include/configs/snapper9g45.h
include/configs/sniper.h
include/configs/socfpga_common.h
include/configs/socfpga_soc64_common.h
include/configs/socrates.h
include/configs/somlabs_visionsom_6ull.h
include/configs/stih410-b2260.h
include/configs/stm32mp13_common.h
include/configs/stm32mp15_common.h
include/configs/stmark2.h
include/configs/stv0991.h
include/configs/sunxi-common.h
include/configs/synquacer.h
include/configs/taurus.h
include/configs/tb100.h
include/configs/tbs2910.h
include/configs/tegra-common.h
include/configs/theadorable.h
include/configs/thunderx_88xx.h
include/configs/ti814x_evm.h
include/configs/ti816x_evm.h
include/configs/ti_armv7_common.h
include/configs/total_compute.h
include/configs/tplink_wdr4300.h
include/configs/tqma6.h
include/configs/trats.h
include/configs/trats2.h
include/configs/turris_mox.h
include/configs/udoo.h
include/configs/udoo_neo.h
include/configs/usb_a9263.h
include/configs/usbarmory.h
include/configs/vcoreiii.h
include/configs/verdin-imx8mm.h
include/configs/verdin-imx8mp.h
include/configs/vexpress_aemv8.h
include/configs/vexpress_common.h
include/configs/vf610twr.h
include/configs/vinco.h
include/configs/vining_2000.h
include/configs/vocore2.h
include/configs/wandboard.h
include/configs/warp7.h
include/configs/work_92105.h
include/configs/xea.h
include/configs/xenguest_arm64.h
include/configs/xilinx_zynqmp_mini_nand.h
include/configs/xpress.h
include/configs/xtfpga.h
include/init.h
include/system-constants.h
post/drivers/memory.c
test/dm/remoteproc.c

diff --git a/README b/README
index 5ab042a2defb83842d5e3db972bdf1c545d9b155..b095937121b7b42e4d7cef799397824fbb1b1de9 100644 (file)
--- a/README
+++ b/README
@@ -1441,7 +1441,7 @@ Configuration Settings:
                the RAM base is not zero, or RAM is divided into banks,
                this variable needs to be recalcuated to get the address.
 
-- CONFIG_SYS_SDRAM_BASE:
+- CFG_SYS_SDRAM_BASE:
                Physical start address of SDRAM. _Must_ be 0 here.
 
 - CONFIG_SYS_FLASH_BASE:
index 4c696cb53a48732857df40954140bdeb05f37d94..d97a5787424ef5d7e2c63fbccba7fd67ba03651c 100644 (file)
@@ -476,9 +476,9 @@ static void __slc_rgn_op(unsigned long paddr, unsigned long sz, const int op)
 static void arc_ioc_setup(void)
 {
        /* IOC Aperture start is equal to DDR start */
-       unsigned int ap_base = CONFIG_SYS_SDRAM_BASE;
+       unsigned int ap_base = CFG_SYS_SDRAM_BASE;
        /* IOC Aperture size is equal to DDR size */
-       long ap_size = CONFIG_SYS_SDRAM_SIZE;
+       long ap_size = CFG_SYS_SDRAM_SIZE;
 
        /* Unsupported configuration. See [ NOTE 2 ] for more details. */
        if (!slc_exists())
index 6b215206a2728d4821d7e82b520b8f4f64e201fa..156785796183c428e8d51556b5867972133a8ed6 100644 (file)
@@ -20,7 +20,7 @@ int arch_cpu_init(void)
        timer_init();
 
        gd->cpu_clk = get_board_sys_clk();
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
 
        cache_init();
 
index b4d113dc1e08f74bd3e3e567868b6f8c4cd2981c..954fa5f8b45068b198ea89163486a65b87b85778 100644 (file)
@@ -29,7 +29,7 @@
  */
 static void __secure ls1_save_ddr_head(void)
 {
-       const char *src = (const char *)CONFIG_SYS_SDRAM_BASE;
+       const char *src = (const char *)CFG_SYS_SDRAM_BASE;
        char *dest = (char *)(OCRAM_BASE_S_ADDR + OCRAM_S_SIZE - DDR_RESV_LEN);
        struct ccsr_scfg __iomem *scfg = (void *)CFG_SYS_FSL_SCFG_ADDR;
        int i;
index ef71e2cf2bca5b6d8dd157ec8a248156eb0c79ce..bbaa91f0e108d9f6904aaf42931c76784167a32b 100644 (file)
@@ -1441,7 +1441,7 @@ int dram_init_banksize(void)
        }
 #endif
 
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        if (gd->ram_size > CONFIG_SYS_DDR_BLOCK1_SIZE) {
                gd->bd->bi_dram[0].size = CONFIG_SYS_DDR_BLOCK1_SIZE;
                gd->bd->bi_dram[1].start = CONFIG_SYS_DDR_BLOCK2_BASE;
@@ -1571,7 +1571,7 @@ void update_early_mmu_table(void)
 
        if (gd->ram_size <= CONFIG_SYS_FSL_DRAM_SIZE1) {
                mmu_change_region_attr(
-                                       CONFIG_SYS_SDRAM_BASE,
+                                       CFG_SYS_SDRAM_BASE,
                                        gd->ram_size,
                                        PTE_BLOCK_MEMTYPE(MT_NORMAL)    |
                                        PTE_BLOCK_OUTER_SHARE           |
@@ -1579,7 +1579,7 @@ void update_early_mmu_table(void)
                                        PTE_TYPE_VALID);
        } else {
                mmu_change_region_attr(
-                                       CONFIG_SYS_SDRAM_BASE,
+                                       CFG_SYS_SDRAM_BASE,
                                        CONFIG_SYS_DDR_BLOCK1_SIZE,
                                        PTE_BLOCK_MEMTYPE(MT_NORMAL)    |
                                        PTE_BLOCK_OUTER_SHARE           |
index 328ba908450416e5743bc1dc71427b01c8404db7..d84c10cf4363f5e6cfc46dad7cb558530af88c90 100644 (file)
@@ -32,8 +32,8 @@
                                        arch = "arm";
                                        os = "tee";
                                        compression = "none";
-                                       load = <(CONFIG_SYS_SDRAM_BASE + 0x8400000)>;
-                                       entry = <(CONFIG_SYS_SDRAM_BASE + 0x8400000)>;
+                                       load = <(CFG_SYS_SDRAM_BASE + 0x8400000)>;
+                                       entry = <(CFG_SYS_SDRAM_BASE + 0x8400000)>;
 
                                        blob-ext {
                                                filename = "tee.bin";
index 35424345bf02b0953dce03c6b55bed3d3931d081..2141a4581c7c34e2fae8a3fd7ef13601fc76fe71 100644 (file)
        (DMM_SDRC_MAP_EMIF1_AND_EMIF2 << EMIF_SDRC_MAP_SHIFT) |\
        (DMM_SDRC_ADDR_SPC_SDRAM << EMIF_SDRC_ADDRSPC_SHIFT) |\
        (DMM_SDRC_INTL_128B << EMIF_SDRC_INTL_SHIFT) |\
-       (CONFIG_SYS_SDRAM_BASE << EMIF_SYS_ADDR_SHIFT))
+       (CFG_SYS_SDRAM_BASE << EMIF_SYS_ADDR_SHIFT))
 
 #define DMM_LISA_MAP_EMIF1_ONLY_BASE_VAL       (\
        (DMM_SDRC_MAP_EMIF1_ONLY << EMIF_SDRC_MAP_SHIFT)|\
index 4733c0793c36bba719537f602d59535c175a852f..c63c27dac7e1fced3a8ddb775dc54a36956fc623 100644 (file)
@@ -12,6 +12,6 @@
 #define CONFIG_IPROC
 
 /* Memory Info */
-#define CONFIG_SYS_SDRAM_BASE          0x61000000
+#define CFG_SYS_SDRAM_BASE             0x61000000
 
 #endif /* __IPROC_COMMON_CONFIGS_H */
index aca20022312900c6418b9dbe218c5055ba960917..bae10271844add321ed488950d51ecba93449fae 100644 (file)
@@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index 82ff21908f269d3d3d143531fcbb0fe9f336baa4..dc6cdc35d15ca2b538914d74881cc8d4618e0ed1 100644 (file)
@@ -54,7 +54,7 @@ int board_init(void)
        int i = 0, rc;
        struct udevice *dev;
 
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        while (1) {
                rc = uclass_get_device(UCLASS_MISC, i++, &dev);
index 57e51c81059b6a01ef1605404d141bc639b0a0d7..3b91a0cba33ea1caad0d9c31102f31c2979ec030 100644 (file)
@@ -114,38 +114,38 @@ SMRDATA1:
        .word CONFIG_SYS_SDRC_CR_VAL
        .word AT91_ASM_MC_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
        .word AT91_ASM_MC_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL1
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
        .word AT91_ASM_MC_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL2
-       .word CONFIG_SYS_SDRAM1
-       .word CONFIG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM1
+       .word CFG_SYS_SDRAM_VAL
        .word AT91_ASM_MC_SDRAMC_TR
        .word CONFIG_SYS_SDRC_TR_VAL
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
        .word AT91_ASM_MC_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL3
-       .word CONFIG_SYS_SDRAM
-       .word CONFIG_SYS_SDRAM_VAL
+       .word CFG_SYS_SDRAM
+       .word CFG_SYS_SDRAM_VAL
 SMRDATA1E:
        /* SMRDATA1 is 176 bytes long */
 #endif /* CONFIG_IS_ENABLED(SKIP_LOWLEVEL_INIT) */
index c51eee2f17e831229e7e63b831887478c601fd57..ecfe589e45593ce99de426d5569ef9c692b36835 100644 (file)
@@ -201,38 +201,38 @@ SMRDATA1:
        .word CONFIG_SYS_SDRC_MDR_VAL
        .word AT91_ASM_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL2
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL1
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL1
        .word AT91_ASM_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL3
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL2
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL3
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL4
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL5
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL6
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL7
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL8
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL9
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL2
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL3
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL4
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL5
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL6
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL7
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL8
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL9
        .word AT91_ASM_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL4
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL10
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL10
        .word AT91_ASM_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL5
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL11
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL11
        .word AT91_ASM_SDRAMC_TR
        .word CONFIG_SYS_SDRC_TR_VAL2
-       .word CONFIG_SYS_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL12
+       .word CFG_SYS_SDRAM_BASE
+       .word CFG_SYS_SDRAM_VAL12
        /* User reset enable*/
        .word AT91_ASM_RSTC_MR
        .word CONFIG_SYS_RSTC_RMR_VAL
index 73fdd1f243292246da66064766fa8bc2a75ce5d9..42078b39f8ab7ab7f000d010f30dba5f6849a67f 100644 (file)
@@ -26,14 +26,14 @@ int dram_init(void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */
        gd->ram_size = get_ram_size(
-                       (void *)CONFIG_SYS_SDRAM_BASE,
+                       (void *)CFG_SYS_SDRAM_BASE,
                        CONFIG_MAX_RAM_BANK_SIZE);
        return 0;
 }
 
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = gd->ram_size;
 
        return 0;
index fa867f27f30ebf9d8c50cc74189b60764dc038e6..cad8ccc5315f79f30f7f19774a780c4a6dc20561 100644 (file)
@@ -236,7 +236,7 @@ int ddr3_mem_ctrl_init(struct mem_timings *mem, int reset)
  * better have similar timings, since there's only a single adjustment that is
  * shared by both chips).
  */
-const unsigned int test_addr = CONFIG_SYS_SDRAM_BASE;
+const unsigned int test_addr = CFG_SYS_SDRAM_BASE;
 
 /* Test pattern with which RAM will be tested */
 static const unsigned int test_pattern[] = {
index a4863281e3601645c1bd8e69e01f9fedda53818c..8050406613d7db73389ca3d291ed4b4013632c93 100644 (file)
@@ -178,7 +178,7 @@ static unsigned int imx8m_find_dram_entry_in_mem_map(void)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(imx8m_mem_map); i++)
-               if (imx8m_mem_map[i].phys == CONFIG_SYS_SDRAM_BASE)
+               if (imx8m_mem_map[i].phys == CFG_SYS_SDRAM_BASE)
                        return i;
 
        hang(); /* Entry not found, this must never happen. */
index 802cb0e2ba834eece392b4662a455630615d1061..5d95fb89a61c7af11a85a4c7f371d4697eee5623 100644 (file)
@@ -373,7 +373,7 @@ static unsigned int imx8ulp_find_dram_entry_in_mem_map(void)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(imx8ulp_arm64_mem_map); i++)
-               if (imx8ulp_arm64_mem_map[i].phys == CONFIG_SYS_SDRAM_BASE)
+               if (imx8ulp_arm64_mem_map[i].phys == CFG_SYS_SDRAM_BASE)
                        return i;
 
        hang(); /* Entry not found, this must never happen. */
index 699a3dc317f04bc49eba6e50c3d939671b98006c..2ba3245e226ca20c0105a7f814f4266e46d4c2d0 100644 (file)
@@ -172,7 +172,7 @@ static void spl_dram_init(void)
         * Get actual RAM size, so we can adjust DDR row size for <512M
         * memories
         */
-       ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, SZ_512M);
+       ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, SZ_512M);
        if (ram_size < SZ_512M) {
                mem_ddr.rowaddr = 14;
                mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
index e9d78740a1579384d316a239fad48621cc201c79..38ead8ace20ce5f4dc8065c3a46e21ffc75aa8df 100644 (file)
@@ -44,7 +44,7 @@ static int setup_fec(void)
 int board_init(void)
 {
        /* Address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_FEC_MXC
        setup_fec();
index 6b8f4115c4ea4a474e606a1d6d0062d1703bb179..cb9801b7a13ca48e0ca59844b7a629ce3ce731cf 100644 (file)
@@ -349,7 +349,7 @@ void *board_spl_fit_buffer_addr(ulong fit_size, int sectors, int bl_len)
 #if defined(CONFIG_MX6) && defined(CONFIG_SPL_OS_BOOT)
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = imx_ddr_size();
 
        return 0;
index 227706e8dca0f657ed500447edb37f74827b71a4..d5e1f8e2e780e1ae785e7d3347da5294fb025234 100644 (file)
@@ -561,7 +561,7 @@ void remove_fwl_configs(struct fwl_data *fwl_data, size_t fwl_data_size)
 void spl_enable_dcache(void)
 {
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
-       phys_addr_t ram_top = CONFIG_SYS_SDRAM_BASE;
+       phys_addr_t ram_top = CFG_SYS_SDRAM_BASE;
 
        dram_init();
 
index 3d2ff6775a3f44b86ee00070122ce836262f42bc..2aec96277e6f276416042133ae985251348bef95 100644 (file)
@@ -24,7 +24,7 @@ struct mpu_region_config k3_mpu_regions[16] = {
         O_I_WB_RD_WR_ALLOC, REGION_8MB},
 
        /* U-Boot's code area marking it as WB and Write allocate */
-       {CONFIG_SYS_SDRAM_BASE, REGION_2, XN_DIS, PRIV_RW_USR_RW,
+       {CFG_SYS_SDRAM_BASE, REGION_2, XN_DIS, PRIV_RW_USR_RW,
         O_I_WB_RD_WR_ALLOC, REGION_2GB},
        /* mcu_r5fss0_core0 BTCM area marking it as WB and Write allocate. */
        {0x41010000, 3, XN_DIS, PRIV_RW_USR_RW, O_I_WB_RD_WR_ALLOC,
index 53117c2695cfc161bf694cd7302f8fcb257b3e78..ea7d0b903cf6ae4d91d759e9831c454c5de402eb 100644 (file)
@@ -318,7 +318,7 @@ void ddr3_init_ecc(u32 base, u32 ddr3_size)
        }
 
        ddr3_ecc_init_range(base);
-       ddr3_reset_data(CONFIG_SYS_SDRAM_BASE, ddr3_size);
+       ddr3_reset_data(CFG_SYS_SDRAM_BASE, ddr3_size);
 
        /* mapping DDR3 ECC system interrupt from CIC2 to GIC */
 #if defined(CONFIG_SOC_K2HK) || defined(CONFIG_SOC_K2L)
index 5d837e059719c18a3e7dda669d0fc68b1be192b0..988b057e5984fe1deeb46187169ae606459debb5 100644 (file)
@@ -25,7 +25,7 @@ int dram_init(void)
 {
        u32 i;
 
-       if (((size_t)preloader_param >= CONFIG_SYS_SDRAM_BASE) &&
+       if (((size_t)preloader_param >= CFG_SYS_SDRAM_BASE) &&
            ((size_t)preloader_param % sizeof(size_t) == 0) &&
            preloader_param->magic == BOOT_ARGUMENT_MAGIC &&
            preloader_param->dram_rank_num <=
@@ -35,7 +35,7 @@ int dram_init(void)
                for (i = 0; i < preloader_param->dram_rank_num; i++)
                        gd->ram_size += preloader_param->dram_rank_size[i];
        } else {
-               gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+               gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
                                            SZ_2G);
        }
 
index a8955064e03150af0dc8381fb03caeed67d03bdb..d8b10f035808b29ef8500a365dae0786e7175568 100644 (file)
@@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, SZ_2G);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, SZ_2G);
 
        return 0;
 }
index cf89e63e80ad0c55763e3c6ec2b1ccd4d27a32d8..fb74b2f34d7b43abc3327421caa014d366857a42 100644 (file)
@@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, SZ_2G);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, SZ_2G);
 
        return 0;
 }
index cc7f9794c547320bf7d37270b9fed86674867dd4..8204d962751574869a0c9bc10a919b7fdd7063f0 100644 (file)
@@ -21,8 +21,8 @@ DECLARE_GLOBAL_DATA_PTR;
 static struct mm_region ac5_mem_map[] = {
        {
                /* RAM */
-               .phys = CONFIG_SYS_SDRAM_BASE,
-               .virt = CONFIG_SYS_SDRAM_BASE,
+               .phys = CFG_SYS_SDRAM_BASE,
+               .virt = CFG_SYS_SDRAM_BASE,
                .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
                         PTE_BLOCK_INNER_SHARE
        },
@@ -102,7 +102,7 @@ int alleycat5_dram_init_banksize(void)
        /*
         * Config single DRAM bank
         */
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = gd->ram_size;
 
        return 0;
index e3098a7ca878527786bb1ef82a2a6c6db7422b2f..2c94f899f3739790bdf5d22081a0a6a44c11691d 100644 (file)
@@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 {
-       unsigned long top = CONFIG_SYS_SDRAM_BASE + min(gd->ram_size, USABLE_RAM_SIZE);
+       unsigned long top = CFG_SYS_SDRAM_BASE + min(gd->ram_size, USABLE_RAM_SIZE);
 
        return (gd->ram_top > top) ? top : gd->ram_top;
 }
index bab375e18acc9b32e185dfd127f333f1a5b1f2b6..6c801bfa1db73131e26ddf97b838f5f3dc891f56 100644 (file)
@@ -38,7 +38,7 @@ int a8k_dram_init_banksize(void)
         */
        phys_size_t max_bank0_size = SZ_4G - SZ_1G;
 
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        if (gd->ram_size <= max_bank0_size) {
                gd->bd->bi_dram[0].size = gd->ram_size;
                return 0;
index 44d5214a3df1e96651a603dae87f14eb4a9c3b8a..86755d6d954389d679780107c2e29774bfcba321 100644 (file)
@@ -72,14 +72,14 @@ int dram_init(void)
 
        /* dram_init must store complete ramsize in gd->ram_size */
        gd->ram_size = get_ram_size(
-                       (void *)CONFIG_SYS_SDRAM_BASE,
+                       (void *)CFG_SYS_SDRAM_BASE,
                        CONFIG_MAX_RAM_BANK_SIZE);
        return 0;
 }
 
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = gd->ram_size;
 
        return 0;
@@ -520,7 +520,7 @@ void board_init_f(ulong dummy)
        sdram_init();
        /* dram_init must store complete ramsize in gd->ram_size */
        gd->ram_size = get_ram_size(
-                       (void *)CONFIG_SYS_SDRAM_BASE,
+                       (void *)CFG_SYS_SDRAM_BASE,
                        CONFIG_MAX_RAM_BANK_SIZE);
 }
 #endif
index 312f868fbc71efd1ec098dda9160c4a40e380071..a6a97af37d7b7ff5ac4f2e174f800597e686b05f 100644 (file)
@@ -389,7 +389,7 @@ static void dra7_enable_ecc(u32 base, const struct emif_regs *regs)
                /* Set region1 memory with 0 */
                rgn_start = (regs->emif_ecc_address_range_1 &
                             EMIF_ECC_REG_ECC_START_ADDR_MASK) << 16;
-               rgn = rgn_start + CONFIG_SYS_SDRAM_BASE;
+               rgn = rgn_start + CFG_SYS_SDRAM_BASE;
                size = (regs->emif_ecc_address_range_1 &
                        EMIF_ECC_REG_ECC_END_ADDR_MASK) + 0x10000 - rgn_start;
 
@@ -400,7 +400,7 @@ static void dra7_enable_ecc(u32 base, const struct emif_regs *regs)
                /* Set region2 memory with 0 */
                rgn_start = (regs->emif_ecc_address_range_2 &
                             EMIF_ECC_REG_ECC_START_ADDR_MASK) << 16;
-               rgn = rgn_start + CONFIG_SYS_SDRAM_BASE;
+               rgn = rgn_start + CFG_SYS_SDRAM_BASE;
                size = (regs->emif_ecc_address_range_2 &
                        EMIF_ECC_REG_ECC_END_ADDR_MASK) + 0x10000 - rgn_start;
 
@@ -1340,7 +1340,7 @@ void dmm_init(u32 base)
 
        mapped_size = 0;
        section_cnt = 3;
-       sys_addr = CONFIG_SYS_SDRAM_BASE;
+       sys_addr = CFG_SYS_SDRAM_BASE;
        emif1_size = get_emif_mem_size(EMIF1_BASE);
        emif2_size = get_emif_mem_size(EMIF2_BASE);
        debug("emif1_size 0x%x emif2_size 0x%x\n", emif1_size, emif2_size);
@@ -1568,7 +1568,7 @@ void sdram_init(void)
                size_prog = log_2_n_round_down(size_prog);
                size_prog = (1 << size_prog);
 
-               size_detect = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+               size_detect = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
                                                size_prog);
                /* Compare with the size programmed */
                if (size_detect != size_prog) {
index 0551bc125e8fc2ba2604c3e0a311b8a23ad26f10..0f9b915ea3dd03917be89d4dd3c66a88eea9ef19 100644 (file)
@@ -198,11 +198,11 @@ u32 get_sec_mem_start(void)
         */
        if (sec_mem_start == 0)
                sec_mem_start =
-                       (CONFIG_SYS_SDRAM_BASE + (
+                       (CFG_SYS_SDRAM_BASE + (
 #if defined(CONFIG_OMAP54XX)
                        omap_sdram_size()
 #else
-                       get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+                       get_ram_size((void *)CFG_SYS_SDRAM_BASE,
                                     CONFIG_MAX_RAM_BANK_SIZE)
 #endif
                        - sec_mem_size));
index 4baef2eed3e4f432f4ba371484852dc68e393d8b..f0f46f2dcb74e134e64df514c1b71945cd43adf1 100644 (file)
@@ -50,7 +50,7 @@ int dram_init(void)
 /* This is called after dram_init() so use get_ram_size result */
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = gd->ram_size;
 
        return 0;
index 12f1d7ee5637662c8fabb4d1aa3e68913c4b11a5..e086c47f3c0010acae5e67a1756e5bfaae60134e 100644 (file)
@@ -37,7 +37,7 @@ struct tos_parameter_t {
 
 int dram_init_banksize(void)
 {
-       size_t top = min((unsigned long)(gd->ram_size + CONFIG_SYS_SDRAM_BASE),
+       size_t top = min((unsigned long)(gd->ram_size + CFG_SYS_SDRAM_BASE),
                         (unsigned long)(gd->ram_top));
 
 #ifdef CONFIG_ARM64
@@ -48,26 +48,26 @@ int dram_init_banksize(void)
 #ifdef CONFIG_SPL_OPTEE_IMAGE
        struct tos_parameter_t *tos_parameter;
 
-       tos_parameter = (struct tos_parameter_t *)(CONFIG_SYS_SDRAM_BASE +
+       tos_parameter = (struct tos_parameter_t *)(CFG_SYS_SDRAM_BASE +
                        TRUST_PARAMETER_OFFSET);
 
        if (tos_parameter->tee_mem.flags == 1) {
-               gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+               gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
                gd->bd->bi_dram[0].size = tos_parameter->tee_mem.phy_addr
-                                       - CONFIG_SYS_SDRAM_BASE;
+                                       - CFG_SYS_SDRAM_BASE;
                gd->bd->bi_dram[1].start = tos_parameter->tee_mem.phy_addr +
                                        tos_parameter->tee_mem.size;
                gd->bd->bi_dram[1].size = top - gd->bd->bi_dram[1].start;
        } else {
-               gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+               gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
                gd->bd->bi_dram[0].size = 0x8400000;
                /* Reserve 32M for OPTEE with TA */
-               gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE
+               gd->bd->bi_dram[1].start = CFG_SYS_SDRAM_BASE
                                        + gd->bd->bi_dram[0].size + 0x2000000;
                gd->bd->bi_dram[1].size = top - gd->bd->bi_dram[1].start;
        }
 #else
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = top - gd->bd->bi_dram[0].start;
 #endif
 #endif
@@ -207,7 +207,7 @@ int dram_init(void)
 
 phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 {
-       unsigned long top = CONFIG_SYS_SDRAM_BASE + SDRAM_MAX_SIZE;
+       unsigned long top = CFG_SYS_SDRAM_BASE + SDRAM_MAX_SIZE;
 
        return (gd->ram_top > top) ? top : gd->ram_top;
 }
index b49006c6c8a65bff08f789eba56b10596aeeb43f..09e09192fba2b38c0c46d74dabe347704d421311 100644 (file)
@@ -46,7 +46,7 @@ void s_init(void) {
 int board_init(void)
 {
        /* Address of boot parameters for ATAG (if ATAG is used) */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index 2c873192e6088419e7b0ebfa118a24e26a57a27c..cdf2750f1c52d0cdae8b1ecc4241acd663c29595 100644 (file)
@@ -33,11 +33,11 @@ void mctl_await_completion(u32 *reg, u32 mask, u32 val)
 bool mctl_mem_matches(u32 offset)
 {
        /* Try to write different values to RAM at two addresses */
-       writel(0, CONFIG_SYS_SDRAM_BASE);
-       writel(0xaa55aa55, (ulong)CONFIG_SYS_SDRAM_BASE + offset);
+       writel(0, CFG_SYS_SDRAM_BASE);
+       writel(0xaa55aa55, (ulong)CFG_SYS_SDRAM_BASE + offset);
        dsb();
        /* Check if the same value is actually observed when reading back */
-       return readl(CONFIG_SYS_SDRAM_BASE) ==
-              readl((ulong)CONFIG_SYS_SDRAM_BASE + offset);
+       return readl(CFG_SYS_SDRAM_BASE) ==
+              readl((ulong)CFG_SYS_SDRAM_BASE + offset);
 }
 #endif
index 56c2d557ff13de20184be619901ad7a27c408fcc..3aa3ce76272ce977ed2b1b177ba5f54337e9d654 100644 (file)
@@ -175,9 +175,9 @@ static int sdr_readpipe_scan(void)
        u32 k = 0;
 
        for (k = 0; k < 32; k++)
-               writel(k, CONFIG_SYS_SDRAM_BASE + 4 * k);
+               writel(k, CFG_SYS_SDRAM_BASE + 4 * k);
        for (k = 0; k < 32; k++) {
-               if (readl(CONFIG_SYS_SDRAM_BASE + 4 * k) != k)
+               if (readl(CFG_SYS_SDRAM_BASE + 4 * k) != k)
                        return 0;
        }
        return 1;
@@ -266,11 +266,11 @@ static u32 dram_get_dram_size(struct dram_para *para)
        dram_para_setup(para);
        dram_scan_readpipe(para);
        for (i = 0; i < 32; i++) {
-               *((u8 *)(CONFIG_SYS_SDRAM_BASE + 0x200 + i)) = 0x11;
-               *((u8 *)(CONFIG_SYS_SDRAM_BASE + 0x600 + i)) = 0x22;
+               *((u8 *)(CFG_SYS_SDRAM_BASE + 0x200 + i)) = 0x11;
+               *((u8 *)(CFG_SYS_SDRAM_BASE + 0x600 + i)) = 0x22;
        }
        for (i = 0; i < 32; i++) {
-               val1 = *((u8 *)(CONFIG_SYS_SDRAM_BASE + 0x200 + i));
+               val1 = *((u8 *)(CFG_SYS_SDRAM_BASE + 0x200 + i));
                if (val1 == 0x22)
                        count++;
        }
@@ -283,11 +283,11 @@ static u32 dram_get_dram_size(struct dram_para *para)
        para->row_width = rowflag;
        dram_para_setup(para);
        if (colflag == 10) {
-               addr1 = CONFIG_SYS_SDRAM_BASE + 0x400000;
-               addr2 = CONFIG_SYS_SDRAM_BASE + 0xc00000;
+               addr1 = CFG_SYS_SDRAM_BASE + 0x400000;
+               addr2 = CFG_SYS_SDRAM_BASE + 0xc00000;
        } else {
-               addr1 = CONFIG_SYS_SDRAM_BASE + 0x200000;
-               addr2 = CONFIG_SYS_SDRAM_BASE + 0x600000;
+               addr1 = CFG_SYS_SDRAM_BASE + 0x200000;
+               addr2 = CFG_SYS_SDRAM_BASE + 0x600000;
        }
        for (i = 0; i < 32; i++) {
                *((u8 *)(addr1 + i)) = 0x33;
@@ -319,7 +319,7 @@ static u32 dram_get_dram_size(struct dram_para *para)
 
 static void simple_dram_check(void)
 {
-       volatile u32 *dram = (u32 *)CONFIG_SYS_SDRAM_BASE;
+       volatile u32 *dram = (u32 *)CFG_SYS_SDRAM_BASE;
        int i;
 
        for (i = 0; i < 0x40; i++)
index 9107b114df5e90cb5375ddd3b4601181a709aa57..4af5922f334dc1bfe7cd5c509a97416716dce5f6 100644 (file)
@@ -711,7 +711,7 @@ static unsigned long mctl_calc_rank_size(struct rank_para *rank)
  */
 static void mctl_r40_detect_rank_count(struct dram_para *para)
 {
-       ulong rank1_base = (ulong) CONFIG_SYS_SDRAM_BASE +
+       ulong rank1_base = (ulong) CFG_SYS_SDRAM_BASE +
                           mctl_calc_rank_size(&para->ranks[0]);
        struct sunxi_mctl_ctl_reg * const mctl_ctl =
                        (struct sunxi_mctl_ctl_reg *)SUNXI_DRAM_CTL0_BASE;
@@ -744,10 +744,10 @@ static void mctl_r40_detect_rank_count(struct dram_para *para)
 
 static void mctl_auto_detect_dram_size(uint16_t socid, struct dram_para *para)
 {
-       mctl_auto_detect_dram_size_rank(socid, para, (ulong)CONFIG_SYS_SDRAM_BASE, &para->ranks[0]);
+       mctl_auto_detect_dram_size_rank(socid, para, (ulong)CFG_SYS_SDRAM_BASE, &para->ranks[0]);
 
        if ((socid == SOCID_A64 || socid == SOCID_R40) && para->dual_rank) {
-               mctl_auto_detect_dram_size_rank(socid, para, (ulong)CONFIG_SYS_SDRAM_BASE + mctl_calc_rank_size(&para->ranks[0]), &para->ranks[1]);
+               mctl_auto_detect_dram_size_rank(socid, para, (ulong)CFG_SYS_SDRAM_BASE + mctl_calc_rank_size(&para->ranks[0]), &para->ranks[1]);
        }
 }
 
index 82d3d3350284a2e60c772dc2bce6512ade70ba7e..54bbd8a776e9f0dd7d9c52e7e25133afd2ed54c9 100644 (file)
@@ -370,7 +370,7 @@ int dram_init_banksize(void)
 
        /* fall back to default DRAM bank size computation */
 
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = usable_ram_size_below_4g();
 
 #ifdef CONFIG_PCI
@@ -412,5 +412,5 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 
        /* fall back to default usable RAM computation */
 
-       return CONFIG_SYS_SDRAM_BASE + usable_ram_size_below_4g();
+       return CFG_SYS_SDRAM_BASE + usable_ram_size_below_4g();
 }
index ac595ee0a27118b4d85db008be1da825fee10b1e..3b6518c71c90dcd46e31655715f99ee23856dc09 100644 (file)
@@ -54,7 +54,7 @@ int arch_cpu_init(void)
        writel(0x757BDF0D, &devcfg_base->unlock);
        writel(0xFFFFFFFF, &devcfg_base->rom_shadow);
 
-#if (CONFIG_SYS_SDRAM_BASE == 0)
+#if (CFG_SYS_SDRAM_BASE == 0)
        /* remap DDR to zero, FILTERSTART */
        writel(0, &scu_base->filter_start);
 
index e2985792d96f965b15a934bd930dcc6492c0b8a9..dac2229f72e19414800fd21335fe445fbcda3ea0 100644 (file)
@@ -239,7 +239,7 @@ int clock_pll(int fsys, int flags)
         * software workaround for SDRAM opeartion after exiting LIMP
         * mode errata
         */
-       out_be32(sdram_workaround, CONFIG_SYS_SDRAM_BASE);
+       out_be32(sdram_workaround, CFG_SYS_SDRAM_BASE);
 #endif
 
        /* wait for DQS logic to relock */
index f2eb6fcb463b04bcdb1787ce81d81c950ed0ed47..672aa0bb14ea8ab95f8e91440590793428c4ff9a 100644 (file)
 
 #ifdef CONFIG_PCI
 #define CFG_SYS_PCI_BAR0               (0x40000000)
-#define CFG_SYS_PCI_BAR1               (CONFIG_SYS_SDRAM_BASE)
+#define CFG_SYS_PCI_BAR1               (CFG_SYS_SDRAM_BASE)
 #define CFG_SYS_PCI_TBATR0             (CONFIG_SYS_MBAR)
-#define CFG_SYS_PCI_TBATR1             (CONFIG_SYS_SDRAM_BASE)
+#define CFG_SYS_PCI_TBATR1             (CFG_SYS_SDRAM_BASE)
 #endif
 #endif                         /* CONFIG_M547x */
 
index 0c2c1a99655277d94da18eb2abe64a37ae22a7d9..28fe803928ea71713b8db6b793b160b1c55ad3c8 100644 (file)
@@ -62,7 +62,7 @@ static void trap_init(ulong value) {
 
 int arch_initr_trap(void)
 {
-       trap_init(CONFIG_SYS_SDRAM_BASE);
+       trap_init(CFG_SYS_SDRAM_BASE);
 
        return 0;
 }
index 7577fdd25d79b50e66a5639a9ef91317eef8f95b..7a682f256a65cdc4e49673ed2b9d631f9b354cbf 100644 (file)
@@ -135,7 +135,7 @@ void trap_restore(void)
 
 int arch_initr_trap(void)
 {
-       trap_init(CONFIG_SYS_SDRAM_BASE);
+       trap_init(CFG_SYS_SDRAM_BASE);
 
        return 0;
 }
index cff98b0a7707bedf3377992acfea25976739831f..15d1eff2ba7ad0f083aa4f2787e4b799a604d320 100644 (file)
@@ -78,7 +78,7 @@ void board_init_f(ulong dummy)
 
 phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 {
-       return CONFIG_SYS_SDRAM_BASE + (256 * 1024 * 1024);
+       return CFG_SYS_SDRAM_BASE + (256 * 1024 * 1024);
 }
 
 int print_cpuinfo(void)
index 5bc31006aa15f778eb82583d48cdce49fd35f187..d484eb92c419ec951051cd6dbe8fe627114d67fc 100644 (file)
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if CONFIG_SYS_SDRAM_SIZE <= SZ_64M
+#if CFG_SYS_SDRAM_SIZE <= SZ_64M
 #define MSCC_RAM_TLB_SIZE   SZ_64M
 #define MSCC_ATTRIB2   MMU_REGIO_INVAL
-#elif CONFIG_SYS_SDRAM_SIZE <= SZ_128M
+#elif CFG_SYS_SDRAM_SIZE <= SZ_128M
 #define MSCC_RAM_TLB_SIZE   SZ_64M
 #define MSCC_ATTRIB2   MMU_REGIO_RW
-#elif CONFIG_SYS_SDRAM_SIZE <= SZ_256M
+#elif CFG_SYS_SDRAM_SIZE <= SZ_256M
 #define MSCC_RAM_TLB_SIZE   SZ_256M
 #define MSCC_ATTRIB2   MMU_REGIO_INVAL
-#elif CONFIG_SYS_SDRAM_SIZE <= SZ_512M
+#elif CFG_SYS_SDRAM_SIZE <= SZ_512M
 #define MSCC_RAM_TLB_SIZE   SZ_256M
 #define MSCC_ATTRIB2   MMU_REGIO_RW
 #else
index c53a4202e0d9cf3de8f77a8b735e340a09712692..f7fbd33cc4b99af1cce437c2c2006836d7d951ef 100644 (file)
@@ -67,6 +67,6 @@ int print_cpuinfo(void)
 
 int dram_init(void)
 {
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
        return 0;
 }
index d52eabbd2b1fe84294d90895bf7b7b4670ee2734..75fb3ca00d2c43512ba91fe9672dc8155aa659a7 100644 (file)
@@ -13,7 +13,7 @@
 #include <mach/common.h>
 
 #define MIPS_VCOREIII_MEMORY_DDR3
-#define MIPS_VCOREIII_DDR_SIZE CONFIG_SYS_SDRAM_SIZE
+#define MIPS_VCOREIII_DDR_SIZE CFG_SYS_SDRAM_SIZE
 
 #if defined(CONFIG_DDRTYPE_H5TQ1G63BFA)        /* Serval1 Refboard */
 
index 3cad3567e72a5b0c95b2c5fc1c0a1a241d38492e..6b9f253952a16da6e7c54c866601d6bca0865753 100644 (file)
@@ -18,7 +18,7 @@
 #include "dram.h"
 
 #ifndef CONFIG_SYS_INIT_SP_ADDR
-#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_SDRAM_BASE + \
+#define CONFIG_SYS_INIT_SP_ADDR        (CFG_SYS_SDRAM_BASE + \
                                CONFIG_SYS_INIT_SP_OFFSET)
 #endif
 
index 9c5789b1c8eb32994e0f8e616deed55a859375ce..85cb084c13ff3e9d87737b6e01c92ad0dcffac0e 100644 (file)
@@ -81,7 +81,7 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 {
        if (IS_ENABLED(CONFIG_RAM_OCTEON)) {
                /* Map a maximum of 256MiB - return not size but address */
-               return CONFIG_SYS_SDRAM_BASE + min(gd->ram_size,
+               return CFG_SYS_SDRAM_BASE + min(gd->ram_size,
                                                   UBOOT_RAM_SIZE_MAX);
        } else {
                return gd->ram_top;
index 4dd9c10faa5ae5835e5c83c4afc340e567b3add7..85544503a5ee38da46f640c3b4cf25d4d821124b 100644 (file)
@@ -73,7 +73,7 @@ static int nios_cpu_setup(void *ctx, struct event *event)
        if (ret)
                return ret;
 
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
 #ifndef CONFIG_ROM_STUBS
        copy_exception_trampoline();
 #endif
index e12043b260935d4b7b579149135b36581b673a8d..6d1c6b055c6b6bda47d4382b48086e444bd20cce 100644 (file)
@@ -288,7 +288,7 @@ long int spd_sdram()
        /*
         * Set up LAWBAR for all of DDR.
         */
-       ecm->bar = CONFIG_SYS_SDRAM_BASE & 0xfffff000;
+       ecm->bar = CFG_SYS_SDRAM_BASE & 0xfffff000;
        ecm->ar  = (LAWAR_EN | LAWAR_TRGT_IF_DDR | (LAWAR_SIZE & law_size));
        debug("DDR:bar=0x%08x\n", ecm->bar);
        debug("DDR:ar=0x%08x\n", ecm->ar);
index b0363c9c1028ef5c4cf7960c4d56ab88ad707407..6acd31d284791f7a684911608df57d463bdc60a6 100644 (file)
@@ -424,7 +424,7 @@ int dram_init(void)
        defined(CONFIG_ARCH_QEMU_E500)
        gd->ram_size = fsl_ddr_sdram_size();
 #else
-       gd->ram_size = (phys_size_t)CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+       gd->ram_size = (phys_size_t)CFG_SYS_SDRAM_SIZE * 1024 * 1024;
 #endif
 
        return 0;
index f109ecb9ff7603730d8f34b7c945d7e9fc9ee3f9..44f8ed8a19a3a74b395b825f8120e09c9e8a605b 100644 (file)
@@ -195,7 +195,7 @@ u32 determine_mp_bootpg(unsigned int *pagesize)
        /* use last 4K of mapped memory */
        bootpg = ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ?
                CONFIG_MAX_MEM_MAPPED : gd->ram_size) +
-               CONFIG_SYS_SDRAM_BASE - 4096;
+               CFG_SYS_SDRAM_BASE - 4096;
        if (pagesize)
                *pagesize = 4096;
 
index d917e9dfb62f80c8e244db6c601941b9a04c0266..71496ab294d2560dc8b7be8818739826071597a5 100644 (file)
@@ -16,7 +16,7 @@ void construct_pamu_addr_table(struct pamu_addr_tbl *tbl, int *num_entries)
        int j;
 
        tbl->start_addr[i] =
-                       (uint64_t)virt_to_phys((void *)CONFIG_SYS_SDRAM_BASE);
+                       (uint64_t)virt_to_phys((void *)CFG_SYS_SDRAM_BASE);
        tbl->size[i] = (phys_size_t)(min(gd->ram_size, CONFIG_MAX_MEM_MAPPED));
        tbl->end_addr[i] = tbl->start_addr[i] +  tbl->size[i] - 1;
 
index 8ae8d8a3e7d6e43d3598d1ea8ea1558b02ced54c..1df0822e9d734b322eaae2f9d6cb789843e97219 100644 (file)
@@ -126,7 +126,7 @@ void arch_lmb_reserve(struct lmb *lmb)
 
 #ifdef DEBUG
        if (((u64)bootmap_base + bootm_size) >
-           (CONFIG_SYS_SDRAM_BASE + (u64)gd->ram_size))
+           (CFG_SYS_SDRAM_BASE + (u64)gd->ram_size))
                puts("WARNING: bootm_low + bootm_size exceed total memory\n");
        if ((bootmap_base + bootm_size) > get_effective_memsize())
                puts("WARNING: bootm_low + bootm_size exceed eff. memory\n");
index a681e472ab65a1778a9457d9c19326c30a9a1ab0..dd7978cfced3e7c7c77a4ddde842b2f7e9f04e4f 100644 (file)
@@ -448,7 +448,7 @@ int state_init(void)
 {
        state = &main_state;
 
-       state->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       state->ram_size = CFG_SYS_SDRAM_SIZE;
        state->ram_buf = os_malloc(state->ram_size);
        if (!state->ram_buf) {
                printf("Out of memory\n");
index 2051207f0ba93a11a4b6415d8825e8a3375266b8..88b57bfb7e5f99070c47d56e261678bb2bbbc8bb 100644 (file)
@@ -25,7 +25,7 @@
        };
 
        memory {
-               reg = <0 CONFIG_SYS_SDRAM_SIZE>;
+               reg = <0 CFG_SYS_SDRAM_SIZE>;
        };
 
        reserved-memory {
index 3eb045708914ad5975080b24cbb82e76d612c0de..a9cd7908f83eb5fa4ba3960953f13165e6c93bf8 100644 (file)
@@ -21,7 +21,7 @@
        };
 
        memory {
-               reg = /bits/ 64 <0 CONFIG_SYS_SDRAM_SIZE>;
+               reg = /bits/ 64 <0 CFG_SYS_SDRAM_SIZE>;
        };
 
        reserved-memory {
index 85ee547b4aae33d9538fcd29db959d9b4fea0e00..d360eea7eba3fa51c638d88961cb9f84d5a8dcb4 100644 (file)
@@ -18,7 +18,7 @@ OUTPUT_ARCH(sh)
 
 MEMORY
 {
-       ram     : ORIGIN = CONFIG_SYS_SDRAM_BASE, LENGTH = CONFIG_SYS_SDRAM_SIZE
+       ram     : ORIGIN = CFG_SYS_SDRAM_BASE, LENGTH = CFG_SYS_SDRAM_SIZE
 }
 
 ENTRY(_start)
index 3fa093a02ea304dcb903c5c6b442f4be2501e3f0..b31fa6d70311c523075a58d5be1c7bba29858768 100644 (file)
@@ -11,8 +11,8 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
 
        return 0;
 }
index a5fad6c46c7e5fbdb3bbe04f87a841340ac70b79..b205e5e3db1bf3e0099d4a62353f4289a6e433fb 100644 (file)
@@ -88,7 +88,7 @@ int do_bootm_linux(int flag, int argc, char *const argv[],
                set_sh_linux_param((unsigned long)param + ORIG_ROOT_DEV, 0x0200);
                set_sh_linux_param((unsigned long)param + LOADER_TYPE, 0x0001);
                set_sh_linux_param((unsigned long)param + INITRD_START,
-                       GET_INITRD_START(images->rd_start, CONFIG_SYS_SDRAM_BASE));
+                       GET_INITRD_START(images->rd_start, CFG_SYS_SDRAM_BASE));
                set_sh_linux_param((unsigned long)param + INITRD_SIZE,
                        images->rd_end - images->rd_start);
        }
index a09e103fc1d61d54c1100c560bc9d4194670482a..98d9753b7e34be14e9de5d0e792d161b6c409683 100644 (file)
@@ -45,7 +45,7 @@ int print_cpuinfo(void)
 
 int arch_cpu_init(void)
 {
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
        return 0;
 }
 
index c8dc186cddf26309a46ca22710e290049a95690c..36945bbdccf5d1cd88b6309f1d001fd80bfceced 100644 (file)
@@ -150,7 +150,7 @@ int board_init(void)
 #if defined(CONFIG_HW_WATCHDOG)
        hw_watchdog_init();
 #endif
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index 2b08930af6f603857aecfa5b34f7aa900dd3413c..f9a37e7215c960039b30471f483c925d75690cf0 100644 (file)
@@ -40,8 +40,8 @@ int dram_init(void)
        MCFSDRAMC_DCR = MCFSDRAMC_DCR_RTIM_6 |
                        MCFSDRAMC_DCR_RC((15 * CONFIG_SYS_CLK / 1000000) >> 4);
        asm (" nop");
-#ifdef CONFIG_SYS_SDRAM_BASE0
-       MCFSDRAMC_DACR0 = MCFSDRAMC_DACR_BASE(CONFIG_SYS_SDRAM_BASE0)|
+#ifdef CFG_SYS_SDRAM_BASE0
+       MCFSDRAMC_DACR0 = MCFSDRAMC_DACR_BASE(CFG_SYS_SDRAM_BASE0)|
                MCFSDRAMC_DACR_CASL(1) | MCFSDRAMC_DACR_CBM(3) |
                MCFSDRAMC_DACR_PS_32;
        asm (" nop");
@@ -54,7 +54,7 @@ int dram_init(void)
        for (i = 0; i < 10; i++)
                asm (" nop");
 
-       *(unsigned long *)(CONFIG_SYS_SDRAM_BASE0) = 0xA5A5A5A5;
+       *(unsigned long *)(CFG_SYS_SDRAM_BASE0) = 0xA5A5A5A5;
        asm (" nop");
        MCFSDRAMC_DACR0 |= MCFSDRAMC_DACR_RE;
        asm (" nop");
@@ -65,12 +65,12 @@ int dram_init(void)
        MCFSDRAMC_DACR0 |= MCFSDRAMC_DACR_IMRS;
        asm (" nop");
        /* write SDRAM mode register */
-       *(unsigned long *)(CONFIG_SYS_SDRAM_BASE0 + 0x80440) = 0xA5A5A5A5;
+       *(unsigned long *)(CFG_SYS_SDRAM_BASE0 + 0x80440) = 0xA5A5A5A5;
        asm (" nop");
-       size += CONFIG_SYS_SDRAM_SIZE0 * 1024 * 1024;
+       size += CFG_SYS_SDRAM_SIZE0 * 1024 * 1024;
 #endif
-#ifdef CONFIG_SYS_SDRAM_BASE1xx
-       MCFSDRAMC_DACR1 = MCFSDRAMC_DACR_BASE (CONFIG_SYS_SDRAM_BASE1)
+#ifdef CFG_SYS_SDRAM_BASE1xx
+       MCFSDRAMC_DACR1 = MCFSDRAMC_DACR_BASE (CFG_SYS_SDRAM_BASE1)
                        | MCFSDRAMC_DACR_CASL (1)
                        | MCFSDRAMC_DACR_CBM (3)
                        | MCFSDRAMC_DACR_PS_16;
@@ -79,15 +79,15 @@ int dram_init(void)
 
        MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_IP;
 
-       *(unsigned short *) (CONFIG_SYS_SDRAM_BASE1) = 0xA5A5;
+       *(unsigned short *) (CFG_SYS_SDRAM_BASE1) = 0xA5A5;
        MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_RE;
 
        for (i = 0; i < 2000; i++)
                asm (" nop");
 
        MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_IMRS;
-       *(unsigned int *) (CONFIG_SYS_SDRAM_BASE1 + 0x220) = 0xA5A5;
-       size += CONFIG_SYS_SDRAM_SIZE1 * 1024 * 1024;
+       *(unsigned int *) (CFG_SYS_SDRAM_BASE1 + 0x220) = 0xA5A5;
+       size += CFG_SYS_SDRAM_SIZE1 * 1024 * 1024;
 #endif
        gd->ram_size = size;
 
index ff1c4cb1707335f7aaa1490a44138c41dc1ccd8a..a52a032e4d5d1674427e398ddfb1e181e68e1633 100644 (file)
@@ -139,7 +139,7 @@ int board_fix_fdt(void *blob)
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index 619cd6c6cd35db33f2aac33d6797c6cae1ed752a..0c4f8e03b8596e301cd64a6db4d2dc86c54ec92f 100644 (file)
@@ -7,7 +7,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index c6ecc323bb99d9e8e2cc2566036a8808cfe63763..45fe3e5f0bdf800c1225a5fac2bea92c81c8cda6 100644 (file)
@@ -80,7 +80,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index 77c7dd7ab0e88fc45cb62c41af6313a60ed2f78e..a8899af6e5af04331650d42db54f15f7ffc4a313 100644 (file)
@@ -150,7 +150,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index 059ebf8f17273599de7e600cf3ecc9b67129bc0b..224653519b95777c14afac964f57a09f67a3f189 100644 (file)
@@ -63,7 +63,7 @@ int timer_init(void)
 int dram_init(void)
 {
        gd->ram_size = smc_dram_size(0);
-       gd->ram_size -= CONFIG_SYS_SDRAM_BASE;
+       gd->ram_size -= CFG_SYS_SDRAM_BASE;
        mem_map_fill();
 
        return 0;
index 63aa2d6134969fd970ecbb981e911390c7391f19..e7899f49f0c25d31e0edf5e16d9f18046f8119f7 100644 (file)
@@ -105,7 +105,7 @@ int timer_init(void)
 int dram_init(void)
 {
        gd->ram_size = smc_dram_size(0);
-       gd->ram_size -= CONFIG_SYS_SDRAM_BASE;
+       gd->ram_size -= CFG_SYS_SDRAM_BASE;
 
        mem_map_fill();
 
index 953e9db9c8e83e43d5647e9285191d8a3004688f..3d20cfb2fabe756fb1b8e8d84f5e41db41d1bcc8 100644 (file)
@@ -34,7 +34,7 @@ int board_early_init_r(void)
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index 4959a7fd6dcf445544d26642b0f2a323ea3885ba..ad02cf16da5e0d5a430c1582106e55b51224e26f 100644 (file)
@@ -137,7 +137,7 @@ int misc_init_r (void)
 
 int dram_init (void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
 #ifdef CONFIG_CM_SPD_DETECT
        {
 extern void dram_query(void);
@@ -160,12 +160,12 @@ extern void dram_query(void);
         *
         */
        sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4;
-       gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE +
+       gd->ram_size = get_ram_size((long *) CFG_SYS_SDRAM_BASE +
                                    REMAPPED_FLASH_SZ,
                                    0x01000000 << sdram_shift);
        }
 #else
-       gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE +
+       gd->ram_size = get_ram_size((long *) CFG_SYS_SDRAM_BASE +
                                    REMAPPED_FLASH_SZ,
                                    PHYS_SDRAM_1_SIZE);
 #endif /* CM_SPD_DETECT */
index 1c830192653122315c8a61c43db149d7acd9a11d..763131c217e53968ce68a410059297b767cfd460 100644 (file)
@@ -73,7 +73,7 @@ static void flash__init(void)
 int dram_init(void)
 {
        gd->ram_size =
-               get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, PHYS_SDRAM_1_SIZE);
+               get_ram_size((long *)CFG_SYS_SDRAM_BASE, PHYS_SDRAM_1_SIZE);
        return 0;
 }
 
index 3e2f79a1cf4ce5b0817da27c1615fccf2a5758e5..43563c412793f608faeda7a44cca1ef3c26c975d 100644 (file)
@@ -39,12 +39,12 @@ int dram_init(void)
         * GPIO configuration for bus should be set correctly from reset,
         * so we do not care! First, set up address space: at this point,
         * we should be running from internal SRAM;
-        * so use CONFIG_SYS_SDRAM_BASE as the base address for SDRAM,
+        * so use CFG_SYS_SDRAM_BASE as the base address for SDRAM,
         * and do not care where it is
         */
-       __raw_writel((CONFIG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000018,
+       __raw_writel((CFG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000018,
                        &sdp->cs0);
-       __raw_writel((CONFIG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000000,
+       __raw_writel((CFG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000000,
                        &sdp->cs1);
        /*
         * I am not sure from the data sheet, but it seems burst length
@@ -72,7 +72,7 @@ int dram_init(void)
         */
        __raw_writel(0x71462C00, &sdp->ctrl);
        /* Dummy write to start SDRAM */
-       writel(0, CONFIG_SYS_SDRAM_BASE);
+       writel(0, CFG_SYS_SDRAM_BASE);
 #endif
 
        /*
@@ -82,8 +82,8 @@ int dram_init(void)
         * (Do not rely on the SDCS register(s) being set to 0x00000000
         * during reset as stated in the data sheet.)
         */
-       gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
-                               0x80000000 - CONFIG_SYS_SDRAM_BASE);
+       gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
+                               0x80000000 - CFG_SYS_SDRAM_BASE);
 
        return 0;
 }
index d2c6ada66838cfb66efb43279cc3f130b36b127e..b8e02f459031ea7cdeab06941904a130cb6abfb2 100644 (file)
@@ -81,7 +81,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        at91sam9260ek_nand_hw_init();
@@ -92,8 +92,8 @@ int board_init(void)
 int dram_init(void)
 {
        gd->ram_size = get_ram_size(
-               (void *)CONFIG_SYS_SDRAM_BASE,
-               CONFIG_SYS_SDRAM_SIZE);
+               (void *)CFG_SYS_SDRAM_BASE,
+               CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 2992353199feab2673374c0abf9f2eaeaabb5a7f..eab3a130819505a6d6a7eb4a6ad96218aa0806fd 100644 (file)
@@ -156,7 +156,7 @@ int board_init(void)
        gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9261EK;
 #endif
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        at91sam9261ek_nand_hw_init();
@@ -176,8 +176,8 @@ int board_eth_init(struct bd_info *bis)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-               CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+               CFG_SYS_SDRAM_SIZE);
 
        return 0;
 }
index b2b7093080501798575a5970c12d0e9a96bb84bd..15f20b62f6720e2298644faf0c728b0df1eb6504 100644 (file)
@@ -95,7 +95,7 @@ int board_init(void)
        /* arch number of AT91SAM9263EK-Board */
        gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9263EK;
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        at91sam9263ek_nand_hw_init();
@@ -108,8 +108,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-               CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+               CFG_SYS_SDRAM_SIZE);
 
        return 0;
 }
index 2f3a772b81fa721eb7b0f6593a372e9a0df2eae4..f53c1cf612d545385c3f25fa104f811221f848f2 100644 (file)
@@ -168,7 +168,7 @@ int board_init(void)
        gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9M10G45EK;
 
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        at91sam9m10g45ek_nand_hw_init();
@@ -181,8 +181,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *) CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 546851953a11259d1848c36ead751c5d45f082bb..a3e294c88fc8988d4c677c4939932ba1369efe29 100644 (file)
@@ -99,7 +99,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_NAND_ATMEL
        at91sam9n12ek_nand_hw_init();
@@ -114,8 +114,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                       CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                       CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index bca7c8d9af52e58c19e778e96223a4a9badce9e8..11725f778b7dbca3af1b6ac56abdf6c394c663d0 100644 (file)
@@ -93,7 +93,7 @@ int board_init(void)
        /* arch number of AT91SAM9RLEK-Board */
        gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9RLEK;
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        at91sam9rlek_nand_hw_init();
@@ -104,7 +104,7 @@ int board_init(void)
 int dram_init(void)
 {
        gd->ram_size = get_ram_size(
-               (void *)CONFIG_SYS_SDRAM_BASE,
-               CONFIG_SYS_SDRAM_SIZE);
+               (void *)CFG_SYS_SDRAM_BASE,
+               CFG_SYS_SDRAM_SIZE);
        return 0;
 }
index 817aa2fef707e37cbb4f5b743233bcb750716d16..ab666b6be34f18085aa2d51b6616a82bb34cc284 100644 (file)
@@ -115,7 +115,7 @@ int board_init(void)
        gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9X5EK;
 
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        at91sam9x5ek_nand_hw_init();
@@ -129,8 +129,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE,
-                                       CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *) CFG_SYS_SDRAM_BASE,
+                                       CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 786de18f8c64b3ddcdc76d9a952f8e9dbea987ac..a3e35f306663ec4cc60e24c4f59368976ad6b7a8 100644 (file)
@@ -120,7 +120,7 @@ int misc_init_r(void)
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        sam9x60ek_nand_hw_init();
@@ -130,7 +130,7 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
index 6524867708af235904dd35b1b47ae3ae063d9527..6e41017af17ce83d00d55012625641f2eb901fd8 100644 (file)
@@ -65,7 +65,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        rgb_leds_init();
 
@@ -84,8 +84,8 @@ int misc_init_r(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 020777002823a17d281cbf47b7aceabfe3192cf4..fabe492715ab055997b7d2356541c927d337f810 100644 (file)
@@ -54,7 +54,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        rgb_leds_init();
 
@@ -63,8 +63,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 16e9183f541430e3d380beee86174495eb1bfc86..854715ea2269bd2a6ac8ddb5d67d249dde7d5cf0 100644 (file)
@@ -115,7 +115,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        rgb_leds_init();
 
@@ -130,8 +130,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index a778f2694df16efa655cc648ee95ab06930f2c63..ce73a801e50111570ff398cc98da5c8ba153c8d9 100644 (file)
@@ -94,7 +94,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_NAND_ATMEL
        sama5d3_xplained_nand_hw_init();
@@ -110,8 +110,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
 
        return 0;
 }
index 008f1db6b0e22b400e1e2baf6b385dcb362f2f94..660a6b9d58358320b010babddc2c12fa25458844 100644 (file)
@@ -147,7 +147,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_NAND_ATMEL
        sama5d3xek_nand_hw_init();
@@ -166,8 +166,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 4058594e4decb423352879def8ed61300fa41b24..780aba15ab1d4d27b49f4fec6baa403306914b2c 100644 (file)
@@ -121,7 +121,7 @@ int misc_init_r(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_NAND_ATMEL
        sama5d4_xplained_nand_hw_init();
@@ -135,8 +135,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index ef5a8a0d5cc6a1541204d96f139625963219c0b0..2226906a3b3d7b9b9c7d765eaaf46838ba40c320 100644 (file)
@@ -107,7 +107,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_NAND_ATMEL
        sama5d4ek_nand_hw_init();
@@ -121,8 +121,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 7d83e76f9ac0a45ea2a77f2bf2bbe5ceb6b3fa38..295fd079dcf7cee5cb4a128e5e67ce06fe040941 100644 (file)
@@ -67,7 +67,7 @@ int misc_init_r(void)
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        board_leds_init();
 
@@ -76,7 +76,7 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
index 35c74ba9dd2815907079ebd022640ed747904acb..9b42299b080f8c4a31bd0a985935273b385db559 100644 (file)
@@ -307,7 +307,7 @@ int board_init(void)
        gd->bd->bi_arch_number = MACH_TYPE_SNAPPER_9260;
 
        /* Address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        ret = gurnard_nand_hw_init();
@@ -407,8 +407,8 @@ int board_eth_init(struct bd_info *bis)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index bdf8d06add8a43e34e5e14d9cea026e558874f2c..c31e2c86a2d5108bd5c3cdfa6b6634faab7c5390 100644 (file)
@@ -182,7 +182,7 @@ int board_init(void)
        hw_watchdog_init();
 #endif
 
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_MTD_RAW_NAND
        gpmc_init();
index a7a9775fdf4e8d348bcf56d99818d34855ffa9df..e3a9c00e8098be9091e9d902bafcdbfd0951a814 100644 (file)
@@ -449,7 +449,7 @@ int board_init(void)
        if (read_eeprom() < 0)
                puts("EEPROM Content Invalid.\n");
 
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 #if defined(CONFIG_NOR) || defined(CONFIG_MTD_RAW_NAND)
        gpmc_init();
 #endif
index 6064eb43db11805c0b31b56568dafd54cadca5f2..e91fa40e640cedbeb7373b9bc44b65480d418080 100644 (file)
@@ -26,7 +26,7 @@ int board_init(void)
         * Address of boot parameters passed to kernel
         * Use default offset 0x100
         */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
@@ -36,14 +36,14 @@ int board_init(void)
  */
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = gd->ram_size;
 
        return 0;
index c89ad0bfe3d4958096373912d1448d7b17edaa92..3d31776d48419fa35f3802af2fe007c2bce9f1f4 100644 (file)
@@ -95,7 +95,7 @@ static void usb_a9263_macb_hw_init(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        usb_a9263_nand_hw_init();
@@ -111,8 +111,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 3e2418866c737656122e0dec9dbd2fd527f707ba..69a9df942311949cc6712be30ede9712aea7ba77 100644 (file)
@@ -28,7 +28,7 @@ int dram_init(void)
        /* Dummy write to start SDRAM */
        *((volatile unsigned long *) 0) = 0;
 
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
 
        return 0;
 };
index bcfe1bfaf67072711a185bb85b246c878f8a934d..5df378a62e3c293e6d565c67fd33c8d679d36aa1 100644 (file)
@@ -45,7 +45,7 @@ int power_init_board(void)
 
 int board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
        gpmc_init();
        set_i2c_pin_mux();
        i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
index e67bf81ee3a80465fac7513d9ade5eee2608dd86..a6223a477fef689f4dcecfae15f38f5190965102 100644 (file)
@@ -119,7 +119,7 @@ void sdram_init(void)
        unsigned long ram_size;
 
        config_ddr(0, &ioregs_ddr3, NULL, NULL, &ddr3_emif_regs, 0);
-       ram_size = get_ram_size((long int *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+       ram_size = get_ram_size((long int *)CFG_SYS_SDRAM_BASE, 0x80000000);
        if (ram_size == 0x80000000 ||
            ram_size == 0x40000000 ||
            ram_size == 0x20000000)
@@ -127,7 +127,7 @@ void sdram_init(void)
 
        ddr3_emif_regs.sdram_config = 0x638453B2;
        config_ddr(0, &ioregs_ddr3, NULL, NULL, &ddr3_emif_regs, 0);
-       ram_size = get_ram_size((long int *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+       ram_size = get_ram_size((long int *)CFG_SYS_SDRAM_BASE, 0x80000000);
        if (ram_size == 0x08000000)
                return;
 
index c20e8714949388e54447fbced5ef64596bebe2ef..e95e04a30a6bf7624dd14f62f23cc1a83c1e105c 100644 (file)
@@ -114,7 +114,7 @@ int dram_init(void)
        out_be32(&memctl->memc_mcr, 0x80002038);
        udelay(200);
 
-       gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+       gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
                                    SDRAM_MAX_SIZE);
 
        return 0;
index 72cf46c749ff1b5db3c2bb6909922882b975e0ce..2b03e4891d92f0d3d1565e9fc169c0c055014b80 100644 (file)
@@ -29,13 +29,13 @@ board_early_init_f(void)
 int
 board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x2000;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x2000;
        return 0;
 }
 
 int
 dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, SZ_64M);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, SZ_64M);
        return 0;
 }
index 1054837d434d398b9e6054d49f3f385875edb62b..648d77fd21e30c95f91ebfec71378b7e5b8797cc 100644 (file)
@@ -286,7 +286,7 @@ int board_init(void)
        hw_watchdog_init();
 #endif
 
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
        return 0;
 }
 
index a5d79d8e3e1a909866d9fdea2affe31b50af5810..913c2ea16640626e835e375d0959dbf1a004a772 100644 (file)
@@ -85,8 +85,8 @@ DECLARE_GLOBAL_DATA_PTR;
 int dram_init(void)
 {
        gd->ram_size = get_ram_size(
-                       (void *)CONFIG_SYS_SDRAM_BASE,
-                       CONFIG_SYS_SDRAM_SIZE);
+                       (void *)CFG_SYS_SDRAM_BASE,
+                       CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
@@ -135,7 +135,7 @@ int board_init(void)
        at91_periph_clk_enable(ATMEL_ID_PIOC);
 
        /* Set adress of boot parameters. */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
        /* Initialize UARTs and power management. */
        ethernut5_power_init();
 #ifdef CONFIG_CMD_NAND
index 16237e29e4673e1995d37a93aef0e599652cec8a..3df3e41c0b2cacd3fd9692d1f080767c50d5097d 100644 (file)
@@ -126,7 +126,7 @@ void *board_fdt_blob_setup(int *err)
 {
        *err = 0;
        /* QEMU loads a generated DTB for us at the start of RAM. */
-       return (void *)CONFIG_SYS_SDRAM_BASE;
+       return (void *)CFG_SYS_SDRAM_BASE;
 }
 
 void enable_caches(void)
index 98043b020c521923d7f5239513176b8da861cfd5..2304e9e8ec3dcc895454de6118dcff2ab4a9e8b0 100644 (file)
@@ -264,7 +264,7 @@ int board_init(void)
        meesc_ethercat_hw_init();
 
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        meesc_nand_hw_init();
index f5bed6c35bb3fd880122dde33610efe5353d80d0..46ffd817b44b3a7a537d1b9c0f341e3a6a859526 100644 (file)
@@ -61,7 +61,7 @@ static void dp_ddr_restore(void)
 
        /* get the address of ddr date from SPARECR3 */
        src = (u64 *)in_le32(&scfg->sparecr[2]);
-       dst = (u64 *)CONFIG_SYS_SDRAM_BASE;
+       dst = (u64 *)CFG_SYS_SDRAM_BASE;
 
        for (i = 0; i < DDR_BUFF_LEN / 8; i++)
                *dst++ = *src++;
index 71922aab4ef48b5831bca2409574574e52132ab3..d3323b9ec1e5a6328d682f1d044e58cf7b9f4350 100644 (file)
@@ -50,7 +50,7 @@ static void dp_ddr_restore(void)
 
        /* get the address of ddr date from SPARECR3 */
        src = (u64 *)(in_be32(&scfg->sparecr[2]) + DDR_BUFF_LEN - 8);
-       dst = (u64 *)(CONFIG_SYS_SDRAM_BASE + DDR_BUFF_LEN - 8);
+       dst = (u64 *)(CFG_SYS_SDRAM_BASE + DDR_BUFF_LEN - 8);
 
        for (i = 0; i < DDR_BUFF_LEN / 8; i++)
                *dst-- = *src--;
index bc37c553a5b4f0730af30498a4cd5328c3038fd1..f2b8750a3f385a5df9e244b3d422faa775cbfce2 100644 (file)
@@ -102,7 +102,7 @@ int dram_init(void)
                else
                        gd->ram_size = SYS_SDRAM_SIZE_512;
 #else
-               gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+               gd->ram_size = CFG_SYS_SDRAM_SIZE;
 #endif
        }
        return 0;
@@ -139,7 +139,7 @@ int dram_init(void)
                gd->ram_size = SYS_SDRAM_SIZE_512;
        }
 #else
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
 #endif
        mmdc_init(&mparam);
 
index 3f70fbc356599c6ba4176c87c182831adb93c38e..f17a6c186d3bb1a3047f10990a1ee4dc830b5790 100644 (file)
@@ -66,7 +66,7 @@ int dram_init(void)
 {
        gd->ram_size = tfa_get_dram_size();
        if (!gd->ram_size)
-               gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+               gd->ram_size = CFG_SYS_SDRAM_SIZE;
 
        return 0;
 }
@@ -90,7 +90,7 @@ int dram_init(void)
        };
 
        mmdc_init(&mparam);
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
 #if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
        /* This will break-before-make MMU for DDR */
        update_early_mmu_table();
index 456609d99324dc748fa5e97a52f1e66805d2b541..62c935e4d3ececdfd7e3fd74844c01fe22a623e2 100644 (file)
@@ -113,7 +113,7 @@ int dram_init(void)
 {
        gd->ram_size = tfa_get_dram_size();
        if (!gd->ram_size)
-               gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+               gd->ram_size = CFG_SYS_SDRAM_SIZE;
 
        return 0;
 }
@@ -140,7 +140,7 @@ int dram_init(void)
        mmdc_init(&mparam);
 #endif
 
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
 #if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
        /* This will break-before-make MMU for DDR */
        update_early_mmu_table();
index 66fe1519cc6dfccd251f124bc1a4774748e27dc9..4e70acc5a0cc83b0c7c8617f5b69242622e4ce50 100644 (file)
@@ -192,7 +192,7 @@ int fsl_initdram(void)
 
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = gd->ram_size;
 
        return 0;
index 4325439be95cc4257ce16bf89190c4ef27ae4ac7..d144f25c623c0c5f2d2391f08af42cec538d61c5 100644 (file)
@@ -47,7 +47,7 @@ static void ddrmc_init(void)
        if (is_warm_boot()) {
                out_be32(&ddr->sdram_cfg_2,
                         DDR_SDRAM_CFG_2 & ~SDRAM_CFG2_D_INIT);
-               out_be32(&ddr->init_addr, CONFIG_SYS_SDRAM_BASE);
+               out_be32(&ddr->init_addr, CFG_SYS_SDRAM_BASE);
                out_be32(&ddr->init_ext_addr, (1 << 31));
 
                /* DRAM VRef will not be trained */
index 33027ad05750026fce198be0ecd2c4a5f608ffbc..8b74d458237df038d20db54de250b3493faa680e 100644 (file)
@@ -162,7 +162,7 @@ void ddrmc_init(void)
        if (is_warm_boot()) {
                out_be32(&ddr->sdram_cfg_2,
                         DDR_SDRAM_CFG_2 & ~SDRAM_CFG2_D_INIT);
-               out_be32(&ddr->init_addr, CONFIG_SYS_SDRAM_BASE);
+               out_be32(&ddr->init_addr, CFG_SYS_SDRAM_BASE);
                out_be32(&ddr->init_ext_addr, (1 << 31));
 
                /* DRAM VRef will not be trained */
index 7bfb4557dd5be3a14970847761e150db888dc8d3..6125c9e13aa35dd4e157600130321ae40cf2edb3 100644 (file)
@@ -29,7 +29,7 @@ int dram_init(void)
        sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
        u32 dramsize, i;
 
-       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
+       dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
 
        for (i = 0x13; i < 0x20; i++) {
                if (dramsize == (1 << i))
@@ -37,35 +37,35 @@ int dram_init(void)
        }
        i--;
 
-       out_be32(&sdram->cs0, CONFIG_SYS_SDRAM_BASE | i);
-#ifdef CONFIG_SYS_SDRAM_BASE1
-       out_be32(&sdram->cs1, CONFIG_SYS_SDRAM_BASE | i);
+       out_be32(&sdram->cs0, CFG_SYS_SDRAM_BASE | i);
+#ifdef CFG_SYS_SDRAM_BASE1
+       out_be32(&sdram->cs1, CFG_SYS_SDRAM_BASE | i);
 #endif
-       out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
-       out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
+       out_be32(&sdram->cfg1, CFG_SYS_SDRAM_CFG1);
+       out_be32(&sdram->cfg2, CFG_SYS_SDRAM_CFG2);
 
        udelay(500);
 
        /* Issue PALL */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
        asm("nop");
 
        /* Perform two refresh cycles */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
        asm("nop");
 
        /* Issue LEMR */
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE);
        asm("nop");
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_EMOD);
        asm("nop");
 
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
        asm("nop");
 
        out_be32(&sdram->ctrl,
-               (CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000F00);
+               (CFG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000F00);
        asm("nop");
 
        udelay(100);
index e7c7a94036b5b68a68ac98d9f6c57a4c8c0de5dc..44161a0b0a1c441753e3f95850f762d50cd2111b 100644 (file)
@@ -44,7 +44,7 @@ int dram_init(void)
                GPIO_PAR_SDRAM_SRAS | GPIO_PAR_SDRAM_SCKE |
                GPIO_PAR_SDRAM_SDCS(3));
 
-       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
+       dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
        for (i = 0x13; i < 0x20; i++) {
                if (dramsize == (1 << i))
                        break;
@@ -61,7 +61,7 @@ int dram_init(void)
 
                /* Initialize DACR0 */
                out_be32(&sdram->dacr0,
-                       SDRAMC_DARCn_BA(CONFIG_SYS_SDRAM_BASE) |
+                       SDRAMC_DARCn_BA(CFG_SYS_SDRAM_BASE) |
                        SDRAMC_DARCn_CASL_C1 | SDRAMC_DARCn_CBM_CMD20 |
                        SDRAMC_DARCn_PS_32);
                asm("nop");
@@ -80,7 +80,7 @@ int dram_init(void)
                }
 
                /* Write to this block to initiate precharge */
-               *(u32 *) (CONFIG_SYS_SDRAM_BASE) = 0xA5A59696;
+               *(u32 *) (CFG_SYS_SDRAM_BASE) = 0xA5A59696;
 
                /*  Set RE (bit 15) in DACR */
                setbits_be32(&sdram->dacr0, SDRAMC_DARCn_RE);
@@ -95,7 +95,7 @@ int dram_init(void)
                asm("nop");
 
                /* Write to the SDRAM Mode Register */
-               *(u32 *) (CONFIG_SYS_SDRAM_BASE + 0x400) = 0xA5A59696;
+               *(u32 *) (CFG_SYS_SDRAM_BASE + 0x400) = 0xA5A59696;
        }
 
        gd->ram_size = dramsize;
index 48c00791114dd5c7c7b709d6200eb31d0e3c8be6..efff0551409603233046567531107d157cb03a3f 100644 (file)
@@ -86,7 +86,7 @@ int dram_init(void)
        mbar_writeLong(MCFSIM_DACR0, 0x0000b364);  /* Enable DACR0[IMRS] (bit 6); RE remains enabled */
        *((volatile unsigned long *) 0x800) = junk; /* Access RAM to initialize the mode register */
 
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
 
        return 0;
 };
index 85f5f0c034094a89988e32698c526bd15750f7de..179a2a242a8d3df486bd376d2d9f91119a865312 100644 (file)
@@ -47,7 +47,7 @@ int dram_init(void)
                __asm__("nop");
 
                /* Initialize DMR0 */
-               dramsize = (CONFIG_SYS_SDRAM_SIZE << 20);
+               dramsize = (CFG_SYS_SDRAM_SIZE << 20);
                temp = (dramsize - 1) & 0xFFFC0000;
                mbar_writeLong(MCFSIM_DMR0, temp | 1);
                __asm__("nop");
@@ -57,7 +57,7 @@ int dram_init(void)
                __asm__("nop");
 
                /* Write to this block to initiate precharge */
-               *(u32 *) (CONFIG_SYS_SDRAM_BASE) = 0xa5a5a5a5;
+               *(u32 *) (CFG_SYS_SDRAM_BASE) = 0xa5a5a5a5;
                mb();
                __asm__("nop");
 
@@ -74,7 +74,7 @@ int dram_init(void)
                               mbar_readLong(MCFSIM_DACR0) | 0x0040);
                __asm__("nop");
 
-               *(u32 *) (CONFIG_SYS_SDRAM_BASE + 0x800) = 0xa5a5a5a5;
+               *(u32 *) (CFG_SYS_SDRAM_BASE + 0x800) = 0xa5a5a5a5;
                mb();
        }
 
index 9580cf2a03902aab1819f2fc35114c7483580996..3c20a23385c5dcf6395e9179544419479bc35406 100644 (file)
@@ -30,7 +30,7 @@ int dram_init(void)
        /* Dummy write to start SDRAM */
        *((volatile unsigned long *)0) = 0;
 
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
 
        return 0;
        };
index 1c4fb7232afb5af4e057cda7b0074dac02e118c3..00fa35ca5f71b8efcd941a94cc45066a2e171638 100644 (file)
@@ -35,7 +35,7 @@ int dram_init(void)
        out_be16(&gpio_reg->par_sdram, 0x3FF);
 
        /* Set up chip select */
-       out_be32(&sdp->sdbar0, CONFIG_SYS_SDRAM_BASE);
+       out_be32(&sdp->sdbar0, CFG_SYS_SDRAM_BASE);
        out_be32(&sdp->sdbmr0, MCF_SDRAMC_SDMRn_BAM_32M | MCF_SDRAMC_SDMRn_V);
 
        /* Set up timing */
@@ -49,34 +49,34 @@ int dram_init(void)
        setbits_be32(&sdp->sdcr, MCF_SDRAMC_SDCR_IPALL);
 
        /* Dummy write to start SDRAM */
-       *((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
+       *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
 
        /* Send LEMR */
        setbits_be32(&sdp->sdmr,
                MCF_SDRAMC_SDMR_BNKAD_LEMR | MCF_SDRAMC_SDMR_AD(0x0) |
                MCF_SDRAMC_SDMR_CMD);
-       *((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
+       *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
 
        /* Send LMR */
        out_be32(&sdp->sdmr, 0x058d0000);
-       *((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
+       *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
 
        /* Stop sending commands */
        clrbits_be32(&sdp->sdmr, MCF_SDRAMC_SDMR_CMD);
 
        /* Set precharge */
        setbits_be32(&sdp->sdcr, MCF_SDRAMC_SDCR_IPALL);
-       *((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
+       *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
 
        /* Stop manual precharge, send 2 IREF */
        clrbits_be32(&sdp->sdcr, MCF_SDRAMC_SDCR_IPALL);
        setbits_be32(&sdp->sdcr, MCF_SDRAMC_SDCR_IREF);
-       *((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
-       *((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
+       *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
+       *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
 
 
        out_be32(&sdp->sdmr, 0x018d0000);
-       *((volatile unsigned long *)CONFIG_SYS_SDRAM_BASE) = 0xa5a59696;
+       *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696;
 
        /* Stop sending commands */
        clrbits_be32(&sdp->sdmr, MCF_SDRAMC_SDMR_CMD);
@@ -91,7 +91,7 @@ int dram_init(void)
                | MCF_SDRAMC_SDCR_RCNT((SDRAM_TREFI/(PERIOD*64)) - 1 + 1)
                | MCF_SDRAMC_SDCR_DQS_OE(0x3));
 
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
 
        return 0;
 };
index e1ea9b3a58f8b1eb888359f07c5e5344b0b086eb..53e0f202101ce0eeaeb290a7ca0af4113a4d2a27 100644 (file)
@@ -21,7 +21,7 @@ int dram_init(void)
 {
        u32 dramsize, i, dramclk;
 
-       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
+       dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
        for (i = 0x13; i < 0x20; i++) {
                if (dramsize == (1 << i))
                        break;
@@ -40,7 +40,7 @@ int dram_init(void)
 
                /* Initialize DACR0 */
                MCFSDRAMC_DACR0 = (0
-                       | MCFSDRAMC_DACR_BASE(CONFIG_SYS_SDRAM_BASE)
+                       | MCFSDRAMC_DACR_BASE(CFG_SYS_SDRAM_BASE)
                        | MCFSDRAMC_DACR_CASL(1)
                        | MCFSDRAMC_DACR_CBM(3)
                        | MCFSDRAMC_DACR_PS_32);
@@ -62,7 +62,7 @@ int dram_init(void)
                }
 
                /* Write to this block to initiate precharge */
-               *(u32 *)(CONFIG_SYS_SDRAM_BASE) = 0xA5A59696;
+               *(u32 *)(CFG_SYS_SDRAM_BASE) = 0xA5A59696;
                asm("nop");
 
                /* Set RE (bit 15) in DACR */
@@ -79,7 +79,7 @@ int dram_init(void)
                asm("nop");
 
                /* Write to the SDRAM Mode Register */
-               *(u32 *)(CONFIG_SYS_SDRAM_BASE + 0x400) = 0xA5A59696;
+               *(u32 *)(CFG_SYS_SDRAM_BASE + 0x400) = 0xA5A59696;
        }
        gd->ram_size = dramsize;
 
index 8a7d8cadf02e14a1c31145f999ca00e5e929ac4f..0de36a7f747bae436dcf40559301b00d76c38734 100644 (file)
@@ -106,7 +106,7 @@ CONFIG_SYS_CSn_BASE         -- defines the Chip Select Base register
 CONFIG_SYS_CSn_MASK            -- defines the Chip Select Mask register
 CONFIG_SYS_CSn_CTRL            -- defines the Chip Select Control register
 
-CONFIG_SYS_SDRAM_BASE          -- defines the DRAM Base
+CFG_SYS_SDRAM_BASE             -- defines the DRAM Base
 
 2. MEMORY MAP UNDER U-BOOT AND LINUX KERNEL
 ===========================================
index c9f89353ce4bccf74e44f72d74024ff4e213037f..76ebc0ab8dcd8b34332d29f7758e7c18155f6153 100644 (file)
@@ -29,7 +29,7 @@ int dram_init(void)
        sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
        u32 dramsize, i;
 
-       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
+       dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
 
        for (i = 0x13; i < 0x20; i++) {
                if (dramsize == (1 << i))
@@ -37,35 +37,35 @@ int dram_init(void)
        }
        i--;
 
-       out_be32(&sdram->cs0, CONFIG_SYS_SDRAM_BASE | i);
-#ifdef CONFIG_SYS_SDRAM_BASE1
-       out_be32(&sdram->cs1, CONFIG_SYS_SDRAM_BASE | i);
+       out_be32(&sdram->cs0, CFG_SYS_SDRAM_BASE | i);
+#ifdef CFG_SYS_SDRAM_BASE1
+       out_be32(&sdram->cs1, CFG_SYS_SDRAM_BASE | i);
 #endif
-       out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
-       out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
+       out_be32(&sdram->cfg1, CFG_SYS_SDRAM_CFG1);
+       out_be32(&sdram->cfg2, CFG_SYS_SDRAM_CFG2);
 
        udelay(500);
 
        /* Issue PALL */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
        asm("nop");
 
        /* Perform two refresh cycles */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
        asm("nop");
 
        /* Issue LEMR */
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE);
        asm("nop");
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_EMOD);
        asm("nop");
 
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
        asm("nop");
 
        out_be32(&sdram->ctrl,
-               (CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
+               (CFG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
        asm("nop");
 
        udelay(100);
index 7a75b04dd0d230384d43e30ea06d4ff06b7eb442..b278dbfb4852443308b9bae08bb84039de9a9899 100644 (file)
@@ -29,7 +29,7 @@ int dram_init(void)
        sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
        u32 dramsize, i;
 
-       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
+       dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
 
        for (i = 0x13; i < 0x20; i++) {
                if (dramsize == (1 << i))
@@ -37,30 +37,30 @@ int dram_init(void)
        }
        i--;
 
-       out_be32(&sdram->cs0, CONFIG_SYS_SDRAM_BASE | i);
-       out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
-       out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
+       out_be32(&sdram->cs0, CFG_SYS_SDRAM_BASE | i);
+       out_be32(&sdram->cfg1, CFG_SYS_SDRAM_CFG1);
+       out_be32(&sdram->cfg2, CFG_SYS_SDRAM_CFG2);
 
        /* Issue PALL */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
 
        /* Issue LEMR */
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE | 0x04000000);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_EMOD);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE | 0x04000000);
 
        udelay(500);
 
        /* Issue PALL */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
 
        /* Perform two refresh cycles */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
 
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE);
 
        out_be32(&sdram->ctrl,
-               (CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
+               (CFG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
 
        udelay(100);
 
index bba54202155bff27726aa4176c8f7fd326651265..bfbcd5dc81dbf95160e984b4312d1e4771e76e59 100644 (file)
@@ -105,7 +105,7 @@ CONFIG_SYS_CSn_BASE -- defines the Chip Select Base register
 CONFIG_SYS_CSn_MASK    -- defines the Chip Select Mask register
 CONFIG_SYS_CSn_CTRL    -- defines the Chip Select Control register
 
-CONFIG_SYS_SDRAM_BASE  -- defines the DRAM Base
+CFG_SYS_SDRAM_BASE     -- defines the DRAM Base
 
 2. MEMORY MAP UNDER U-BOOT AND LINUX KERNEL
 ===========================================
index cfa5ca4a477c45a13690c72459a8755c1100a403..0e9eec316c2fc928db886c64114ee571656c8d2a 100644 (file)
@@ -29,7 +29,7 @@ int dram_init(void)
        sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
        u32 dramsize, i;
 
-       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
+       dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
 
        for (i = 0x13; i < 0x20; i++) {
                if (dramsize == (1 << i))
@@ -37,30 +37,30 @@ int dram_init(void)
        }
        i--;
 
-       out_be32(&sdram->cs0, CONFIG_SYS_SDRAM_BASE | i);
-       out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
-       out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
+       out_be32(&sdram->cs0, CFG_SYS_SDRAM_BASE | i);
+       out_be32(&sdram->cfg1, CFG_SYS_SDRAM_CFG1);
+       out_be32(&sdram->cfg2, CFG_SYS_SDRAM_CFG2);
 
        /* Issue PALL */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
 
        /* Issue LEMR */
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE | 0x04000000);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_EMOD);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE | 0x04000000);
 
        udelay(500);
 
        /* Issue PALL */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 2);
 
        /* Perform two refresh cycles */
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
-       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
+       out_be32(&sdram->ctrl, CFG_SYS_SDRAM_CTRL | 4);
 
-       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
+       out_be32(&sdram->mode, CFG_SYS_SDRAM_MODE);
 
        out_be32(&sdram->ctrl,
-               (CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
+               (CFG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
 
        udelay(100);
 
index 2650d300e3843f35f2af25a992d788c16e5d248a..85d43cccd1a09b8167efc318c7d6aa01101faf8a 100644 (file)
@@ -97,10 +97,10 @@ int dram_init(void)
 int fixed_sdram(void)
 {
        immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
-       u32 msize = CONFIG_SYS_SDRAM_SIZE;
+       u32 msize = CFG_SYS_SDRAM_SIZE;
        u32 msize_log2 = __ilog2(msize);
 
-       im->sysconf.ddrlaw[0].bar = CONFIG_SYS_SDRAM_BASE & 0xfffff000;
+       im->sysconf.ddrlaw[0].bar = CFG_SYS_SDRAM_BASE & 0xfffff000;
        im->sysconf.ddrlaw[0].ar = LBLAWAR_EN | (msize_log2 - 1);
 
        im->sysconf.ddrcdr = CONFIG_SYS_DDRCDR_VALUE;
@@ -127,7 +127,7 @@ int fixed_sdram(void)
 
        im->ddr.sdram_cfg |= SDRAM_CFG_MEM_EN;
        udelay(2000);
-       return CONFIG_SYS_SDRAM_SIZE >> 20;
+       return CFG_SYS_SDRAM_SIZE >> 20;
 }
 #endif /*!CONFIG_SYS_SPD_EEPROM */
 
index 46095acedfddb3fa380f2be7fc27afd4c41d7cec..86364acf8ca018aaacb38bc357cffe37aaa52fe9 100644 (file)
@@ -30,7 +30,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int dram_init(void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
                                PHYS_SDRAM_1_SIZE);
        return 0;
 }
index 038e6736acecf724c4a1178d2fee1e2fc6e852ed..f896fd7ccce52f03583848fe8753357746373fd0 100644 (file)
@@ -244,7 +244,7 @@ phys_size_t fixed_sdram(void)
        printf("Configuring DDR for %s MT/s data rate\n",
                        strmhz(buf, sysinfo.freq_ddrbus));
 
-       ddr_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+       ddr_size = CFG_SYS_SDRAM_SIZE * 1024 * 1024;
 
        fsl_ddr_set_memctl_regs(&ddr_cfg_regs, 0, 0);
 
index 70e4dfcfa456068c006bb4e1a041a843c3d6fc27..954197282e6b885ebe12638e390a32bffae6fa42 100644 (file)
@@ -507,7 +507,7 @@ int splash_screen_prepare(void)
 /* u-boot dram initialize */
 int dram_init(void)
 {
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
        return 0;
 }
 
@@ -518,10 +518,10 @@ int dram_init_banksize(void)
        unsigned int reg_val = readl(SCR_USER_SIG6_READ);
 
        /* set global data memory */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x00000100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x00000100;
 
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
-       gd->bd->bi_dram[0].size  = CONFIG_SYS_SDRAM_SIZE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].size  = CFG_SYS_SDRAM_SIZE;
 
        /* Number of Row: 14 bits */
        if ((reg_val >> 28) == 14)
index c6eb11e93263f977370512c39fe9279d42ecfc03..d9dfb256b32a36df78f616c6df4e7d207361d39a 100644 (file)
@@ -45,15 +45,15 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* Address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
 
        return 0;
 }
index 47b880435210da5576baeeeada5c181020e67fd6..4889a6a4f3b960021ba20ec758f1cf499783a549 100644 (file)
@@ -34,11 +34,11 @@ DECLARE_GLOBAL_DATA_PTR;
 static long fixed_sdram(void)
 {
        immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
-       u32 msize = CONFIG_SYS_SDRAM_SIZE;
+       u32 msize = CFG_SYS_SDRAM_SIZE;
        u32 msize_log2 = __ilog2(msize);
 
        out_be32(&im->sysconf.ddrlaw[0].bar,
-                CONFIG_SYS_SDRAM_BASE  & 0xfffff000);
+                CFG_SYS_SDRAM_BASE  & 0xfffff000);
        out_be32(&im->sysconf.ddrlaw[0].ar, LBLAWAR_EN | (msize_log2 - 1));
        out_be32(&im->sysconf.ddrcdr, CONFIG_SYS_DDRCDR_VALUE);
 
@@ -66,7 +66,7 @@ static long fixed_sdram(void)
        setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN);
        sync();
 
-       return get_ram_size(CONFIG_SYS_SDRAM_BASE, msize);
+       return get_ram_size(CFG_SYS_SDRAM_BASE, msize);
 }
 
 int dram_init(void)
index 6423c1efb24bbc36ec27412a8cd36c8d4a61d613..b472ca5b94a6bf8341a87d09dcbf3f6089b12ff1 100644 (file)
@@ -95,7 +95,7 @@ int board_init(void)
        hw_watchdog_init();
 #endif
 
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
        gpmc_init();
 
        return 0;
index 5b245cb447348dea96c59555f8327f4c4cd534dc..8532225dc0dbfd8291f5b33e12ed8e4ecebc98f1 100644 (file)
@@ -27,7 +27,7 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 {
        DECLARE_GLOBAL_DATA_PTR;
 
-       if (gd->ram_top < CONFIG_SYS_SDRAM_BASE) {
+       if (gd->ram_top < CFG_SYS_SDRAM_BASE) {
                /* 2GB wrapped around to 0 */
                return CKSEG0ADDR(256 << 20);
        }
index bed24972f7a85901d8677f51dc3f883ec3af6634..aa910bf1ce1b96fdbe9765d5de60d91241f245a3 100644 (file)
@@ -118,7 +118,7 @@ _msc01:
        /* setup basic address decode */
        PTR_LI  t0, CKSEG1ADDR(MALTA_MSC01_BIU_BASE)
        li      t1, 0x0
-       li      t2, -CONFIG_SYS_SDRAM_SIZE
+       li      t2, -CFG_SYS_SDRAM_SIZE
        sw      t1, MSC01_BIU_MCBAS1L_OFS(t0)
        sw      t2, MSC01_BIU_MCMSK1L_OFS(t0)
        sw      t1, MSC01_BIU_MCBAS2L_OFS(t0)
@@ -168,7 +168,7 @@ _msc01:
        sw      t3, MSC01_PCI_SC2PIOMAPL_OFS(t0)
 
        /* setup PCI_BAR0 memory window */
-       li      t1, -CONFIG_SYS_SDRAM_SIZE
+       li      t1, -CFG_SYS_SDRAM_SIZE
        sw      t1, MSC01_PCI_BAR0_OFS(t0)
 
        /* setup PCI to SysCon/CPU translation */
index 9853a0ba82f6f90515c0150fb2737ba7351fbdab..4a72ab5cecad5ffcaf6d2d98dcee4474de202e5f 100644 (file)
@@ -94,7 +94,7 @@ static enum sys_con malta_sys_con(void)
 
 int dram_init(void)
 {
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
 
        return 0;
 }
index 6a836370e36dd6d57259e3736cd4c518f1a6c7b7..7122692721143faf10bf1608138d36b4298a2b3f 100644 (file)
@@ -19,7 +19,7 @@ int dram_init(void)
 {
        /* MIG IP block is smart and doesn't need SW
         * to do any init */
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;   /* in bytes */
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;      /* in bytes */
 
        return 0;
 }
index 7dbb3a91432434177f6b821aae914e5342ed6ccd..f3a0de3967bba17b15dadb729220f8b65157a55b 100644 (file)
@@ -412,7 +412,7 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, 1 << 30);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, 1 << 30);
        return 0;
 }
 
index 02ae7df04db988e072c6589cc7294f3a9e45c8de..5462a3dea228ab93f1d62597196da78320339447 100644 (file)
@@ -185,7 +185,7 @@ int spl_start_uboot(void)
  */
 int board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        gpmc_init();
 
index c8138dcf30587a0261a9024d880de587de48368c..0252ada93ff527d6d0523c2f85366adc04728baf 100644 (file)
@@ -52,7 +52,7 @@ int set_km_env(void)
        char envval[16];
        char *p;
 
-       pnvramaddr = CONFIG_SYS_SDRAM_BASE + gd->ram_size -
+       pnvramaddr = CFG_SYS_SDRAM_BASE + gd->ram_size -
                CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM - CONFIG_KM_PNVRAM;
        sprintf(envval, "0x%x", pnvramaddr);
        env_set("pnvramaddr", envval);
@@ -65,7 +65,7 @@ int set_km_env(void)
                CONFIG_KM_PNVRAM) / 0x400;
        env_set_ulong("pram", pram);
 
-       varaddr = CONFIG_SYS_SDRAM_BASE + gd->ram_size -
+       varaddr = CFG_SYS_SDRAM_BASE + gd->ram_size -
                CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM;
        env_set_hex("varaddr", varaddr);
        sprintf(envval, "0x%x", varaddr);
index 6a7b848161454080cc144cfc572682a01cf3017d..ddd8f7a13e1a24d2f855de4b8224e1a4a56adcb2 100644 (file)
@@ -142,10 +142,10 @@ static int fixed_sdram(void)
        setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN);
 
        disable_addr_trans();
-       msize = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_SIZE);
+       msize = get_ram_size(CFG_SYS_SDRAM_BASE, CFG_SYS_SDRAM_SIZE);
        enable_addr_trans();
        msize /= (1024 * 1024);
-       if (CONFIG_SYS_SDRAM_SIZE >> 20 != msize) {
+       if (CFG_SYS_SDRAM_SIZE >> 20 != msize) {
                for (ddr_size = msize << 20, ddr_size_log2 = 0;
                        (ddr_size > 1);
                        ddr_size = ddr_size >> 1, ddr_size_log2++)
@@ -169,7 +169,7 @@ int dram_init(void)
                return -ENXIO;
 
        out_be32(&im->sysconf.ddrlaw[0].bar,
-               CONFIG_SYS_SDRAM_BASE & LAWBAR_BAR);
+               CFG_SYS_SDRAM_BASE & LAWBAR_BAR);
        msize = fixed_sdram();
 
 #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
index 4ec60f1685439af82791c74ceff03f933397863d..556d39d4d4e3c0a3eda43948933c523779da5e4d 100644 (file)
@@ -84,7 +84,7 @@ int fsl_initdram(void)
 
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = gd->ram_size;
 
        return 0;
index 3719bcf7317e6b690fcab7155e9655fbab59bcfc..1a7fa3fc1e4891d3281c327b80343a50ea0a4294 100644 (file)
@@ -184,7 +184,7 @@ int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
        /* Define only 1MiB range for mem_regions at the middle of the RAM */
        /* For 1GiB range mem_regions takes approx. 4min */
-       *vstart = CONFIG_SYS_SDRAM_BASE + (gd->ram_size >> 1);
+       *vstart = CFG_SYS_SDRAM_BASE + (gd->ram_size >> 1);
        *size = 1 << 20;
        return 0;
 }
index d47c7b5f1eb1b82e68d59bd5a8b4ceafb689e48a..b3c176dd59a09075cd01c99935e287b257a60cac 100644 (file)
@@ -164,7 +164,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #if !CONFIG_IS_ENABLED(DM_SPI)
        vinco_spi0_hw_init();
@@ -188,8 +188,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 0504d6177fd5053d3ba5115b5364138d3da6d5d2..ff233e920a031b5a5950784d7fa2275ee62a45c7 100644 (file)
@@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
        return 0;
 }
 
index 755e879085c23d89fcaa353fca9ef7ed8f7ca084..ec10f77c51e4847cfdb74a8c8778c79f899f37a5 100644 (file)
@@ -12,7 +12,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index d1bca6d62ef806a136afd8700194868ebef31ab8..55f7696c51075cc8886a4ca9cc955d887fb31b4c 100644 (file)
@@ -11,7 +11,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index fce5de6767cd1494d64176f0c6372ee1cd51e426..2490b15ec78ffd3a1dfaeaf95218a4cf7aa70807 100644 (file)
@@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        debug("gd->fdt_blob is %p\n", gd->fdt_blob);
        return 0;
index 6abf08bd24cc22a53e0a7ad6fd6858771a5b3006..84b95be648d7ed9c93f51b67db98b464e157a819 100644 (file)
@@ -28,7 +28,7 @@ int board_early_init_r(void)
                        ICPU_GENERAL_CTRL_IF_SI_OWNER(2));
 
        /* Address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
 
        return 0;
 }
index 76e3f2ebbce7e2c3129ec5cf62880d1420b92bfe..48170b3aa12d71cec00d93cb59d513c30fb4ee82 100644 (file)
@@ -29,7 +29,7 @@ int board_early_init_r(void)
        writel(0, BASE_CFG + ICPU_SW_MODE);
 
        /* Address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
 
        return 0;
 }
index 2a75ec281cb149210a62118fa406ff8cb01c9d99..f261346b358dff4fd89ce44d466b37523c2f18d4 100644 (file)
@@ -77,7 +77,7 @@ int board_early_init_r(void)
                        ICPU_GENERAL_CTRL_IF_SI_OWNER(2));
 
        /* Address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
 
        return 0;
 }
index 87e79076574fabea572eadbbfd4305ef6b4e4f45..99d5f5be657e519c69d7f0c7b8b5787bc2b04b8f 100644 (file)
@@ -22,7 +22,7 @@ int board_early_init_r(void)
        writel(0, BASE_CFG + ICPU_SW_MODE);
 
        /* Address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
 
        return 0;
 }
index bd8c7e8b70036f47467e16b31873fbab5a9cafba..49993168c237ddd26371ecc9e5292de50bd40df8 100644 (file)
@@ -22,7 +22,7 @@ int board_early_init_r(void)
        writel(0, BASE_CFG + ICPU_SW_MODE);
 
        /* Address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE;
 
        return 0;
 }
index d97ebd015120f60e44521cf0b2df376023a20504..e84dd251c25458a7c7496c13cef6dd725bee8ff1 100644 (file)
@@ -166,7 +166,7 @@ void sdram_init(void)
                   0);
 
        /* Detect memory physically present */
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
                                    CONFIG_MAX_RAM_BANK_SIZE);
 
        /* Reconfigure memory for actual detected size */
@@ -269,7 +269,7 @@ void set_mux_conf_regs(void)
  */
 int board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
        return 0;
 }
 
index 4fbe1e583584d94ab1d972446ce6a1fa444f645f..75d2636bf4533c71309bfbcdf8aff684dd9ef91c 100644 (file)
@@ -24,7 +24,7 @@ int dram_init(void)
        ddr_init();
 
        gd->mem_clk = 0;
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, 0x7b000000);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, 0x7b000000);
 
        sec_init();
        debug("PBF relocate done\n");
index 3b60afc59c36c68096c019b57b80168e6ab8783c..85fbaf0b28b6a4e0c66580bd55ca9f323a7f0cdb 100644 (file)
@@ -70,7 +70,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        /* Force ethernet PHY out of reset */
        gpio_request(ETHERNET_PHY_RESET, "phy_reset");
index a36526986caba7b6b69a9b5ddd639cde2e5fdd3c..ea090575fb20000dd1b5943cd8a465575ed07ee8 100644 (file)
@@ -312,7 +312,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
index 6197e549c2e51b77d0d1399550a9b9769e0728c7..2d1435acff6cdf9a544a4c9de53711aa747f5ac6 100644 (file)
@@ -78,7 +78,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        /* Force ethernet PHY out of reset */
        gpio_request(ETHERNET_PHY_RESET, "phy_reset");
index 199ec4a31098f771830b44932723eb2f13bd834d..f609e4f07289c7f91df204ed6400691fec8ea5fb 100644 (file)
@@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-       gd->bd->bi_boot_params = (CONFIG_SYS_SDRAM_BASE + 0x100);
+       gd->bd->bi_boot_params = (CFG_SYS_SDRAM_BASE + 0x100);
 
        return 0;
 }
index 87607df20d5eee9919a6d276e7be6907f927b9e9..c3ebcd3e39fe3845936989015fd3f3ec44492efe 100644 (file)
@@ -80,7 +80,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        /* Force ethernet PHY out of reset */
        gpio_request(ETHERNET_PHY_RESET, "phy_reset");
index 8e24ac013c05a305c7464183f5716c3ad2c9e675..1437875cfa7b4f5d9bf666bc9eef53cafa18d255 100644 (file)
@@ -89,7 +89,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        /* Force ethernet PHY out of reset */
        gpio_request(ETHERNET_PHY_RESET, "phy_reset");
index 1a3a4c11a17267ef0f28259d774604ded42d3a47..db1fb4b035f000bb6a46dee10b42f3b6d65da469 100644 (file)
@@ -78,7 +78,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        /* Force ethernet PHY out of reset */
        gpio_request(ETHERNET_PHY_RESET, "phy_reset");
index 4558070af8830539de52b516ff955a08fe131dae..6ecebfe814df4bee19c24e427ab2bccdf4a11056 100644 (file)
@@ -71,7 +71,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        /* Force ethernet PHY out of reset */
        gpio_request(ETHERNET_PHY_RESET, "phy_reset");
index 56bdb34329a7f0ec31dfd73502be50bfed6ce73c..f069eccde974b89aa3eb9d2ad9fc957eab7fe8c4 100644 (file)
@@ -88,7 +88,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        cpld_init();
 
index 23b55e3e0302c31b72149df1f1eece722215363c..c56582a19485f19a0153625d1f7d33eff5f7b927 100644 (file)
@@ -126,7 +126,7 @@ int board_init(void)
        /* arch number of AT91SAM9M10G45EK-Board */
        gd->bd->bi_arch_number = MACH_TYPE_PM9G45;
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_CMD_NAND
        pm9g45_nand_hw_init();
@@ -141,15 +141,15 @@ int board_init(void)
 int dram_init(void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
-       gd->bd->bi_dram[0].size = CONFIG_SYS_SDRAM_SIZE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].size = CFG_SYS_SDRAM_SIZE;
 
        return 0;
 }
index 5320c1f2e0adbc0bd9a81acdfb24923111173f1d..a992dc684291338d330c036e765de3af1d644c33 100644 (file)
@@ -46,7 +46,7 @@ int dram_init(void)
        u32 addr;
 
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
-               addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
+               addr = CFG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
                gd->ram_size += get_ram_size((long *)addr, SDRAM_BANK_SIZE);
        }
        return 0;
@@ -64,7 +64,7 @@ int dram_init_banksize(void)
        u32 addr, size;
 
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
-               addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
+               addr = CFG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
                size = get_ram_size((long *)addr, SDRAM_BANK_SIZE);
 
                gd->bd->bi_dram[i].start = addr;
index 943b498293b938ad5dd096901beb861838726034..16ce5cb892534c45bf4578d81ae073e41498e2ed 100644 (file)
@@ -122,7 +122,7 @@ int dram_init(void)
        unsigned long addr;
 
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
-               addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
+               addr = CFG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
                gd->ram_size += get_ram_size((long *)addr, SDRAM_BANK_SIZE);
        }
        return 0;
@@ -134,7 +134,7 @@ int dram_init_banksize(void)
        unsigned long addr, size;
 
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
-               addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
+               addr = CFG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
                size = get_ram_size((long *)addr, SDRAM_BANK_SIZE);
 
                gd->bd->bi_dram[i].start = addr;
index 4c655dfd4956a48d16e86b87b9dc988f767a6238..8b953f9b397ef67f319b296fcd43b8b059692e03 100644 (file)
@@ -115,7 +115,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
 
 int dram_init(void)
 {
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+       gd->ram_size = CFG_SYS_SDRAM_SIZE;
        return 0;
 }
 
@@ -173,7 +173,7 @@ int board_late_init(void)
 int init_addr_map(void)
 {
        if (IS_ENABLED(CONFIG_ADDR_MAP))
-               addrmap_set_entry(0, 0, CONFIG_SYS_SDRAM_SIZE, 0);
+               addrmap_set_entry(0, 0, CFG_SYS_SDRAM_SIZE, 0);
 
        return 0;
 }
index 85025f20efaea34340da380bbe4b1384c015386b..2efede62aa5d00a75d6ee8701d33e8778f78cd43 100644 (file)
@@ -85,7 +85,7 @@ int board_init(void)
 #ifdef CONFIG_MACH_TYPE
        gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
 #endif
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_FACTORYSET
        factoryset_read_eeprom(FACTORYSET_EEPROM_ADDR);
index d87628097d0df425d497c4a43659fcfc74ed890c..569b86db00ace7585fa90e93c707f3f3f11d0dcd 100644 (file)
@@ -262,7 +262,7 @@ void at91_udp_hw_init(void)
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        /* we have to request the gpios again after relocation */
        corvus_request_gpio();
@@ -287,8 +287,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index b965ae9fa497082c9e5c5fcda6aac7733bc32ae9..8f4b0eae49516e1542e6cee79086ffdf468f4b1a 100644 (file)
@@ -146,7 +146,7 @@ int dram_init_banksize(void)
        dram_init();
 
        /* Bank 0 declares the memory available in the DDR low region */
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = gd->ram_size;
 
        /* Bank 1 declares the memory available in the DDR high region */
index ce6c877959adb9181dbe622d7c0f52469e854b52..3d0f7341a37103e208c2718a6dd041519159ddee 100644 (file)
@@ -167,7 +167,7 @@ int board_init(void)
 #endif
 
        /* Adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        smartweb_nand_hw_init();
        smartweb_macb_hw_init();
@@ -177,8 +177,8 @@ int board_init(void)
 int dram_init(void)
 {
        gd->ram_size = get_ram_size(
-               (void *)CONFIG_SYS_SDRAM_BASE,
-               CONFIG_SYS_SDRAM_SIZE);
+               (void *)CFG_SYS_SDRAM_BASE,
+               CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index 47d3f6aef22e41c907c615bdc548f66648ece2fe..1eee972d49e12a65fdb1a213e599b926d8c4879d 100644 (file)
@@ -185,8 +185,8 @@ void mem_init(void)
        sdramc_configure(AT91_SDRAMC_NC_10);
 
        /* Do memtest for 128MB */
-       ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                               CONFIG_SYS_SDRAM_SIZE);
+       ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                               CFG_SYS_SDRAM_SIZE);
 
        /*
         * If 32MB or 16MB should be supported check also for
@@ -306,7 +306,7 @@ struct at91_udc_data board_udc_data  = {
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        taurus_request_gpio();
 #ifdef CONFIG_CMD_NAND
@@ -326,8 +326,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
        return 0;
 }
 
index a218278cb34ef138707ab3d1a9569b8b8e7840b1..79e492f0a8ec4f5dc7e4ca76607516b5d0f952d1 100644 (file)
@@ -11,7 +11,7 @@
 
 phys_size_t get_effective_memsize(void)
 {
-       return CONFIG_SYS_SDRAM_SIZE;
+       return CFG_SYS_SDRAM_SIZE;
 }
 
 static int sram_init(void)
index 04527cf79ab2bce328a510f048446090ebb633d4..ad49999dc28ee5c5f4d3f14ef561caccd204f775 100644 (file)
@@ -51,11 +51,11 @@ phys_size_t fixed_sdram(void)
        asm ("sync; isync; msync");
        udelay(1000);
 
-       if (get_ram_size(0, CONFIG_SYS_SDRAM_SIZE<<20) == CONFIG_SYS_SDRAM_SIZE<<20) {
+       if (get_ram_size(0, CFG_SYS_SDRAM_SIZE<<20) == CFG_SYS_SDRAM_SIZE<<20) {
                /*
                 * OK, size detected -> all done
                 */
-               return CONFIG_SYS_SDRAM_SIZE<<20;
+               return CFG_SYS_SDRAM_SIZE<<20;
        }
 
        return 0;                               /* nothing found !              */
index 229922739118bed71c598fa139372e184ccdc7de..b3f9550742ec44a58ad60409fb1e58060f52e598 100644 (file)
@@ -30,7 +30,7 @@ int board_late_init(void)
        status_led_set(2, CONFIG_LED_STATUS_ON);
 
        /* Address of boot parameters for ATAG (if ATAG is used) */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
        ret = gpio_request(usb_nrst_gpio, "usb_nrst_gpio");
        if (!ret)
index 8e80ca6e17e00b826d3eb3ce3ed6417fe1618c03..7c44379ec4af07ecf538b6175072cb7398c08443 100644 (file)
@@ -107,7 +107,7 @@ int dram_init(void)
 {
        u32 max_size = imx_ddr_size();
 
-       gd->ram_size = get_ram_size_stride_test((u32 *) CONFIG_SYS_SDRAM_BASE,
+       gd->ram_size = get_ram_size_stride_test((u32 *) CFG_SYS_SDRAM_BASE,
                                                (u32)max_size);
 
        return 0;
@@ -288,7 +288,7 @@ int board_init(void)
        int ret = 0;
 
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_VIDEO_IPUV3
        ret = setup_display();
index beab4e9d1884786cf6d93e23900d5703f17e27cb..5426fc4ffd8439509a84000ae0344a31e5f78fd3 100644 (file)
@@ -88,7 +88,7 @@ int dram_init(void)
         */
        out_be32(&dc->dacr0, 0x00003304);
 
-       dramsize = ((CONFIG_SYS_SDRAM_SIZE)-1) & 0xfffc0000;
+       dramsize = ((CFG_SYS_SDRAM_SIZE)-1) & 0xfffc0000;
        out_be32(&dc->dmr0,  dramsize|1);
 
        /* issue a PRECHARGE ALL */
@@ -102,8 +102,8 @@ int dram_init(void)
        out_be32(&dc->dacr0, 0x0000b344);
        out_be32((u32 *)0x00000c00, 0xbeaddeed);
 
-       gd->ram_size = get_ram_size(CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size(CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
 
        return 0;
 }
index d48da48b69d69972d8d861ec6c2cafde001e498f..475e3edfa62e574c3cffe10b54ea8e83bde2e781 100644 (file)
@@ -35,7 +35,7 @@ int dram_init(void)
         * Serial Boot: The dram is already initialized in start.S
         * only require to return DRAM size
         */
-       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
+       dramsize = CFG_SYS_SDRAM_SIZE * 0x100000;
 
        gd->ram_size = dramsize;
 
index 3a447ca8a93ce8d2c281db1506ec630f64a98a77..8d9eedb7523c18fc9048a68ae969dde15c40d44d 100644 (file)
@@ -144,7 +144,7 @@ static const struct boot_mode board_boot_modes[] = {
 int board_init(void)
 {
        /* address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_VIDEO_IPUV3
        setup_display();
index b7ddc3ba78f4d66e626a47420847a6a609a4451b..839a692ce85dde7f76c89d6446c21e13b2aaa0d0 100644 (file)
@@ -238,7 +238,7 @@ int board_init(void)
        hw_watchdog_init();
 #endif
 
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
        return 0;
 }
 
index b97fedddd5e29e474f505afed64e84741ce820f0..9e5828161157e0bcf0d1edd965ae292fe022177c 100644 (file)
@@ -704,7 +704,7 @@ int board_init(void)
        hw_watchdog_init();
 #endif
 
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 #if defined(CONFIG_NOR) || defined(CONFIG_MTD_RAW_NAND)
        gpmc_init();
 #endif
index 529129ecc76e9939fa6989239f4677402ce55081..d0b7a14e0e993f82112dc020683c1b5a4959eedd 100644 (file)
@@ -639,7 +639,7 @@ int board_init(void)
        u32 mreqprio_0, mreqprio_1, modena_init0_bw_fractional,
            modena_init0_bw_integer, modena_init0_watermark_0;
 
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
        gpmc_init();
 
        /*
index cfc825e52a36868b3282d35dc7ce4376ea0624e6..652c40f55c4c776bb0cf30979434a1fb1cb29b20 100644 (file)
@@ -661,7 +661,7 @@ bool am571x_idk_needs_lcd(void)
 int board_init(void)
 {
        gpmc_init();
-       gd->bd->bi_boot_params = (CONFIG_SYS_SDRAM_BASE + 0x100);
+       gd->bd->bi_boot_params = (CFG_SYS_SDRAM_BASE + 0x100);
 
        return 0;
 }
index 34ec3915f3d7b4a7e8414f12eb198951852fc3e5..b266ccb4b82eb3d83857c191ef415e682cf9dabe 100644 (file)
@@ -75,13 +75,13 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 int dram_init_banksize(void)
 {
        /* Bank 0 declares the memory available in the DDR low region */
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = 0x80000000;
        gd->ram_size = 0x80000000;
 
 #ifdef CONFIG_PHYS_64BIT
        /* Bank 1 declares the memory available in the DDR high region */
-       gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE1;
+       gd->bd->bi_dram[1].start = CFG_SYS_SDRAM_BASE1;
        gd->bd->bi_dram[1].size = 0x80000000;
        gd->ram_size = 0x100000000;
 #endif
index a854d615c1d70ad35c279976c7391bd1556a6b77..1c00e253ffc85dee83c77a25ce1dd6005367e035 100644 (file)
@@ -644,7 +644,7 @@ int dram_init_banksize(void)
 
        ram_size = board_ti_get_emif_size();
 
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = get_effective_memsize();
        if (ram_size > CONFIG_MAX_MEM_MAPPED) {
                gd->bd->bi_dram[1].start = 0x200000000;
index d6e431ead0efd96ba2597110a95931b7b7772e67..d4e672a7acd5aa734442a2b6a1fd840a16fe2772 100644 (file)
@@ -71,13 +71,13 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 int dram_init_banksize(void)
 {
        /* Bank 0 declares the memory available in the DDR low region */
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = 0x80000000;
        gd->ram_size = 0x80000000;
 
 #ifdef CONFIG_PHYS_64BIT
        /* Bank 1 declares the memory available in the DDR high region */
-       gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE1;
+       gd->bd->bi_dram[1].start = CFG_SYS_SDRAM_BASE1;
        gd->bd->bi_dram[1].size = 0x80000000;
        gd->ram_size = 0x100000000;
 #endif
index e09adc8ad34eecfdb42ff02341cbfdf0ac332f9c..4d28582311bed66538e422cb66503b63d5cc3aae 100644 (file)
@@ -60,13 +60,13 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 int dram_init_banksize(void)
 {
        /* Bank 0 declares the memory available in the DDR low region */
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = 0x7fffffff;
        gd->ram_size = 0x80000000;
 
 #ifdef CONFIG_PHYS_64BIT
        /* Bank 1 declares the memory available in the DDR high region */
-       gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE1;
+       gd->bd->bi_dram[1].start = CFG_SYS_SDRAM_BASE1;
        gd->bd->bi_dram[1].size = 0x37fffffff;
        gd->ram_size = 0x400000000;
 #endif
index 51e8de4b89122d2d4c5946f668cf55425654a305..34818736a4f5c9aa6f03408754175a5080147295 100644 (file)
@@ -46,7 +46,7 @@ int dram_init(void)
 
        ddr3_size = ddr3_init();
 
-       gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+       gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
                                    CONFIG_MAX_RAM_BANK_SIZE);
 #if defined(CONFIG_TI_AEMIF)
        if (!(board_is_k2g_ice() || board_is_k2g_i1()))
@@ -71,7 +71,7 @@ struct legacy_img_hdr *spl_get_load_buffer(ssize_t offset, size_t size)
 
 int board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
        return 0;
 }
 
@@ -120,7 +120,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 
        /* adjust memory start address for LPAE */
        if (lpae) {
-               start[0] -= CONFIG_SYS_SDRAM_BASE;
+               start[0] -= CFG_SYS_SDRAM_BASE;
                start[0] += CONFIG_SYS_LPAE_SDRAM_BASE;
        }
 
@@ -174,11 +174,11 @@ void ft_board_setup_ex(void *blob, struct bd_info *bd)
                                            "linux,initrd-end", NULL);
                        if (prop1 && prop2) {
                                initrd_start = __be64_to_cpu(*prop1);
-                               initrd_start -= CONFIG_SYS_SDRAM_BASE;
+                               initrd_start -= CFG_SYS_SDRAM_BASE;
                                initrd_start += CONFIG_SYS_LPAE_SDRAM_BASE;
                                initrd_start = __cpu_to_be64(initrd_start);
                                initrd_end = __be64_to_cpu(*prop2);
-                               initrd_end -= CONFIG_SYS_SDRAM_BASE;
+                               initrd_end -= CFG_SYS_SDRAM_BASE;
                                initrd_end += CONFIG_SYS_LPAE_SDRAM_BASE;
                                initrd_end = __cpu_to_be64(initrd_end);
 
@@ -221,7 +221,7 @@ void ft_board_setup_ex(void *blob, struct bd_info *bd)
                        *reserve_start = __cpu_to_be64(*reserve_start);
                        size = __cpu_to_be64(*(reserve_start + 1));
                        if (size) {
-                               *reserve_start -= CONFIG_SYS_SDRAM_BASE;
+                               *reserve_start -= CFG_SYS_SDRAM_BASE;
                                *reserve_start +=
                                        CONFIG_SYS_LPAE_SDRAM_BASE;
                                *reserve_start =
index 2d42af6b809d5c334b1589f6530344c5f25a4275..8c708355d4ca084c88f90c31f5178d327695a84d 100644 (file)
@@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 #if defined(CONFIG_MTD_RAW_NAND)
        gpmc_init();
 #endif
index 9d4ffb0f979b577ca58ef6e8d2012b93fbac4f8c..efef855b3d06817a323b7a42daffaacd003d93c7 100644 (file)
@@ -56,7 +56,7 @@ int board_early_init_f(void)
 int board_init(void)
 {
        /* adress of boot parameters */
-       gd->bd->bi_boot_params  = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params  = CFG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_SYS_FLASH_CFI
        /* Use 16-bit memory interface for NOR Flash */
@@ -76,8 +76,8 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
 
        return 0;
 }
index 96d0185329d229988800b665d4537e10bfe7a34e..3c7cfa309c13e799c89c275347071df8fc7b3498 100644 (file)
@@ -79,7 +79,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int dram_init(void)
 {
        /* use the DDR controllers configured size */
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
                                    (ulong)imx_ddr_size());
 
        return 0;
index 475250d8013a4caddc537c820c1d3c06bdb3b4ea..65e0e9a156abddadf70f88bbc42f829b1eb15f95 100644 (file)
@@ -73,7 +73,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int dram_init(void)
 {
        /* use the DDR controllers configured size */
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
                                    (ulong)imx_ddr_size());
 
        return 0;
index 07fe45447186699aed29b654c0c8fbc0735f080b..f335d5b4f4aa260464e252c81756bf41b5fd52e2 100644 (file)
@@ -266,7 +266,7 @@ int board_init(void)
        hw_watchdog_init();
 #endif
 
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
 #if defined(CONFIG_NOR) || defined(CONFIG_MTD_RAW_NAND)
        gpmc_init();
 #endif
index 5d12f84cfeaaedb8285238f64bac439320e507ea..c8e791a4da8ab4285a6a534a6a78e8a17fa62820 100644 (file)
@@ -67,15 +67,15 @@ int board_init(void)
 {
        reset_periph();
        /* adress of boot parameters */
-       gd->bd->bi_boot_params  = CONFIG_SYS_SDRAM_BASE + 0x100;
+       gd->bd->bi_boot_params  = CFG_SYS_SDRAM_BASE + 0x100;
 
        return 0;
 }
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
 
        return 0;
 }
index 17ee541bd840f10c841539718c3b731c9e7fce8d..df4c457672389e06fec13b7352a4753f44ffc83b 100644 (file)
@@ -105,7 +105,7 @@ int board_late_init(void)
        return board_late_init_xilinx();
 }
 
-#if !defined(CONFIG_SYS_SDRAM_BASE) && !defined(CONFIG_SYS_SDRAM_SIZE)
+#if !defined(CFG_SYS_SDRAM_BASE) && !defined(CFG_SYS_SDRAM_SIZE)
 int dram_init_banksize(void)
 {
        return fdtdec_setup_memory_banksize();
@@ -123,8 +123,8 @@ int dram_init(void)
 #else
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
 
        zynq_ddrc_init();
 
index 579708d2e0cf9e028993ed9b120c0a16eed619cb..e3f70c4caf4a11ee7e0e3af93581c85be31dfd1e 100644 (file)
@@ -236,7 +236,7 @@ unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
        return ret;
 }
 
-#if !defined(CONFIG_SYS_SDRAM_BASE) && !defined(CONFIG_SYS_SDRAM_SIZE)
+#if !defined(CFG_SYS_SDRAM_BASE) && !defined(CFG_SYS_SDRAM_SIZE)
 int dram_init_banksize(void)
 {
        int ret;
@@ -261,7 +261,7 @@ int dram_init(void)
 #else
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = get_effective_memsize();
 
        mem_map_fill();
@@ -271,8 +271,8 @@ int dram_init_banksize(void)
 
 int dram_init(void)
 {
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
+       gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
+                                   CFG_SYS_SDRAM_SIZE);
 
        return 0;
 }
index 34d1e5f18befca3bcd52ba2be8fd68b1c918f79d..8813be544be111b797c12a2fec4b1989398fe3a5 100644 (file)
@@ -116,8 +116,8 @@ ulong env_get_bootm_low(void)
                return tmp;
        }
 
-#if defined(CONFIG_SYS_SDRAM_BASE)
-       return CONFIG_SYS_SDRAM_BASE;
+#if defined(CFG_SYS_SDRAM_BASE)
+       return CFG_SYS_SDRAM_BASE;
 #elif defined(CONFIG_ARM) || defined(CONFIG_MICROBLAZE) || defined(CONFIG_RISCV)
        return gd->bd->bi_dram[0].start;
 #else
index aaaedfe9735e337f1db4c9f2ce242303157d00c8..bbd406fc66eca5055c11285439002d126db47336 100644 (file)
@@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_ARCH_KEYSTONE
 #include <asm/arch/ddr3.h>
-#define DDR_MIN_ADDR           CONFIG_SYS_SDRAM_BASE
+#define DDR_MIN_ADDR           CFG_SYS_SDRAM_BASE
 #define STACKSIZE              (512 << 10)     /* 512 KiB */
 
 #define DDR_REMAP_ADDR         0x80000000
@@ -247,9 +247,9 @@ static int is_addr_valid(u32 addr)
        /* Check in ecc address range 1 */
        if (ecc_ctrl & EMIF_ECC_REG_ECC_ADDR_RGN_1_EN_MASK) {
                start_addr = ((range & EMIF_ECC_REG_ECC_START_ADDR_MASK) << 16)
-                               + CONFIG_SYS_SDRAM_BASE;
+                               + CFG_SYS_SDRAM_BASE;
                end_addr = (range & EMIF_ECC_REG_ECC_END_ADDR_MASK) + 0xFFFF +
-                               CONFIG_SYS_SDRAM_BASE;
+                               CFG_SYS_SDRAM_BASE;
                if ((addr >= start_addr) && (addr <= end_addr))
                        /* addr within ecc address range 1 */
                        return 1;
@@ -259,9 +259,9 @@ static int is_addr_valid(u32 addr)
        if (ecc_ctrl & EMIF_ECC_REG_ECC_ADDR_RGN_2_EN_MASK) {
                range = readl(&emif->emif_ecc_address_range_2);
                start_addr = ((range & EMIF_ECC_REG_ECC_START_ADDR_MASK) << 16)
-                               + CONFIG_SYS_SDRAM_BASE;
+                               + CFG_SYS_SDRAM_BASE;
                end_addr = (range & EMIF_ECC_REG_ECC_END_ADDR_MASK) + 0xFFFF +
-                               CONFIG_SYS_SDRAM_BASE;
+                               CFG_SYS_SDRAM_BASE;
                if ((addr >= start_addr) && (addr <= end_addr))
                        /* addr within ecc address range 2 */
                        return 1;
@@ -309,11 +309,11 @@ static int do_ddr_test(struct cmd_tbl *cmdtp,
        start_addr = hextoul(argv[2], NULL);
        end_addr = hextoul(argv[3], NULL);
 
-       if ((start_addr < CONFIG_SYS_SDRAM_BASE) ||
-           (start_addr > (CONFIG_SYS_SDRAM_BASE +
+       if ((start_addr < CFG_SYS_SDRAM_BASE) ||
+           (start_addr > (CFG_SYS_SDRAM_BASE +
             get_effective_memsize() - 1)) ||
-           (end_addr < CONFIG_SYS_SDRAM_BASE) ||
-           (end_addr > (CONFIG_SYS_SDRAM_BASE +
+           (end_addr < CFG_SYS_SDRAM_BASE) ||
+           (end_addr > (CFG_SYS_SDRAM_BASE +
             get_effective_memsize() - 1)) || (start_addr >= end_addr)) {
                puts("Invalid start or end address!\n");
                return cmd_usage(cmdtp);
index e6117a7ba5e17c270aa8a435a4efb1aae1bca1b0..aab1130763e3d15b6b3afe745318be548198e25a 100644 (file)
@@ -329,12 +329,12 @@ __weak int mach_cpu_init(void)
 /* Get the top of usable RAM */
 __weak phys_size_t board_get_usable_ram_top(phys_size_t total_size)
 {
-#if defined(CONFIG_SYS_SDRAM_BASE) && CONFIG_SYS_SDRAM_BASE > 0
+#if defined(CFG_SYS_SDRAM_BASE) && CFG_SYS_SDRAM_BASE > 0
        /*
         * Detect whether we have so much RAM that it goes past the end of our
         * 32-bit address space. If so, clip the usable RAM so it doesn't.
         */
-       if (gd->ram_top < CONFIG_SYS_SDRAM_BASE)
+       if (gd->ram_top < CFG_SYS_SDRAM_BASE)
                /*
                 * Will wrap back to top of 32-bit space when reservations
                 * are made.
@@ -369,8 +369,8 @@ static int setup_dest_addr(void)
         */
        gd->ram_size -= CONFIG_SYS_MEM_TOP_HIDE;
 #endif
-#ifdef CONFIG_SYS_SDRAM_BASE
-       gd->ram_base = CONFIG_SYS_SDRAM_BASE;
+#ifdef CFG_SYS_SDRAM_BASE
+       gd->ram_base = CFG_SYS_SDRAM_BASE;
 #endif
        gd->ram_top = gd->ram_base + get_effective_memsize();
        gd->ram_top = board_get_usable_ram_top(gd->mon_len);
index 15806dfaee1556dcb561871766a11be374600fe0..584503eb12e46882c9c6e027788a4bf62b75a898 100644 (file)
@@ -142,21 +142,21 @@ CONFIG_SYS_CACHE_DCACR:
   cache-related registers config
 CONFIG_SYS_CACHE_ACRX:
   cache-related registers config
-CONFIG_SYS_SDRAM_BASE:
+CFG_SYS_SDRAM_BASE:
   SDRAM config for SDRAM controller-specific registers
-CONFIG_SYS_SDRAM_SIZE:
+CFG_SYS_SDRAM_SIZE:
   SDRAM config for SDRAM controller-specific registers
-CONFIG_SYS_SDRAM_BASEX:
+CFG_SYS_SDRAM_BASEX:
   SDRAM config for SDRAM controller-specific registers
-CONFIG_SYS_SDRAM_CFG1:
+CFG_SYS_SDRAM_CFG1:
   SDRAM config for SDRAM controller-specific registers
-CONFIG_SYS_SDRAM_CFG2:
+CFG_SYS_SDRAM_CFG2:
   SDRAM config for SDRAM controller-specific registers
-CONFIG_SYS_SDRAM_CTRL:
+CFG_SYS_SDRAM_CTRL:
   SDRAM config for SDRAM controller-specific registers
-CONFIG_SYS_SDRAM_MODE:
+CFG_SYS_SDRAM_MODE:
   SDRAM config for SDRAM controller-specific registers
-CONFIG_SYS_SDRAM_EMOD:
+CFG_SYS_SDRAM_EMOD:
   SDRAM config for SDRAM controller-specific registers, please
   see arch/m68k/cpu/<specific_cpu>/start.S files to see how
   these options are used.
index 35defb0af0b19161355b6906ff5b43bb6e8dee8e..34a75e7fb0076271af75e320ee38b4b0050e534a 100644 (file)
@@ -96,8 +96,8 @@ to 0xDxxx_xxxx.
 
 .. code-block:: c
 
-   #define CONFIG_SYS_SDRAM_BASE               0xc8000000
-   #define CONFIG_SYS_SDRAM_SIZE               0x08000000
+   #define CFG_SYS_SDRAM_BASE          0xc8000000
+   #define CFG_SYS_SDRAM_SIZE          0x08000000
 
 You will need to change the environment variables location and setting,
 too. You may change other configs to fit your board.
index 5e8fb7a89c21fe64d138bdf9c9d7a8d8a1272c2b..9dada5e11756fb45b5c383bb7efaf1a1cd382a72 100644 (file)
@@ -130,7 +130,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
        if (is_warm_boot()) {
                ddr_out32(&ddr->sdram_cfg_2,
                          regs->ddr_sdram_cfg_2 & ~SDRAM_CFG2_D_INIT);
-               ddr_out32(&ddr->init_addr, CONFIG_SYS_SDRAM_BASE);
+               ddr_out32(&ddr->init_addr, CFG_SYS_SDRAM_BASE);
                ddr_out32(&ddr->init_ext_addr, DDR_INIT_ADDR_EXT_UIA);
 
                /* DRAM VRef will not be trained */
index 3c1f7a18912096d455cef15eb7e949cc3451bc1b..f8d1468a26f16e9b1940e751144c2efa93eebd16 100644 (file)
@@ -230,7 +230,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
        if (is_warm_boot()) {
                ddr_out32(&ddr->sdram_cfg_2,
                          regs->ddr_sdram_cfg_2 & ~SDRAM_CFG2_D_INIT);
-               ddr_out32(&ddr->init_addr, CONFIG_SYS_SDRAM_BASE);
+               ddr_out32(&ddr->init_addr, CFG_SYS_SDRAM_BASE);
                ddr_out32(&ddr->init_ext_addr, DDR_INIT_ADDR_EXT_UIA);
 
                /* DRAM VRef will not be trained */
index fcff223b4f0dc5a8e7b123cbdeb34ae9ffdf8f74..4975dbb821e11cc1433aff8ecbdd1d1a341ab145 100644 (file)
@@ -30,7 +30,7 @@
  */
 #ifndef CFG_SYS_FSL_DDR_SDRAM_BASE_PHY
 #ifdef CONFIG_MPC83xx
-#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY CONFIG_SYS_SDRAM_BASE
+#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY CFG_SYS_SDRAM_BASE
 #else
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY CONFIG_SYS_DDR_SDRAM_BASE
 #endif
index 0f2dc243cb82f6e11809bdb7d7eaa865df70da50..1c4a1cae4df4b6482ce4a4517bdf74047418d44f 100644 (file)
@@ -162,7 +162,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
        if (is_warm_boot()) {
                out_be32(&ddr->sdram_cfg_2,
                         regs->ddr_sdram_cfg_2 & ~SDRAM_CFG2_D_INIT);
-               out_be32(&ddr->init_addr, CONFIG_SYS_SDRAM_BASE);
+               out_be32(&ddr->init_addr, CFG_SYS_SDRAM_BASE);
                out_be32(&ddr->init_ext_addr, DDR_INIT_ADDR_EXT_UIA);
 
                /* DRAM VRef will not be trained */
index a14c766dda712957b842716332f92df8438979af..c40cd768abf578ae73d7a49fc7e3179949fbe9c0 100644 (file)
 #define FAR_END_DIMM_ADDR              0x50
 #define MAX_DIMM_ADDR                  0x60
 
-#ifndef CONFIG_SYS_SDRAM_SIZE
+#ifndef CFG_SYS_SDRAM_SIZE
 #define SDRAM_CS_SIZE                  0xFFFFFFF
 #else
-#define SDRAM_CS_SIZE                  ((CONFIG_SYS_SDRAM_SIZE >> 10) - 1)
+#define SDRAM_CS_SIZE                  ((CFG_SYS_SDRAM_SIZE >> 10) - 1)
 #endif
 #define SDRAM_CS_BASE                  0x0
 #define SDRAM_DIMM_SIZE                        0x80000000
index 22f4995453ed0a25551fc5dce2e0bb6895810e25..a3b662fb13dafa75f8eca61d6dc8effaa0cc7e4b 100644 (file)
@@ -60,7 +60,7 @@ config PCI_MAP_SYSTEM_MEMORY
          instead of a physical address (e.g. on MIPS). The PCI core will then remap
          the virtual memory base address to a physical address when adding the PCI
          region of type PCI_REGION_SYS_MEMORY.
-         This should only be required on MIPS where CONFIG_SYS_SDRAM_BASE is still
+         This should only be required on MIPS where CFG_SYS_SDRAM_BASE is still
          being used as virtual address.
 
 config PCI_SRIOV
index dc114027814d01df77b2927ce4da06668e4192fb..b81eb35368967b6ebf55f69f4c802af4f31ac94a 100644 (file)
@@ -191,7 +191,7 @@ static int rcar_gen2_pci_probe(struct udevice *dev)
 
        /* AHB-PCI Bridge Communication Registers */
        writel(RCAR_AHB_BUS_MODE, priv->cfg_base + RCAR_AHB_BUS_CTR_REG);
-       writel((CONFIG_SYS_SDRAM_BASE & 0xf0000000) | RCAR_PCIAHB_PREFETCH16,
+       writel((CFG_SYS_SDRAM_BASE & 0xf0000000) | RCAR_PCIAHB_PREFETCH16,
               priv->cfg_base + RCAR_PCIAHB_WIN1_CTR_REG);
        writel(0xf0000000 | RCAR_PCIAHB_PREFETCH16,
               priv->cfg_base + RCAR_PCIAHB_WIN2_CTR_REG);
@@ -204,7 +204,7 @@ static int rcar_gen2_pci_probe(struct udevice *dev)
        /* PCI Configuration Registers for AHBPCI */
        devad = setup_bus_address(dev, PCI_BDF(0, 0, 0), 0);
        writel(priv->cfg_base + 0x800, devad + PCI_BASE_ADDRESS_0);
-       writel(CONFIG_SYS_SDRAM_BASE & 0xf0000000, devad + PCI_BASE_ADDRESS_1);
+       writel(CFG_SYS_SDRAM_BASE & 0xf0000000, devad + PCI_BASE_ADDRESS_1);
        writel(0xf0000000, devad + PCI_BASE_ADDRESS_2);
        writel(PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
               PCI_COMMAND_PARITY | PCI_COMMAND_SERR,
index d514c040344c164add6b452fa8e23a8c4b1d4ba2..c1be56ce7a082580bb37a5f196de9f7d95c2a367 100644 (file)
@@ -158,9 +158,9 @@ static int sh7751_pci_probe(struct udevice *dev)
 
        /* Set up target memory mappings (for external DMA access) */
        /* Map both P0 and P2 range to Area 3 RAM for ease of use */
-       p4_out(CONFIG_SYS_SDRAM_SIZE - 0x100000, SH7751_PCILSR0);
-       p4_out(CONFIG_SYS_SDRAM_BASE & 0x1FF00000, SH7751_PCILAR0);
-       p4_out(CONFIG_SYS_SDRAM_BASE & 0xFFF00000, SH7751_PCICONF5);
+       p4_out(CFG_SYS_SDRAM_SIZE - 0x100000, SH7751_PCILSR0);
+       p4_out(CFG_SYS_SDRAM_BASE & 0x1FF00000, SH7751_PCILAR0);
+       p4_out(CFG_SYS_SDRAM_BASE & 0xFFF00000, SH7751_PCICONF5);
 
        p4_out(0, SH7751_PCILSR1);
        p4_out(0, SH7751_PCILAR1);
index 99891dce61d57b6656ea26cb4c2457a46f272acf..a0b82c78321c0ed9e19885e0d763073a8e79b277 100644 (file)
@@ -459,9 +459,9 @@ static void pcie_dw_set_host_bars(const void *regs_base)
        }
 
        /* Set the BAR base and size towards DDR */
-       bar0 = CONFIG_SYS_SDRAM_BASE & ~0xf;
+       bar0 = CFG_SYS_SDRAM_BASE & ~0xf;
        bar0 |= PCI_BASE_ADDRESS_MEM_TYPE_32;
-       writel(CONFIG_SYS_SDRAM_BASE, regs_base + PCIE_CONFIG_BAR0);
+       writel(CFG_SYS_SDRAM_BASE, regs_base + PCIE_CONFIG_BAR0);
 
        reg = ((size >> 20) - 1) << 12;
        writel(size, regs_base + RESIZABLE_BAR_CTL0);
index a52774179e2f4967c4b0dcc39673d07b27cd822b..b7f692f645070ad594585dd177df9c66a55e80d2 100644 (file)
 #include <asm/arch-ls102xa/svr.h>
 
 #ifndef CFG_SYS_PCI_MEMORY_BUS
-#define CFG_SYS_PCI_MEMORY_BUS CONFIG_SYS_SDRAM_BASE
+#define CFG_SYS_PCI_MEMORY_BUS CFG_SYS_SDRAM_BASE
 #endif
 
 #ifndef CFG_SYS_PCI_MEMORY_PHYS
-#define CFG_SYS_PCI_MEMORY_PHYS CONFIG_SYS_SDRAM_BASE
+#define CFG_SYS_PCI_MEMORY_PHYS CFG_SYS_SDRAM_BASE
 #endif
 
 #ifndef CFG_SYS_PCI_MEMORY_SIZE
index 141b19b57ac035cd755a5f636377f88d1f28100d..dc466a88e71232f55ccde1c2ac73f53d99b9e55d 100644 (file)
@@ -203,7 +203,7 @@ static void ast2500_sdrammc_calc_size(struct dram_info *info)
        u32 test_pattern = 0xdeadbeef;
        u32 cap_param = SDRAM_CONF_CAP_1024M;
        u32 refresh_timing_param = DDR4_TRFC;
-       const u32 write_addr_base = CONFIG_SYS_SDRAM_BASE + write_test_offset;
+       const u32 write_addr_base = CFG_SYS_SDRAM_BASE + write_test_offset;
 
        for (ram_size = SDRAM_MAX_SIZE; ram_size > SDRAM_MIN_SIZE;
             ram_size >>= 1) {
@@ -231,7 +231,7 @@ static void ast2500_sdrammc_calc_size(struct dram_info *info)
                        ((refresh_timing_param & SDRAM_AC_TRFC_MASK)
                         << SDRAM_AC_TRFC_SHIFT));
 
-       info->info.base = CONFIG_SYS_SDRAM_BASE;
+       info->info.base = CFG_SYS_SDRAM_BASE;
        info->info.size = ram_size - ast2500_sdrammc_get_vga_mem_size(info);
        clrsetbits_le32(&info->regs->config,
                        (SDRAM_CONF_CAP_MASK << SDRAM_CONF_CAP_SHIFT),
index 5d426088be3ea89270f1b3c3bab38c0205751f85..a2d7ca82fc01abda5a124c2abbfaf1e67ca676ed 100644 (file)
@@ -838,7 +838,7 @@ static void ast2600_sdrammc_calc_size(struct dram_info *info)
        u32 test_pattern = 0xdeadbeef;
        u32 cap_param = SDRAM_CONF_CAP_2048M;
        u32 refresh_timing_param = DDR4_TRFC;
-       const u32 write_addr_base = CONFIG_SYS_SDRAM_BASE + write_test_offset;
+       const u32 write_addr_base = CFG_SYS_SDRAM_BASE + write_test_offset;
 
        for (ram_size = SDRAM_MAX_SIZE; ram_size > SDRAM_MIN_SIZE;
             ram_size >>= 1) {
@@ -866,7 +866,7 @@ static void ast2600_sdrammc_calc_size(struct dram_info *info)
                        ((refresh_timing_param & SDRAM_AC_TRFC_MASK)
                         << SDRAM_AC_TRFC_SHIFT));
 
-       info->info.base = CONFIG_SYS_SDRAM_BASE;
+       info->info.base = CFG_SYS_SDRAM_BASE;
        info->info.size = ram_size - ast2600_sdrammc_get_vga_mem_size(info);
 
        clrsetbits_le32(&info->regs->config, SDRAM_CONF_CAP_MASK,
@@ -1015,7 +1015,7 @@ static void ast2600_sdrammc_update_size(struct dram_info *info)
                break;
        }
 
-       info->info.base = CONFIG_SYS_SDRAM_BASE;
+       info->info.base = CFG_SYS_SDRAM_BASE;
        info->info.size = ram_size - ast2600_sdrammc_get_vga_mem_size(info);
 
        if (0 == (conf & SDRAM_CONF_ECC_SETUP))
index d12a3b4f436e049a4ad1b3478f573a893e70629f..1737fdac9707794f06a3fbdefa714db402825629 100644 (file)
@@ -243,17 +243,17 @@ static int mtk_ddr3_rank_size_detect(struct udevice *dev)
         * and it has maximum addressing region
         */
 
-       writel(WALKING_PATTERN, CONFIG_SYS_SDRAM_BASE);
+       writel(WALKING_PATTERN, CFG_SYS_SDRAM_BASE);
 
-       if (readl(CONFIG_SYS_SDRAM_BASE) != WALKING_PATTERN)
+       if (readl(CFG_SYS_SDRAM_BASE) != WALKING_PATTERN)
                return -EINVAL;
 
        for (step = 0; step < 5; step++) {
-               writel(~WALKING_PATTERN, CONFIG_SYS_SDRAM_BASE +
+               writel(~WALKING_PATTERN, CFG_SYS_SDRAM_BASE +
                       (WALKING_STEP << step));
 
-               start = readl(CONFIG_SYS_SDRAM_BASE);
-               test = readl(CONFIG_SYS_SDRAM_BASE + (WALKING_STEP << step));
+               start = readl(CFG_SYS_SDRAM_BASE);
+               test = readl(CFG_SYS_SDRAM_BASE + (WALKING_STEP << step));
                if ((test != ~WALKING_PATTERN) || test == start)
                        break;
        }
@@ -727,7 +727,7 @@ static int mtk_ddr3_get_info(struct udevice *dev, struct ram_info *info)
        struct mtk_ddr3_priv *priv = dev_get_priv(dev);
        u32 val = readl(priv->emi + EMI_CONA);
 
-       info->base = CONFIG_SYS_SDRAM_BASE;
+       info->base = CFG_SYS_SDRAM_BASE;
 
        switch ((val & EMI_COL_ADDR_MASK) >> EMI_COL_ADDR_SHIFT) {
        case 0:
index 42daf06866867641976aff04f4e05d1e7c3e31cb..bb21078df14073982c29d77ca149aa2d4b5fa939 100644 (file)
@@ -2687,7 +2687,7 @@ static int octeon_ddr_probe(struct udevice *dev)
        if (!mem_mbytes)
                return -ENODEV;
 
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size = MB(mem_mbytes);
 
        /*
index 69c454a4ba86b029a781d2b4f86c3d6e895c3275..6929a7e494ee91ba2545d559ca1d3698242e0455 100644 (file)
@@ -617,12 +617,12 @@ static int sdram_col_row_detect(struct udevice *dev)
 
        /* Detect col */
        for (col = 11; col >= 9; col--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE +
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE +
                        (1 << (col + params->chan.bw - 1));
                writel(test_pattern, addr);
                if ((readl(addr) == test_pattern) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
 
@@ -637,11 +637,11 @@ static int sdram_col_row_detect(struct udevice *dev)
 
        /* Detect row*/
        for (row = 16; row >= 12; row--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE + (1 << (row + 15 - 1));
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE + (1 << (row + 15 - 1));
                writel(test_pattern, addr);
                if ((readl(addr) == test_pattern) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
 
index b3e7421d0854a50157fc89807c38a78ba9a273ba..ec46ba54575e6315ea1ecd71a923fded56d248b6 100644 (file)
@@ -220,12 +220,12 @@ int sdram_detect_col(struct sdram_cap_info *cap_info,
        u32 bw = cap_info->bw;
 
        for (col = coltmp; col >= 9; col -= 1) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               test_addr = (void __iomem *)(CONFIG_SYS_SDRAM_BASE +
+               writel(0, CFG_SYS_SDRAM_BASE);
+               test_addr = (void __iomem *)(CFG_SYS_SDRAM_BASE +
                                (1ul << (col + bw - 1ul)));
                writel(PATTERN, test_addr);
                if ((readl(test_addr) == PATTERN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (col == 8) {
@@ -245,12 +245,12 @@ int sdram_detect_bank(struct sdram_cap_info *cap_info,
        u32 bk;
        u32 bw = cap_info->bw;
 
-       test_addr = (void __iomem *)(CONFIG_SYS_SDRAM_BASE +
+       test_addr = (void __iomem *)(CFG_SYS_SDRAM_BASE +
                        (1ul << (coltmp + bktmp + bw - 1ul)));
-       writel(0, CONFIG_SYS_SDRAM_BASE);
+       writel(0, CFG_SYS_SDRAM_BASE);
        writel(PATTERN, test_addr);
        if ((readl(test_addr) == PATTERN) &&
-           (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+           (readl(CFG_SYS_SDRAM_BASE) == 0))
                bk = 3;
        else
                bk = 2;
@@ -268,12 +268,12 @@ int sdram_detect_bg(struct sdram_cap_info *cap_info,
        u32 dbw;
        u32 bw = cap_info->bw;
 
-       test_addr = (void __iomem *)(CONFIG_SYS_SDRAM_BASE +
+       test_addr = (void __iomem *)(CFG_SYS_SDRAM_BASE +
                        (1ul << (coltmp + bw + 1ul)));
-       writel(0, CONFIG_SYS_SDRAM_BASE);
+       writel(0, CFG_SYS_SDRAM_BASE);
        writel(PATTERN, test_addr);
        if ((readl(test_addr) == PATTERN) &&
-           (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+           (readl(CFG_SYS_SDRAM_BASE) == 0))
                dbw = 0;
        else
                dbw = 1;
@@ -337,12 +337,12 @@ int sdram_detect_row(struct sdram_cap_info *cap_info,
        void __iomem *test_addr;
 
        for (row = rowtmp; row > 12; row--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               test_addr = (void __iomem *)(CONFIG_SYS_SDRAM_BASE +
+               writel(0, CFG_SYS_SDRAM_BASE);
+               test_addr = (void __iomem *)(CFG_SYS_SDRAM_BASE +
                                (1ul << (row + bktmp + coltmp + bw - 1ul)));
                writel(PATTERN, test_addr);
                if ((readl(test_addr) == PATTERN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (row == 12) {
@@ -363,8 +363,8 @@ int sdram_detect_row_3_4(struct sdram_cap_info *cap_info,
        u32 row = cap_info->cs0_row;
        void __iomem *test_addr, *test_addr1;
 
-       test_addr = CONFIG_SYS_SDRAM_BASE;
-       test_addr1 = (void __iomem *)(CONFIG_SYS_SDRAM_BASE +
+       test_addr = CFG_SYS_SDRAM_BASE;
+       test_addr1 = (void __iomem *)(CFG_SYS_SDRAM_BASE +
                        (0x3ul << (row + bktmp + coltmp + bw - 1ul - 1ul)));
 
        writel(0, test_addr);
@@ -421,15 +421,15 @@ int sdram_detect_cs1_row(struct sdram_cap_info *cap_info, u32 dram_type)
 
                /* detect cs1 row */
                for (row = cap_info->cs0_row; row > 12; row--) {
-                       test_addr = (void __iomem *)(CONFIG_SYS_SDRAM_BASE +
+                       test_addr = (void __iomem *)(CFG_SYS_SDRAM_BASE +
                                    cs0_cap +
                                    (1ul << (row + bktmp + coltmp + bw - 1ul)));
-                       writel(0, CONFIG_SYS_SDRAM_BASE + cs0_cap);
+                       writel(0, CFG_SYS_SDRAM_BASE + cs0_cap);
                        writel(PATTERN, test_addr);
 
                        if (((readl(test_addr) & byte_mask) ==
                             (PATTERN & byte_mask)) &&
-                           ((readl(CONFIG_SYS_SDRAM_BASE + cs0_cap) &
+                           ((readl(CFG_SYS_SDRAM_BASE + cs0_cap) &
                              byte_mask) == 0)) {
                                break;
                        }
index c024a0cd633771230d96f707a146daf708087fff..98b2593ac49fa86072c8cdb4b7566890614d56b3 100644 (file)
@@ -726,7 +726,7 @@ static int px30_dmc_probe(struct udevice *dev)
 
        priv->pmugrf = syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);
        debug("%s: grf=%p\n", __func__, priv->pmugrf);
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size =
                rockchip_sdram_size((phys_addr_t)&priv->pmugrf->os_reg[2]);
 
index 832154ee3af1135282d26b3d44a6e500b6cb20cb..a2425f22e2cabbe5b33ffadc0ab2feb22fe93d91 100644 (file)
@@ -616,12 +616,12 @@ static int rk3066_dmc_sdram_col_row_detect(struct rk3066_dmc_dram_info *dram, in
 
        /* Detect col. */
        for (col = 11; col >= 9; col--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE +
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE +
                       (1 << (col + sdram_params->ch[channel].bw - 1));
                writel(TEST_PATTERN, addr);
                if ((readl(addr) == TEST_PATTERN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (col == 8) {
@@ -638,11 +638,11 @@ static int rk3066_dmc_sdram_col_row_detect(struct rk3066_dmc_dram_info *dram, in
        rk3066_dmc_move_to_access_state(chan);
        /* Detect row, max 15, min13 for rk3066 */
        for (row = 16; row >= 13; row--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE + (1 << (row + 15 - 1));
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE + (1 << (row + 15 - 1));
                writel(TEST_PATTERN, addr);
                if ((readl(addr) == TEST_PATTERN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (row == 12) {
@@ -854,7 +854,7 @@ static int rk3066_dmc_probe(struct udevice *dev)
                if (ret)
                        return ret;
        } else {
-               priv->info.base = CONFIG_SYS_SDRAM_BASE;
+               priv->info.base = CFG_SYS_SDRAM_BASE;
                priv->info.size = rockchip_sdram_size((phys_addr_t)&priv->pmu->sys_reg[2]);
        }
 
index 16cfbf947bde835433a99d2e7d5ffab099db08e7..ded65393806e00d6a5497af3b522dd474fbcc98c 100644 (file)
@@ -23,7 +23,7 @@ static int rk3128_dmc_probe(struct udevice *dev)
 
        priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
        debug("%s: grf=%p\n", __func__, priv->grf);
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size = rockchip_sdram_size(
                                (phys_addr_t)&priv->grf->os_reg[1]);
 
index be8ba4464d45c011e8cf3f054757fd64ebf50c7d..272b1b2dce1f92d1493f93ecd6d36a9a799d7490 100644 (file)
@@ -638,12 +638,12 @@ static int sdram_col_row_detect(struct dram_info *dram, int channel,
 
        /* Detect col */
        for (col = 11; col >= 9; col--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE +
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE +
                        (1 << (col + sdram_params->ch[channel].bw - 1));
                writel(TEST_PATTEN, addr);
                if ((readl(addr) == TEST_PATTEN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (col == 8) {
@@ -660,11 +660,11 @@ static int sdram_col_row_detect(struct dram_info *dram, int channel,
        move_to_access_state(chan);
        /* Detect row, max 15,min13 in rk3188*/
        for (row = 16; row >= 13; row--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE + (1 << (row + 15 - 1));
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE + (1 << (row + 15 - 1));
                writel(TEST_PATTEN, addr);
                if ((readl(addr) == TEST_PATTEN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (row == 12) {
@@ -919,7 +919,7 @@ static int rk3188_dmc_probe(struct udevice *dev)
        if (ret)
                return ret;
 #else
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size = rockchip_sdram_size(
                                (phys_addr_t)&priv->pmu->sys_reg[2]);
 #endif
index cd4234f389ebe4db08f26cea61114464c4fa4cd0..1b204fb56e66415b088035887508495100e64716 100644 (file)
@@ -636,12 +636,12 @@ static int dram_cap_detect(struct dram_info *dram,
                writel(3, &axi_bus->ddrconf);
        move_to_access_state(dram->chan[0].pctl);
        for (col = 11; col >= 9; col--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE +
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE +
                        (1 << (col + bw - 1));
                writel(TEST_PATTEN, addr);
                if ((readl(addr) == TEST_PATTEN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (col == 8) {
@@ -656,11 +656,11 @@ static int dram_cap_detect(struct dram_info *dram,
 
        /* Detect row*/
        for (row = 16; row >= 12; row--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE + (1u << (row + 11 + 3 - 1));
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE + (1u << (row + 11 + 3 - 1));
                writel(TEST_PATTEN, addr);
                if ((readl(addr) == TEST_PATTEN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (row == 11) {
@@ -672,11 +672,11 @@ static int dram_cap_detect(struct dram_info *dram,
                sdram_params->ch[0].cs0_row = row;
        }
        /* cs detect */
-       writel(0, CONFIG_SYS_SDRAM_BASE);
-       writel(TEST_PATTEN, CONFIG_SYS_SDRAM_BASE + (1u << 30));
-       writel(~TEST_PATTEN, CONFIG_SYS_SDRAM_BASE + (1u << 30) + 4);
-       if ((readl(CONFIG_SYS_SDRAM_BASE + (1u << 30)) == TEST_PATTEN) &&
-           (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+       writel(0, CFG_SYS_SDRAM_BASE);
+       writel(TEST_PATTEN, CFG_SYS_SDRAM_BASE + (1u << 30));
+       writel(~TEST_PATTEN, CFG_SYS_SDRAM_BASE + (1u << 30) + 4);
+       if ((readl(CFG_SYS_SDRAM_BASE + (1u << 30)) == TEST_PATTEN) &&
+           (readl(CFG_SYS_SDRAM_BASE) == 0))
                sdram_params->ch[0].rank = 2;
        else
                sdram_params->ch[0].rank = 1;
@@ -813,7 +813,7 @@ static int rk322x_dmc_probe(struct udevice *dev)
        if (ret)
                return ret;
 #else
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size = rockchip_sdram_size(
                        (phys_addr_t)&priv->grf->os_reg[2]);
 #endif
index 227a3cc6a88d2be484ca095812b4d86c5aba0c00..83778ad1c2c1b4da8d1d4fb201d443f5c9eeea72 100644 (file)
@@ -684,12 +684,12 @@ static int sdram_col_row_detect(struct dram_info *dram, int channel,
 
        /* Detect col */
        for (col = 11; col >= 9; col--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE +
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE +
                        (1 << (col + sdram_params->ch[channel].bw - 1));
                writel(TEST_PATTEN, addr);
                if ((readl(addr) == TEST_PATTEN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (col == 8) {
@@ -705,11 +705,11 @@ static int sdram_col_row_detect(struct dram_info *dram, int channel,
        move_to_access_state(chan);
        /* Detect row*/
        for (row = 16; row >= 12; row--) {
-               writel(0, CONFIG_SYS_SDRAM_BASE);
-               addr = CONFIG_SYS_SDRAM_BASE + (1 << (row + 15 - 1));
+               writel(0, CFG_SYS_SDRAM_BASE);
+               addr = CFG_SYS_SDRAM_BASE + (1 << (row + 15 - 1));
                writel(TEST_PATTEN, addr);
                if ((readl(addr) == TEST_PATTEN) &&
-                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                   (readl(CFG_SYS_SDRAM_BASE) == 0))
                        break;
        }
        if (row == 11) {
@@ -1087,7 +1087,7 @@ static int rk3288_dmc_probe(struct udevice *dev)
        if (ret)
                return ret;
 #else
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size = rockchip_sdram_size(
                        (phys_addr_t)&priv->pmu->sys_reg[2]);
 #endif
index 44d7d8a0d9be6a593e6a6e719ead3d3ed6a89f33..10828e80822a07d2601cb72203f75564d86b471f 100644 (file)
@@ -21,7 +21,7 @@ static int rk3308_dmc_probe(struct udevice *dev)
        struct dram_info *priv = dev_get_priv(dev);
 
        priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size = rockchip_sdram_size((phys_addr_t)&priv->grf->os_reg2);
 
        return 0;
index 9c6798f816ac89b9a91b2de84e184fd06f15bf8a..b511c6bf6fe57bd16238a2615094b306cd2c641b 100644 (file)
@@ -580,7 +580,7 @@ static int rk3328_dmc_probe(struct udevice *dev)
 
        priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
        debug("%s: grf=%p\n", __func__, priv->grf);
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size = rockchip_sdram_size(
                                (phys_addr_t)&priv->grf->os_reg[2]);
 #endif
index cbf502bd0e960cb70b5a6de40197054d0d9e03bf..136e4ede712297128418173b9f9e984e57633820 100644 (file)
@@ -3151,7 +3151,7 @@ static int rk3399_dmc_probe(struct udevice *dev)
 
        priv->pmugrf = syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);
        debug("%s: pmugrf = %p\n", __func__, priv->pmugrf);
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size =
                rockchip_sdram_size((phys_addr_t)&priv->pmugrf->os_reg2);
 #endif
index 0ac4b54eef3e821084d476d07cc4b4349ed3908c..f661615c1b91efada8ab7e02dff4d36043dd71ac 100644 (file)
@@ -21,7 +21,7 @@ static int rk3568_dmc_probe(struct udevice *dev)
        struct dram_info *priv = dev_get_priv(dev);
 
        priv->pmugrf = syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);
-       priv->info.base = CONFIG_SYS_SDRAM_BASE;
+       priv->info.base = CFG_SYS_SDRAM_BASE;
        priv->info.size =
                rockchip_sdram_size((phys_addr_t)&priv->pmugrf->pmu_os_reg2);
 
index 130b73dfe49d91dead1a0d83539594a80063c008..60525f2286798b1842302e6c154263bdcae2a571 100644 (file)
@@ -90,7 +90,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
 
        /* AHB-PCI Bridge Communication Registers */
        writel(AHB_BUS_CTR_INIT, &ahbcom_pci->ahb_bus_ctr);
-       writel((CONFIG_SYS_SDRAM_BASE & 0xf0000000) | PCIAHB_WIN_PREFETCH,
+       writel((CFG_SYS_SDRAM_BASE & 0xf0000000) | PCIAHB_WIN_PREFETCH,
               &ahbcom_pci->pciahb_win1_ctr);
        writel(0xf0000000 | PCIAHB_WIN_PREFETCH,
               &ahbcom_pci->pciahb_win2_ctr);
@@ -103,7 +103,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
        writel(PCIWIN1_PCICMD | AHB_CFG_AHBPCI,
               &ahbcom_pci->ahbpci_win1_ctr);
        writel(phys_base + AHBPCI_OFFSET, &ahbconf_pci->basead);
-       writel(CONFIG_SYS_SDRAM_BASE & 0xf0000000, &ahbconf_pci->win1_basead);
+       writel(CFG_SYS_SDRAM_BASE & 0xf0000000, &ahbconf_pci->win1_basead);
        writel(0xf0000000, &ahbconf_pci->win2_basead);
        writel(SERREN | PERREN | MASTEREN | MEMEN,
               &ahbconf_pci->cmnd_sts);
index 2ee6212c58dcdf5ae1d710cc87da1ec29f6bbb46..9110a4848211772cde55361f13ed16237657a520 100644 (file)
@@ -385,7 +385,7 @@ static void sunxi_frontend_mode_set(const struct ctfb_res_modes *mode,
                (struct sunxi_de_fe_reg *)SUNXI_DE_FE0_BASE;
 
        setbits_le32(&de_fe->bypass, SUNXI_DE_FE_BYPASS_CSC_BYPASS);
-       writel(CONFIG_SYS_SDRAM_BASE + address, &de_fe->ch0_addr);
+       writel(CFG_SYS_SDRAM_BASE + address, &de_fe->ch0_addr);
        writel(mode->xres * 4, &de_fe->ch0_stride);
        writel(SUNXI_DE_FE_INPUT_FMT_ARGB8888, &de_fe->input_fmt);
        writel(SUNXI_DE_FE_OUTPUT_FMT_ARGB8888, &de_fe->output_fmt);
@@ -1222,7 +1222,7 @@ static int sunxi_de_probe(struct udevice *dev)
                           EFI_RESERVED_MEMORY_TYPE);
 #endif
 
-       fb_dma_addr = sunxi_display->fb_addr - CONFIG_SYS_SDRAM_BASE;
+       fb_dma_addr = sunxi_display->fb_addr - CFG_SYS_SDRAM_BASE;
        if (overscan_offset) {
                fb_dma_addr += 0x1000 - (overscan_offset & 0xfff);
                sunxi_display->fb_addr += ALIGN(overscan_offset, 0x1000);
index 719caf7b0c3bde9fd2fbe7c1375b3c2c6bba9c38..3a4fbc6eab8317caf98d451f39ef5cd9398ea182 100644 (file)
@@ -30,8 +30,8 @@
  * -The heap is placed below the monitor
  * -The stack is placed below the heap (&grows down).
  */
-#define CONFIG_SYS_SDRAM_BASE          0xc8000000
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000
+#define CFG_SYS_SDRAM_BASE             0xc8000000
+#define CFG_SYS_SDRAM_SIZE             0x08000000
 #define CONFIG_MONITOR_IS_IN_RAM
 
 #endif /* __CONFIG_H */
index ad7bd133200faf7de0f5871cdb8f7dfb449591ff..ab889180eede47036bf8ff84d0bf5054ed03020f 100644 (file)
@@ -26,8 +26,8 @@
  * -The heap is placed below the monitor
  * -The stack is placed below the heap (&grows down).
  */
-#define CONFIG_SYS_SDRAM_BASE          0xD0000000
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000
+#define CFG_SYS_SDRAM_BASE             0xD0000000
+#define CFG_SYS_SDRAM_SIZE             0x08000000
 #define CONFIG_MONITOR_IS_IN_RAM
 
 #endif /* __CONFIG_H */
index 25c3f22bea1333d8e69179d3a97b685f0242c612..6dfa3dd0f02af7bc51ff8bc85646df84782a6be5 100644 (file)
 /*
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define CONFIG_SYS_SDRAM_SIZE          32      /* SDRAM size in MB */
-#define CONFIG_SYS_SDRAM_CFG1          0x43711630
-#define CONFIG_SYS_SDRAM_CFG2          0x56670000
-#define CONFIG_SYS_SDRAM_CTRL          0xE1002000
-#define CONFIG_SYS_SDRAM_EMOD          0x80010000
-#define CONFIG_SYS_SDRAM_MODE          0x00CD0000
+#define CFG_SYS_SDRAM_BASE             0x40000000
+#define CFG_SYS_SDRAM_SIZE             32      /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_CFG1             0x43711630
+#define CFG_SYS_SDRAM_CFG2             0x56670000
+#define CFG_SYS_SDRAM_CTRL             0xE1002000
+#define CFG_SYS_SDRAM_EMOD             0x80010000
+#define CFG_SYS_SDRAM_MODE             0x00CD0000
 
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /* FLASH organization */
 #ifdef CONFIG_SYS_FLASH_CFI
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINV | CF_CACR_INVI)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_CENB | CF_CACR_CINV | \
                                         CF_CACR_DISD | CF_CACR_INVI | \
index f200d706a92a30cee72388bf05610399bfaf309b..e28662c6e59a32425e617048999d16975be43d37 100644 (file)
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_SDRAM_SIZE          16      /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_SDRAM_SIZE             16      /* SDRAM size in MB */
 
 /*
  * For booting Linux, the board info and command line data
@@ -81,7 +81,7 @@
  * the maximum mapped by the Linux kernel during initialization ??
  */
 /* Initial Memory map for Linux */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINV)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_CENB | CF_CACR_DISD | \
                                         CF_CACR_CEIB | CF_CACR_DCM | \
index 9ff66d751c667eb902381ba69a3e8952a97783f8..f1da278d5159d410cf07f311102026663173c4d9 100644 (file)
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_SDRAM_SIZE          16              /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_SDRAM_SIZE             16              /* SDRAM size in MB */
 #define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CS0_BASE)
 
 #if 0 /* test-only */
@@ -67,7 +67,7 @@
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
@@ -90,8 +90,8 @@
 #define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_FLASH_BASE | \
                                         CF_ADDRMASK(2) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
-#define CONFIG_SYS_CACHE_ACR1          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR1          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_CENB | CF_CACR_CEIB | \
                                         CF_CACR_DBWE)
index f7bfe598a80a6ab1f73a02f2d99e54901696b2e0..bd3c57d1438c64e0f50445217e065f0a9615e5f5 100644 (file)
 /*
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_SDRAM_SIZE          16      /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_SDRAM_SIZE             16      /* SDRAM size in MB */
 
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CS0_BASE)
 #define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_FLASH_BASE | \
                                         CF_ADDRMASK(8) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
-#define CONFIG_SYS_CACHE_ACR1          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR1          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_CENB | CF_CACR_CEIB | \
                                         CF_CACR_DBWE)
index dcd83650f22e515eea012604cae554eb14aed91f..7c3bc032bfee4ed5d0e4c94c0897a996a5ce9dbb 100644 (file)
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_SDRAM_SIZE          4       /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_SDRAM_SIZE             4       /* SDRAM size in MB */
 #define CONFIG_SYS_FLASH_BASE          0xffe00000
 
 /*
@@ -82,7 +82,7 @@
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*
  * FLASH organization
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINV | CF_CACR_INVI)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_CENB | CF_CACR_CINV | \
                                         CF_CACR_DISD | CF_CACR_INVI | \
index 9012794501a859474888324e95b0f8286e0ef1f8..4eb4abea725142a5a82f66738311e7e0f7a429f9 100644 (file)
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_SDRAM_SIZE          16      /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_SDRAM_SIZE             16      /* SDRAM size in MB */
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_CS0_BASE
 
 /*
@@ -84,7 +84,7 @@
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINV | CF_CACR_INVI)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_CENB | CF_CACR_CINV | \
                                         CF_CACR_DISD | CF_CACR_INVI | \
index 925d26eaf10dd8661fb119e58ae0f20796f12261..eda394467e9376bd73c7873314d3b69317c4d9fb 100644 (file)
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define        CONFIG_SYS_SDRAM_SIZE           16      /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define        CFG_SYS_SDRAM_SIZE              16      /* SDRAM size in MB */
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_CS0_BASE
 #define        CONFIG_SYS_INT_FLASH_BASE       0xf0000000
 #define CONFIG_SYS_INT_FLASH_ENABLE    0x21
@@ -85,7 +85,7 @@
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINV + CF_CACR_DCM)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_CENB | CF_CACR_DISD | \
                                         CF_CACR_CEIB | CF_CACR_DBWE | \
index 79a4e6171d23c7ba81bd906d8ce6215d6244e58d..159993a46bc5d729d17fe327c706934c425ddbb0 100644 (file)
 /*
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define CONFIG_SYS_SDRAM_SIZE          64      /* SDRAM size in MB */
-#define CONFIG_SYS_SDRAM_CFG1          0x43711630
-#define CONFIG_SYS_SDRAM_CFG2          0x56670000
-#define CONFIG_SYS_SDRAM_CTRL          0xE1092000
-#define CONFIG_SYS_SDRAM_EMOD          0x80010000
-#define CONFIG_SYS_SDRAM_MODE          0x00CD0000
+#define CFG_SYS_SDRAM_BASE             0x40000000
+#define CFG_SYS_SDRAM_SIZE             64      /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_CFG1             0x43711630
+#define CFG_SYS_SDRAM_CFG2             0x56670000
+#define CFG_SYS_SDRAM_CTRL             0xE1092000
+#define CFG_SYS_SDRAM_EMOD             0x80010000
+#define CFG_SYS_SDRAM_MODE             0x00CD0000
 
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINVA)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_EC | CF_CACR_CINVA | \
                                         CF_CACR_DCM_P)
index fc21af56ec7baeb898f3c1bafe645ab7b065d6d5..d7ece6393498b1ee9aa9116f27391e6d6e2993d6 100644 (file)
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define CONFIG_SYS_SDRAM_SIZE          32      /* SDRAM size in MB */
-#define CONFIG_SYS_SDRAM_CFG1          0x53722730
-#define CONFIG_SYS_SDRAM_CFG2          0x56670000
-#define CONFIG_SYS_SDRAM_CTRL          0xE1092000
-#define CONFIG_SYS_SDRAM_EMOD          0x40010000
-#define CONFIG_SYS_SDRAM_MODE          0x018D0000
+#define CFG_SYS_SDRAM_BASE             0x40000000
+#define CFG_SYS_SDRAM_SIZE             32      /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_CFG1             0x53722730
+#define CFG_SYS_SDRAM_CFG2             0x56670000
+#define CFG_SYS_SDRAM_CTRL             0xE1092000
+#define CFG_SYS_SDRAM_EMOD             0x40010000
+#define CFG_SYS_SDRAM_MODE             0x018D0000
 
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINVA)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_EC | CF_CACR_CINVA | \
                                         CF_CACR_DCM_P)
index f7c09a2333cbc487e967b2a863336fc2863fba98..b2fc6923e0d99ab14057166c96ec1fc6914bb35a 100644 (file)
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define CONFIG_SYS_SDRAM_SIZE          32      /* SDRAM size in MB */
-#define CONFIG_SYS_SDRAM_CFG1          0x53722730
-#define CONFIG_SYS_SDRAM_CFG2          0x56670000
-#define CONFIG_SYS_SDRAM_CTRL          0xE1092000
-#define CONFIG_SYS_SDRAM_EMOD          0x40010000
-#define CONFIG_SYS_SDRAM_MODE          0x018D0000
+#define CFG_SYS_SDRAM_BASE             0x40000000
+#define CFG_SYS_SDRAM_SIZE             32      /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_CFG1             0x53722730
+#define CFG_SYS_SDRAM_CFG2             0x56670000
+#define CFG_SYS_SDRAM_CTRL             0xE1092000
+#define CFG_SYS_SDRAM_EMOD             0x40010000
+#define CFG_SYS_SDRAM_MODE             0x018D0000
 
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINVA)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_EC | CF_CACR_CINVA | \
                                         CF_CACR_DCM_P)
index a5518d3d50f22eb7f400086f2337b3ca0bfe9ebd..2e7140cd86a1319e8f127df633435bf1833697e5 100644 (file)
@@ -62,8 +62,8 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       (CONFIG_SYS_IMMR + 0x2800)
 #define        CONFIG_SYS_INIT_RAM_SIZE        (0x2e00 - 0x2800)
 
-/* RAM configuration (note that CONFIG_SYS_SDRAM_BASE must be zero) */
-#define        CONFIG_SYS_SDRAM_BASE           0x00000000
+/* RAM configuration (note that CFG_SYS_SDRAM_BASE must be zero) */
+#define        CFG_SYS_SDRAM_BASE              0x00000000
 
 /* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE          CONFIG_TEXT_BASE
index 0e70b2853b2913b5b54d8a2fb77c050223c2b533..d9627e393d9cd66e2f000b2ef9299baea877a30e 100644 (file)
@@ -59,7 +59,7 @@
 /*
  * DDR Setup
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000 /* DDR is system memory */
+#define CFG_SYS_SDRAM_BASE             0x00000000 /* DDR is system memory */
 #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL  0x03000000
 
 #define CONFIG_SYS_DDRCDR_VALUE        (DDRCDR_DHC_EN | DDRCDR_ODT | DDRCDR_Q_DRN)
@@ -69,7 +69,7 @@
 /*
  * Manually set up DDR parameters
  */
-#define CONFIG_SYS_SDRAM_SIZE          0x10000000 /* 256 MiB */
+#define CFG_SYS_SDRAM_SIZE             0x10000000 /* 256 MiB */
 #define CONFIG_SYS_DDR_CS0_BNDS                0x0000000f
 #define CONFIG_SYS_DDR_CS0_CONFIG      (CSCONFIG_EN \
                                        | CSCONFIG_ODT_WR_ONLY_CURRENT \
index c59a37646f49a6d94f733114d19ff606a103a4f7..6a51149a94949f0ee2957f8f43e5e8551e5e7787 100644 (file)
@@ -40,7 +40,7 @@
 #define CONFIG_MEM_INIT_VALUE  0xDeadBeef
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000      /* DDR is system memory*/
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 /* I2C addresses of SPD EEPROMs */
 #define SPD_EEPROM_ADDRESS     0x51    /* CTLR 0 DIMM 0 */
index f87e7597ad046f3bea358f157897ca1cb93f4a14..21491b9f97ca1fd584022097b71e6dd032c97aaa 100644 (file)
 #ifndef __ASSEMBLY__
 extern unsigned long get_sdram_size(void);
 #endif
-#define CONFIG_SYS_SDRAM_SIZE          get_sdram_size() /* DDR size */
+#define CFG_SYS_SDRAM_SIZE             get_sdram_size() /* DDR size */
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 #define CONFIG_SYS_CCSRBAR                     0xffe00000
 #define CONFIG_SYS_CCSRBAR_PHYS_LOW            CONFIG_SYS_CCSRBAR
index 8c7b877bfb925dedb766f4eace1873f37765c61d..d7e06d23ec4591530338bf4862476ad6742b536f 100644 (file)
  */
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 #define SPD_EEPROM_ADDRESS     0x52
-#define CONFIG_SYS_SDRAM_SIZE  4096    /* for fixed parameter use */
+#define CFG_SYS_SDRAM_SIZE     4096    /* for fixed parameter use */
 
 /*
  * Local Bus Definitions
index 824190a4123416d38b833f44bc35ec379c1c0c80..417b9ae7b2415e3abe56a4310d0a14f1d23cffb5 100644 (file)
@@ -7,7 +7,7 @@
 #define _CONFIG_SBX81LIFKW_H
 
 /* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE  0x00000000
+#define CFG_SYS_SDRAM_BASE     0x00000000
 
 /*
  * NS16550 Configuration
index e67da1fe1dc282c2e4c0bc11e90454bffbba6e6b..87b68227a0d9080ff931dea7aa39eb24a294db0f 100644 (file)
@@ -7,7 +7,7 @@
 #define _CONFIG_SBX81LIFXCAT_H
 
 /* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE  0x00000000
+#define CFG_SYS_SDRAM_BASE     0x00000000
 
 /*
  * NS16550 Configuration
index 154b2f174afb00f7122605700fa001caa948a64d..616387f487692ad02fd94f59aebeb22a66f52130 100644 (file)
  */
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #if defined(CONFIG_TARGET_T1024RDB)
 #define SPD_EEPROM_ADDRESS     0x51
-#define CONFIG_SYS_SDRAM_SIZE  4096    /* for fixed parameter use */
+#define CFG_SYS_SDRAM_SIZE     4096    /* for fixed parameter use */
 #elif defined(CONFIG_TARGET_T1023RDB)
-#define CONFIG_SYS_SDRAM_SIZE   2048
+#define CFG_SYS_SDRAM_SIZE   2048
 #endif
 
 /*
index 847cf65b4092f2663a101f48a468c621db36d2ed..37dfe32e21bfdcd0ad34d31491ec9af9583226be 100644 (file)
  */
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 #define SPD_EEPROM_ADDRESS     0x51
 
-#define CONFIG_SYS_SDRAM_SIZE  4096    /* for fixed parameter use */
+#define CFG_SYS_SDRAM_SIZE     4096    /* for fixed parameter use */
 
 /*
  * IFC Definitions
index b49c26477684fb68520820c9471f84c4629247c7..8f56de40ce8f846cc95f0d865cb390fe4d155668 100644 (file)
@@ -86,8 +86,8 @@
  */
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_SDRAM_SIZE  2048    /* for fixed parameter use */
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_SIZE     2048    /* for fixed parameter use */
 #define SPD_EEPROM_ADDRESS1    0x51
 #define SPD_EEPROM_ADDRESS2    0x52
 #define SPD_EEPROM_ADDRESS     SPD_EEPROM_ADDRESS1
index aae41a339254ca5f26bcc59df9b271ffaa2c3106..e9db4a224f90ff622ff3816b317a3a56feab5549 100644 (file)
@@ -81,8 +81,8 @@
  */
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_SDRAM_SIZE  2048    /* for fixed parameter use */
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_SIZE     2048    /* for fixed parameter use */
 #define SPD_EEPROM_ADDRESS1    0x51
 #define SPD_EEPROM_ADDRESS2    0x52
 #define SPD_EEPROM_ADDRESS     SPD_EEPROM_ADDRESS1
index 9dc45e397f9ba85ae03515c2ff48e18374f0da32..cc86c9d4a51bd30693375f218333eed1e862787d 100644 (file)
@@ -62,7 +62,7 @@
  */
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 /*
  * IFC Definitions
 #define SPD_EEPROM_ADDRESS2    0x54
 #define SPD_EEPROM_ADDRESS3    0x56
 #define SPD_EEPROM_ADDRESS     SPD_EEPROM_ADDRESS1     /* for p3041/p5010 */
-#define CONFIG_SYS_SDRAM_SIZE  4096    /* for fixed parameter use */
+#define CFG_SYS_SDRAM_SIZE     4096    /* for fixed parameter use */
 
 /*
  * IFC Definitions
index 78201adc07f54d814126f8b8ba65b57f429995d7..57f3f37908df9b27669628052d55175d0825d108 100644 (file)
@@ -13,7 +13,7 @@
 #include <environment/ti/mmc.h>
 
 /* DDR Configuration */
-#define CONFIG_SYS_SDRAM_BASE1         0x880000000
+#define CFG_SYS_SDRAM_BASE1            0x880000000
 
 #define PARTS_DEFAULT \
        /* Linux partitions */ \
index 140940730d0ef8706645339b483bbc4a3fa77c3a..25c71f00a20fdf111bcb6e7f271103a209ebf131 100644 (file)
@@ -16,7 +16,7 @@
 #include <environment/ti/k3_dfu.h>
 
 /* DDR Configuration */
-#define CONFIG_SYS_SDRAM_BASE1         0x880000000
+#define CFG_SYS_SDRAM_BASE1            0x880000000
 
 #define PARTS_DEFAULT \
        /* Linux partitions */ \
index 0345160787ef33fdb45e9e058c1894d58f9688fe..0307426e4abab93e349a1709ac1df08e2d46ed9d 100644 (file)
@@ -15,7 +15,7 @@
 #include <environment/ti/k3_dfu.h>
 
 /* DDR Configuration */
-#define CONFIG_SYS_SDRAM_BASE1         0x880000000
+#define CFG_SYS_SDRAM_BASE1            0x880000000
 
 #define PARTS_DEFAULT \
        /* Linux partitions */ \
index 2bda66fe033bcad031fba302f8893267731a1b03..eba78d3894c890353667deea91b653721dd1316b 100644 (file)
@@ -33,8 +33,8 @@
 /* size of internal SRAM */
 #define CONFIG_SYS_INIT_RAM_SIZE       0x1000
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_SDRAM_SIZE          0x1000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_SDRAM_SIZE             0x1000000
 #define CONFIG_SYS_FLASH_BASE          0xffc00000
 
 /* amcore design has flash data bytes wired swapped */
index 650140bb724c62609c851d4233214bf4ae0ac093..63c7dfc1feba799d6e349e4a6b35ad232f6a5487 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_SDRAM_BASE           0x80000000
+#define CFG_SYS_SDRAM_BASE           0x80000000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x8000
index 3114cf0c4fba40bb337879377e3e2e717f2f12ef..865aad2a3f9083e74bb482723157eaf2f7c11f20 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_SDRAM_BASE           0x80000000
+#define CFG_SYS_SDRAM_BASE           0x80000000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x2000
index f0674456fd0c49d3cc2a96078075e0ad8699c162..0464a69e8236bd537f92324426595459b24bad22 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_SDRAM_BASE           0x80000000
+#define CFG_SYS_SDRAM_BASE           0x80000000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x2000
index e2e491bdb0aa69e8b43329f824cc9cb4abab0c1d..cf23837863bed167a3b3173ec14edc6f78675449 100644 (file)
@@ -63,7 +63,7 @@
 /* On Apalis iMX8 USDHC1 is eMMC, USDHC2 is 8-bit and USDHC3 is 4-bit MMC/SD */
 #define CFG_SYS_FSL_USDHC_NUM  3
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #define PHYS_SDRAM_1                   0x80000000
 #define PHYS_SDRAM_2                   0x880000000
 #define PHYS_SDRAM_1_SIZE              SZ_2G           /* 2 GB */
index 30d32d27e3dc39801da56359023027bbbec1140e..356d4c35ee2b57a8cca7abc3a23ab370aca75826 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index f7deba4f56663a4587a708ccf1a4709f8158738b..ed32e772f8e2312740b09fbf9fbb3775616b5aa2 100644 (file)
@@ -6,9 +6,9 @@
 #ifndef __CONFIG_ARBEL_H
 #define __CONFIG_ARBEL_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x0
+#define CFG_SYS_SDRAM_BASE             0x0
 #define CONFIG_SYS_BOOTMAPSZ           (20 << 20)
-#define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_SDRAM_BASE
+#define CONFIG_SYS_INIT_RAM_ADDR       CFG_SYS_SDRAM_BASE
 #define CONFIG_SYS_INIT_RAM_SIZE       0x8000
 
 /* Default environemnt variables */
index 35e8840a92a0fda3377fc8e783d89707b7664a19..90cf4705f4f4839f19c385064bfe173fdf3f2d8b 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 5c9005805e1f97cdb9e4fb49f11d42a7a695195d..cbd0d6cea011a1baeed15729703a711cbfd32750 100644 (file)
@@ -14,7 +14,7 @@
 
 /* Misc CPU related */
 
-#define CONFIG_SYS_SDRAM_BASE          ASPEED_DRAM_BASE
+#define CFG_SYS_SDRAM_BASE             ASPEED_DRAM_BASE
 
 #ifdef CONFIG_PRE_CON_BUF_SZ
 #define CONFIG_SYS_INIT_RAM_ADDR       (ASPEED_SRAM_BASE + CONFIG_PRE_CON_BUF_SZ)
index 58635df149b725b2d66857c95d1b6a3bbd8e36ee..b142ea3c3350309b016c413a3ac21d83e47dcc3b 100644 (file)
@@ -57,7 +57,7 @@
 
 #define CONFIG_SYS_CLK                 80000000
 #define CONFIG_SYS_CPU_CLK             (CONFIG_SYS_CLK * 3)
-#define CONFIG_SYS_SDRAM_SIZE          32              /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_SIZE             32              /* SDRAM size in MB */
 
 /*
  * Define baudrate for UART1 (console output, tftp, ...)
  * (Set up by the startup code)
  * for MCF5373, the allowable range is 0x40000000 to 0x7FF00000
  */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 /*
  * Chipselect bank definitions
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + \
-                                               (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + \
+                                               (CFG_SYS_SDRAM_SIZE << 20))
 
 /* FLASH organization */
 
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINVA)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_EC | CF_CACR_CINVA | \
                                         CF_CACR_DCM_P)
index 574bfe37e9ad1c82011ca4ab7230eb67e290f157..0d76f419db5bf3799601efa1bbda18f02438ffad 100644 (file)
@@ -31,8 +31,8 @@
  * SDRAM: 1 bank, min 32, max 128 MB
  * Initialized before u-boot gets started.
  */
-#define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
+#define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS1
+#define CFG_SYS_SDRAM_SIZE             0x04000000
 
 #define CONFIG_SYS_INIT_RAM_SIZE       (16 * 1024)
 #ifdef CONFIG_AT91SAM9XE
index 2c785ad4264df3ef1399d4ac59a7e32b2d6c1605..dcc1cca4791b68086a2cdd05544f1848626887f3 100644 (file)
@@ -17,8 +17,8 @@
 #include <asm/hardware.h>
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x04000000
 #define CONFIG_SYS_INIT_RAM_SIZE       (16 * 1024)
 #define CONFIG_SYS_INIT_RAM_ADDR       ATMEL_BASE_SRAM
 
index bba8574b1c86d7460f035fb4602d7b1666cdfefc..aefa9fc60c409c94c5251e5ac4cce4c04ab56cc1 100644 (file)
@@ -23,8 +23,8 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
+#define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS1
+#define CFG_SYS_SDRAM_SIZE             0x04000000
 
 #define CONFIG_SYS_INIT_RAM_SIZE       (16 * 1024)
 #define CONFIG_SYS_INIT_RAM_ADDR       ATMEL_BASE_SRAM1
 /* Memory Device Register -> SDRAM */
 #define CONFIG_SYS_SDRC_MDR_VAL                AT91_SDRAMC_MD_SDRAM
 #define CONFIG_SYS_SDRC_MR_VAL2                AT91_SDRAMC_MODE_PRECHARGE
-#define CONFIG_SYS_SDRAM_VAL1          0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL1             0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_MR_VAL3                AT91_SDRAMC_MODE_REFRESH
-#define CONFIG_SYS_SDRAM_VAL2          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL3          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL4          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL5          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL6          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL7          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL8          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL9          0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL2             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL3             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL4             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL5             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL6             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL7             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL8             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL9             0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_MR_VAL4                AT91_SDRAMC_MODE_LMR
-#define CONFIG_SYS_SDRAM_VAL10         0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL10            0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_MR_VAL5                AT91_SDRAMC_MODE_NORMAL
-#define CONFIG_SYS_SDRAM_VAL11         0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL11            0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_TR_VAL2                1200            /* SDRAM_TR */
-#define CONFIG_SYS_SDRAM_VAL12         0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL12            0               /* SDRAM_BASE */
 
 /* setup SMC0, CS0 (NOR Flash) - 16-bit, 15 WS */
 #define CONFIG_SYS_SMC0_SETUP0_VAL                             \
index 3ce264a4a90b7b84812b8826607935713a291b98..08cfee1a4e18412038d8c9ceb2815516175c91df 100644 (file)
@@ -15,8 +15,8 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE           0x70000000
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000
+#define CFG_SYS_SDRAM_BASE           0x70000000
+#define CFG_SYS_SDRAM_SIZE             0x08000000
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index 5e3ded241fa991c65b5fd3ac8f48ae3f4edd425a..76f87c16192e95dd43d5d158f90d69e835aa0aa2 100644 (file)
@@ -14,8 +14,8 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK     16000000        /* main clock xtal */
 
 /* Misc CPU related */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x08000000
 
 /* DataFlash */
 
index b79c8ba5bf864cda01a7a69846bba02230b82b78..e1111b6dd38ef533b0dba8995503e14bd8f6a07f 100644 (file)
@@ -17,8 +17,8 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* main clock xtal */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
+#define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS1
+#define CFG_SYS_SDRAM_SIZE             0x04000000
 
 #define CONFIG_SYS_INIT_RAM_SIZE       (16 * 1024)
 #define CONFIG_SYS_INIT_RAM_ADDR       ATMEL_BASE_SRAM
index 40ea4ed49e8a452ff2e144b65b87cb0a13f80687..eb1d1ad60d1a8670b12a3f3144a89e185745547f 100644 (file)
@@ -20,8 +20,8 @@
  */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000      /* 128 megs */
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x08000000      /* 128 megs */
 
 /* DataFlash */
 
index e3b6956eb5a2b148f69332b47ba68e6c5c19fe44..83ac87b10a58af7e7e21f2b26f14dcc8298b7c27 100644 (file)
@@ -28,7 +28,7 @@
        (PHYS_SDRAM_0 + PHYS_SDRAM_0_SIZE)      /* SDRAM Bank #2 */
 #define PHYS_SDRAM_0_SIZE      0x20000000      /* 512 MB */
 #define PHYS_SDRAM_1_SIZE      0x20000000      /* 512 MB */
-#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM_0
+#define CFG_SYS_SDRAM_BASE     PHYS_SDRAM_0
 
 /*
  * Serial console configuration
index 1932713f453a21c0d982994b2148bf344d4d7eaf..6d82712186d4e6f621caac107c7ea9a62691b9c0 100644 (file)
@@ -20,8 +20,8 @@
  */
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_SDRAM_SIZE          SZ_512M
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_SIZE             SZ_512M
 
 /*
  * UART configuration
index d0c46a2c823b229829597abd2e7d42006ceaefbb..b02ed1bfe0e00abc22b39be398bbf77bea26ad8e 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __BCM947622_H
 #define __BCM947622_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #define COUNTER_FREQUENCY              50000000
 #endif
index 1346ace4bf6c34dcf02206c24d204f228942ff45..246feb66b29578c1212c8c31f45aa3d1aab5c719 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM94908_H
 #define __BCM94908_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index f3d17ddaacfb147572b2bbd585fef17d7c8ae835..c428b1ab578570ed0ba0723e92a070ded5f55c15 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM94912_H
 #define __BCM94912_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index 361569a8c5f0853053676c86ca7b03f924f2a365..f1b68ba67338d9b22c97f8e1dee42603d5ca13ce 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __BCM963138_H
 #define __BCM963138_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 #define CONFIG_SYS_HZ_CLOCK            500000000
 
 #endif
index edbdfc3c51adea52ad658654fc4025a7db5a1b4c..90dfa98311d221fa3a8c761b895065a357077ebe 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM963146_H
 #define __BCM963146_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index 5a24cccba108cc418b11a8cdf90382076a898ea9..54f6750c743324c41cb02a98ef61c585eb727b09 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM963148_H
 #define __BCM963148_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index b15c4111c9671b0dc296f6112b1cfa1f2992ce70..2fdd22d1b0d10f336cdb4ec9369494127e5cf53e 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM963158_H
 #define __BCM963158_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index b25f6a12819a58987460b8fb56d1bd2480b43b39..32fc4a5e390f0721052113ee2b1bce63e3bf1adc 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM963178_H
 #define __BCM963178_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index c8f32672b7d8a20dfdec0121df70adb23340463e..c69d177da2ea68e80ab54d81b7cb6f05142208e2 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM96756_H
 #define __BCM96756_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index 5d9e87b693a07c8a1fb24cc08b6f0e64f009bdb1..37d2d91d96f0538d6d2d1e1a4344afb16cfd6df1 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM96813_H
 #define __BCM96813_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index 1d6d5d616691a7b9b5124b07f8a83c56f1a93053..581fd559856e913663e8ee690d8ffd675bdbfd2b 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM96846_H
 #define __BCM96846_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index 6e420f2c66fb1817d6e2a11920f7cf7186f1f6e2..3fb1ab9230c89079b7c2b69f567dea367a6bce0c 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM96855_H
 #define __BCM96855_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index a7ae71eeaafe038d2d5f63e37cc44c777c831c42..5f5af321897aa3d28c071f57da1e6a042bbab59e 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM96856_H
 #define __BCM96856_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index 4e584b41fb37535c089f598c70692893f6b948c4..9a0d89a7519fe33d2f18f089abcb672a98526362 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM96858_H
 #define __BCM96858_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index 3e23e94ac4bd6e3e53e49d57c398659f62878aec..7702d1f5682840b33b98b0739b40cdb022a24376 100644 (file)
@@ -6,6 +6,6 @@
 #ifndef __BCM96878_H
 #define __BCM96878_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #endif
index 76189a4d31f7619034acc05ed2814f65af93759f..b5469880fe2f8481d1abf1f73ee6c4cc1e812d62 100644 (file)
@@ -15,7 +15,7 @@
 #define V2M_BASE                       0x80000000
 #define PHYS_SDRAM_1                   V2M_BASE
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 /*
  * Initial SP before reloaction is placed at end of first DRAM bank,
index 9f51b9ca59d2b1755f641e6698bd8fb331611d10..9769a7140926ec24d82236ff032ad1737f9db4b8 100644 (file)
@@ -81,7 +81,7 @@ extern phys_addr_t prior_stage_fdt_address;
  * MiB.  However, BOLT can be configured to allow loading larger
  * initramfs images, in which case this limitation is eliminated.
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x100000
 
 /*
index 829e816ad664be656c074f9e23c1d8d588a2e071..556bfa08ebba7080e9c2868c05c5a688a1924d03 100644 (file)
@@ -6,8 +6,8 @@
 #ifndef __CONFIG_BITMAIN_ANTMINER_S9_H
 #define __CONFIG_BITMAIN_ANTMINER_S9_H
 
-#define CONFIG_SYS_SDRAM_BASE  0x00000000
-#define CONFIG_SYS_SDRAM_SIZE  0x40000000
+#define CFG_SYS_SDRAM_BASE     0x00000000
+#define CFG_SYS_SDRAM_SIZE     0x40000000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "pxefile_addr_r=0x2000000\0" \
index ca2bc1907e39b077132554dd43a4873f0a297aa2..a075a5b2f3266c11e64425eb403818558037b3d6 100644 (file)
 #define PHYS_SDRAM                     (0x80000000)
 #define PHYS_SDRAM_SIZE                (SZ_512M)
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index c328f41420159ef571b2cb05b8eb8010deb1d611..e40f110cac6e90dae15c33dcc1b036411956afbb 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index d16d50e5ec2fc18dee89df7b18e07aed03f2507d..508317f231ee0d477236351a960ca39b06daafd4 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index f69c46b11c4b12942fa0dca052d490dbe633bd1b..c5bda16d2bcd59f1cf7cbc838832fcf1287c39ee 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index acd021ecadcc88f44727bcaa312aae0ee9edf7be..32397c26e8abee5b293ccbceb12bc4a1caae00bf 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index fa9e5f02a085013cd3cf081eb813383aa924a05d..18c99727a04296fca74db03d76c637434437342d 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index bcf5c874d3223cbd674e60a475890b4f77fe0c35..f8d7148d497ea108646777f3022d9259a15b3c96 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index e31b8bc719e6952fbf991714bfb51bfc43ef05b1..d564a32ee52678136711d1ec4207db1d207e8be5 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index 6e707d341b7fea1e6085dc7f85a7e91dad7a856a..f982a4363db65964a61909b9c0941ddde97febe5 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index bb72c8cb533b6127bf90fcb118879bdb7a350c30..11d623c28b213cdb6e1e7bd262bf70b4c21439e3 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index a1c992b7a6e61e718bd376f7c599def509b5d189..30965c85bfaa01c347e0eaf7b46d37fc3b6145cc 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* U-Boot */
 
index a09e831c540eb3963f863fc649967432c21e3e53..0033a7fb0223e35c8ff10a1ddd59a0dfac151e21 100644 (file)
@@ -22,9 +22,9 @@
  * Memory map
  */
 #ifdef CONFIG_64BIT
-# define CONFIG_SYS_SDRAM_BASE         0xffffffff80000000
+# define CFG_SYS_SDRAM_BASE            0xffffffff80000000
 #else
-# define CONFIG_SYS_SDRAM_BASE         0x80000000
+# define CFG_SYS_SDRAM_BASE            0x80000000
 #endif
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
index bdedf7ea2d78a751cefb7d4a9fa27aa9c2e73c3f..78b2000aa2ed4771b743108190b83ac1dcf8a383 100644 (file)
@@ -76,7 +76,7 @@ BUR_COMMON_ENV \
 
 /* RAM */
 #define PHYS_SDRAM_1                   MMDC0_ARB_BASE_ADDR
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 1bf6baf75c23914cd8388956acbe2ad36d5ac629..f1734aaca7f5025f1f35abbcb4c1e835b34a2b8f 100644 (file)
@@ -45,7 +45,7 @@
  * always, even when we have more.  We always start at 0x80000000,
  * and we place the initial stack pointer in our SRAM.
  */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /*
  * Our platforms make use of SPL to initalize the hardware (primarily
index c4110f84c0bc19ffbea8db7fe050c9eb93f35469..474ad69d996c7c28e8bef548cdafe92ceab1c844 100644 (file)
@@ -92,7 +92,7 @@
 
 /* On CCP board, USDHC1 is for eMMC */
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #define PHYS_SDRAM_1                   0x80000000
 #define PHYS_SDRAM_2                   0x880000000
 /* DDR3 board total DDR is 1 GB */
index c395384c8d38303c933a6298aed385c2f4773a96..6f2b8245b9860c627326fa4ea9695c08311a3799 100644 (file)
 
 #define CFG_SYS_FSL_USDHC_NUM  3
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #define PHYS_SDRAM_1                   0x80000000
 #define PHYS_SDRAM_2                   0x880000000
 #define PHYS_SDRAM_1_SIZE              0x80000000      /* 2 GB */
index b7511adc09ad5a7a0f3259ad7c048f9cc6fa34cf..f268dfd0943d82ac0b95d5a51f5ca831d43a365a 100644 (file)
@@ -11,7 +11,7 @@
 
 /* Memory configuration */
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000 /* cached (KSEG0) address */
+#define CFG_SYS_SDRAM_BASE             0x80000000 /* cached (KSEG0) address */
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 
 /* NS16550-ish UARTs */
index fc45e597f6d1705e646f7378722c4a61fbed0848..eb899c455782db3df44b38895a4cbc7d90944ffb 100644 (file)
@@ -82,7 +82,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 25443629e208fee0efe0e0c86a338031b0d031a4..47c4aacc436b25edb653b9d10301425345b49c11 100644 (file)
@@ -21,7 +21,7 @@
 /* RAM */
 #define PHYS_SDRAM_1                   MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_2                   MMDC1_ARB_BASE_ADDR
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 52000b58b73fa39468808c7dfebf2edd475558cf..65b9074cd9cb68565916ebaf9d38d00d3a65ca3e 100644 (file)
@@ -30,7 +30,7 @@
  */
 
 #define CONFIG_SYS_CLK                 66000000
-#define CONFIG_SYS_SDRAM_SIZE          16              /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_SIZE             16              /* SDRAM size in MB */
 
 /* ---
  * Define baudrate for UART1 (console output, tftp, ...)
@@ -152,9 +152,9 @@ enter a valid image address in flash */
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 /*
  *-------------------------------------------------------------------------
@@ -162,7 +162,7 @@ enter a valid image address in flash */
  *-----------------------------------------------------------------------
  */
 
-/* #define CONFIG_SYS_SDRAM_SIZE               16 */
+/* #define CFG_SYS_SDRAM_SIZE          16 */
 
 /*
  *-----------------------------------------------------------------------
@@ -186,8 +186,8 @@ enter a valid image address in flash */
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINV | CF_CACR_INVI)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_CENB | CF_CACR_CINV | \
                                         CF_CACR_DISD | CF_CACR_INVI | \
index afe8badd6502fa5c6f5e5051ade4e742ef476c2b..ca8445a3d05a6a580e4b0754be2fe23fc386d45a 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index d641fbf47e7560374e8f681713294c9f84c958eb..6002d8d5c9f098cddeed9c22457203e254efb4a3 100644 (file)
@@ -96,7 +96,7 @@
 /* On Colibri iMX8X USDHC1 is eMMC, USDHC2 is 4-bit SD */
 #define CFG_SYS_FSL_USDHC_NUM  2
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #define PHYS_SDRAM_1                   0x80000000
 #define PHYS_SDRAM_2                   0x880000000
 #define PHYS_SDRAM_1_SIZE              SZ_2G           /* 2 GB */
index 68d923c1ae194bbbc0ad71bf1ea3d38939de09c1..14278e9ca4f7c07a2ced88bfa60a0d9ca65ddce5 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index f9bf849ae9804a3fb2f0d01fa748b22f722ffb10..c08095561d839ca332f56c5c05c392a6dcf2d881 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 0f6f99d244f91c2df60eb61ff83a6af3f31e4caa..11283071397f1cb1e7fa6d83c55398302b49e2ea 100644 (file)
@@ -85,7 +85,7 @@
 #define PHYS_SDRAM                     (0x80000000)
 #define PHYS_SDRAM_SIZE                        (256 * SZ_1M)
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 8e0230c135e3416ede020d54d598604dc311d7b8..8aec52d508e26a2eb0937dcdc57cb2c0effaa050 100644 (file)
@@ -22,7 +22,7 @@
 #define PHYS_SDRAM_1           (V2M_BASE)
 #define PHYS_SDRAM_1_SIZE      0x80000000
 
-#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE     PHYS_SDRAM_1
 
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0)
index 9d44e6723e2a115a0c1d14d8aa0afb8fc42471f9..c7a3e47437bc8c89402a3b1b9a4d0662e325eae4 100644 (file)
@@ -32,8 +32,8 @@
 #define CONFIG_USART_ID                        ATMEL_ID_SYS
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_CS6
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000
+#define CFG_SYS_SDRAM_BASE           ATMEL_BASE_CS6
+#define CFG_SYS_SDRAM_SIZE             0x08000000
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index 4f0188dd19edbd567d8d28c10abbba098605b964..e2e1cfedbde199f4b678a80ebcf37a82b25a64d6 100644 (file)
 /* Load U-Boot Image From MMC */
 
 /* additions for new relocation code, must added to all boards */
-#define CONFIG_SYS_SDRAM_BASE          0xc0000000
+#define CFG_SYS_SDRAM_BASE             0xc0000000
 
 #include <asm/arch/hardware.h>
 
index b944d50663ceb9f3351db84519126dedc75eca38..b16f3d48e38601e0edca7f97455e137286322012 100644 (file)
@@ -42,7 +42,7 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        SZ_512M
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 5244b9cf5cc8e200943553a193754bf0cd095f40..c473f3d86ebf4f60d6b821a3c914651ddd0594b4 100644 (file)
@@ -15,8 +15,8 @@
 /*
  * Memory configurations
  */
-#define CONFIG_SYS_SDRAM_BASE          EMC_DYCS0_BASE
-#define CONFIG_SYS_SDRAM_SIZE          SZ_64M
+#define CFG_SYS_SDRAM_BASE             EMC_DYCS0_BASE
+#define CFG_SYS_SDRAM_SIZE             SZ_64M
 
 /*
  * DMA
index e694dd7551ae5665190c9ad5fd58217463ae9abc..ddc436d50190029417fb915129a7b06d12850d92 100644 (file)
@@ -72,7 +72,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 0e5ecab9feb25b80838b047fba519ebf6067394f..0a7428b02caf1a9f9f639df0e4e54c2eaff4e233 100644 (file)
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
index c37b4c635b2740bb7084f3808586091c83c89519..daf7ecd7975b54e95fca04eaec69b39446192fa2 100644 (file)
@@ -17,7 +17,7 @@
 #define PHYS_SDRAM_1                   0x80000000
 /* Note: 8 MiB (0x86000000 - 0x86800000) are reserved for tz/smem/hyp/rmtfs/rfsa */
 #define PHYS_SDRAM_1_SIZE              SZ_1G
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 /* Environment */
 #define BOOT_TARGET_DEVICES(func) \
index 1fa5d05e7b473d4496b80a611ccfcc7506fa0b93..31cd8536de4b343b84ca4af6751c50f640018aaf 100644 (file)
@@ -19,7 +19,7 @@
 #define PHYS_SDRAM_2                   0x100000000
 #define PHYS_SDRAM_2_SIZE              0x5ea4ffff
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 #include <config_distro_bootcmd.h>
 
index 8f0e8be433073b5be64e4a15317e6a14e0caa789..001596c00a45eddfc1a7bb1405b8d6873adb1f77 100644 (file)
@@ -11,7 +11,7 @@
 /* Sdram Bank #1 Address */
 #define PHYS_SDRAM_1                   0x80000000
 #define PHYS_SDRAM_1_SIZE              0x7B000000
-#define CONFIG_SYS_SDRAM_BASE   PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE   PHYS_SDRAM_1
 
 /* BOOT */
 
index 1d655292d7efd8908493f1648655e4ab5f614b19..fc1c2aed7780c09eb5f62b350aa39a5bff8de605 100644 (file)
@@ -13,7 +13,7 @@
 /*
  * RAM
  */
-#define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE
+#define CFG_SYS_SDRAM_BASE EMC_DYCS0_BASE
 
 /*
  * cmd
index 80a820c913b7bc7f2ae64324a56b3d361d0e6b54..80de73d15d507fa888b78763eeacd15e4a06ea70 100644 (file)
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE0         0x00000000
-#define        CONFIG_SYS_SDRAM_SIZE0          16      /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_BASE0            0x00000000
+#define        CFG_SYS_SDRAM_SIZE0             16      /* SDRAM size in MB */
 
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_SDRAM_BASE0
-#define        CONFIG_SYS_SDRAM_SIZE           CONFIG_SYS_SDRAM_SIZE0
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_SDRAM_BASE0
+#define        CFG_SYS_SDRAM_SIZE              CFG_SYS_SDRAM_SIZE0
 
 /*
  * For booting Linux, the board info and command line data
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINV + CF_CACR_DCM)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR0          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_CENB | CF_CACR_DISD | \
                                         CF_CACR_CEIB | CF_CACR_DBWE | \
index 16d2648e11f30f018a77c658a2ba3eb1e69f817b..d24bc56f34ab2c1254c4bc6136853dd4d2ecca0c 100644 (file)
@@ -50,7 +50,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index a4891ddbc4ff8710d936e685fc5c2ac4e096e58e..e39bb94314f301da4b33ee538a7bb19dba1aee6d 100644 (file)
@@ -27,7 +27,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 60fab0419f5da7f61d54cf2959cc8890d7067a96..c2b921e7cb8b26fa1ae3df83eed31e7eeee88809 100644 (file)
@@ -8,8 +8,8 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_SDRAM_BASE          0x10000000
-#define CONFIG_SYS_SDRAM_SIZE          SZ_16M
+#define CFG_SYS_SDRAM_BASE             0x10000000
+#define CFG_SYS_SDRAM_SIZE             SZ_16M
 
 /*
  * Environment
index 2f067a4424824b051e5e325ec0d3d5cc269cfcb9..b4f14a9a589db3dea1fd698abc69b10163cb953f 100644 (file)
@@ -10,7 +10,7 @@
 
 #include <configs/exynos7420-common.h>
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE                (256UL << 20UL) /* 256 MB */
index f19e12d909049eb55a8ff01528d84379bd83f432..97a8ffb4f61e592a2a735afba8f9069968419443 100644 (file)
@@ -26,8 +26,8 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       (32 << 10)
 
 /* 128MB SDRAM in 1 bank */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          (128 << 20)
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             (128 << 20)
 
 /* 512kB on-chip NOR flash */
 # define CONFIG_SYS_FLASH_BASE         0x00200000 /* AT91SAM9XE_FLASH_BASE */
index 44f5cb1e83f450b6aa9c93cce8242e098d321326..dd322c2b3a79787b9da5c3e42dfd2e8fced199b8 100644 (file)
 
 #define CONFIG_RD_LVL
 
-#define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE
+#define PHYS_SDRAM_1           CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_1_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_2           (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
+#define PHYS_SDRAM_2           (CFG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
 #define PHYS_SDRAM_2_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_3           (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_3           (CFG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_3_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_4           (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_4           (CFG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_4_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_5           (CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_5           (CFG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_5_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_6           (CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_6           (CFG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_6_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_7           (CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_7           (CFG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_7_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_8           (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_8           (CFG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_8_SIZE      SDRAM_BANK_SIZE
 
 /* SPI */
index 8e2f135f934cf05b8831bea9241c66c85dc6c8b7..cc0cf5ecbfbd9cbefff9e1266c65add91f3d8721 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef __CONFIG_5250_H
 #define __CONFIG_5250_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE                (256UL << 20UL) /* 256 MB */
index a8bef860c2f77b13dd8553161e5e54b460788a76..cff910c1bd5b2dd12de7c7e2f165e45813aa1d2c 100644 (file)
 
 /* select serial console configuration */
 
-#define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE
+#define PHYS_SDRAM_1           CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_1_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_2           (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
+#define PHYS_SDRAM_2           (CFG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
 #define PHYS_SDRAM_2_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_3           (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_3           (CFG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_3_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_4           (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_4           (CFG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_4_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_5           (CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_5           (CFG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_5_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_6           (CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_6           (CFG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_6_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_7           (CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_7           (CFG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_7_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_8           (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_8           (CFG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_8_SIZE      SDRAM_BANK_SIZE
 
 /* Configuration of ENV Blocks */
index b05846d0b920541f59bf396f3b3da0e1bbdd77d2..68c36dc2fd9574fe2e688024decd69ab0a2edc15 100644 (file)
 #define CONFIG_SYS_BAUDRATE_TABLE \
        {9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600}
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE                (256UL << 20UL) /* 256 MB */
-#define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE
+#define PHYS_SDRAM_1           CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_1_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_2           (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
+#define PHYS_SDRAM_2           (CFG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
 #define PHYS_SDRAM_2_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_3           (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_3           (CFG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_3_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_4           (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_4           (CFG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_4_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_5           (CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_5           (CFG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_5_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_6           (CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_6           (CFG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_6_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_7           (CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_7           (CFG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_7_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_8           (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_8           (CFG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_8_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_9           (CONFIG_SYS_SDRAM_BASE + (8 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_9           (CFG_SYS_SDRAM_BASE + (8 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_9_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_10          (CONFIG_SYS_SDRAM_BASE + (9 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_10          (CFG_SYS_SDRAM_BASE + (9 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_10_SIZE     SDRAM_BANK_SIZE
-#define PHYS_SDRAM_11          (CONFIG_SYS_SDRAM_BASE + (10 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_11          (CFG_SYS_SDRAM_BASE + (10 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_11_SIZE     SDRAM_BANK_SIZE
-#define PHYS_SDRAM_12          (CONFIG_SYS_SDRAM_BASE + (11 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_12          (CFG_SYS_SDRAM_BASE + (11 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_12_SIZE     SDRAM_BANK_SIZE
 
 #ifndef MEM_LAYOUT_ENV_SETTINGS
index ba098316e0836b4b6e1de2474c6a9bbf73e7436d..f5353ec79a1a9fe78e2431c32a6f444672727fb4 100644 (file)
@@ -18,8 +18,8 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* 12 MHz crystal */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000      /* 128 megs */
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x08000000      /* 128 megs */
 
 /* NAND flash */
 #define CFG_SYS_NAND_BASE              0x40000000
index a1400eba1adab12d47c34e716d1db6a559b6f9ff..a7557144402b89d0f4c728bdd6d2c221d67c5e95 100644 (file)
@@ -7,7 +7,7 @@
 #define __CONFIG_GARDENA_SMART_GATEWAY_H
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 
index fa6f0e63ac501daef5f35f0d174d62581fd5fe65..6cdfe8c4c3c0f823e3156fb8fb189348135e1ba3 100644 (file)
@@ -12,9 +12,9 @@
 /*
  * DDR Setup
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000 /* DDR is system memory */
-/* TODO: Check: Can this be unified with CONFIG_SYS_SDRAM_BASE? */
-#define CONFIG_SYS_DDR_SDRAM_BASE      CONFIG_SYS_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             0x00000000 /* DDR is system memory */
+/* TODO: Check: Can this be unified with CFG_SYS_SDRAM_BASE? */
+#define CONFIG_SYS_DDR_SDRAM_BASE      CFG_SYS_SDRAM_BASE
 
 /*
  * Memory test
index c862f15ee2b4d010672785cd3866fa3321d0d650..85ceaf8ccb1a5e009831d5921cad4893e73571fa 100644 (file)
@@ -37,7 +37,7 @@
 /* Memory */
 #define PHYS_SDRAM                    MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE         PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE            PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index d519384d026e88e2e06b4f5af8918dcc8a85220f..1dba2e92fb9d43a6190fcf7550f1de64df245b17 100644 (file)
@@ -94,7 +94,7 @@
 
 #define CONFIG_SYS_BOOTMAPSZ (256 << 20)     /* 256M */
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index d2138c220f0a4b4432b1dd53a4bef1d8beb07d39..dd6b22de7bac4ad2fcc87eace4af580da480a26f 100644 (file)
@@ -13,8 +13,8 @@
 /* Miscellaneous */
 
 /* Internal RAM Size (RZ/A1=3M, RZ/A1M=5M, RZ/A1H=10M) */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          (10 * 1024 * 1024)
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             (10 * 1024 * 1024)
 
 /* Network interface */
 #define CONFIG_SH_ETHER_USE_PORT       0
index 645ca162a35a537d25a655f2b94f7a41c0224d4d..fe00272a1bd0f41f2b42a2ebfe1714d9bde99684 100644 (file)
@@ -53,7 +53,7 @@
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index e3c97b20d51ef1efddbfefaf9efdde8d4e76c36f..2b0b04891cc27470a24185ffe71d09d7681143fc 100644 (file)
@@ -10,6 +10,6 @@
 #ifndef _GXP_H_
 #define _GXP_H_
 
-#define CONFIG_SYS_SDRAM_BASE   0x40000000
+#define CFG_SYS_SDRAM_BASE   0x40000000
 
 #endif
index a7d21a76dba5684c071fae560c755803ee7ee685..0d281a3379aa29753224664f07041852759b694a 100644 (file)
@@ -14,7 +14,7 @@
  * Miscellaneous configurable options
  */
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
        "fdt_high=0x20000000\0"                                 \
index 18c1e83aeb4a55563fa6f0c4ecdf7aaeef3e90a2..775f166f1d35660a7375a9a67745fe54c1e4ac45 100644 (file)
@@ -24,7 +24,7 @@
 /* 1008 MB (the last 16Mb are secured for TrustZone by ATF*/
 #define PHYS_SDRAM_1_SIZE              0x3EFFFFFF
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 #define CONFIG_SYS_INIT_RAM_SIZE       0x1000
 
index 973df8e4abce83da8df2101577a66d16df7454e5..914c3ad9ef04c6875a363deb5b63a225b34e945b 100644 (file)
@@ -16,7 +16,7 @@
 #define PHYS_SDRAM_1                   0x00000000
 #define PHYS_SDRAM_1_SIZE              0xC0000000
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 #define CONFIG_SYS_INIT_RAM_SIZE       0x1000
 
index 1d7b171da75a6232443811baf5a2593e79567f3f..fcb2dec54ec13f91c51d3e9a08bd3bc3dcfa7494 100644 (file)
@@ -22,8 +22,8 @@
  */
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_SDRAM_SIZE          SZ_1G
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_SIZE             SZ_1G
 
 /*
  * UART configuration
index 9e092e16ea04431c2c09b1ec5e46654f4e6e3be8..0ae935208ca56c72c636a0ff00c3644a6cc2a3b6 100644 (file)
@@ -21,8 +21,8 @@
  */
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_SDRAM_SIZE          SZ_1G
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_SIZE             SZ_1G
 
 /*
  * UART configuration
index 1fc45f9060bb41a307aef5d7eb2d3c5fba9aa0ad..f1ca28b7ca32ef59d18ef4e2d1b2af82cb4b332f 100644 (file)
@@ -21,8 +21,8 @@
  */
 
 /* SDRAM Configuration (for final code, data, stack, heap) */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000      /* 128 Mbytes */
+#define CFG_SYS_SDRAM_BASE             0x80000000
+#define CFG_SYS_SDRAM_SIZE             0x08000000      /* 128 Mbytes */
 
 /*----------------------------------------------------------------------
  * Commands
index 974dff8f6f44168b7d397b0da5d71309d7254cb2..594aa4f75e77a6ad035c9afb18727cc01334c833 100644 (file)
        "upd=run load update\0"                                         \
 
 /* additions for new relocation code, must be added to all boards */
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 #endif /* __IMX27LITE_COMMON_CONFIG_H */
index b8eb5c82cf7eb84ca94f1b0edc6b243c0e3b44e4..d4e2583ee8a4ad8a2a5437b8377986f4cb839110 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 6b822e725058e6d1f35828d020cd9011baa5ddf4..1b08c5e9a7e6e2fb8fa7b249e051791f18f0f599 100644 (file)
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index f7f8f33ed8986ae4e12027504072661d044d0a29..a074df5829b4f77c702b5f90b34fcec945b07c91 100644 (file)
@@ -55,7 +55,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 15171d7ad67b91e0be325ead299dba8ca9a0f847..855af29ec96d445a5646a9f7a9a95c157c486b83 100644 (file)
@@ -85,7 +85,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                      MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE           PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE           PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR        IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE        IRAM_SIZE
 
index 70b4b84215d3be9c72828eb93c357435346fbbf1..0a688afe6cdb83a5a431fe9d5f9d12962937bb8b 100644 (file)
@@ -63,7 +63,7 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        SZ_128M
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index c6db5e943eea5851f15a5614bdaa4ecfec6dcb7f..e5118f11580eb2a025f6eef8ebd2888e6ca369ca 100644 (file)
@@ -69,7 +69,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 917d567d2eca562e72ce4cbe137140f2d28f91b8..e62f9c5462b294a14e74898969ba97f2a30ab4ac 100644 (file)
 #define CONFIG_SYS_INIT_RAM_SIZE       0x80000
 
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000 /* 2GB DDR */
 
index 8e08899458050550482fa2a1261715edb4ac7bfe..143da00110469f224b37144235d9a6d675ff09d9 100644 (file)
@@ -74,7 +74,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x200000
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                0x80000000 /* 2GB DDR */
 
index dd9f93f35c29370f15a5157804faea3c669f6254..c7669305f59223b08421d07db8828de3fde87364 100644 (file)
@@ -21,7 +21,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x200000
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x40000000 /* Minimum 1 GiB DDR */
 
index f1d1c1c9c3d16509b4b103c6498e70d80a7a60b7..9937071874fd05725d8e8b62b6d162eab6fab6b9 100644 (file)
@@ -57,7 +57,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE        0x200000
 
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000 /* 2GB DDR */
 
index 9cdba70493b229d53691b60993a27313bf6c9ece..cd47d842ffc7878c6709d791a8676a4584fc1cf0 100644 (file)
@@ -41,7 +41,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 
 /* SDRAM configuration */
 #define PHYS_SDRAM                      0x40000000
index 065356341fcae872aaec283c00054794c0ca212d..58e165c35a7b14af2edd0c0330d45fa6a34e4a8a 100644 (file)
@@ -32,7 +32,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 
 /* SDRAM configuration */
 #define PHYS_SDRAM                      0x40000000
index 0ae3da12ad38200d332738561eef467ccdf1577d..f532c1052f5d81516765b11794b45a93c059c439 100644 (file)
@@ -78,7 +78,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x200000
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #if CONFIG_IS_ENABLED(IMX8MN_BEACON_2GB_LPDDR)
 #define PHYS_SDRAM_SIZE                0x80000000 /* 2GB DDR */
index d6959ac95a1384dde5ae907cd505bfd1fec38aee..415248eadfc501a3659d6a80f5342a2fe02f313a 100644 (file)
@@ -26,7 +26,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 
 #endif /* __IMX8MN_BSH_SMM_S2_COMMON_H */
index 9c75e3eec1521aa6e3aec50d7ef66d5f1c5336b4..8857bc7c598b5cbad57dd4ebbbf6ffb8437c10ce 100644 (file)
@@ -49,7 +49,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE        0x200000
 
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000 /* 2GB DDR */
 
index a484d91364928c4f7551d821999baa4d82387175..628bb5813ff160bd7755b20209ed10d18424abfb 100644 (file)
@@ -46,7 +46,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        SZ_1G /* 1GB DDR */
 
index d5252abb218025114a90947d2ab0e8706ed91cd2..a169be35a4926c823c1bb1e2991192cf814db511 100644 (file)
@@ -26,7 +26,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 
 /* SDRAM configuration */
 #define PHYS_SDRAM                      0x40000000
index bf8782513644bea40673f5ae730eeb2864f72188..62bcef5eecdb398355c3ea2d66136aabb0f229c3 100644 (file)
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x200000
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x20000000 /* Minimum 512 MiB DDR */
 
index 1b533e2c142e5db4872ea8cafd554d79fd36d2a0..d394762e3bb2c03181b56a3b615de2096eac74b4 100644 (file)
@@ -55,7 +55,7 @@
 
 
 /* Totally 2GB DDR */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000
 
index 7986d20eed1a29e9ae4a34d5a03ceb9c0e561732..3e995c9721725973222cbb37be232085daa689c0 100644 (file)
@@ -56,7 +56,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       0x80000
 
 /* Totally 2GB DDR */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000
 
index 8f2b474817d93b833002bb9f1ded3dd48f2377cd..1943a24b79db13c03dc1253c95605d6ee381276a 100644 (file)
 
 
 /* Totally 6GB or 4G DDR */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #if defined(CONFIG_TARGET_IMX8MP_RSB3720A1_6G)
 #define PHYS_SDRAM_SIZE                        0xC0000000      /* 3 GB */
index b1c213cc89b67c33711d7507d1c237253338c268..7d360583c416dc64d37418374ad846f7f0f5a8e0 100644 (file)
@@ -26,7 +26,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 
 /* SDRAM configuration */
 #define PHYS_SDRAM                      0x40000000
index 4b2107e405748313e0aa49f7b6abb3ec729b7824..271376cb9fc85f1975793ded8f93bd28f6e87a22 100644 (file)
@@ -50,7 +50,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE        0x80000
 
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                                        0x40000000 /* 1 GB DDR */
 
index 2d4c8d78c6769867ce033b37dde2f532762c4c60..672a9fa7a34261f0334174dca67f0e3297636d14 100644 (file)
@@ -56,7 +56,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE        0x80000
 
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0xC0000000 /* 3GB DDR */
 
index 1905e538c5befe1f1fac99dbb44e6fe51c036fde..dd354b0265de5622bcb82d65b87d910347074c10 100644 (file)
@@ -88,7 +88,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE        0x80000
 
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0x40000000 /* 1GB DDR */
 
index 7f6d59db3aa273226e1cdef7f034d1bd8f310362..f1f907f3e5a45088aa85ffe6f578f5e58dc8c1c8 100644 (file)
 
 /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #define PHYS_SDRAM_1                   0x80000000
 #define PHYS_SDRAM_2                   0x880000000
 #define PHYS_SDRAM_1_SIZE              0x80000000      /* 2 GB */
index 67f19bc19220fc7ec2695b42681eb44eac733c51..fe27ac36a3b1b895ad5b2a6d703b20425e0cd9f7 100644 (file)
  */
 #define CFG_SYS_FSL_USDHC_NUM  3
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #define PHYS_SDRAM_1                   0x80000000
 #define PHYS_SDRAM_2                   0x880000000
 #define PHYS_SDRAM_1_SIZE              0x80000000      /* 2 GB */
index 567351fcad64448245c22f02b602ae636ef16d22..19f1dba04706d0668156d8395f36670cb2ec9e54 100644 (file)
 
 /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #define PHYS_SDRAM_1                   0x80000000
 #define PHYS_SDRAM_2                   0x880000000
 #define PHYS_SDRAM_1_SIZE              0x80000000      /* 2 GB */
index 7bf0ce784c5eccc6839a988ec7235f13873c6de6..592df2795b13f0e6626766b213c48362f6ca8141 100644 (file)
@@ -54,7 +54,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       0x80000
 
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #define PHYS_SDRAM                     0x80000000
 #define PHYS_SDRAM_SIZE                        0x80000000 /* 2GB DDR */
 
index b28146640863503738ed19c46edc0ab35ff8873a..077a4d843dcdf2fd48f59a7fc35209ad3f86e2be 100644 (file)
 #define CONFIG_SYS_INIT_RAM_ADDR        0x80000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x200000
 
-#define CONFIG_SYS_SDRAM_BASE           0x80000000
+#define CFG_SYS_SDRAM_BASE           0x80000000
 #define PHYS_SDRAM                      0x80000000
 #define PHYS_SDRAM_SIZE                        0x80000000 /* 2GB DDR */
 
index 512e0e61aa78b1c27db0968ac767dd49939c01f6..8d0458d1d63f457df277ce948b3db6d44f44a647 100644 (file)
@@ -30,7 +30,7 @@
  */
 #define PHYS_SDRAM_1           0x00000000      /* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE      0x08000000      /* 128 MB */
-#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE     PHYS_SDRAM_1
 
 /*
  * FLASH and environment organization
index a2e50c3b8df2a436f016b4f2d0688cdd91d1f0ad..5a769e0787175918f6749092f006474a1374a541 100644 (file)
  *   :           :
  *   :          Specified explicitly by CONFIG_CUSTOM_SYS_INIT_SP_ADDR
  *   :
- *  Specified explicitly by CONFIG_SYS_SDRAM_BASE
+ *  Specified explicitly by CFG_SYS_SDRAM_BASE
  *
  *  NOTES:
  *    - Stack starts from CONFIG_CUSTOM_SYS_INIT_SP_ADDR and grows down,
- *      i.e. towards CONFIG_SYS_SDRAM_BASE but nothing stops it from crossing
- *      that CONFIG_SYS_SDRAM_BASE in which case data won't be really saved on
+ *      i.e. towards CFG_SYS_SDRAM_BASE but nothing stops it from crossing
+ *      that CFG_SYS_SDRAM_BASE in which case data won't be really saved on
  *      stack any longer and values popped from stack will contain garbage
  *      leading to unexpected behavior, typically but not limited to:
  *        - "Returning" back to bogus caller function
 #define DCCM_BASE                      0x80000000
 #define DCCM_SIZE                      SZ_128K
 
-#define CONFIG_SYS_SDRAM_BASE          DCCM_BASE
-#define CONFIG_SYS_SDRAM_SIZE          DCCM_SIZE
+#define CFG_SYS_SDRAM_BASE             DCCM_BASE
+#define CFG_SYS_SDRAM_SIZE             DCCM_SIZE
 
 #define ROM_BASE                       CONFIG_SYS_MONITOR_BASE
 #define ROM_SIZE                       SZ_256K
 
 #define RAM_DATA_BASE                  SYS_INIT_SP_ADDR
-#define RAM_DATA_SIZE                  CONFIG_SYS_SDRAM_SIZE - \
+#define RAM_DATA_SIZE                  CFG_SYS_SDRAM_SIZE - \
                                        (SYS_INIT_SP_ADDR - \
-                                       CONFIG_SYS_SDRAM_BASE) - \
+                                       CFG_SYS_SDRAM_BASE) - \
                                        CONFIG_SYS_MALLOC_LEN - \
                                        CONFIG_ENV_SIZE
 #endif /* _CONFIG_IOT_DEVKIT_H_ */
index 9f54f259994a94fc2f252f52ec7ea5c624cd3884..2a0b0c7163a7e351ac76eb9b0407a1a0dd0966a5 100644 (file)
@@ -16,7 +16,7 @@
 #include <environment/ti/k3_dfu.h>
 
 /* DDR Configuration */
-#define CONFIG_SYS_SDRAM_BASE1         0x880000000
+#define CFG_SYS_SDRAM_BASE1            0x880000000
 /* FLASH Configuration */
 #define CONFIG_SYS_FLASH_BASE          0x000000000
 
index 932d7d3c8cb56952fa2599c084f9d2258014be66..e690ef959060a8403f7a18710d564ea5d62171d5 100644 (file)
@@ -17,7 +17,7 @@
 #include <environment/ti/k3_dfu.h>
 
 /* DDR Configuration */
-#define CONFIG_SYS_SDRAM_BASE1         0x880000000
+#define CFG_SYS_SDRAM_BASE1            0x880000000
 
 /* SPL Loader Configuration */
 #if defined(CONFIG_TARGET_J721S2_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
index 7d36a25dc232e0ce2f5e7036a2136cb4055a38b3..db1daee13633931d79b5b8c8d36e522209d72697 100644 (file)
@@ -7,7 +7,7 @@
 /*
  * DDR Setup
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000 /* DDR is system memory */
+#define CFG_SYS_SDRAM_BASE             0x00000000 /* DDR is system memory */
 
 #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL  (DDR_SDRAM_CLK_CNTL_SS_EN | \
                                        DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05)
@@ -17,7 +17,7 @@
 /*
  * Manually set up DDR parameters
  */
-#define CONFIG_SYS_SDRAM_SIZE          0x80000000 /* 2048 MiB */
+#define CFG_SYS_SDRAM_SIZE             0x80000000 /* 2048 MiB */
 
 /*
  * The reserved memory
index ad9853ab6b3b6d773042f9f40ae94783945c1228..b5913ed70003c1a78275937d8ac95a5256ddd9b8 100644 (file)
@@ -20,7 +20,7 @@
 #define PHYS_SDRAM_SIZE                        (1u * 1024 * 1024 * 1024)
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 #define SPD_EEPROM_ADDRESS             0x54
 
index c8423fdfb0ab683d3852a25c2e071a070f43bdaf..dbf038cefa030389eb404350f2f11203c40baeb1 100644 (file)
  */
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 #define SPD_EEPROM_ADDRESS     0x54
-#define CONFIG_SYS_SDRAM_SIZE  4096    /* for fixed parameter use */
+#define CFG_SYS_SDRAM_SIZE     4096    /* for fixed parameter use */
 
 /******************************************************************************
  * (PRAM usage)
index b3e1fc2a864e68fefe2c07a34d8751479aaeb400..e2808ec02dc1bb2cd49fab7a19b89466a79b27b6 100644 (file)
@@ -14,7 +14,7 @@
 
 /* RAM */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
index a2aedefcec215e3e22fc64a84713521fe2150477..73b595176219ad0cfb46f1550dc1a03c01c9c11e 100644 (file)
@@ -17,7 +17,7 @@
 /* RAM */
 #define PHYS_SDRAM                     DDR_CSD1_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        (SZ_4G)
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x200000
index 6acd2f792534973561289372d680b897331649f4..9b452818c1e166830bf5ea719144de19b0209431 100644 (file)
@@ -64,7 +64,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x80000
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0xC0000000 /* 3GB DDR */
 
index 7ed1f153c2324a0226379b821d3d21fb9a6097a6..bbf0761814b4b6cb6ed6d40f9600c425065bd07c 100644 (file)
@@ -21,7 +21,7 @@
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_SYS_DDR_BLOCK2_BASE     0x2080000000ULL
 
 /* early stack pointer */
index c401fd32169d2b42850d1b31ab3c6e2db990686a..967de66f3c9d3eae1cd3aa825aa2d59317d473b1 100644 (file)
@@ -67,7 +67,7 @@
 #define PHYS_SDRAM_1_SIZE              (512 * SZ_1M)
 #define PHYS_SDRAM_SIZE                (PHYS_SDRAM_1_SIZE)
 
-#define CONFIG_SYS_SDRAM_BASE          (PHYS_SDRAM_1)
+#define CFG_SYS_SDRAM_BASE             (PHYS_SDRAM_1)
 #define CONFIG_SYS_INIT_RAM_ADDR       (IRAM_BASE_ADDR)
 #define CONFIG_SYS_INIT_RAM_SIZE       (IRAM_SIZE)
 
index b0e49ad6df0768a73a24bf904e274c67d080612b..de1fc0bfa4c603dabf3030bb0920500c8df8d380 100644 (file)
@@ -86,7 +86,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 1f642fbecc3c876ffd660ae60e190a6838d16783..bee064c6f385c7b8e6c6c6ff38ef26cd65c5e383 100644 (file)
@@ -85,7 +85,7 @@
        "bootscript=source ${bootscraddr}\0"
 
 /* additions for new relocation code, must added to all boards */
-#define CONFIG_SYS_SDRAM_BASE          0xc0000000
+#define CFG_SYS_SDRAM_BASE             0xc0000000
 
 #include <asm/arch/hardware.h>
 
index dbd7d107dae9313f4d70ed3463b4e5323f7e2a03..3a2c508ffacfab625b0ba273aac9d31cffc7ea31 100644 (file)
@@ -82,7 +82,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x80000
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0xc0000000 /* 3GB LPDDR4 one Rank */
 
index 28372d41590a83ef65f780635ced2977a51c65ea..b9134508853b3364590a019688acbb136977ad2a 100644 (file)
@@ -7,7 +7,7 @@
 #define __CONFIG_LINKIT_SMART_7688_H
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 
index 1d51b87b68b31707e3dc9291f956ad0867c34f9b..d1ebd99ae144125b643c1b89f8928b75e307702b 100644 (file)
@@ -87,7 +87,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 196e024b57e0bc841aa363756faa5a989eda6fbe..f0a9e9ab315580c3642264b91ea9fdf3db03a2a6 100644 (file)
@@ -9,7 +9,7 @@
 #include "ls1012a_common.h"
 
 /* DDR */
-#define CONFIG_SYS_SDRAM_SIZE          0x40000000
+#define CFG_SYS_SDRAM_SIZE             0x40000000
 
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
index 809f9ae8c8dc010424005d8c24a5201acd6b6c43..07124370775bd11c16e843555fdbd7c94797d504 100644 (file)
@@ -12,7 +12,7 @@
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_SYS_DDR_BLOCK2_BASE     0x880000000ULL
 
 /*SPI device */
index 674bcbeb75844f24a19b9d923b515a0479681aa6..c19ed2f43ecfdef09318dcdfd298ac7a174fc894 100644 (file)
@@ -10,7 +10,7 @@
 #include "ls1012a_common.h"
 
 /* DDR */
-#define CONFIG_SYS_SDRAM_SIZE          0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x20000000
 
 #undef BOOT_TARGET_DEVICES
 #define BOOT_TARGET_DEVICES(func) \
index 9ad3a1201183fd4e988a3e59965de1ac89d63ee5..54555b34dd47a695b31108ea9fc30e84775f05ba 100644 (file)
@@ -10,7 +10,7 @@
 #include "ls1012a_common.h"
 
 /* DDR */
-#define CONFIG_SYS_SDRAM_SIZE          0x40000000
+#define CFG_SYS_SDRAM_SIZE             0x40000000
 
 /*
  * QIXIS Definitions
index 4f77acdaedec021f2fbd397e3e4c9480aff2eaca..d74936d1281dbb1ee6bca9a944b3f7be67a0f0c4 100644 (file)
@@ -10,7 +10,7 @@
 #include "ls1012a_common.h"
 
 /* DDR */
-#define CONFIG_SYS_SDRAM_SIZE          0x40000000
+#define CFG_SYS_SDRAM_SIZE             0x40000000
 
 /*
  * I2C IO expander
index 3579f9c8437b285e9cf62320b9b895bbfac07ee5..49a77fd6b6bb8605dfb9fa44a4de5d7739f1d607 100644 (file)
@@ -42,7 +42,7 @@
 #define SDRAM_CFG_BI                   0x00000001
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 /*
  * Serial Port
index 45665115f662a77e1029d3502f158d0d2030c2fb..1f5a80ff085aa1cbadb859514f1e672f6612b9ee 100644 (file)
@@ -20,7 +20,7 @@
 #define SPD_EEPROM_ADDRESS             0x51
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE           0xdeadbeef
index 1e2db12a83f21b7426a74c38e33f533ed63436dc..49546066115055778ccb8a8d99853eb89d5a124a 100644 (file)
@@ -57,7 +57,7 @@
 #define PHYS_SDRAM_SIZE                        (1u * 1024 * 1024 * 1024)
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 /* Serial Port */
 #define CFG_SYS_NS16550_CLK            get_serial_clock()
index 323feb6e33332e486375d22e2fc894a628de5a08..d77224934c01f297597ba36e0ae5cd31a345b733 100644 (file)
@@ -60,7 +60,7 @@
 #define PHYS_SDRAM_SIZE                        (1u * 1024 * 1024 * 1024)
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
 
 /*
  * IFC Definitions
index 587f23be587ffaaf44121c3fff79e07bf99503f0..064c4f069cbd5d32272148c507a6d541c4448437 100644 (file)
@@ -15,7 +15,7 @@
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_SYS_DDR_BLOCK2_BASE     0x2080000000ULL
 
 /*
index df6338298b48bccbf34cc892df2fb4b32750f9e9..e940dff99889b8220b890c9e33190580c9bb2dba 100644 (file)
@@ -34,7 +34,7 @@
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_SYS_DDR_BLOCK2_BASE      0x880000000ULL
 
 #define CPU_RELEASE_ADDR               secondary_boot_addr
index b09588f4796d02e3394fa0e41a3916486a967afb..ce254d8b3f12714c3af6a99e15284788d981b926 100644 (file)
@@ -34,7 +34,7 @@
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_SYS_DDR_BLOCK2_BASE      0x880000000ULL
 
 #define CPU_RELEASE_ADDR               secondary_boot_addr
index 2117b0811686d25f0a87bc393ae794d52578ef09..f8eaee881d06f82f144539eead9ebb737dea58c4 100644 (file)
@@ -32,7 +32,7 @@
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_SYS_DDR_BLOCK2_BASE     0x8080000000ULL
 /*
  * SMP Definitinos
index c79a50795b8cb93e8050990345e34c773221bdef..21c097ecbbdf4119b824b6400e3d695a670716fa 100644 (file)
@@ -19,7 +19,7 @@
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_SYS_DDR_BLOCK2_BASE     0x8080000000ULL
 
 /*
index 8b2b7479c11bec2bfd4cb1610c4856101705c727..ad85e2de6eda2c9f0f6fe7fcfad70bbce557ac59 100644 (file)
@@ -17,8 +17,8 @@
 #define CONFIG_SYS_DDR_SDRAM_BASE              0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
 #define CONFIG_SYS_DDR_BLOCK2_BASE             0x2080000000ULL
-#define CONFIG_SYS_SDRAM_SIZE                  0x200000000UL
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_SIZE                     0x200000000UL
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 #define SPD_EEPROM_ADDRESS1            0x51
 #define SPD_EEPROM_ADDRESS2            0x52
index 1734f323f929e2996fa40a516decf51e5286fa88..cbdb2fa1357e1a5b5120e973982e546b6dbce018 100644 (file)
@@ -20,7 +20,7 @@
 #define PHYS_SDRAM_2_SIZE              (gd->bd->bi_dram[1].size)
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
-#define CONFIG_SYS_SDRAM_BASE          (PHYS_SDRAM_1)
+#define CFG_SYS_SDRAM_BASE             (PHYS_SDRAM_1)
 #define CONFIG_SYS_INIT_RAM_ADDR       (IRAM_BASE_ADDR)
 #define CONFIG_SYS_INIT_RAM_SIZE       (IRAM_SIZE)
 
index 2dd34ea7313ccf58fd74a46f47ed458cba280608..c9aee00cd357c59e184acd10d013f53832eff7be 100644 (file)
  */
 
 #ifdef CONFIG_64BIT
-# define CONFIG_SYS_SDRAM_BASE         0xffffffff80000000
+# define CFG_SYS_SDRAM_BASE            0xffffffff80000000
 #else
-# define CONFIG_SYS_SDRAM_BASE         0x80000000
+# define CFG_SYS_SDRAM_BASE            0x80000000
 #endif
-#define CONFIG_SYS_SDRAM_SIZE          0x10000000      /* 256 MiB */
+#define CFG_SYS_SDRAM_SIZE             0x10000000      /* 256 MiB */
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 
index db84302231a6dfeb12ca964557d70dee5fd7cdc9..5ad945b558968724d3cd0f51a92b77b859fd5a2d 100644 (file)
@@ -47,6 +47,6 @@
  */
 
 /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
-#define CONFIG_SYS_SDRAM_SIZE          SZ_1G
+#define CFG_SYS_SDRAM_SIZE             SZ_1G
 
 #endif /* _CONFIG_DB_MV7846MP_GP_H */
index f9f0825f6f81d62e650cccc258e10f8106053c8d..8aa3b0cd808cb7b3705b75a0fc26f234513f07e2 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index c6ce8837474e66be395d40c2ff262dcbc17ccb80..2422cbf9f0b6e79909ce567e03b34570804f51b2 100644 (file)
@@ -17,7 +17,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index cd3910ee4ba6b24dc4c60dd9ed68809e0e579794..2e07886c194bab9e1a8215fb141f5815983397ff 100644 (file)
@@ -44,8 +44,8 @@
 #define PHYS_SDRAM                                     ATMEL_BASE_CS1 /* 0x20000000 */
 #define PHYS_SDRAM_SIZE                                0x02000000     /* 32 MByte */
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_SDRAM_SIZE          PHYS_SDRAM_SIZE
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
+#define CFG_SYS_SDRAM_SIZE             PHYS_SDRAM_SIZE
 
 #define CONFIG_SYS_INIT_RAM_ADDR       ATMEL_BASE_SRAM0
 #define CONFIG_SYS_INIT_RAM_SIZE       (16 * 1024)
index 726f33c26c2a1484a5b1b5c2c037f79e2924dd8e..6331b7615db6b96e0696fdccc1528d02ed3904ca 100644 (file)
@@ -36,7 +36,7 @@
 #define STDIN_CFG "serial"
 #endif
 
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 
 /* ROM USB boot support, auto-execute boot.scr at scriptaddr */
 #define BOOTENV_DEV_ROMUSB(devtypeu, devtypel, instance) \
index 4c7cfac8af75f5d31b8bbd2c18256de5b4239544..3def93d61e8ae65c143daccf6a70b9009154cdde 100644 (file)
@@ -9,7 +9,7 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_SDRAM_BASE       0x80000000
+#define CFG_SYS_SDRAM_BASE       0x80000000
 
 #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
 
index bd35378800b75c7db0eba4914199de6f4a410be3..ac5ff9289a52513d8ccc2d45d6179c06798c43fa 100644 (file)
@@ -49,7 +49,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x80000
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000 /* 2GB DDR */
 #define PHYS_SDRAM_2                   0xc0000000
index c76e1fcaed9e785bd3f88acd263894c4247248b5..65cd6f5bc4c2bd0ef09ae2c527f1896784330e37 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_MT7620_H
 #define __CONFIG_MT7620_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 
index e09e9c82eb8da7c4ec76420fb0b7779ced4d4af8..1211bb4748807e0125f09c7fad97eabc044dd7f8 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_MT7621_H
 #define __CONFIG_MT7621_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED          0x1c000000
index fd8e30acf592ce8d48202a651b42a50aef941467..e5d60e1cd2b1451cabf17123b04dc4f7e5e7bc07 100644 (file)
@@ -15,7 +15,7 @@
 /* SPL -> Uboot */
 #define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
 /* DRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 /* Ethernet */
 #define CONFIG_IPADDR                  192.168.1.1
index 73093f94d2b6960a72484ee33f1527f8992b38be..39a7ba76633b4ace718d3581a688bd09d5f11d8a 100644 (file)
@@ -21,7 +21,7 @@
 #define MMC_SUPPORTS_TUNING
 
 /* DRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* This is needed for kernel booting */
 #define FDT_HIGH                       "0xac000000"
index bb12ebfe4fd002a0d3428e15c7ccffa4c08c9914..9c5034f5f08630cca5c0eb9941839f972b63d4ff 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_MT7628_H
 #define __CONFIG_MT7628_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x80000
 
index 668dc3c4f741494a134568d0f8c2bcfc8e2cb1da..d330adbc01b90294274e29a5de7fa2030a88d1f1 100644 (file)
@@ -25,7 +25,7 @@
 /* UBoot -> Kernel */
 
 /* DRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 /* Ethernet */
 #define CONFIG_IPADDR                  192.168.1.1
index 9f26b0ba7bba5150b6cd48cb5a079469836a2596..249f0b9662d0f1348bd5d2b6bc34799ae1e230a1 100644 (file)
@@ -16,6 +16,6 @@
 #define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
 
 /* DRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 #endif
index 4fbd57a573dbca4b233de3c11032e6441788dab5..990e411a64063c719ce2533ef22f71bb6e531882 100644 (file)
@@ -16,6 +16,6 @@
 #define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
 
 /* DRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 #endif
index 7cabbef92889d383971dc24b5b33805a1ceee28b..8a8bc85ca70e2659b946edd036019d08519ac993 100644 (file)
@@ -10,8 +10,8 @@
 #define __MT8518_H
 
 /* DRAM definition */
-#define CONFIG_SYS_SDRAM_BASE                  0x40000000
-#define CONFIG_SYS_SDRAM_SIZE                  0x20000000
+#define CFG_SYS_SDRAM_BASE                     0x40000000
+#define CFG_SYS_SDRAM_SIZE                     0x20000000
 
 /* Uboot definition */
 
index e870fc810cb1c3fd7c419184cae11d7ec6950155..e45bfd76b6e19495c895fd560f20aa284adce3cf 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 /* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE  0x00000000
+#define CFG_SYS_SDRAM_BASE     0x00000000
 
 /*
  * NS16550 Configuration
index 41bdfae6c31cf564fb684e85b17b31c15b8ae911..9c4038be8b0490ca7fa36890e874edeb3cf2c71a 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch/soc.h>
 
 /* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE   0x200000000
+#define CFG_SYS_SDRAM_BASE   0x200000000
 
 #define CONFIG_SYS_BAUDRATE_TABLE   { 9600, 19200, 38400, 57600, \
                                      115200, 230400, 460800, 921600 }
index 6d3cb99b2dfec0395455acddf68dd9dd269eaaf9..7641b5622194de0c03f21d37b386de854c0d7c7d 100644 (file)
@@ -13,7 +13,7 @@
  */
 
 /* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE  0x00000000
+#define CFG_SYS_SDRAM_BASE     0x00000000
 
 #define CONFIG_SYS_BAUDRATE_TABLE      { 300, 600, 1200, 1800, 2400, 4800, \
                                          9600, 19200, 38400, 57600, 115200, \
index 5debd9117c6e547d31c029e9be7c26557b8aba69..358e06fd20797eb0ab0250aafec4797cc65fc06a 100644 (file)
@@ -12,7 +12,7 @@
 #define CONFIG_SYS_TCLK                250000000       /* 250MHz */
 
 /* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE  0x00000000
+#define CFG_SYS_SDRAM_BASE     0x00000000
 
 /* auto boot */
 
index dd303a17d61c7b1f8a7cac13901b1e872d00270a..aa3d7a1a3fc82e5310cef080e1ed34d2a15f7967 100644 (file)
@@ -10,7 +10,7 @@
 /* Memory configuration */
 #define PHYS_SDRAM_1                   0x40000000      /* Base address */
 #define PHYS_SDRAM_1_SIZE              0x08000000      /* Max 128 MB RAM */
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 /* Status LED */
 
index 4c0531212edde30f0d2a13a29806db100f35e2ad..f597cdb305631622b84e1e21adf5cfb671ffa8fb 100644 (file)
@@ -13,7 +13,7 @@
 /* Memory configuration */
 #define PHYS_SDRAM_1                   0x40000000      /* Base address */
 #define PHYS_SDRAM_1_SIZE              0x08000000      /* Max 128 MB RAM */
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 /* Extra Environments */
 #define CONFIG_EXTRA_ENV_SETTINGS \
index 140f5e98c52158a12351b5372d5bbce43ac7b8d7..bc8c8933704352437d537a7b24908c3a9ecbcfa4 100644 (file)
@@ -13,7 +13,7 @@
 /* Memory configuration */
 #define PHYS_SDRAM_1                   0x40000000      /* Base address */
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* Max 1 GB RAM */
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 /* UBI and NAND partitioning */
 
index 95afb350ec34596e00035a7032653009e53bdd36..2229980db370a388e56e2080d7cf96542fd3ea84 100644 (file)
 #define PHYS_SDRAM_1           CSD0_BASE_ADDR
 #define PHYS_SDRAM_1_SIZE      (512 * 1024 * 1024)
 
-#define CONFIG_SYS_SDRAM_BASE          (PHYS_SDRAM_1)
+#define CFG_SYS_SDRAM_BASE             (PHYS_SDRAM_1)
 #define CONFIG_SYS_INIT_RAM_ADDR       (IRAM_BASE_ADDR)
 #define CONFIG_SYS_INIT_RAM_SIZE       (IRAM_SIZE)
 
index 7783563972028769938b35c4cae9d747a2255523..e84bac67ef72e9a0d963e4d223f877597eb119b6 100644 (file)
@@ -60,7 +60,7 @@
 #define PHYS_SDRAM_2_SIZE              (gd->bd->bi_dram[1].size)
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
-#define CONFIG_SYS_SDRAM_BASE          (PHYS_SDRAM_1)
+#define CFG_SYS_SDRAM_BASE             (PHYS_SDRAM_1)
 #define CONFIG_SYS_INIT_RAM_ADDR       (IRAM_BASE_ADDR)
 #define CONFIG_SYS_INIT_RAM_SIZE       (IRAM_SIZE)
 
index 3c9b2ad58ee49ad58b7c77df58641fc3f6170eac..9e837a38833713bcd7a4a9d91543b10d487986f0 100644 (file)
@@ -95,7 +95,7 @@
 #define PHYS_SDRAM_2_SIZE              (gd->bd->bi_dram[1].size)
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
-#define CONFIG_SYS_SDRAM_BASE          (PHYS_SDRAM_1)
+#define CFG_SYS_SDRAM_BASE             (PHYS_SDRAM_1)
 #define CONFIG_SYS_INIT_RAM_ADDR       (IRAM_BASE_ADDR)
 #define CONFIG_SYS_INIT_RAM_SIZE       (IRAM_SIZE)
 
index b26613a2ea8344d5965dff7d9b4d54c82f9604de..52ff7b00b436ab2a7503ef17c982d6cd7fe41678 100644 (file)
@@ -96,7 +96,7 @@
 #define PHYS_SDRAM_2_SIZE              (gd->bd->bi_dram[1].size)
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
-#define CONFIG_SYS_SDRAM_BASE          (PHYS_SDRAM_1)
+#define CFG_SYS_SDRAM_BASE             (PHYS_SDRAM_1)
 #define CONFIG_SYS_INIT_RAM_ADDR       (IRAM_BASE_ADDR)
 #define CONFIG_SYS_INIT_RAM_SIZE       (IRAM_SIZE)
 
index 1db4d6c01b173d21271c6d2dab8799c884d751b4..3c4ba095e4e71bbcc9d6e85e94c33a58602a203a 100644 (file)
@@ -85,7 +85,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Physical Memory Map */
-#define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
+#define CFG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index a6cefab5508ab38c90877ecab833b560109b9d36..9c160c41ece6f4ca297be58761600dee5d17a7e4 100644 (file)
@@ -27,7 +27,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                    MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE         PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE            PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index bc9fab12909a69764231cb302df797c66bf2730e..711b5a334aad9acc3a2751caf00ca28781cfdfba 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index ca1d077437b736b2b5460962fd43e21cbd98757b..3c2621d8c91ad3c3bbd6b2ad7b77192a1b903387 100644 (file)
@@ -82,7 +82,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 44a5eeff198432836fb819a5c41b43b30ee31de9..a3a12aeb39007b7ed0c40340a482e36c796be82b 100644 (file)
@@ -82,7 +82,7 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        SZ_2G
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index a41e428eb8ada5eddcf96714c42d93eee0d9e056..f0e239fdb6eb705e7ec90e20e4945d2c5bb35e37 100644 (file)
@@ -78,7 +78,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index c655671ee1bdd022f17350aa4b499f6c03311adc..a0f9c537e5dd5ef776d8a33fa8ed22bd7a15fe96 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 65f0a5c996626718655434bb9dafbc543fb754f0..8199b4b8319e424b6976e7f49d18be4feb4fc66d 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 604923ec2b77982af3d9c0ed493e8ad8e30376d7..827385c65e2a4ebc2a946e4c90738fdeb6692761 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index af176583814f7e76a9ffa460deb64ae4caaf5abf..c39b3572b84befdbed5657946ede821f0f4b1db9 100644 (file)
@@ -81,7 +81,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 62e8e62991185074d3a71926bd62b4cc31c4a6f9..362de482f575fcf3a38bb9df1871980082501027 100644 (file)
@@ -26,7 +26,7 @@
 /* Physical Memory Map */
 
 #define PHYS_SDRAM                     0x60000000
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "image=zImage\0" \
index e93824928b322927bc1c7e51ed7b14e0dd5d9623..9ef1eea5e61d11a220f1e0d5772faf735b8d1960 100644 (file)
@@ -26,7 +26,7 @@
 
 #define PHYS_SDRAM                     0x60000000
 #define PHYS_SDRAM_SIZE                        SZ_1G
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
index 273f938554defd524467c54925f29a9ddcb950a8..cdd12866ac0aed2ca600d653a5d8a6562c699ce6 100644 (file)
@@ -22,7 +22,7 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        SZ_256M
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index ec5339d930a31af29efba32d3a021d6af38a086b..9d09811316478ee7ad3a32024c39e948adce223a 100644 (file)
@@ -90,7 +90,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                    MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE         PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE            PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 2623f99f8d0c05934a5e3e5f9e6353962c933293..9ad4f590697785eb70b4efcf2f2f2dff7d5fa0f5 100644 (file)
  * FLASH and environment organization
  */
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_ADDR       0x4020f800
 #define CONFIG_SYS_INIT_RAM_SIZE       0x800
 
  */
 
 #define SDRAM_SIZE                     0x10000000      /* 256 MB */
-#define SDRAM_END                      (CONFIG_SYS_SDRAM_BASE + SDRAM_SIZE)
+#define SDRAM_END                      (CFG_SYS_SDRAM_BASE + SDRAM_SIZE)
 
 #define IMAGE_MAXSIZE                  0x1FF800        /* 2 MB - 2 kB */
 #define KERNEL_OFFSET                  0x40000         /* 256 kB */
index 9dc05d80ec2ccebfb48792663e858bb601f03465..8d39d75a42bc12c8bb0c2a518eb4100ab89a7219 100644 (file)
@@ -30,7 +30,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index ea407c9f6f1a19c147dfe1f11c9621d830f4dbcf..080c659b6ecbc3309112687acf52a3b878ee9a5e 100644 (file)
@@ -23,7 +23,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index d469ef83c240d5cf03ccfe7c6a92fc99e345a3f8..b930a538640dfc8441edabc360118b7690285fd6 100644 (file)
@@ -13,8 +13,8 @@
  */
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_SDRAM_SIZE          SZ_256M
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_SIZE             SZ_256M
 
 /*
  * Console configuration
index 00f7d871271dd0aefcb2b27e24d9e119d5e0a008..5ac951a370a45547a549bed7fe9b743cc0a5cfb5 100644 (file)
@@ -7,7 +7,7 @@
 #include "mx6_common.h"
 
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 0fa7490e7de621783f698b2bcdb067a41bb3fa66..b475354bbc6df3b062199e0ecc5bf2239b5be63b 100644 (file)
@@ -14,6 +14,6 @@
 #define CONFIG_SYS_INIT_SP_OFFSET      0x00180000
 #endif
 
-#define CONFIG_SYS_SDRAM_BASE          0xffffffff80000000
+#define CFG_SYS_SDRAM_BASE             0xffffffff80000000
 
 #endif /* __OCTEON_COMMON_H__ */
index ab1eb787e70fe4ef161b409f88d87e731b5a7439..03d1a8e7b5fcce09a6cd740ed6a778ce952363b9 100644 (file)
@@ -10,7 +10,7 @@
 /** Maximum size of image supported for bootm (and bootable FIT images) */
 
 /** Memory base address */
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_TEXT_BASE
 
 /** Stack starting address */
 
index 38f99ab21674230be3218f086958e26574aaea95..58275ccffa01414fcc12c0ec54386376b880687e 100644 (file)
@@ -36,7 +36,7 @@
 /** Maximum size of image supported for bootm (and bootable FIT images) */
 
 /** Memory base address */
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_TEXT_BASE
 
 /** Stack starting address */
 
index babd3ca9631c6136c160635fa5adc93acb98bb8c..ce8ea583fa106dbc28eda71dac41aa54f21bd5a5 100644 (file)
@@ -17,9 +17,9 @@
 #define CONFIG_SYS_PL310_BASE  0x10502000
 #endif
 
-#define CONFIG_SYS_SDRAM_BASE  0x40000000
+#define CFG_SYS_SDRAM_BASE     0x40000000
 #define SDRAM_BANK_SIZE                (256 << 20)     /* 256 MB */
-#define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE
+#define PHYS_SDRAM_1           CFG_SYS_SDRAM_BASE
 
 #include <linux/sizes.h>
 
index 15646297423ec3e8c146c8da597bdff5a0423b45..d2d7fca54450497ccdb6da31b51e3538c7d5571c 100644 (file)
@@ -10,7 +10,7 @@
 #include <configs/exynos5420-common.h>
 #include <configs/exynos5-common.h>
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 #define TZPC_BASE_OFFSET               0x10000
 
index 2b47d4ca3768beddc4cfc955025a274485018468..5b0d87a33679c343d4c5ff17bf3ff66a2edbb512 100644 (file)
 /* defines for SPL */
 
 /* additions for new relocation code, must added to all boards */
-#define CONFIG_SYS_SDRAM_BASE          0xc0000000
+#define CFG_SYS_SDRAM_BASE             0xc0000000
 
 #include <asm/arch/hardware.h>
 
index 3ff8187b5df73698f8c48134e4343500ebde4bdf..5b097e9fef295a2eb22cb6816483e5566e5d1b67 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/sizes.h>
 
 /* Environment options */
-#define CONFIG_SYS_SDRAM_BASE 0x80000000
+#define CFG_SYS_SDRAM_BASE 0x80000000
 
 /* ---------------------------------------------------------------------
  * Board boot configuration
index b3cdd2f1ebe3f2e0b4d4622871eea98a00f1e05a..53889d699b267be4d77454dd5c8d6246a54698eb 100644 (file)
@@ -14,7 +14,7 @@
 #define CONFIG_STANDALONE_LOAD_ADDR    CONFIG_SYS_LOAD_ADDR
 
 /* Physical Memory Map */
-#define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
+#define CFG_SYS_SDRAM_BASE             MMDC0_ARB_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 36aaa7c14fb3c5295c4f99f49cefd515d308bc80..6633d541a31bf1fb91f6347d0b2a22732456f836 100644 (file)
@@ -11,8 +11,8 @@
 #include <configs/exynos4-common.h>
 
 /* ORIGEN has 4 bank of DRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             0x40000000
+#define PHYS_SDRAM_1                   CFG_SYS_SDRAM_BASE
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
 /* Power Down Modes */
index b0233b96b06dc2d76bf16d07bf718810d0b664e9..8d0311cfb3b4545a9f1ab114c254de2f294deda8 100644 (file)
@@ -11,7 +11,7 @@
 #define _OWL_COMMON_CONFIG_H_
 
 /* SDRAM Definitions */
-#define CONFIG_SYS_SDRAM_BASE          0x0
+#define CFG_SYS_SDRAM_BASE             0x0
 
 /* Some commands use this as the default load address */
 
index 6e8ac1b98df5e4b8dfd3b57cbbd7c596cea315a9..14d702e1efeb85f8691fe57114e74bcfc319f1c9 100644 (file)
 #define SPD_EEPROM_ADDRESS 0x52
 
 #if defined(CONFIG_TARGET_P1020RDB_PD)
-#define CONFIG_SYS_SDRAM_SIZE_LAW      LAW_SIZE_2G
+#define CFG_SYS_SDRAM_SIZE_LAW LAW_SIZE_2G
 #else
-#define CONFIG_SYS_SDRAM_SIZE_LAW      LAW_SIZE_1G
+#define CFG_SYS_SDRAM_SIZE_LAW LAW_SIZE_1G
 #endif
-#define CONFIG_SYS_SDRAM_SIZE          (1u << (CONFIG_SYS_SDRAM_SIZE_LAW - 19))
+#define CFG_SYS_SDRAM_SIZE             (1u << (CFG_SYS_SDRAM_SIZE_LAW - 19))
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 /* Default settings for DDR3 */
 #ifndef CONFIG_TARGET_P2020RDB
index 6267dc729ab607c590500b571dca672ca38c41e6..85cedde098842f45114f1caf46994ff98b664bb3 100644 (file)
@@ -34,7 +34,7 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        SZ_256M
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index e13b5df0fabdac1d2d965f552b9270a5ac4c3016..f7e36f22ce87a1b1a1756a5f606b79c75d7dad46 100644 (file)
@@ -36,7 +36,7 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        SZ_256M
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index a04a03a7e18139ddc923efa5693fc23172795352..586cddf41848109159d0df49934bbf5f294c0a70 100644 (file)
 #define PHYS_SDRAM                     (0x80000000)
 #define PHYS_SDRAM_SIZE                        (CONFIG_PCM052_DDR_SIZE * SZ_1M)
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 14cbfde28bfe7209c5a397111660890829566492..cf705dcb19725fe47f4e27eaaa95e3a8706a523a 100644 (file)
@@ -15,7 +15,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 7a8d3c63d445e079b34df524d7f488b10bb2b7fe..bfc0011fbf96794a65d5a2bf1f5a3d04ba0fe5ed 100644 (file)
@@ -20,7 +20,7 @@
 #include <configs/exynos5-dt-common.h>
 #include <configs/exynos5-common.h>
 
-#define CONFIG_SYS_SDRAM_BASE  0x20000000
+#define CFG_SYS_SDRAM_BASE     0x20000000
 
 #define CONFIG_POWER_TPS65090_EC
 
index 2c749ac2143dc1ae840d59425b5ae0609ffa80dd..09c6b4f8dd51b4927b978b5407df931eeee1fe7d 100644 (file)
@@ -20,7 +20,7 @@
 #include <configs/exynos5-dt-common.h>
 #include <configs/exynos5-common.h>
 
-#define CONFIG_SYS_SDRAM_BASE  0x20000000
+#define CFG_SYS_SDRAM_BASE     0x20000000
 
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE                (512UL << 20UL) /* 512 MB */
index c98393b7c757d6a8732bca67e99b2f45c0e08c61..ac68c933a06ea646cac71d28cd5548972375a620 100644 (file)
@@ -64,7 +64,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
 
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                 SZ_2G /* 2GB DDR */
index 49cd9d4b3c69c27f6b92efd16c73f9470fa038b6..aedaf806e5e7379abea7073e0009341c486d355c 100644 (file)
@@ -63,7 +63,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
 
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000
index 4ea16d6115ab6c162ed61493ab8f4ee1d344c072..d9abbbc28b37778cbbe23f6e870c0c3155d38d81 100644 (file)
@@ -23,7 +23,7 @@
        (CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE - CONFIG_SYS_INIT_RAM_SIZE)
 
 /* SDRAM Configuration (for final code, data, stack, heap) */
-#define CONFIG_SYS_SDRAM_BASE          0x88000000
+#define CFG_SYS_SDRAM_BASE             0x88000000
 
 /* Memory Test */
 
index f95beeb214a92c13dea458a63b17c96aec45ee97..fc2cab960c672a2d0061857503c1c372aaff1f32 100644 (file)
@@ -91,7 +91,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 85772ba6e838c8a21105ea32d5a5e47388fff9e3..22b4976d722f5cceaaf8bd1389d4d4af8e80e193 100644 (file)
@@ -91,7 +91,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index b3a38d8a940a6aacae35bd055522ad7cb8d96e18..f5b9eed2bcd9033af16c2c3dea96b2e05ff768ea 100644 (file)
@@ -93,7 +93,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 17af19d49dc11643030371e55b0832802d941e0e..91baff9638624fd87ea52e4a9f728e6f85e63db1 100644 (file)
@@ -67,7 +67,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       0x80000
 
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000      /* 2 GiB DDR */
 
index adb2f43ea4d1c7f0e1ecbafcddc0d3bb16f7fb8d..3fbddd903a3f15eeb35e8b65291a955b91d190ef 100644 (file)
 /* Memory Device Register -> SDRAM */
 #define CONFIG_SYS_SDRC_MDR_VAL                AT91_SDRAMC_MD_SDRAM
 #define CONFIG_SYS_SDRC_MR_VAL2                AT91_SDRAMC_MODE_PRECHARGE
-#define CONFIG_SYS_SDRAM_VAL1          0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL1             0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_MR_VAL3                AT91_SDRAMC_MODE_REFRESH
-#define CONFIG_SYS_SDRAM_VAL2          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL3          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL4          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL5          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL6          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL7          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL8          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL9          0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL2             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL3             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL4             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL5             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL6             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL7             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL8             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL9             0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_MR_VAL4                AT91_SDRAMC_MODE_LMR
-#define CONFIG_SYS_SDRAM_VAL10         0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL10            0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_MR_VAL5                AT91_SDRAMC_MODE_NORMAL
-#define CONFIG_SYS_SDRAM_VAL11         0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL11            0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_TR_VAL2                1200            /* SDRAM_TR */
-#define CONFIG_SYS_SDRAM_VAL12         0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL12            0               /* SDRAM_BASE */
 
 /* setup SMC0, CS0 (NOR Flash) - 16-bit, 15 WS */
 #define CONFIG_SYS_SMC0_SETUP0_VAL                                     \
        "flashboot=run ramargs;run addip;bootm 0x10050000\0"    \
        ""
 
-#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE     PHYS_SDRAM
 
 #endif
index 4352a242de3325ff64ca15762e780eb1718b4f13..c1f6334d6a1a04da73933b657caf728a4cda11a8 100644 (file)
 /* Memory Device Register -> SDRAM */
 #define CONFIG_SYS_SDRC_MDR_VAL                AT91_SDRAMC_MD_SDRAM
 #define CONFIG_SYS_SDRC_MR_VAL2                AT91_SDRAMC_MODE_PRECHARGE
-#define CONFIG_SYS_SDRAM_VAL1          0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL1             0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_MR_VAL3                AT91_SDRAMC_MODE_REFRESH
-#define CONFIG_SYS_SDRAM_VAL2          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL3          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL4          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL5          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL6          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL7          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL8          0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRAM_VAL9          0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL2             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL3             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL4             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL5             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL6             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL7             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL8             0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL9             0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_MR_VAL4                AT91_SDRAMC_MODE_LMR
-#define CONFIG_SYS_SDRAM_VAL10         0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL10            0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_MR_VAL5                AT91_SDRAMC_MODE_NORMAL
-#define CONFIG_SYS_SDRAM_VAL11         0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL11            0               /* SDRAM_BASE */
 #define CONFIG_SYS_SDRC_TR_VAL2                1200            /* SDRAM_TR */
-#define CONFIG_SYS_SDRAM_VAL12         0               /* SDRAM_BASE */
+#define CFG_SYS_SDRAM_VAL12            0               /* SDRAM_BASE */
 
 /* setup SMC0, CS0 (NOR Flash) - 16-bit, 15 WS */
 #define CONFIG_SYS_SMC0_SETUP0_VAL                                     \
        "flashboot=run ramargs;run addip;bootm 0x10050000\0"    \
        ""
 
-#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE     PHYS_SDRAM
 
 #endif
index a7deaa321371bc8e1fa6c5bc0e43a93127f804d9..4a0a16818ed0ef2bd4e532714ea9a688175512d3 100644 (file)
@@ -20,8 +20,8 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE           0x70000000
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000
+#define CFG_SYS_SDRAM_BASE           0x70000000
+#define CFG_SYS_SDRAM_SIZE             0x08000000
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index 05253d59efdc5cb78a611f826c7db728317cbc3f..365fdd30c08c426deb15ef1208919cbc35c161c5 100644 (file)
@@ -11,7 +11,7 @@
 #endif
 
 #define CONFIG_SYS_BOOTMAPSZ            (0x30 << 20)
-#define CONFIG_SYS_SDRAM_BASE           0x0
+#define CFG_SYS_SDRAM_BASE           0x0
 
 /* Default environemnt variables */
 #define CONFIG_SERVERIP                 192.168.0.1
index 2e206542f8dbdb5a6309df703b526b384e187153..1c11685f49e4f3802f57b7627f57ee3528d446fa 100644 (file)
@@ -9,7 +9,7 @@
 #define __POMELO_CONFIG_H__
 
 /* SDRAM Bank #1 start address */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* SIZE of malloc pool */
 
index f9decb2a4c2cbf36cba3982d9340beaaddc709ac..bee1ef649488f784435a84d9d58868e973a949c3 100644 (file)
@@ -36,7 +36,7 @@
 #define DDR_BASE                       0x00000000
 #define PHYS_SDRAM_1                   DDR_BASE
 #define PHYS_SDRAM_1_SIZE              0x80000000 /* 2GB */
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 /* Console I/O Buffer Size */
 
index 8b151ef18836b8012816a663b8ab677f71bb5567..99376155b491e41a7ca2416feb7abf8c93e135c7 100644 (file)
@@ -14,7 +14,7 @@
 #define GICD_BASE                      0xff131000
 #define GICC_BASE                      0xff132000
 
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 #define SDRAM_MAX_SIZE                 0xff000000
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 
index 535762ecb240f3649980178b3ae4671e9e8b2f5b..a67af73fd56f6284b1b323b6dc6b6e86d5916d44 100644 (file)
@@ -10,7 +10,7 @@
 
 /* Physical memory map */
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 /* GUIDs for capsule updatable firmware images */
 #define QEMU_ARM_UBOOT_IMAGE_GUID \
index 9fc51fdfd7631ae7905c58a74dcc1686e9c8b16c..e7c810957d6dd4e89cdf61e3e5cd796825012043 100644 (file)
@@ -31,7 +31,7 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
  */
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 
 #define CONFIG_HWCONFIG
 
index d81e5d6c8620df031b6adcdb9f95ee2ed6992ee0..72f35cc05420fa71fdc863ef785b205050f339cd 100644 (file)
@@ -8,7 +8,7 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 #define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
 
index 406ee6282c5f70a839da9b7668466f3024dad8b3..f6ee7201eba103c938fb7cc9df4116d279b5dd21 100644 (file)
@@ -6,8 +6,8 @@
 /* SCIF */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x8C000000
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
+#define CFG_SYS_SDRAM_BASE             0x8C000000
+#define CFG_SYS_SDRAM_SIZE             0x04000000
 
 /* Address of u-boot image in Flash */
 #define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
index 3a38e0656de13516e6055541174b7ec33afaa06b..61b9447ea5f5c9fafd4898c4448a99afe41853f9 100644 (file)
@@ -17,8 +17,8 @@
 /* console */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 38400, 115200 }
 
-#define CONFIG_SYS_SDRAM_BASE          (RCAR_GEN2_SDRAM_BASE)
-#define CONFIG_SYS_SDRAM_SIZE          (RCAR_GEN2_UBOOT_SDRAM_SIZE)
+#define CFG_SYS_SDRAM_BASE             (RCAR_GEN2_SDRAM_BASE)
+#define CFG_SYS_SDRAM_SIZE             (RCAR_GEN2_UBOOT_SDRAM_SIZE)
 
 /* Timer */
 #define CONFIG_TMU_TIMER
index 7432cffb5a56cb0f89c6e3aa42eb119c08225fc2..5853072597804e3d5adb63a0c12b76ee41e92af2 100644 (file)
@@ -26,8 +26,8 @@
 /* MEMORY */
 
 #define DRAM_RSV_SIZE                  0x08000000
-#define CONFIG_SYS_SDRAM_BASE          (0x40000000 + DRAM_RSV_SIZE)
-#define CONFIG_SYS_SDRAM_SIZE          (0x80000000u - DRAM_RSV_SIZE)
+#define CFG_SYS_SDRAM_BASE             (0x40000000 + DRAM_RSV_SIZE)
+#define CFG_SYS_SDRAM_SIZE             (0x80000000u - DRAM_RSV_SIZE)
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED          (0x80000000u - DRAM_RSV_SIZE)
 
index 6616396777a03646c557ed7fab7295dd13d10cfb..b4c19727478e01403c1d3ecb5da05cf0ddc4f94b 100644 (file)
@@ -10,7 +10,7 @@
 
 #define CONFIG_SYS_HZ_CLOCK            24000000
 
-#define CONFIG_SYS_SDRAM_BASE          0x60000000
+#define CFG_SYS_SDRAM_BASE             0x60000000
 #define SDRAM_BANK_SIZE                        (512UL << 20UL)
 #define SDRAM_MAX_SIZE                  (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
 
index 9297184bded8b8f43494b42c49f1bdb43376f422..99c86edeaa40bf91fe023729778ac1646775a73c 100644 (file)
@@ -11,7 +11,7 @@
 
 #define CONFIG_IRAM_BASE               0x10080000
 
-#define CONFIG_SYS_SDRAM_BASE          0x60000000
+#define CFG_SYS_SDRAM_BASE             0x60000000
 #define SDRAM_BANK_SIZE                        (1024UL << 20UL)
 #define SDRAM_MAX_SIZE                 CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE
 
index 12d4bc65d7e41f6e0ecf32f38f8e16cfc868cc85..fac27a7d27c6f96617305e0276393515992e51a8 100644 (file)
@@ -14,7 +14,7 @@
 
 /* RAW SD card / eMMC locations. */
 
-#define CONFIG_SYS_SDRAM_BASE          0x60000000
+#define CFG_SYS_SDRAM_BASE             0x60000000
 #define SDRAM_MAX_SIZE                 0x80000000
 
 /* usb mass storage */
index 6fe1b2d9a2e0da3571dbf77dc8c0c33213480431..334fb3affa5e7a29482fc214b9ac9202a96f7cc5 100644 (file)
@@ -13,7 +13,7 @@
 
 /* spl size 32kb sram - 2kb bootrom */
 
-#define CONFIG_SYS_SDRAM_BASE          0x60000000
+#define CFG_SYS_SDRAM_BASE             0x60000000
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 #define SDRAM_MAX_SIZE                 0x80000000
 
index 4fb86b69a8e9ffe39b64cc20fcdd49c352e7d22e..6889ba591b3d9bca1f0d21e5fcc812e2251b77da 100644 (file)
@@ -12,7 +12,7 @@
 
 #define CONFIG_IRAM_BASE               0x10080000
 
-#define CONFIG_SYS_SDRAM_BASE          0x60000000
+#define CFG_SYS_SDRAM_BASE             0x60000000
 #define SDRAM_BANK_SIZE                        (512UL << 20UL)
 #define SDRAM_MAX_SIZE                 0x80000000
 
index 81f16edbad644d2b80e5b0b6e8cb6189ea50b1f8..4aa7e0449dbcbe778410a3702595711f91923ede 100644 (file)
@@ -15,7 +15,7 @@
 
 /* RAW SD card / eMMC locations. */
 
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 #define SDRAM_MAX_SIZE                 0xfe000000
 
index 263d1bd180c53cd546d7b184184628a3a11476b2..4b510b139910f969fb94c79a629bc10e07481150 100644 (file)
@@ -10,7 +10,7 @@
 
 #define CONFIG_IRAM_BASE               0xfff80000
 
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 #define SDRAM_MAX_SIZE                 0xff000000
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 
index 1e214e4ebe15b019ab20b8e4b28e11d363f433a0..132b7d0fe9bcdade4c276a51e260c1f3e2831ea8 100644 (file)
@@ -11,7 +11,7 @@
 #define CONFIG_IRAM_BASE               0xff090000
 
 /* FAT sd card locations. */
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 #define SDRAM_MAX_SIZE                 0xff000000
 
 #define ENV_MEM_LAYOUT_SETTINGS \
index 37e0c1d936c36d17c57e60c2f8108e0c7f900090..92cdc1a51fbdc1933fcb527eb0a5e468e93fd9f3 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 #define SDRAM_MAX_SIZE                 0xff000000
 
 #define CONFIG_IRAM_BASE               0xff8c0000
index 2f9aee58197b97b503f0f96ef7ce0e3aa7f8ad2a..78f624d31ca29c65b1c741dbb3b1eda0838ef254 100644 (file)
@@ -21,7 +21,7 @@
 /* RAW SD card / eMMC locations. */
 
 /* FAT sd card locations. */
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 #define SDRAM_MAX_SIZE                 0xf8000000
 
 #ifndef CONFIG_SPL_BUILD
index 15e815234020b12bfc4c928b551b4b9b88cfe04a..d43dc2580e4642bebeda599d6564200cf23652b8 100644 (file)
@@ -10,7 +10,7 @@
 
 #define CONFIG_IRAM_BASE               0xfdcc0000
 
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 #define SDRAM_MAX_SIZE                 0xf0000000
 
 #define ENV_MEM_LAYOUT_SETTINGS                \
index cd8fe8b518b58fd70074333dce1688a8a8835e8e..2c24944d9c3db82f7715eb60b1cae0c9f449cb15 100644 (file)
@@ -23,7 +23,7 @@
 #endif
 
 /* Memory layout */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 #define CONFIG_SYS_UBOOT_BASE          CONFIG_TEXT_BASE
 /*
  * The board really has 256M. However, the VC (VideoCore co-processor) shares
@@ -31,7 +31,7 @@
  * smaller amount of RAM is present in order to avoid stomping on the area
  * the VC uses.
  */
-#define CONFIG_SYS_SDRAM_SIZE          SZ_128M
+#define CFG_SYS_SDRAM_SIZE             SZ_128M
 
 /* Devices */
 /* LCD */
index 83c3167f38dcd7a3ab64edd401f347adf99dde72..76836add3027db9405c44ddcc03c55777b20137f 100644 (file)
@@ -15,7 +15,7 @@
 #define CONFIG_SYS_TIMER_BASE          0x10350020
 #define CONFIG_SYS_TIMER_COUNTER       (CONFIG_SYS_TIMER_BASE + 8)
 
-#define CONFIG_SYS_SDRAM_BASE          0x60000000
+#define CFG_SYS_SDRAM_BASE             0x60000000
 
 /* rockchip ohci host driver */
 
index ae94f0ecc56a00c192df981b14fd1cf057946788..e071d4da5e869b1ba1f99dbf1b41ea82224f4c04 100644 (file)
@@ -18,7 +18,7 @@
 /*-----------------------------------------------------------------------
  *  System memory Configuration
  */
-#define CONFIG_SYS_SDRAM_BASE          0x71000000
+#define CFG_SYS_SDRAM_BASE             0x71000000
 
 /*
  * "(0x40000000 - CONFIG_SYS_RESERVE_MEM_SIZE)" has been used in
@@ -55,7 +55,7 @@
  *        Starting kernel ...
  *        ...
  */
-#define CONFIG_SYS_SDRAM_SIZE          (0xb0000000 - CONFIG_SYS_SDRAM_BASE)
+#define CFG_SYS_SDRAM_SIZE             (0xb0000000 - CFG_SYS_SDRAM_BASE)
 
 #define BMP_LOAD_ADDR                  0x78000000
 
index de4510aa434875d7ac9e98fcf82250a368d4447d..ed891ab22a983575ebd7c2e2a8257c419f78c0d5 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/arch/cpu.h>              /* get chip and board defs */
 
 /* DRAM Base */
-#define CONFIG_SYS_SDRAM_BASE          0x30000000
+#define CFG_SYS_SDRAM_BASE             0x30000000
 
 /* Text Base */
 
        "dfu_alt_info=" CONFIG_DFU_ALT "\0"
 
 /* Goni has 3 banks of DRAM, but swap the bank */
-#define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE   /* OneDRAM Bank #0 */
+#define PHYS_SDRAM_1           CFG_SYS_SDRAM_BASE      /* OneDRAM Bank #0 */
 #define PHYS_SDRAM_1_SIZE      (80 << 20)              /* 80 MB in Bank #0 */
 #define PHYS_SDRAM_2           0x40000000              /* mDDR DMC1 Bank #1 */
 #define PHYS_SDRAM_2_SIZE      (256 << 20)             /* 256 MB in Bank #1 */
index 668b52600e85cb4c5dbc6f7e4cd5cf495f1c284c..614d04fda072e8aa78373042a58f2f5f2fd17482 100644 (file)
@@ -14,8 +14,8 @@
 /* Keep L2 Cache Disabled */
 
 /* Universal has 2 banks of DRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             0x40000000
+#define PHYS_SDRAM_1                   CFG_SYS_SDRAM_BASE
 
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
index afb1e3d0f105d1537e76aa01e9758a565cb970ed..75302bf5c05d62e260ba23c361bec69000bfaab8 100644 (file)
@@ -17,7 +17,7 @@
 #define CONFIG_USART_ID     0 /* ignored in arm */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x8000000       /* 128 MB */
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x8000000       /* 128 MB */
 
 #endif
index 7c5bfdb2e6d3629bd8941e2c162f9ae8365d7798..22813d4c5448d4a221550be13b0f6122ec790847 100644 (file)
@@ -23,8 +23,8 @@
  */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x10000000      /* 256 megs */
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x10000000      /* 256 megs */
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index de6c92ed7d43e802d131f0b32b37b90cf3ccb910..f826eab9ff2a9bae458e8b5ac2e08dd730cf655c 100644 (file)
@@ -16,8 +16,8 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x10000000
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x10000000
 
 /* SPL */
 
index ebdb39273ef5153a8680cd549d44efb2dea6c239..01ed1a3c8e7df5c75e5da1d97bea0294a59aebdb 100644 (file)
@@ -15,8 +15,8 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x20000000
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x20000000
 
 #ifdef CONFIG_SD_BOOT
 /* u-boot env in sd/mmc card */
index 09cc4dddb2ad1c194e24ef04eee41e37ca84ac02..2e3c1ea40063bfc3f48fc7822a3da3fb28358d8b 100644 (file)
@@ -16,8 +16,8 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x20000000
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x20000000
 
 /* NAND Flash */
 #ifdef CONFIG_CMD_NAND
index 1c9af9b6759aa2b51449ee6a340c3d6a3aa4c222..4b13a101170faa812cb86e201e2cdcfa56c12a32 100644 (file)
@@ -24,8 +24,8 @@
 #define ATMEL_PMC_UHP                  (1 <<  6)
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE           0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x10000000
+#define CFG_SYS_SDRAM_BASE           0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x10000000
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index afb9b9a2fbf6da170dc20d426c11f84c6b71940a..3f58928565ff940da6f60d8387b26981d21f8986 100644 (file)
@@ -31,8 +31,8 @@
 #endif
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE           0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x20000000
+#define CFG_SYS_SDRAM_BASE           0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x20000000
 
 /* SerialFlash */
 
index 0daadec5536bd640ac702ba9dc7d3435f81b65e4..084cb4def667317d022a73555988e729320ed58c 100644 (file)
@@ -12,8 +12,8 @@
 #include "at91-sama5_common.h"
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE           0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x20000000
+#define CFG_SYS_SDRAM_BASE           0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x20000000
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index d59899f0baa0027c2a643f9793e6efd4db4e9a5c..cbc1c0f46517be6740361f6371c692eb75b8b178 100644 (file)
@@ -12,8 +12,8 @@
 #include "at91-sama5_common.h"
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE           0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x20000000
+#define CFG_SYS_SDRAM_BASE           0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x20000000
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index 3f905bf2d77d48d476027c20176677ea70272da7..68fa31fe76fdabbeceab2f4a27c8941d4e972eec 100644 (file)
@@ -12,7 +12,7 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK      32768
 #define CONFIG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x60000000
-#define CONFIG_SYS_SDRAM_SIZE          0x20000000
+#define CFG_SYS_SDRAM_BASE             0x60000000
+#define CFG_SYS_SDRAM_SIZE             0x20000000
 
 #endif
index 0dcb2ebc316d5a22a619531673a5a67aba130318..5a7f5e135b5361f41d488f532bc7a9c8d5a84300 100644 (file)
@@ -13,8 +13,8 @@
 /* Size of our emulated memory */
 #define SB_CONCAT(x, y) x ## y
 #define SB_TO_UL(s) SB_CONCAT(s, UL)
-#define CONFIG_SYS_SDRAM_BASE          0
-#define CONFIG_SYS_SDRAM_SIZE \
+#define CFG_SYS_SDRAM_BASE             0
+#define CFG_SYS_SDRAM_SIZE \
                (SB_TO_UL(CONFIG_SANDBOX_RAM_SIZE_MB) << 20)
 
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
index c9dd7509cb2ae697af2c29f0d4be25bb151e3f34..31552f4619d7225f0bbc5f2171f4b758d4aafd29 100644 (file)
@@ -33,7 +33,7 @@
  /* Physical Memory Map */
 #define PHYS_DRAM_1                    0x80000000      /* DRAM Bank #1 */
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_DRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_DRAM_1
  /* Platform/Board specific defs */
 #define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
 
index 2e5592cf94d5ab2ee52b1c431042707f195e2a5b..5ad2124bddab1a4300a141ee88860fb62a65ae00 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 #define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
 
index 85fab927195fc83f3bad6cda8f1847f915de5bee..f4b1a16019ec23608b93e42c071aa80175d144ea 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 #define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
 
index 7159fc35d52b6408443fc588e409c651bb7f8346..974531ea0d82ad81d75678c3c099f6b0584f703f 100644 (file)
@@ -8,8 +8,8 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_SDRAM_BASE 0x80000000
-#define CONFIG_SYS_SDRAM_SIZE SZ_8M
+#define CFG_SYS_SDRAM_BASE 0x80000000
+#define CFG_SYS_SDRAM_SIZE SZ_8M
 
 #ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
index 7c8f1676be26a82e6ddff808006e48ea3741fc7e..d2bc73a400e5f37182e9a4528d3f2c34e6c75a00 100644 (file)
@@ -45,8 +45,8 @@
  * SDRAM: 1 bank, 64 MB, base address 0x20000000
  * Already initialized before u-boot gets started.
  */
-#define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1
-#define CONFIG_SYS_SDRAM_SIZE          (64 * SZ_1M)
+#define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS1
+#define CFG_SYS_SDRAM_SIZE             (64 * SZ_1M)
 
 /*
  * Perform a SDRAM Memtest from the start of SDRAM
index 12c2e1f6159ac31cc0a526f0fed246e769b75fcb..0392530c0adf64d7f92fe7e75618eb6b373f7c73 100644 (file)
@@ -14,7 +14,7 @@
 
 #define CONFIG_SMDK5420                        /* which is in a SMDK5420 */
 
-#define CONFIG_SYS_SDRAM_BASE  0x20000000
+#define CFG_SYS_SDRAM_BASE     0x20000000
 
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE                (512UL << 20UL) /* 512 MB */
index ba562b237803e53834f6122b69fcef189a76ce3e..64963eebe5cef974519996b6c495736d27884881 100644 (file)
@@ -16,7 +16,7 @@
 /* input clock of PLL: SMDKC100 has 12MHz input clock */
 
 /* DRAM Base */
-#define CONFIG_SYS_SDRAM_BASE          0x30000000
+#define CFG_SYS_SDRAM_BASE             0x30000000
 
 /* Text Base */
 
@@ -77,7 +77,7 @@
  */
 
 /* SMDKC100 has 1 banks of DRAM, we use only one in U-Boot */
-#define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE   /* SDRAM Bank #1 */
+#define PHYS_SDRAM_1           CFG_SYS_SDRAM_BASE      /* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE      (128 << 20)     /* 0x8000000, 128 MB Bank #1 */
 
 /*-----------------------------------------------------------------------
index 0b1f0c5f54ca8fa83fd0dc286e9479f09c8c4449..af0c8200fc23e7a43643864bce99b99824b6c291 100644 (file)
@@ -11,7 +11,7 @@
 #include "exynos4-common.h"
 
 /* High Level Configuration Options */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 /* Handling Sleep Mode*/
 #define S5P_CHECK_SLEEP                        0x00000BAD
 
 /* SMDKV310 has 4 bank of DRAM */
 #define SDRAM_BANK_SIZE                (512UL << 20UL) /* 512 MB */
-#define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE
+#define PHYS_SDRAM_1           CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_1_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_2           (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
+#define PHYS_SDRAM_2           (CFG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
 #define PHYS_SDRAM_2_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_3           (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_3           (CFG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_3_SIZE      SDRAM_BANK_SIZE
-#define PHYS_SDRAM_4           (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
+#define PHYS_SDRAM_4           (CFG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
 #define PHYS_SDRAM_4_SIZE      SDRAM_BANK_SIZE
 
 /* FLASH and environment organization */
index faa13c65216fa308b3aa5e931e12a6171cc8ff6c..44b9109d442fe72a5fa985c01497ec8fc773b607 100644 (file)
@@ -38,7 +38,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 7c35c912e5977683f803c434b66158ee942ceca5..9b1cb372ece7f96d94f3c56a480433c348544939 100644 (file)
@@ -21,8 +21,8 @@
 /* CPU */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS6
-#define CONFIG_SYS_SDRAM_SIZE          (128 * 1024 * 1024) /* 64MB */
+#define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS6
+#define CFG_SYS_SDRAM_SIZE             (128 * 1024 * 1024) /* 64MB */
 #define CONFIG_SYS_INIT_RAM_SIZE       0x1000
 #define CONFIG_SYS_INIT_RAM_ADDR       ATMEL_BASE_SRAM
 
index 6054fa42c1a26976a3d38f5be100f9990e8e3c98..95516800793abb27a756d3c4b91cea01993bd149 100644 (file)
@@ -32,7 +32,7 @@
  * Memory
  */
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /*
  * I2C
index 70a24ed267ef5c2336fcd890ebcc3e2f4ff82b97..2656c97767309ff608d9dca3988cb80c7b642e0a 100644 (file)
@@ -38,7 +38,7 @@
  * in U-Boot pre-reloc is higher than in SPL.
  */
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 /*
  * U-Boot general configurations
index 2b2d78b8c8e07319f6cbf945274ad71ace28344f..9403e2f4306d38bbe72482593189916ad9c102a0 100644 (file)
@@ -70,7 +70,7 @@
  */
 #define PHYS_SDRAM_1                   0x0
 #define PHYS_SDRAM_1_SIZE              (1 * 1024 * 1024 * 1024)
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 
 /*
  * Serial / UART configurations
index a60ac6d1a3c57d36a40159f3874a98d24540ef42..c628860eac7458d8796b4fce27cb29c0855cb000 100644 (file)
@@ -55,7 +55,7 @@
 #define CONFIG_MEM_INIT_VALUE  0xDeadBeef
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_VERY_BIG_RAM
 
 /* I2C addresses of SPD EEPROMs */
@@ -73,7 +73,7 @@
 #define CONFIG_SYS_DDR_CONFIG_2                0x04400000
 #define CONFIG_SYS_DDR_CONFIG                  0xC3008000
 #define CONFIG_SYS_DDR_CLK_CONTROL             0x03800000
-#define CONFIG_SYS_SDRAM_SIZE                  256 /* in Megs */
+#define CFG_SYS_SDRAM_SIZE                     256 /* in Megs */
 
 /*
  * Flash on the LocalBus
index dcb88a3a730a6043abe0b305a3ce78534bddf722..008aa500107298f6bd274437f0e0c19bb70e4745 100644 (file)
@@ -53,7 +53,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 1e966a23227c92bf6988daf62ab47c2ddc329b43..806323e375dfb8d54ce2254c8e85835a2ab7302b 100644 (file)
@@ -11,7 +11,7 @@
 
 /* ram memory-related information */
 #define PHYS_SDRAM_1                   0x40000000
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 #define PHYS_SDRAM_1_SIZE              0x3E000000
 
 #define CONFIG_SYS_HZ_CLOCK            750000000       /* 750 MHz */
index 07a5bfc8a86e627e764ccacdc7063096ae534bab..d71114931427975bca9ff493a7d9d645e7ffb4cf 100644 (file)
@@ -13,7 +13,7 @@
 /*
  * Configuration of the external SRAM memory used by U-Boot
  */
-#define CONFIG_SYS_SDRAM_BASE          STM32_DDR_BASE
+#define CFG_SYS_SDRAM_BASE             STM32_DDR_BASE
 
 /*
  * For booting Linux, use the first 256 MB of memory, since this is
index b809f9322ad2b53c18a52b248a03d574726584c6..f78ce41ed85446c3edd7dcaaa9020f4d25167a7e 100644 (file)
@@ -13,7 +13,7 @@
 /*
  * Configuration of the external SRAM memory used by U-Boot
  */
-#define CONFIG_SYS_SDRAM_BASE                  STM32_DDR_BASE
+#define CFG_SYS_SDRAM_BASE                     STM32_DDR_BASE
 
 /*
  * For booting Linux, use the first 256 MB of memory, since this is
index ba49075ce068b1efa43ff07af2c24c0a6f8fd47c..234327e017bc73a1774f275c26ad4a42e6ad5646 100644 (file)
 /*
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
+ * Please note that CFG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define CONFIG_SYS_SDRAM_SIZE          128     /* SDRAM size in MB */
+#define CFG_SYS_SDRAM_BASE             0x40000000
+#define CFG_SYS_SDRAM_SIZE             128     /* SDRAM size in MB */
 
 #define CONFIG_SYS_DRAM_TEST
 
@@ -75,8 +75,8 @@
  * the maximum mapped by the Linux kernel during initialization ??
  */
 /* Initial Memory map for Linux */
-#define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + \
-                                       (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + \
+                                       (CFG_SYS_SDRAM_SIZE << 20))
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
@@ -89,8 +89,8 @@
                                         CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_BCINVA + CF_CACR_ICINVA)
 #define CONFIG_SYS_DCACHE_INV          (CF_CACR_DCINVA)
-#define CONFIG_SYS_CACHE_ACR2          (CONFIG_SYS_SDRAM_BASE | \
-                                        CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \
+#define CONFIG_SYS_CACHE_ACR2          (CFG_SYS_SDRAM_BASE | \
+                                        CF_ADDRMASK(CFG_SYS_SDRAM_SIZE) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
 #define CONFIG_SYS_CACHE_ICACR         (CF_CACR_BEC | CF_CACR_IEC | \
                                         CF_CACR_ICINVA | CF_CACR_EUSP)
index 567aa1ffe4331bb97d37d4d7b6d778dae047db35..b2dcb6058b1082f7c4e91e613b14d0f3e728693d 100644 (file)
@@ -10,7 +10,7 @@
 
 /* ram memory-related information */
 #define PHYS_SDRAM_1                           0x00000000
-#define CONFIG_SYS_SDRAM_BASE                  PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE                     PHYS_SDRAM_1
 #define PHYS_SDRAM_1_SIZE                      0x00198000
 
 /* user interface */
index cd2a74fb52d79c5ea0a54e8871f5fd55bbb653ed..e1a66f53ff565cf1504119779b7d46c8bc21b62e 100644 (file)
  */
 #ifdef CONFIG_MACH_SUN9I
 #define SDRAM_OFFSET(x) 0x2##x
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
+#define CFG_SYS_SDRAM_BASE             0x20000000
 #elif defined(CONFIG_MACH_SUNIV)
 #define SDRAM_OFFSET(x) 0x8##x
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #else
 #define SDRAM_OFFSET(x) 0x4##x
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 /* V3s do not have enough memory to place code at 0x4a000000 */
 #endif
 
@@ -66,7 +66,7 @@
 /* FIXME: this may be larger on some SoCs */
 #define CONFIG_SYS_INIT_RAM_SIZE       0x8000 /* 32 KiB */
 
-#define PHYS_SDRAM_0                   CONFIG_SYS_SDRAM_BASE
+#define PHYS_SDRAM_0                   CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_0_SIZE              0x80000000 /* 2 GiB */
 
 /* mmc config */
index 63d897d090af24edad171a5f2eb9708478585c5a..daa9bbec88a7c43fc2b6d0d49dc2b8b277fcd953 100644 (file)
@@ -11,7 +11,7 @@
 /*
  * SDRAM (for initialize)
  */
-#define CONFIG_SYS_SDRAM_BASE          (0x80000000)    /* Start address of DDR3 */
+#define CFG_SYS_SDRAM_BASE             (0x80000000)    /* Start address of DDR3 */
 #define PHYS_SDRAM_SIZE                        (0x7c000000)    /* Default size (2GB - Secure memory) */
 
 #define CONFIG_VERY_BIG_RAM                            /* SynQuacer supports up to 64GB */
index dd1fe0af7cd2b53f43802cb3d9c336375dbe03f5..1aba986e1e6a4e81d7bccc4c23c6a4feef1b4733 100644 (file)
@@ -41,8 +41,8 @@
  * SDRAM: 1 bank, min 32, max 128 MB
  * Initialized before u-boot gets started.
  */
-#define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1
-#define CONFIG_SYS_SDRAM_SIZE          (128 * SZ_1M)
+#define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS1
+#define CFG_SYS_SDRAM_SIZE             (128 * SZ_1M)
 
 /*
  * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM,
index 92ee920346bbbed69b631756ceefbdda4fdba8d1..cd1309b3b889fe3881df68606f25558809db212c 100644 (file)
@@ -13,8 +13,8 @@
  */
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_SDRAM_SIZE          SZ_128M
+#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_SIZE             SZ_128M
 
 /*
  * UART configuration
index 7f197851d0a76970c56d8ea74c427432fdc937e1..2d8bde1cee86d0f73a2e2a57c69291e1e6effef2 100644 (file)
@@ -13,7 +13,7 @@
 /* General configuration */
 
 /* Physical Memory Map */
-#define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
+#define CFG_SYS_SDRAM_BASE             MMDC0_ARB_BASE_ADDR
 
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
index 92df457e8189ab4ac72c25c8b9e2441993a9c6ab..7e764b0000b01efb5342377f74e8c48c3274ab39 100644 (file)
@@ -40,7 +40,7 @@
 #define PHYS_SDRAM_1           NV_PA_SDRC_CS0
 #define PHYS_SDRAM_1_SIZE      0x20000000      /* 512M */
 
-#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE     PHYS_SDRAM_1
 
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20)     /* 256M */
 
index 655fcb0011b0f51ba78c2ed6e5961cb4b0f6db42..76b496303f3e540187d7041d7682d0d416a7709a 100644 (file)
@@ -68,6 +68,6 @@
 /* Defines for SPL */
 
 /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
-#define CONFIG_SYS_SDRAM_SIZE          SZ_2G
+#define CFG_SYS_SDRAM_SIZE             SZ_2G
 
 #endif /* _CONFIG_THEADORABLE_H */
index cf2efdbe230b04b52b712a8f3c976b25e9ccb91d..1f60b9b49790c77f812ca971120231a579212dcc 100644 (file)
@@ -13,7 +13,7 @@
 /* Link Definitions */
 
 /* SMP Spin Table Definitions */
-#define CPU_RELEASE_ADDR               (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
+#define CPU_RELEASE_ADDR               (CFG_SYS_SDRAM_BASE + 0x7fff0)
 
 /* PL011 Serial Configuration */
 
@@ -30,7 +30,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM_1                   (MEM_BASE)        /* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE              (0x80000000-MEM_BASE)   /* 2048 MB */
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 /* Initial environment variables */
 #define UBOOT_IMG_HEAD_SIZE            0x40
index fc78077014b51c3763b9375f18e7ca83fcded67b..e5b23d2a54ca459b50a4cf4c9e06ab25ad75583d 100644 (file)
@@ -69,7 +69,7 @@
 #define PHYS_DRAM_1_SIZE               0x20000000      /* 512MB */
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1024MB */
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /**
  * Platform/Board specific defs
index 1bd2a1874b8676b2cdc637e0a2e6a09b0a4f9599..4a7c3d5b44954a908ce2aad5a00c3626412b5593 100644 (file)
@@ -20,7 +20,7 @@
 #define V_SCLK          (V_OSCK >> 1)
 
 #define CONFIG_MAX_RAM_BANK_SIZE       (2048 << 20)    /* 2048MB */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /**
  * Platform/Board specific defs
index b289b9e26a00748d8ddb1dd7cb2ea389624c6308..d54c208ef66fd558a4ef2ca0d8367fe4fac86f04 100644 (file)
@@ -64,7 +64,7 @@
  * initial stack pointer in our SRAM. Otherwise, we can define
  * CONFIG_NR_DRAM_BANKS before including this file.
  */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /* If DM_I2C, enable non-DM I2C support */
 
index ab6cd06332154a09000aff86008dfa5cf5eeed27..a609aa3a2aa9be9f2645e7086e446c9b3cc8aa82 100644 (file)
@@ -23,7 +23,7 @@
 /* Top 48MB reserved for secure world use */
 #define DRAM_SEC_SIZE          0x03000000
 #define PHYS_SDRAM_1_SIZE      0x80000000 - DRAM_SEC_SIZE
-#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE     PHYS_SDRAM_1
 
 #define PHYS_SDRAM_2           0x8080000000
 #define PHYS_SDRAM_2_SIZE      0x180000000
index 22d783c325b256c93a4a444a85909662745585c6..137898199177ae8b159af7c701520076d27d5a0a 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_SDRAM_BASE          0xa0000000
+#define CFG_SYS_SDRAM_BASE             0xa0000000
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0xbd000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x8000
index a65ebfb4deab7832e3be165b2632ca1a391c8c8f..f8e3a2d017a3153ec0804b244254f9ca2995c4c3 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index ca3186877839e5d9aa642f9bd21af195ceb14c1e..23dcf20c1f4eb50905fe7e3caecc477fba640f3a 100644 (file)
@@ -16,8 +16,8 @@
 #endif
 
 /* TRATS has 4 banks of DRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             0x40000000
+#define PHYS_SDRAM_1                   CFG_SYS_SDRAM_BASE
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
 /* Tizen - partitions definitions */
index f324ea7ebeb552de6abd2400588ec1a6397b1896..9c6433ccfd87491333d4d447093845ca3f0b49b6 100644 (file)
@@ -17,8 +17,8 @@
 #endif
 
 /* TRATS2 has 4 banks of DRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             0x40000000
+#define PHYS_SDRAM_1                   CFG_SYS_SDRAM_BASE
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
 /* Tizen - partitions definitions */
index f549f9f7ad06cc308a20755decaf5b237555a01a..4ca8eafc91439788d6cabde8da821fc16cf0f460 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef _CONFIG_TURRIS_MOX_H
 #define _CONFIG_TURRIS_MOX_H
 
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CFG_SYS_SDRAM_BASE             0x00000000
 #define CONFIG_SYS_BAUDRATE_TABLE      { 300, 600, 1200, 1800, 2400, 4800, \
                                          9600, 19200, 38400, 57600, 115200, \
                                          230400, 460800, 500000, 576000, \
index 268c737e7eb7fcc19db4bfa61727d19735b0bcc8..c1e80b44c854cd4bba0e0e57e6cebac8cb506918 100644 (file)
@@ -49,7 +49,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 147224806fcc442d75ddb9b99706a45116defef2..f73092661a1dc6a1abf43dae89f6a5930462f213 100644 (file)
@@ -57,7 +57,7 @@
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 2cdc3fbf737f2b1bbe193450a56575c59aa8a05e..d2fd23e1d91dce37f3f943e829fc0fee45dc9db2 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
+#define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS1
+#define CFG_SYS_SDRAM_SIZE             0x04000000
 
 #define CONFIG_SYS_INIT_RAM_SIZE       (16 * 1024)
 #define CONFIG_SYS_INIT_RAM_ADDR       ATMEL_BASE_SRAM1
index c381934f31a9f622391e64ed88ef26e5b2cb8f1a..e944e78603e7eec722310d96b96d56b3a89027ee 100644 (file)
@@ -60,7 +60,7 @@
 #define PHYS_SDRAM                     CSD0_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 338d8af8fb36a0a55165579f5ba380d5055304d6..d9e5dfaceaf8de1e40ce9522d8927bd73293e613 100644 (file)
 
 #define CFG_SYS_NS16550_CLK            CONFIG_SYS_MIPS_TIMER_FREQ
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #if defined(CONFIG_DDRTYPE_H5TQ1G63BFA) || defined(CONFIG_DDRTYPE_MT47H128M8HQ)
-#define CONFIG_SYS_SDRAM_SIZE          (128 * SZ_1M)
+#define CFG_SYS_SDRAM_SIZE             (128 * SZ_1M)
 #elif defined(CONFIG_DDRTYPE_MT41J128M16HA) || defined(CONFIG_DDRTYPE_MT41K128M16JT)
-#define CONFIG_SYS_SDRAM_SIZE          (256 * SZ_1M)
+#define CFG_SYS_SDRAM_SIZE             (256 * SZ_1M)
 #elif defined(CONFIG_DDRTYPE_H5TQ4G63MFR) || defined(CONFIG_DDRTYPE_MT41K256M16)
-#define CONFIG_SYS_SDRAM_SIZE          (512 * SZ_1M)
+#define CFG_SYS_SDRAM_SIZE             (512 * SZ_1M)
 #else
 #error Unknown DDR size - please add!
 #endif
index f513dade6aa69d9a1605b4710a4dc704c25d9e3c..b209d97e5ecb709ae689e3279f531f23c8acb272 100644 (file)
@@ -60,7 +60,7 @@
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 #endif
 
-#define CONFIG_SYS_SDRAM_BASE           0x40000000
+#define CFG_SYS_SDRAM_BASE           0x40000000
 
 /* SDRAM configuration */
 #define PHYS_SDRAM                      0x40000000
index fea4329d23cc772037c79434660438d593dda801..1b9f2ca26f696e2a2b3bb0a0c9e7dced7bcbd1e2 100644 (file)
@@ -69,7 +69,7 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
 
 /* i.MX 8M Plus supports max. 8GB memory in two albeit concecutive banks */
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        (SZ_2G + SZ_1G)
 #define PHYS_SDRAM_2                   0x100000000
index 0c11b6b3331e7010dd51b51e22feae6674eb6c70..9a46d50c6f39c00cc1d2e31fac507b2ddc86e030 100644 (file)
@@ -96,7 +96,7 @@
 /* Top 16MB reserved for secure world use */
 #define DRAM_SEC_SIZE          0x01000000
 #define PHYS_SDRAM_1_SIZE      0x80000000 - DRAM_SEC_SIZE
-#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE     PHYS_SDRAM_1
 
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
 #define PHYS_SDRAM_2                   (0x880000000)
index 5d773060d8263d8c96efcbe463edfd2edfa5f64a..ef136c75a83c756f10bde4679d97b42d31ae859c 100644 (file)
 #define PHYS_SDRAM_2_SIZE              0x20000000      /* 512 MB */
 
 /* additions for new relocation code */
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_SIZE               0x1000
 
 /* Basic environment settings */
index 215149af2e0b69ec22b320a9921fd8cda447fa6b..7b526f725af676c646c6c0971c6ead16d96949eb 100644 (file)
 #define PHYS_SDRAM                     (0x80000000)
 #define PHYS_SDRAM_SIZE                        (128 * 1024 * 1024)
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index a157296761841a8cd466ea8015cbefa96aed9a4b..df0e269b5d2023edccc992d01fe6a8d627ece1d4 100644 (file)
@@ -24,8 +24,8 @@
 #define CONFIG_SYS_TIMER_COUNTER       0xfc06863c
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE           0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x4000000
+#define CFG_SYS_SDRAM_BASE           0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x4000000
 
 /* MMC */
 
index a0846b3f7c96adcaa254930b69c1832c9506680e..7555d97c81482fa6d446bd41bc804bacd29043db 100644 (file)
@@ -23,7 +23,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 2107bec6587a1a968fbf9efb4c5d132f75b2c335..38b940d35ea89f7fd289e566df40dfd49bcf337d 100644 (file)
@@ -7,7 +7,7 @@
 #define __VOCORE2_CONFIG_H__
 
 /* RAM */
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 
index b4c757fd9217354c335123ed3fa56d776155c07b..3acef22132735416fa5600f97fbc409827587045 100644 (file)
@@ -89,7 +89,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index a4b12dc55ed065b37c86ec6ea7f451b0b507f837..cba215c379fdbfc10f170ee4a1979ae02fc0c4ef 100644 (file)
@@ -84,7 +84,7 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index 054eb89d49ca0d750ce356eae23a313cdf4495be..32555c9b6af1ceffec149d61ff9c5fbb6bc93ab5 100644 (file)
@@ -16,8 +16,8 @@
 /*
  * Memory configurations
  */
-#define CONFIG_SYS_SDRAM_BASE          EMC_DYCS0_BASE
-#define CONFIG_SYS_SDRAM_SIZE          SZ_128M
+#define CFG_SYS_SDRAM_BASE             EMC_DYCS0_BASE
+#define CFG_SYS_SDRAM_SIZE             SZ_128M
 
 #define CONFIG_RTC_DS1374
 
index 19ccf633c404fa51ea8489be8a666d75ebf28129..87f628d4ab8e96f347b389d006bc49c342e41dd9 100644 (file)
@@ -23,7 +23,7 @@
 /* Memory configuration */
 #define PHYS_SDRAM_1                   0x40000000      /* Base address */
 #define PHYS_SDRAM_1_SIZE              0x10000000      /* Max 256 MB RAM */
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
 /* Extra Environment */
 #define CONFIG_HOSTNAME                "xea"
index 364dae0cd9340105dfd82180688fc1b6abf8bf51..612436aeb48fb437b80bdb036734f25ea00a9e77 100644 (file)
@@ -11,7 +11,7 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS
 
-#undef CONFIG_SYS_SDRAM_BASE
+#undef CFG_SYS_SDRAM_BASE
 
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS      \
index d2c0e91b32e0815e3c98ebc1e84f61944b167912..1b6e26ee3966c9e4f5e826e79d5d529cfe93e0ac 100644 (file)
@@ -12,7 +12,7 @@
 
 #include <configs/xilinx_zynqmp_mini.h>
 
-#define CONFIG_SYS_SDRAM_SIZE  0x1000000
-#define CONFIG_SYS_SDRAM_BASE  0x0
+#define CFG_SYS_SDRAM_SIZE     0x1000000
+#define CFG_SYS_SDRAM_BASE     0x0
 
 #endif /* __CONFIG_ZYNQMP_MINI_NAND_H */
index 7d0402feead57c4ebb3827c2b35638db047a1194..613ed9595532ccba52d9b6fb7541c984c3f45f32 100644 (file)
@@ -21,7 +21,7 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        (128 << 20)
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
index b93451cbe07adc8cc8bbe1bf96b48c08f3790fe6..8739bb24841eb683d17dcab8ab93619416c93477 100644 (file)
  */
 
 #if XCHAL_HAVE_PTP_MMU || CONFIG_BOARD_SDRAM_SIZE < 0x10000000
-#define CONFIG_SYS_SDRAM_SIZE          CONFIG_BOARD_SDRAM_SIZE
+#define CFG_SYS_SDRAM_SIZE             CONFIG_BOARD_SDRAM_SIZE
 #else
-#define CONFIG_SYS_SDRAM_SIZE          0x10000000
+#define CFG_SYS_SDRAM_SIZE             0x10000000
 #endif
 
-#define CONFIG_SYS_SDRAM_BASE          MEMADDR(0x00000000)
+#define CFG_SYS_SDRAM_BASE             MEMADDR(0x00000000)
 
 /* Lx60 can only map 128kb memory (instead of 256kb) when running under OCD */
 
 #endif
 
 #if defined(CONFIG_MAX_MEM_MAPPED) && \
-       CONFIG_MAX_MEM_MAPPED < CONFIG_SYS_SDRAM_SIZE
+       CONFIG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
 #define XTENSA_SYS_TEXT_ADDR           \
        (MEMADDR(CONFIG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)
 #else
 #define XTENSA_SYS_TEXT_ADDR           \
-       (MEMADDR(CONFIG_SYS_SDRAM_SIZE) - CONFIG_SYS_MONITOR_LEN)
+       (MEMADDR(CFG_SYS_SDRAM_SIZE) - CONFIG_SYS_MONITOR_LEN)
 #endif
 
 /*==============================*/
index d40d11f33d22770b4fccce49962f29126e3bad4b..699dc2482c08698bf088aa8aa48269226329aab1 100644 (file)
@@ -90,8 +90,8 @@ int dram_init(void);
  *
  * If this is not provided, a default implementation will try to set up a
  * single bank. It will do this if CONFIG_NR_DRAM_BANKS and
- * CONFIG_SYS_SDRAM_BASE are set. The bank will have a start address of
- * CONFIG_SYS_SDRAM_BASE and the size will be determined by a call to
+ * CFG_SYS_SDRAM_BASE are set. The bank will have a start address of
+ * CFG_SYS_SDRAM_BASE and the size will be determined by a call to
  * get_effective_memsize().
  *
  * Return: 0 if OK, -ve on error
index 83b41b384f39a134d79192743754cd2dc3f96d73..07c3505e8f586909e7f9cfef80f0608d82e4af46 100644 (file)
@@ -12,7 +12,7 @@
 #define SYS_INIT_SP_ADDR       CONFIG_CUSTOM_SYS_INIT_SP_ADDR
 #else
 #ifdef CONFIG_MIPS
-#define SYS_INIT_SP_ADDR       (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_INIT_SP_OFFSET)
+#define SYS_INIT_SP_ADDR       (CFG_SYS_SDRAM_BASE + CONFIG_SYS_INIT_SP_OFFSET)
 #else
 #define SYS_INIT_SP_ADDR       \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
index d249942af0685bbf0a8aa6f96f0f6bb40d9bedf0..8deac75ebb056244d0b0b9dffb97e7932e6de96f 100644 (file)
@@ -467,7 +467,7 @@ int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
        struct bd_info *bd = gd->bd;
 
-       *vstart = CONFIG_SYS_SDRAM_BASE;
+       *vstart = CFG_SYS_SDRAM_BASE;
        *size = (gd->ram_size >= 256 << 20 ?
                        256 << 20 : gd->ram_size) - (1 << 20);
 
index 1cc07bc80832b9afef96fd442b48029322ba60e8..b5e9f9ddc98c78d96f2cf2cba4373bae0959f2ab 100644 (file)
@@ -208,7 +208,7 @@ static int dm_test_remoteproc_elf(struct unit_test_state *uts)
         * at SDRAM_BASE *device* address (p_paddr field).
         * Its size is defined by the p_filesz field.
         */
-       phdr->p_paddr = CONFIG_SYS_SDRAM_BASE;
+       phdr->p_paddr = CFG_SYS_SDRAM_BASE;
        loaded_firmware_size = phdr->p_filesz;
 
        /*
@@ -231,7 +231,7 @@ static int dm_test_remoteproc_elf(struct unit_test_state *uts)
        unmap_physmem(loaded_firmware, MAP_NOCACHE);
 
        /* Resource table */
-       shdr->sh_addr = CONFIG_SYS_SDRAM_BASE;
+       shdr->sh_addr = CFG_SYS_SDRAM_BASE;
        rsc_table_size = shdr->sh_size;
 
        loaded_rsc_table_paddr = shdr->sh_addr + DEVICE_TO_PHYSICAL_OFFSET;
@@ -243,7 +243,7 @@ static int dm_test_remoteproc_elf(struct unit_test_state *uts)
        /* Load and verify */
        ut_assertok(rproc_elf32_load_rsc_table(dev, (ulong)valid_elf32, size,
                                               &rsc_addr, &rsc_size));
-       ut_asserteq(rsc_addr, CONFIG_SYS_SDRAM_BASE);
+       ut_asserteq(rsc_addr, CFG_SYS_SDRAM_BASE);
        ut_asserteq(rsc_size, rsc_table_size);
        ut_asserteq_mem(loaded_firmware, valid_elf32 + shdr->sh_offset,
                        shdr->sh_size);