]> git.baikalelectronics.ru Git - uboot.git/commitdiff
global: Move remaining CONFIG_SYS_* to CFG_SYS_*
authorTom Rini <trini@konsulko.com>
Wed, 16 Nov 2022 18:10:41 +0000 (13:10 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 5 Dec 2022 21:06:08 +0000 (16:06 -0500)
The rest of the unmigrated CONFIG symbols in the CONFIG_SYS 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>
744 files changed:
.checkpatch.conf
Kconfig
Makefile
README
arch/arm/cpu/arm1176/start.S
arch/arm/cpu/arm926ejs/start.S
arch/arm/cpu/armv7/arch_timer.c
arch/arm/cpu/armv7/ls102xa/cpu.c
arch/arm/cpu/armv7/ls102xa/fdt.c
arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
arch/arm/cpu/armv7/stv0991/timer.c
arch/arm/cpu/armv7m/systick-timer.c
arch/arm/cpu/armv8/fsl-layerscape/cpu.c
arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3
arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
arch/arm/cpu/armv8/fsl-layerscape/soc.c
arch/arm/cpu/armv8/fsl-layerscape/spl.c
arch/arm/cpu/armv8/sec_firmware.c
arch/arm/include/asm/arch-fsl-layerscape/config.h
arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
arch/arm/include/asm/arch-lpc32xx/config.h
arch/arm/include/asm/arch-ls102xa/config.h
arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h
arch/arm/include/asm/arch-mx31/imx-regs.h
arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
arch/arm/include/asm/arch-sunxi/i2c.h
arch/arm/include/asm/global_data.h
arch/arm/lib/bdinfo.c
arch/arm/lib/cache-pl310.c
arch/arm/lib/cache.c
arch/arm/lib/vectors.S
arch/arm/mach-at91/arm920t/clock.c
arch/arm/mach-at91/arm920t/cpu.c
arch/arm/mach-at91/arm920t/lowlevel_init.S
arch/arm/mach-at91/arm920t/timer.c
arch/arm/mach-at91/arm926ejs/clock.c
arch/arm/mach-at91/arm926ejs/cpu.c
arch/arm/mach-at91/arm926ejs/lowlevel_init.S
arch/arm/mach-at91/armv7/clock.c
arch/arm/mach-at91/armv7/cpu.c
arch/arm/mach-at91/include/mach/at91sam9260.h
arch/arm/mach-at91/include/mach/at91sam9261.h
arch/arm/mach-at91/include/mach/at91sam9263.h
arch/arm/mach-at91/include/mach/at91sam9g45.h
arch/arm/mach-at91/include/mach/at91sam9rl.h
arch/arm/mach-at91/include/mach/at91sam9x5.h
arch/arm/mach-at91/include/mach/sam9x60.h
arch/arm/mach-at91/include/mach/sama5d2.h
arch/arm/mach-at91/include/mach/sama5d3.h
arch/arm/mach-at91/include/mach/sama5d4.h
arch/arm/mach-at91/spl_at91.c
arch/arm/mach-at91/spl_atmel.c
arch/arm/mach-davinci/cpu.c
arch/arm/mach-davinci/da850_lowlevel.c
arch/arm/mach-davinci/timer.c
arch/arm/mach-exynos/spl_boot.c
arch/arm/mach-imx/image-container.c
arch/arm/mach-imx/mx5/lowlevel_init.S
arch/arm/mach-k3/config_secure.mk
arch/arm/mach-keystone/cmd_mon.c
arch/arm/mach-keystone/include/mach/hardware.h
arch/arm/mach-kirkwood/include/mach/config.h
arch/arm/mach-kirkwood/include/mach/kw88f6192.h
arch/arm/mach-kirkwood/include/mach/kw88f6281.h
arch/arm/mach-mvebu/cpu.c
arch/arm/mach-mvebu/include/mach/soc.h
arch/arm/mach-mvebu/lowlevel.S
arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c
arch/arm/mach-omap2/config_secure.mk
arch/arm/mach-omap2/mem-common.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-orion5x/include/mach/mv88f5182.h
arch/arm/mach-orion5x/timer.c
arch/arm/mach-rmobile/include/mach/r8a7790.h
arch/arm/mach-rmobile/include/mach/r8a7791.h
arch/arm/mach-rmobile/include/mach/r8a7792.h
arch/arm/mach-rmobile/include/mach/r8a7793.h
arch/arm/mach-rmobile/include/mach/r8a7794.h
arch/arm/mach-rmobile/timer.c
arch/arm/mach-socfpga/misc.c
arch/arm/mach-socfpga/misc_arria10.c
arch/arm/mach-socfpga/misc_gen5.c
arch/arm/mach-socfpga/spl_a10.c
arch/arm/mach-socfpga/timer.c
arch/arm/mach-u8500/cache.c
arch/arm/mach-uniphier/arm32/timer.c
arch/arm/mach-versatile/timer.c
arch/m68k/cpu/mcf523x/cpu.c
arch/m68k/cpu/mcf523x/cpu_init.c
arch/m68k/cpu/mcf523x/speed.c
arch/m68k/cpu/mcf523x/start.S
arch/m68k/cpu/mcf52x2/cpu.c
arch/m68k/cpu/mcf52x2/cpu_init.c
arch/m68k/cpu/mcf52x2/speed.c
arch/m68k/cpu/mcf52x2/start.S
arch/m68k/cpu/mcf530x/cpu.c
arch/m68k/cpu/mcf530x/cpu_init.c
arch/m68k/cpu/mcf530x/speed.c
arch/m68k/cpu/mcf530x/start.S
arch/m68k/cpu/mcf532x/cpu.c
arch/m68k/cpu/mcf532x/cpu_init.c
arch/m68k/cpu/mcf532x/speed.c
arch/m68k/cpu/mcf532x/start.S
arch/m68k/cpu/mcf5445x/cpu_init.c
arch/m68k/cpu/mcf5445x/start.S
arch/m68k/include/asm/cache.h
arch/m68k/include/asm/immap.h
arch/m68k/include/asm/immap_520x.h
arch/m68k/include/asm/immap_5235.h
arch/m68k/include/asm/immap_5249.h
arch/m68k/include/asm/immap_5253.h
arch/m68k/include/asm/immap_5271.h
arch/m68k/include/asm/immap_5272.h
arch/m68k/include/asm/immap_5275.h
arch/m68k/include/asm/immap_5282.h
arch/m68k/include/asm/immap_5301x.h
arch/m68k/include/asm/immap_5307.h
arch/m68k/include/asm/m5249.h
arch/m68k/include/asm/m5271.h
arch/m68k/include/asm/m5282.h
arch/m68k/lib/bdinfo.c
arch/m68k/lib/cache.c
arch/mips/mach-mtmips/mt7621/spl/start.S
arch/powerpc/cpu/mpc83xx/cpu_init.c
arch/powerpc/cpu/mpc83xx/spd_sdram.c
arch/powerpc/cpu/mpc83xx/spl_minimal.c
arch/powerpc/cpu/mpc83xx/start.S
arch/powerpc/cpu/mpc83xx/sysio/sysio.h
arch/powerpc/cpu/mpc85xx/b4860_ids.c
arch/powerpc/cpu/mpc85xx/cmd_errata.c
arch/powerpc/cpu/mpc85xx/cpu.c
arch/powerpc/cpu/mpc85xx/cpu_init.c
arch/powerpc/cpu/mpc85xx/cpu_init_early.c
arch/powerpc/cpu/mpc85xx/fdt.c
arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
arch/powerpc/cpu/mpc85xx/p2041_ids.c
arch/powerpc/cpu/mpc85xx/p3041_ids.c
arch/powerpc/cpu/mpc85xx/p4080_ids.c
arch/powerpc/cpu/mpc85xx/p5040_ids.c
arch/powerpc/cpu/mpc85xx/release.S
arch/powerpc/cpu/mpc85xx/speed.c
arch/powerpc/cpu/mpc85xx/spl_minimal.c
arch/powerpc/cpu/mpc85xx/start.S
arch/powerpc/cpu/mpc85xx/t1024_ids.c
arch/powerpc/cpu/mpc85xx/t1040_ids.c
arch/powerpc/cpu/mpc85xx/t2080_ids.c
arch/powerpc/cpu/mpc85xx/t4240_ids.c
arch/powerpc/cpu/mpc85xx/tlb.c
arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
arch/powerpc/cpu/mpc8xx/start.S
arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
arch/powerpc/cpu/mpc8xxx/pamu_table.c
arch/powerpc/include/asm/config_mpc85xx.h
arch/powerpc/include/asm/fsl_lbc.h
arch/powerpc/include/asm/fsl_liodn.h
arch/powerpc/include/asm/fsl_secure_boot.h
arch/powerpc/include/asm/immap_83xx.h
arch/powerpc/include/asm/immap_85xx.h
arch/powerpc/lib/spl.c
arch/sh/include/asm/config.h
arch/x86/lib/physmem.c
arch/xtensa/include/asm/addrspace.h
board/BuS/eb_cpu5282/eb_cpu5282.c
board/LaCie/net2big_v2/net2big_v2.c
board/Synology/common/legacy.c
board/armltd/integrator/timer.c
board/armltd/vexpress64/vexpress64.c
board/cadence/xtfpga/xtfpga.c
board/cavium/thunderx/atf.c
board/cavium/thunderx/thunderx.c
board/cobra5272/flash.c
board/cortina/presidio-asic/lowlevel_init.S
board/cortina/presidio-asic/presidio.c
board/davinci/da8xxevm/da850evm.c
board/egnite/ethernut5/ethernut5.c
board/emulation/qemu-ppce500/qemu-ppce500.c
board/esd/meesc/meesc.c
board/freescale/common/fsl_chain_of_trust.c
board/freescale/common/fsl_validate.c
board/freescale/common/p_corenet/law.c
board/freescale/common/p_corenet/tlb.c
board/freescale/common/qixis.c
board/freescale/common/qixis.h
board/freescale/ls1012aqds/ls1012aqds.c
board/freescale/ls1021aqds/ls1021aqds.c
board/freescale/ls1021atwr/ls1021atwr.c
board/freescale/ls1043aqds/ls1043aqds.c
board/freescale/ls1043ardb/cpld.c
board/freescale/ls1043ardb/ls1043ardb.c
board/freescale/ls1046aqds/ls1046aqds.c
board/freescale/ls1046ardb/cpld.c
board/freescale/ls1088a/ls1088a.c
board/freescale/ls2080aqds/README
board/freescale/ls2080aqds/ls2080aqds.c
board/freescale/lx2160a/lx2160a.c
board/freescale/m5249evb/m5249evb.c
board/freescale/m5253demo/flash.c
board/freescale/m5253demo/m5253demo.c
board/freescale/m53017evb/README
board/freescale/m5329evb/nand.c
board/freescale/m5373evb/README
board/freescale/m5373evb/nand.c
board/freescale/mpc837xerdb/mpc837xerdb.c
board/freescale/mpc8548cds/law.c
board/freescale/mpc8548cds/mpc8548cds.c
board/freescale/mpc8548cds/tlb.c
board/freescale/mx53loco/mx53loco.c
board/freescale/p1010rdb/law.c
board/freescale/p1010rdb/p1010rdb.c
board/freescale/p1010rdb/spl.c
board/freescale/p1010rdb/tlb.c
board/freescale/p1_p2_rdb_pc/ddr.c
board/freescale/p1_p2_rdb_pc/law.c
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
board/freescale/p1_p2_rdb_pc/tlb.c
board/freescale/p2041rdb/eth.c
board/freescale/p2041rdb/p2041rdb.c
board/freescale/t102xrdb/cpld.c
board/freescale/t102xrdb/ddr.c
board/freescale/t102xrdb/law.c
board/freescale/t102xrdb/t102xrdb.c
board/freescale/t102xrdb/tlb.c
board/freescale/t104xrdb/cpld.c
board/freescale/t104xrdb/ddr.c
board/freescale/t104xrdb/eth.c
board/freescale/t104xrdb/law.c
board/freescale/t104xrdb/spl.c
board/freescale/t104xrdb/t104xrdb.c
board/freescale/t104xrdb/tlb.c
board/freescale/t208xqds/law.c
board/freescale/t208xqds/t208xqds.c
board/freescale/t208xqds/tlb.c
board/freescale/t208xrdb/cpld.c
board/freescale/t208xrdb/law.c
board/freescale/t208xrdb/t208xrdb.c
board/freescale/t208xrdb/tlb.c
board/freescale/t4rdb/cpld.c
board/freescale/t4rdb/law.c
board/freescale/t4rdb/t4240rdb.c
board/freescale/t4rdb/tlb.c
board/gdsys/mpc8308/sdram.c
board/isee/igep00x0/igep00x0.c
board/keymile/common/qrio.c
board/keymile/km83xx/km83xx.c
board/keymile/kmcent2/kmcent2.c
board/keymile/kmcent2/law.c
board/keymile/kmcent2/tlb.c
board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
board/nokia/rx51/rx51.c
board/samsung/goni/onenand.c
board/samsung/universal_c210/onenand.c
board/siemens/smartweb/smartweb.c
board/siemens/taurus/taurus.c
board/socrates/law.c
board/socrates/sdram.c
board/socrates/socrates.c
board/socrates/tlb.c
board/sysam/amcore/amcore.c
board/ti/ks2_evm/board.c
board/ti/omap5_uevm/evm.c
board/xes/common/fsl_8xxx_misc.c
boot/Kconfig
boot/image-board.c
cmd/date.c
cmd/i2c.c
common/board_f.c
common/board_r.c
common/spl/Kconfig.nxp
common/spl/spl.c
common/spl/spl_fit.c
common/spl/spl_nor.c
common/spl/spl_spi.c
common/spl/spl_ubi.c
common/spl/spl_xip.c
doc/README.atmel_mci
doc/README.cfi
doc/README.davinci
doc/README.generic_usb_ohci
doc/README.mpc85xx
doc/README.nand
doc/README.serial_multi
doc/arch/m68k.rst
doc/develop/driver-model/migration.rst
doc/device-tree-bindings/video/exynos-dp.txt
doc/device-tree-bindings/video/exynos-fb.txt
doc/imx/common/imx5.txt
doc/usage/environment.rst
drivers/bootcount/Kconfig
drivers/bootcount/bootcount_i2c.c
drivers/clk/at91/compat.c
drivers/core/Kconfig
drivers/ddr/fsl/main.c
drivers/fpga/ACEX1K.c
drivers/fpga/cyclon2.c
drivers/fpga/spartan2.c
drivers/fpga/spartan3.c
drivers/fpga/virtex2.c
drivers/fpga/zynqpl.c
drivers/gpio/pca953x.c
drivers/gpio/tca642x.c
drivers/i2c/davinci_i2c.c
drivers/i2c/fsl_i2c.c
drivers/i2c/i2c_core.c
drivers/i2c/kona_i2c.c
drivers/i2c/mvtwsi.c
drivers/i2c/mxc_i2c.c
drivers/misc/fsl_ifc.c
drivers/misc/fsl_portals.c
drivers/misc/fsl_sec_mon.c
drivers/mmc/fsl_esdhc_spl.c
drivers/mmc/gen_atmel_mci.c
drivers/mmc/sh_sdhi.c
drivers/mtd/cfi_flash.c
drivers/mtd/nand/raw/fsl_ifc_nand.c
drivers/mtd/nand/raw/fsl_ifc_spl.c
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
drivers/mtd/onenand/onenand_spl.c
drivers/mtd/onenand/onenand_uboot.c
drivers/mtd/spi/fsl_espi_spl.c
drivers/mtd/stm32_flash.c
drivers/net/fm/eth.c
drivers/net/fm/fm.c
drivers/net/fm/init.c
drivers/net/fsl-mc/dpio/qbman_sys.h
drivers/net/fsl-mc/mc.c
drivers/net/fsl_mcdmafec.c
drivers/net/mcffec.c
drivers/net/qe/uec.h
drivers/net/tsec.c
drivers/net/vsc7385.c
drivers/power/power_dialog.c
drivers/qe/uec.h
drivers/qe/uec_phy.c
drivers/rtc/ds1307.c
drivers/rtc/ds1337.c
drivers/rtc/ds1374.c
drivers/rtc/ds3231.c
drivers/rtc/m41t62.c
drivers/rtc/max6900.c
drivers/rtc/pcf8563.c
drivers/rtc/pt7c4338.c
drivers/rtc/rs5c372.c
drivers/rtc/rx8010sj.c
drivers/rtc/x1205.c
drivers/serial/serial-uclass.c
drivers/serial/serial.c
drivers/spi/davinci_spi.c
drivers/spi/kirkwood_spi.c
drivers/sysreset/sysreset_xtfpga.c
drivers/timer/arm_global_timer.c
drivers/timer/imx-gpt-timer.c
drivers/timer/orion-timer.c
drivers/timer/stm32_timer.c
drivers/usb/host/ohci-hcd.c
drivers/video/imx/ipu_common.c
env/Kconfig
env/embedded.c
include/config_fallbacks.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/am335x_evm.h
include/configs/am3517_evm.h
include/configs/am43xx_evm.h
include/configs/am57xx_evm.h
include/configs/amcore.h
include/configs/ap121.h
include/configs/ap143.h
include/configs/ap152.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/at91-sama5_common.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/bcm7260.h
include/configs/bcm7445.h
include/configs/bcm963138.h
include/configs/bcmstb.h
include/configs/bk4r1.h
include/configs/blanche.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/bmips_common.h
include/configs/boston.h
include/configs/brppt2.h
include/configs/bur_am335x_common.h
include/configs/cgtqmx8.h
include/configs/ci20.h
include/configs/cl-som-imx7.h
include/configs/cm_fx6.h
include/configs/cm_t43.h
include/configs/cobra5272.h
include/configs/colibri-imx6ull.h
include/configs/colibri_imx6.h
include/configs/colibri_imx7.h
include/configs/colibri_vf.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/dra7xx_evm.h
include/configs/draak.h
include/configs/dragonboard845c.h
include/configs/eb_cpu5282.h
include/configs/ebisu.h
include/configs/edison.h
include/configs/el6x_common.h
include/configs/embestmx6boards.h
include/configs/etamin.h
include/configs/ethernut5.h
include/configs/evb_ast2500.h
include/configs/evb_ast2600.h
include/configs/exynos5-dt-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/gw_ventana.h
include/configs/highbank.h
include/configs/hikey.h
include/configs/hikey960.h
include/configs/hsdk-4xd.h
include/configs/hsdk.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_rom7720.h
include/configs/imx8ulp_evk.h
include/configs/imx93_evk.h
include/configs/imxrt1020-evk.h
include/configs/imxrt1050-evk.h
include/configs/imxrt1170-evk.h
include/configs/integrator-common.h
include/configs/integratorap.h
include/configs/integratorcp.h
include/configs/j721e_evm.h
include/configs/j721s2_evm.h
include/configs/km/keymile-common.h
include/configs/km/km-mpc832x.h
include/configs/km/km-mpc8360.h
include/configs/km/km-mpc83xx.h
include/configs/km/pg-wcom-ls102xa.h
include/configs/kmcent2.h
include/configs/kmcoge5ne.h
include/configs/kmeter1.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/lacie_kw.h
include/configs/legoev3.h
include/configs/librem5.h
include/configs/linkit-smart-7688.h
include/configs/liteboard.h
include/configs/ls1012a_common.h
include/configs/ls1012aqds.h
include/configs/ls1021aiot.h
include/configs/ls1021aqds.h
include/configs/ls1021atsn.h
include/configs/ls1021atwr.h
include/configs/ls1028a_common.h
include/configs/ls1028aqds.h
include/configs/ls1028ardb.h
include/configs/ls1043a_common.h
include/configs/ls1043aqds.h
include/configs/ls1043ardb.h
include/configs/ls1046a_common.h
include/configs/ls1046afrwy.h
include/configs/ls1046aqds.h
include/configs/ls1046ardb.h
include/configs/ls1088a_common.h
include/configs/ls1088aqds.h
include/configs/ls1088ardb.h
include/configs/ls2080a_common.h
include/configs/ls2080aqds.h
include/configs/ls2080ardb.h
include/configs/lx2160a_common.h
include/configs/lx2160aqds.h
include/configs/lx2160ardb.h
include/configs/lx2162aqds.h
include/configs/m53menlo.h
include/configs/malta.h
include/configs/mccmon6.h
include/configs/meerkat96.h
include/configs/meesc.h
include/configs/microblaze-generic.h
include/configs/msc_sm2s_imx8mp.h
include/configs/mt7620.h
include/configs/mt7621.h
include/configs/mt7622.h
include/configs/mt7628.h
include/configs/mt7629.h
include/configs/mt7981.h
include/configs/mt7986.h
include/configs/mt8512.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/mx51evk.h
include/configs/mx53cx9020.h
include/configs/mx53loco.h
include/configs/mx53ppd.h
include/configs/mx6_common.h
include/configs/mx6cuboxi.h
include/configs/mx6memcal.h
include/configs/mx6sabre_common.h
include/configs/mx6sabreauto.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/mxs.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/odroid.h
include/configs/omap3_beagle.h
include/configs/omap3_evm.h
include/configs/omap3_igep00x0.h
include/configs/omap3_logic.h
include/configs/omap5_uevm.h
include/configs/omapl138_lcdk.h
include/configs/opos6uldev.h
include/configs/p1_p2_bootsrc.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/pg-wcom-expu1.h
include/configs/pg-wcom-seli8.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/presidio_asic.h
include/configs/qcs404-evb.h
include/configs/qemu-ppce500.h
include/configs/r2dplus.h
include/configs/rcar-gen2-common.h
include/configs/rcar-gen3-common.h
include/configs/rk3036_common.h
include/configs/rk3128_common.h
include/configs/rk322x_common.h
include/configs/rk3288_common.h
include/configs/rpi.h
include/configs/rv1108_common.h
include/configs/s5p_goni.h
include/configs/s5pc210_universal.h
include/configs/salvator-x.h
include/configs/sam9x60_curiosity.h
include/configs/sam9x60ek.h
include/configs/sama5d27_som1_ek.h
include/configs/sama5d27_wlsom1_ek.h
include/configs/sama5d2_icp.h
include/configs/sama5d2_ptc_ek.h
include/configs/sama5d3xek.h
include/configs/sama7g5ek.h
include/configs/sandbox.h
include/configs/sdm845.h
include/configs/siemens-am33x-common.h
include/configs/smartweb.h
include/configs/smdkc100.h
include/configs/smegw01.h
include/configs/snapper9g45.h
include/configs/sniper.h
include/configs/socfpga_arria10_socdk.h
include/configs/socfpga_arria5_secu1.h
include/configs/socfpga_chameleonv3.h
include/configs/socfpga_common.h
include/configs/socfpga_soc64_common.h
include/configs/socrates.h
include/configs/somlabs_visionsom_6ull.h
include/configs/stemmy.h
include/configs/stih410-b2260.h
include/configs/stm32f429-discovery.h
include/configs/stm32f429-evaluation.h
include/configs/stm32f469-discovery.h
include/configs/stm32f746-disco.h
include/configs/stm32h743-disco.h
include/configs/stm32h743-eval.h
include/configs/stm32h750-art-pi.h
include/configs/stm32mp13_common.h
include/configs/stm32mp13_st_common.h
include/configs/stm32mp15_common.h
include/configs/stm32mp15_st_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/ten64.h
include/configs/thunderx_88xx.h
include/configs/ti814x_evm.h
include/configs/ti816x_evm.h
include/configs/ti_am335x_common.h
include/configs/ti_armv7_keystone2.h
include/configs/ti_omap3_common.h
include/configs/ti_omap4_common.h
include/configs/ti_omap5_common.h
include/configs/total_compute.h
include/configs/tplink_wdr4300.h
include/configs/tqma6.h
include/configs/tqma6_wru4.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/ulcb.h
include/configs/uniphier.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/x530.h
include/configs/x86-common.h
include/configs/xea.h
include/configs/xilinx_versal.h
include/configs/xilinx_versal_net.h
include/configs/xilinx_zynqmp.h
include/configs/xilinx_zynqmp_r5.h
include/configs/xpress.h
include/configs/xtfpga.h
include/configs/zynq-common.h
include/configs/zynq_cse.h
include/fsl-mc/fsl_mc.h
include/fsl_ifc.h
include/i2c.h
include/mpc85xx.h
include/mpc86xx.h
include/mtd/cfi_flash.h
include/mvebu_mmc.h
include/post.h
include/spl.h
include/system-constants.h
include/tca642x.h
include/tsec.h
lib/time.c
post/drivers/memory.c
post/tests.c
tools/envcrc.c

index 9e40ea060be11523592b842ce7ac3da2a2640b73..c368d4147260932c7e19ee113d1be574833ee083 100644 (file)
@@ -4,7 +4,7 @@
 # Temporary for false positive in checkpatch
 --ignore COMPLEX_MACRO
 
-# For CONFIG_SYS_I2C_NOPROBES
+# For CFG_SYS_I2C_NOPROBES
 --ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
 
 # For simple_strtoul
diff --git a/Kconfig b/Kconfig
index 67f46467b17e92e969aad5bd19b03ade322cfdc1..297281e4746f89c4711ac6b72b34caa6ccd3b2e5 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -264,8 +264,8 @@ config HAS_CUSTOM_SYS_INIT_SP_ADDR
        default y if TFABOOT
        help
          Typically, we use an initial stack pointer address that is calculated
-         by taking the statically defined CONFIG_SYS_INIT_RAM_ADDR, adding the
-         statically defined CONFIG_SYS_INIT_RAM_SIZE and then subtracting the
+         by taking the statically defined CFG_SYS_INIT_RAM_ADDR, adding the
+         statically defined CFG_SYS_INIT_RAM_SIZE and then subtracting the
          build-time constant of GENERATED_GBL_DATA_SIZE.  On MIPS a different
          but statica calculation is performed.  However, some platforms will
          take a different approach.  Say Y here to define the address statically
@@ -333,7 +333,7 @@ config SPL_SYS_MALLOC_F_LEN
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
 
-         It is possible to enable CONFIG_SYS_SPL_MALLOC_START to start a new
+         It is possible to enable CFG_SYS_SPL_MALLOC_START to start a new
          malloc() region in SDRAM once it is inited.
 
 config TPL_SYS_MALLOC_F_LEN
index de5746399a63b5216152f50080748b73b7145dd2..d48f52f2943b81273ea3c5546fdb1c97815ef090 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1138,10 +1138,10 @@ endif
        $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\
                $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG))
        $(call deprecated,CONFIG_DM_I2C,I2C drivers,v2022.04,$(CONFIG_SYS_I2C_LEGACY))
-       @# CONFIG_SYS_TIMER_RATE has brackets in it for some boards which
+       @# CFG_SYS_TIMER_RATE has brackets in it for some boards which
        @# confuses this rule. Use if() to send just a single character which
        @# is enable to tell 'deprecated' that one of these symbols exists
-       $(call deprecated,CONFIG_TIMER,Timer drivers,v2023.01,$(if $(strip $(CONFIG_SYS_TIMER_RATE)$(CONFIG_SYS_TIMER_COUNTER)),x))
+       $(call deprecated,CONFIG_TIMER,Timer drivers,v2023.01,$(if $(strip $(CFG_SYS_TIMER_RATE)$(CFG_SYS_TIMER_COUNTER)),x))
        $(call deprecated,CONFIG_DM_SERIAL,Serial drivers,v2023.04,$(CONFIG_SERIAL))
        $(call deprecated,CONFIG_DM_SCSI,SCSI drivers,v2023.04,$(CONFIG_SCSI))
        @# Check that this build does not use CONFIG options that we do not
@@ -1361,8 +1361,8 @@ u-boot.ldr.hex u-boot.ldr.srec: u-boot.ldr FORCE
 # U-Boot entry point, needed for booting of full-blown U-Boot
 # from the SPL U-Boot version.
 #
-ifndef CONFIG_SYS_UBOOT_START
-CONFIG_SYS_UBOOT_START := $(CONFIG_TEXT_BASE)
+ifndef CFG_SYS_UBOOT_START
+CFG_SYS_UBOOT_START := $(CONFIG_TEXT_BASE)
 endif
 
 # Boards with more complex image requirements can provide an .its source file
@@ -1387,7 +1387,7 @@ endif
 
 ifdef CONFIG_SPL_LOAD_FIT
 MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
-       -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
+       -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \
        -p $(CONFIG_FIT_EXTERNAL_OFFSET) \
        -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \
        $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(DEVICE_TREE))) \
@@ -1395,10 +1395,10 @@ MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
        $(patsubst %,-b arch/$(ARCH)/dts/%.dtbo,$(subst ",,$(CONFIG_OF_OVERLAY_LIST)))
 else
 MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \
-       -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
+       -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \
        -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board"
 MKIMAGEFLAGS_u-boot-ivt.img = -A $(ARCH) -T firmware_ivt -C none -O u-boot \
-       -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
+       -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \
        -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board"
 u-boot-ivt.img: MKIMAGEOUTPUT = u-boot-ivt.img.log
 endif
@@ -1429,7 +1429,7 @@ MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
 UBOOT_BIN := u-boot.bin
 
 MKIMAGEFLAGS_u-boot-lzma.img = -A $(ARCH) -T standalone -C lzma -O u-boot \
-       -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
+       -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \
        -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board"
 
 u-boot.bin.lzma: u-boot.bin FORCE
diff --git a/README b/README
index bb35a895b755c7b482822508078707b9c093f819..0a7635d1a24dacbed662ea6b8fb1006427831097 100644 (file)
--- a/README
+++ b/README
@@ -341,7 +341,7 @@ The following options need to be configured:
 
                CFG_SYS_FSL_DDR_SDRAM_BASE_PHY
                Physical address from the view of DDR controllers. It is the
-               same as CONFIG_SYS_DDR_SDRAM_BASE for  all Power SoCs. But
+               same as CFG_SYS_DDR_SDRAM_BASE for  all Power SoCs. But
                it could be different for ARM SoCs.
 
 - MIPS CPU options:
@@ -352,7 +352,7 @@ The following options need to be configured:
                be swapped if a flash programmer is used.
 
 - ARM options:
-               CONFIG_SYS_EXCEPTION_VECTORS_HIGH
+               CFG_SYS_EXCEPTION_VECTORS_HIGH
 
                Select high exception vectors of the ARM core, e.g., do not
                clear the V bit of the c1 register of CP15.
@@ -415,7 +415,7 @@ The following options need to be configured:
                the defaults discussed just above.
 
 - Cache Configuration for ARM:
-               CONFIG_SYS_PL310_BASE - Physical base address of PL310
+               CFG_SYS_PL310_BASE - Physical base address of PL310
                                        controller register space
 
 - Serial Ports:
@@ -485,7 +485,7 @@ The following options need to be configured:
 - GPIO Support:
                CONFIG_PCA953X          - use NXP's PCA953X series I2C GPIO
 
-               The CONFIG_SYS_I2C_PCA953X_WIDTH option specifies a list of
+               The CFG_SYS_I2C_PCA953X_WIDTH option specifies a list of
                chip-ngpio pairs that tell the PCA953X driver the number of
                pins supported by a particular chip.
 
@@ -927,21 +927,21 @@ The following options need to be configured:
 
                CONFIG_SYS_I2C_DIRECT_BUS
                define this, if you don't use i2c muxes on your hardware.
-               if CONFIG_SYS_I2C_MAX_HOPS is not defined or == 0 you can
+               if CFG_SYS_I2C_MAX_HOPS is not defined or == 0 you can
                omit this define.
 
-               CONFIG_SYS_I2C_MAX_HOPS
+               CFG_SYS_I2C_MAX_HOPS
                define how many muxes are maximal consecutively connected
                on one i2c bus. If you not use i2c muxes, omit this
                define.
 
-               CONFIG_SYS_I2C_BUSES
+               CFG_SYS_I2C_BUSES
                hold a list of buses you want to use, only used if
                CONFIG_SYS_I2C_DIRECT_BUS is not defined, for example
-               a board with CONFIG_SYS_I2C_MAX_HOPS = 1 and
+               a board with CFG_SYS_I2C_MAX_HOPS = 1 and
                CFG_SYS_NUM_I2C_BUSES = 9:
 
-                CONFIG_SYS_I2C_BUSES   {{0, {I2C_NULL_HOP}}, \
+                CFG_SYS_I2C_BUSES      {{0, {I2C_NULL_HOP}}, \
                                        {0, {{I2C_MUX_PCA9547, 0x70, 1}}}, \
                                        {0, {{I2C_MUX_PCA9547, 0x70, 2}}}, \
                                        {0, {{I2C_MUX_PCA9547, 0x70, 3}}}, \
@@ -1044,7 +1044,7 @@ The following options need to be configured:
                active.  To switch to a different bus, use the 'i2c dev' command.
                Note that bus numbering is zero-based.
 
-               CONFIG_SYS_I2C_NOPROBES
+               CFG_SYS_I2C_NOPROBES
 
                This option specifies a list of I2C devices that will be skipped
                when the 'i2c probe' command is issued.  If CONFIG_I2C_MULTI_BUS
@@ -1053,16 +1053,16 @@ The following options need to be configured:
 
                e.g.
                        #undef  CONFIG_I2C_MULTI_BUS
-                       #define CONFIG_SYS_I2C_NOPROBES {0x50,0x68}
+                       #define CFG_SYS_I2C_NOPROBES {0x50,0x68}
 
                will skip addresses 0x50 and 0x68 on a board with one I2C bus
 
                        #define CONFIG_I2C_MULTI_BUS
-                       #define CONFIG_SYS_I2C_NOPROBES {{0,0x50},{0,0x68},{1,0x54}}
+                       #define CFG_SYS_I2C_NOPROBES    {{0,0x50},{0,0x68},{1,0x54}}
 
                will skip addresses 0x50 and 0x68 on bus 0 and address 0x54 on bus 1
 
-               CONFIG_SYS_RTC_BUS_NUM
+               CFG_SYS_RTC_BUS_NUM
 
                If defined, then this indicates the I2C bus number for the RTC.
                If not defined, then U-Boot assumes that RTC is on I2C bus 0.
@@ -1120,19 +1120,19 @@ The following options need to be configured:
                configuration if the INIT_B line goes low (which
                indicated a CRC error).
 
-               CONFIG_SYS_FPGA_WAIT_INIT
+               CFG_SYS_FPGA_WAIT_INIT
 
                Maximum time to wait for the INIT_B line to de-assert
                after PROB_B has been de-asserted during a Virtex II
                FPGA configuration sequence. The default time is 500
                ms.
 
-               CONFIG_SYS_FPGA_WAIT_BUSY
+               CFG_SYS_FPGA_WAIT_BUSY
 
                Maximum time to wait for BUSY to de-assert during
                Virtex II FPGA configuration. The default is 5 ms.
 
-               CONFIG_SYS_FPGA_WAIT_CONFIG
+               CFG_SYS_FPGA_WAIT_CONFIG
 
                Time to wait after FPGA configuration. The default is
                200 ms.
@@ -1429,12 +1429,12 @@ Configuration Settings:
 - CONFIG_SYS_PROMPT:   This is what U-Boot prints on the console to
                prompt for user input.
 
-- CONFIG_SYS_BAUDRATE_TABLE:
+- CFG_SYS_BAUDRATE_TABLE:
                List of legal baudrate settings for this board.
 
-- CONFIG_SYS_MEM_RESERVE_SECURE
+- CFG_SYS_MEM_RESERVE_SECURE
                Only implemented for ARMv8 for now.
-               If defined, the size of CONFIG_SYS_MEM_RESERVE_SECURE memory
+               If defined, the size of CFG_SYS_MEM_RESERVE_SECURE memory
                is substracted from total RAM and won't be reported to OS.
                This memory can be used as secure memory. A variable
                gd->arch.secure_ram is used to track the location. In systems
@@ -1444,7 +1444,7 @@ Configuration Settings:
 - CFG_SYS_SDRAM_BASE:
                Physical start address of SDRAM. _Must_ be 0 here.
 
-- CONFIG_SYS_FLASH_BASE:
+- CFG_SYS_FLASH_BASE:
                Physical start address of Flash memory.
 
 - CONFIG_SYS_MALLOC_LEN:
@@ -1468,16 +1468,16 @@ Configuration Settings:
                boards which do not use the full malloc in SPL (which is
                enabled with CONFIG_SYS_SPL_MALLOC).
 
-- CONFIG_SYS_BOOTMAPSZ:
+- CFG_SYS_BOOTMAPSZ:
                Maximum size of memory mapped by the startup code of
                the Linux kernel; all data that must be processed by
                the Linux kernel (bd_info, boot arguments, FDT blob if
                used) must be put below this limit, unless "bootm_low"
                environment variable is defined and non-zero. In such case
                all data for the Linux kernel must be between "bootm_low"
-               and "bootm_low" + CONFIG_SYS_BOOTMAPSZ.  The environment
+               and "bootm_low" + CFG_SYS_BOOTMAPSZ.     The environment
                variable "bootm_mapsize" will override the value of
-               CONFIG_SYS_BOOTMAPSZ.  If CONFIG_SYS_BOOTMAPSZ is undefined,
+               CFG_SYS_BOOTMAPSZ.  If CFG_SYS_BOOTMAPSZ is undefined,
                then the value in "bootm_size" will be used instead.
 
 - CONFIG_SYS_BOOT_GET_CMDLINE:
@@ -1638,11 +1638,11 @@ Low Level (hardware related) configuration options:
                Default (power-on reset) physical address of CCSR on Freescale
                PowerPC SOCs.
 
-- CONFIG_SYS_CCSRBAR:
+- CFG_SYS_CCSRBAR:
                Virtual address of CCSR.  On a 32-bit build, this is typically
                the same value as CONFIG_SYS_CCSRBAR_DEFAULT.
 
-- CONFIG_SYS_CCSRBAR_PHYS:
+- CFG_SYS_CCSRBAR_PHYS:
                Physical address of CCSR.  CCSR can be relocated to a new
                physical address, if desired.  In this case, this macro should
                be set to that address.  Otherwise, it should be set to the
@@ -1650,17 +1650,17 @@ Low Level (hardware related) configuration options:
                is typically relocated on 36-bit builds.  It is recommended
                that this macro be defined via the _HIGH and _LOW macros:
 
-               #define CONFIG_SYS_CCSRBAR_PHYS ((CONFIG_SYS_CCSRBAR_PHYS_HIGH
-                       * 1ull) << 32 | CONFIG_SYS_CCSRBAR_PHYS_LOW)
+               #define CFG_SYS_CCSRBAR_PHYS ((CFG_SYS_CCSRBAR_PHYS_HIGH
+                       * 1ull) << 32 | CFG_SYS_CCSRBAR_PHYS_LOW)
 
-- CONFIG_SYS_CCSRBAR_PHYS_HIGH:
-               Bits 33-36 of CONFIG_SYS_CCSRBAR_PHYS.  This value is typically
+- CFG_SYS_CCSRBAR_PHYS_HIGH:
+               Bits 33-36 of CFG_SYS_CCSRBAR_PHYS.     This value is typically
                either 0 (32-bit build) or 0xF (36-bit build).  This macro is
                used in assembly code, so it must not contain typecasts or
                integer size suffixes (e.g. "ULL").
 
-- CONFIG_SYS_CCSRBAR_PHYS_LOW:
-               Lower 32-bits of CONFIG_SYS_CCSRBAR_PHYS.  This macro is
+- CFG_SYS_CCSRBAR_PHYS_LOW:
+               Lower 32-bits of CFG_SYS_CCSRBAR_PHYS.  This macro is
                used in assembly code, so it must not contain typecasts or
                integer size suffixes (e.g. "ULL").
 
@@ -1668,7 +1668,7 @@ Low Level (hardware related) configuration options:
                DO NOT CHANGE unless you know exactly what you're
                doing! (11-4) [MPC8xx systems only]
 
-- CONFIG_SYS_INIT_RAM_ADDR:
+- CFG_SYS_INIT_RAM_ADDR:
 
                Start address of memory area that can be used for
                initial data and stack; please note that this must be
@@ -2737,7 +2737,7 @@ locked as (mis-) used as memory, etc.
        cause you grief during the initial boot! It is frequently not
        used.
 
-       CONFIG_SYS_INIT_RAM_ADDR should be somewhere that won't interfere
+       CFG_SYS_INIT_RAM_ADDR should be somewhere that won't interfere
        with your processor/board/system design. The default value
        you will find in any recent u-boot distribution in
        walnut.h should work for you. I'd set it to a value larger
index 5a1536539dc91e5914c34d013c51264bee9a21b1..9e76a4a9e0e17eddafd9f94635c113afd1a14cc3 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/linkage.h>
 
 #ifndef CONFIG_SYS_PHY_UBOOT_BASE
-#define CONFIG_SYS_PHY_UBOOT_BASE      CONFIG_SYS_UBOOT_BASE
+#define CONFIG_SYS_PHY_UBOOT_BASE      CFG_SYS_UBOOT_BASE
 #endif
 
 /*
index aca7793c5798bf3d678c8ae288ccdd96d7721f7f..c882bd39eab07006120606bfe2152a0ea4e1dee2 100644 (file)
@@ -95,7 +95,7 @@ flush_dcache:
        mrc     p15, 0, r0, c1, c0, 0
        bic     r0, r0, #0x00000300     /* clear bits 9:8 (---- --RS) */
        bic     r0, r0, #0x00000087     /* clear bits 7, 2:0 (B--- -CAM) */
-#ifdef CONFIG_SYS_EXCEPTION_VECTORS_HIGH
+#ifdef CFG_SYS_EXCEPTION_VECTORS_HIGH
        orr     r0, r0, #0x00002000     /* set bit 13 (--V- ----) */
 #else
        bic     r0, r0, #0x00002000     /* clear bit 13 (--V- ----) */
index d96406f7626f2dd5901cf1f289a0f60770312a7d..17bd53dae847c46c5ed95d909b2db230c65836ed 100644 (file)
@@ -14,7 +14,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_SYS_HZ_CLOCK
+#ifndef CFG_SYS_HZ_CLOCK
 static inline u32 read_cntfrq(void)
 {
        u32 frq;
@@ -29,8 +29,8 @@ int timer_init(void)
        gd->arch.tbl = 0;
        gd->arch.tbu = 0;
 
-#ifdef CONFIG_SYS_HZ_CLOCK
-       gd->arch.timer_rate_hz = CONFIG_SYS_HZ_CLOCK;
+#ifdef CFG_SYS_HZ_CLOCK
+       gd->arch.timer_rate_hz = CFG_SYS_HZ_CLOCK;
 #else
        gd->arch.timer_rate_hz = read_cntfrq();
 #endif
index d09c21d5d9b2d6d0b01e307a39e6a23067b61630..25e4b49c70e5531777974941e93659a29f3a690e 100644 (file)
@@ -313,9 +313,9 @@ int cpu_eth_init(struct bd_info *bis)
 
 int arch_cpu_init(void)
 {
-       void *epu_base = (void *)(CONFIG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);
+       void *epu_base = (void *)(CFG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);
        void *rcpm2_base =
-               (void *)(CONFIG_SYS_DCSRBAR + DCSR_RCPM2_BLOCK_OFFSET);
+               (void *)(CFG_SYS_DCSRBAR + DCSR_RCPM2_BLOCK_OFFSET);
        struct ccsr_scfg *scfg = (void *)CFG_SYS_FSL_SCFG_ADDR;
        u32 state;
 
index 0e7d5fa06dc6780aaa34f5f39058f32d9fe2eda3..599b7e18ef31e28c7e93895629f653338b64cb91 100644 (file)
@@ -183,7 +183,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
        off = fdt_node_offset_by_compat_reg(blob, FSL_IFC_COMPAT,
-                                           CONFIG_SYS_IFC_ADDR);
+                                           CFG_SYS_IFC_ADDR);
        fdt_set_node_status(blob, off, FDT_STATUS_DISABLED);
 #else
        off = fdt_node_offset_by_compat_reg(blob, FSL_QSPI_COMPAT,
index 954fa5f8b45068b198ea89163486a65b87b85778..dbb0766a9c6418062e21a384c20574f8f58c7801 100644 (file)
@@ -42,7 +42,7 @@ static void __secure ls1_save_ddr_head(void)
 
 static void __secure ls1_fsm_setup(void)
 {
-       void *dcsr_epu_base = (void *)(CONFIG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);
+       void *dcsr_epu_base = (void *)(CFG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);
        void *dcsr_rcpm_base = (void *)SYS_FSL_DCSR_RCPM_ADDR;
 
        out_be32(dcsr_rcpm_base + DCSR_RCPM_CSTTACR0, 0x00001001);
@@ -118,7 +118,7 @@ static void __secure ls1_delay(unsigned int loop)
 
 static void __secure ls1_start_fsm(void)
 {
-       void *dcsr_epu_base = (void *)(CONFIG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);
+       void *dcsr_epu_base = (void *)(CFG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);
        void *ccsr_gic_base = (void *)SYS_FSL_GIC_ADDR;
        struct ccsr_scfg __iomem *scfg = (void *)CFG_SYS_FSL_SCFG_ADDR;
        struct ccsr_ddr __iomem *ddr = (void *)CFG_SYS_FSL_DDR_ADDR;
index 67764ccf66a64544779e96ef9f61b50b0998c025..f7cc45772f91b3def0f04cd90acd3f26e0088a50 100644 (file)
@@ -18,7 +18,7 @@ static struct stv0991_cgu_regs *const stv0991_cgu_regs = \
                                (struct stv0991_cgu_regs *) (CGU_BASE_ADDR);
 
 #define READ_TIMER()   (readl(&gpt1_regs_ptr->cnt) & GPT_FREE_RUNNING)
-#define GPT_RESOLUTION (CONFIG_SYS_HZ_CLOCK / CONFIG_SYS_HZ)
+#define GPT_RESOLUTION (CFG_SYS_HZ_CLOCK / CONFIG_SYS_HZ)
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -67,7 +67,7 @@ void __udelay(unsigned long usec)
 {
        ulong tmo;
        ulong start = get_timer_masked();
-       ulong tenudelcnt = CONFIG_SYS_HZ_CLOCK / (1000 * 100);
+       ulong tenudelcnt = CFG_SYS_HZ_CLOCK / (1000 * 100);
        ulong rndoff;
 
        rndoff = (usec % 10) ? 1 : 0;
index 556eaf8c74ad329e45b3592283fc9e5ebed6beaf..c30af4ff7a282f37baa429ed59ff334975555f25 100644 (file)
@@ -18,7 +18,7 @@
  * The number of reference clock ticks that correspond to 10ms is normally
  * defined in the SysTick Calibration register's TENMS field. However, on some
  * devices this is wrong, so this driver allows the clock rate to be defined
- * using CONFIG_SYS_HZ_CLOCK.
+ * using CFG_SYS_HZ_CLOCK.
  */
 
 #include <common.h>
@@ -76,10 +76,10 @@ int timer_init(void)
 
        /*
         * If the TENMS field is inexact or wrong, specify the clock rate using
-        * CONFIG_SYS_HZ_CLOCK.
+        * CFG_SYS_HZ_CLOCK.
         */
-#if defined(CONFIG_SYS_HZ_CLOCK)
-       gd->arch.timer_rate_hz = CONFIG_SYS_HZ_CLOCK;
+#if defined(CFG_SYS_HZ_CLOCK)
+       gd->arch.timer_rate_hz = CFG_SYS_HZ_CLOCK;
 #else
        gd->arch.timer_rate_hz = (cal & SYSTICK_CAL_TENMS_MASK) * 100;
 #endif
index bbaa91f0e108d9f6904aaf42931c76784167a32b..99413ef52e22b21260b5835cfd9787ed2919e0b5 100644 (file)
@@ -114,7 +114,7 @@ static struct mm_region early_map[] = {
          CONFIG_SYS_FSL_IFC_SIZE1 - CONFIG_SYS_FSL_IFC_SIZE1_1,
          PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE
        },
-       { CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FSL_IFC_BASE1,
+       { CFG_SYS_FLASH_BASE, CONFIG_SYS_FSL_IFC_BASE1,
          CONFIG_SYS_FSL_IFC_SIZE1,
          PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE
        },
@@ -130,9 +130,9 @@ static struct mm_region early_map[] = {
          PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS
        },
 #ifdef CONFIG_FSL_IFC
-       /* Map IFC region #2 up to CONFIG_SYS_FLASH_BASE for NAND boot */
+       /* Map IFC region #2 up to CFG_SYS_FLASH_BASE for NAND boot */
        { CONFIG_SYS_FSL_IFC_BASE2, CONFIG_SYS_FSL_IFC_BASE2,
-         CONFIG_SYS_FLASH_BASE - CONFIG_SYS_FSL_IFC_BASE2,
+         CFG_SYS_FLASH_BASE - CONFIG_SYS_FSL_IFC_BASE2,
          PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE
        },
 #endif
@@ -391,7 +391,7 @@ static struct mm_region final_map[] = {
          PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS
        },
 #endif
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
        {},     /* space holder for secure mem */
 #endif
        {},
@@ -445,7 +445,7 @@ static inline void early_mmu_setup(void)
        if (el == 3)
                gd->arch.tlb_addr = CFG_SYS_FSL_OCRAM_BASE;
        else
-               gd->arch.tlb_addr = CONFIG_SYS_DDR_SDRAM_BASE;
+               gd->arch.tlb_addr = CFG_SYS_DDR_SDRAM_BASE;
        gd->arch.tlb_fillptr = gd->arch.tlb_addr;
        gd->arch.tlb_size = EARLY_PGTABLE_SIZE;
 
@@ -568,7 +568,7 @@ static inline void final_mmu_setup(void)
                }
        }
 
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
        if (gd->arch.secure_ram & MEM_RESERVE_SECURE_MAINTAINED) {
                if (el == 3) {
                        /*
@@ -580,7 +580,7 @@ static inline void final_mmu_setup(void)
                        gd->arch.tlb_addr = gd->arch.secure_ram & ~0xfff;
                        final_map[index].virt = gd->arch.secure_ram & ~0x3;
                        final_map[index].phys = final_map[index].virt;
-                       final_map[index].size = CONFIG_SYS_MEM_RESERVE_SECURE;
+                       final_map[index].size = CFG_SYS_MEM_RESERVE_SECURE;
                        final_map[index].attrs = PTE_BLOCK_OUTER_SHARE;
                        gd->arch.secure_ram |= MEM_RESERVE_SECURE_SECURED;
                        tlb_addr_save = gd->arch.tlb_addr;
@@ -1323,10 +1323,10 @@ phys_size_t get_effective_memsize(void)
                ea_size = gd->ram_size;
        }
 
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
        /* Check if we have enough space for secure memory */
-       if (ea_size > CONFIG_SYS_MEM_RESERVE_SECURE)
-               ea_size -= CONFIG_SYS_MEM_RESERVE_SECURE;
+       if (ea_size > CFG_SYS_MEM_RESERVE_SECURE)
+               ea_size -= CFG_SYS_MEM_RESERVE_SECURE;
        else
                printf("Error: No enough space for secure memory.\n");
 #endif
@@ -1433,7 +1433,7 @@ int dram_init_banksize(void)
         * gd->arch.secure_ram should be done to avoid running it repeatedly.
         */
 
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
        if (gd->arch.secure_ram & MEM_RESERVE_SECURE_MAINTAINED) {
                debug("No need to run again, skip %s\n", __func__);
 
@@ -1442,11 +1442,11 @@ int dram_init_banksize(void)
 #endif
 
        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;
+       if (gd->ram_size > CFG_SYS_DDR_BLOCK1_SIZE) {
+               gd->bd->bi_dram[0].size = CFG_SYS_DDR_BLOCK1_SIZE;
+               gd->bd->bi_dram[1].start = CFG_SYS_DDR_BLOCK2_BASE;
                gd->bd->bi_dram[1].size = gd->ram_size -
-                                         CONFIG_SYS_DDR_BLOCK1_SIZE;
+                                         CFG_SYS_DDR_BLOCK1_SIZE;
 #ifdef CONFIG_SYS_DDR_BLOCK3_BASE
                if (gd->bi_dram[1].size > CONFIG_SYS_DDR_BLOCK2_SIZE) {
                        gd->bd->bi_dram[2].start = CONFIG_SYS_DDR_BLOCK3_BASE;
@@ -1458,17 +1458,17 @@ int dram_init_banksize(void)
        } else {
                gd->bd->bi_dram[0].size = gd->ram_size;
        }
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
        if (gd->bd->bi_dram[0].size >
-                               CONFIG_SYS_MEM_RESERVE_SECURE) {
+                               CFG_SYS_MEM_RESERVE_SECURE) {
                gd->bd->bi_dram[0].size -=
-                               CONFIG_SYS_MEM_RESERVE_SECURE;
+                               CFG_SYS_MEM_RESERVE_SECURE;
                gd->arch.secure_ram = gd->bd->bi_dram[0].start +
                                      gd->bd->bi_dram[0].size;
                gd->arch.secure_ram |= MEM_RESERVE_SECURE_MAINTAINED;
-               gd->ram_size -= CONFIG_SYS_MEM_RESERVE_SECURE;
+               gd->ram_size -= CFG_SYS_MEM_RESERVE_SECURE;
        }
-#endif /* CONFIG_SYS_MEM_RESERVE_SECURE */
+#endif /* CFG_SYS_MEM_RESERVE_SECURE */
 
 #if defined(CONFIG_RESV_RAM) && !defined(CONFIG_SPL_BUILD)
        /* Assign memory for MC */
@@ -1520,7 +1520,7 @@ int dram_init_banksize(void)
        }
 #endif
 
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
        debug("%s is called. gd->ram_size is reduced to %lu\n",
              __func__, (ulong)gd->ram_size);
 #endif
@@ -1580,7 +1580,7 @@ void update_early_mmu_table(void)
        } else {
                mmu_change_region_attr(
                                        CFG_SYS_SDRAM_BASE,
-                                       CONFIG_SYS_DDR_BLOCK1_SIZE,
+                                       CFG_SYS_DDR_BLOCK1_SIZE,
                                        PTE_BLOCK_MEMTYPE(MT_NORMAL)    |
                                        PTE_BLOCK_OUTER_SHARE           |
                                        PTE_BLOCK_NS                    |
@@ -1589,10 +1589,10 @@ void update_early_mmu_table(void)
 #ifndef CONFIG_SYS_DDR_BLOCK2_SIZE
 #error "Missing CONFIG_SYS_DDR_BLOCK2_SIZE"
 #endif
-               if (gd->ram_size - CONFIG_SYS_DDR_BLOCK1_SIZE >
+               if (gd->ram_size - CFG_SYS_DDR_BLOCK1_SIZE >
                    CONFIG_SYS_DDR_BLOCK2_SIZE) {
                        mmu_change_region_attr(
-                                       CONFIG_SYS_DDR_BLOCK2_BASE,
+                                       CFG_SYS_DDR_BLOCK2_BASE,
                                        CONFIG_SYS_DDR_BLOCK2_SIZE,
                                        PTE_BLOCK_MEMTYPE(MT_NORMAL)    |
                                        PTE_BLOCK_OUTER_SHARE           |
@@ -1601,7 +1601,7 @@ void update_early_mmu_table(void)
                        mmu_change_region_attr(
                                        CONFIG_SYS_DDR_BLOCK3_BASE,
                                        gd->ram_size -
-                                       CONFIG_SYS_DDR_BLOCK1_SIZE -
+                                       CFG_SYS_DDR_BLOCK1_SIZE -
                                        CONFIG_SYS_DDR_BLOCK2_SIZE,
                                        PTE_BLOCK_MEMTYPE(MT_NORMAL)    |
                                        PTE_BLOCK_OUTER_SHARE           |
@@ -1611,9 +1611,9 @@ void update_early_mmu_table(void)
 #endif
                {
                        mmu_change_region_attr(
-                                       CONFIG_SYS_DDR_BLOCK2_BASE,
+                                       CFG_SYS_DDR_BLOCK2_BASE,
                                        gd->ram_size -
-                                       CONFIG_SYS_DDR_BLOCK1_SIZE,
+                                       CFG_SYS_DDR_BLOCK1_SIZE,
                                        PTE_BLOCK_MEMTYPE(MT_NORMAL)    |
                                        PTE_BLOCK_OUTER_SHARE           |
                                        PTE_BLOCK_NS                    |
index 9119d60ffb31c72682c492eab9dbc38032e08e99..6f3fe7ca6e08e2a74671f1b1abb9acba7205ae56 100644 (file)
@@ -116,10 +116,10 @@ Flash Layout
 Environment Variables
 =====================
 mcboottimeout: MC boot timeout in milliseconds. If this variable is not defined
-               the value CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS will be assumed.
+               the value CFG_SYS_LS_MC_BOOT_TIMEOUT_MS will be assumed.
 
 mcmemsize:     MC DRAM block size in hex. If this variable is not defined, the value
-               CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE will be assumed.
+               CFG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE will be assumed.
 
 mcinitcmd:     This environment variable is defined to initiate MC and DPL deployment
                from the location where it is stored(NOR, NAND, SD, SATA, USB)during
index 4880a313ea6adb920ff233e7e9441eed39a92f76..e3c3fc6bfb55f9a60ffb83f76b9d2b1eaebef778 100644 (file)
@@ -10,7 +10,7 @@
 #include <fsl_sec.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        SET_QP_INFO(FSL_DPAA1_STREAM_ID_END, 0),
        SET_QP_INFO(FSL_DPAA1_STREAM_ID_END, 0),
        SET_QP_INFO(FSL_DPAA1_STREAM_ID_END, 0),
index e47d3af85e07fd7266af0d2e23208045f62ab379..333d7e2fa21aebc35460d181c0db38c1cddb762e 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        SET_QP_INFO(FSL_DPAA1_STREAM_ID_END, 0),
        SET_QP_INFO(FSL_DPAA1_STREAM_ID_END, 0),
        SET_QP_INFO(FSL_DPAA1_STREAM_ID_END, 0),
index 89a6262c1282a32f5ea692a36c5d29ba4b479862..359cbc0430970ff712aec4a7a67e38494886bd1d 100644 (file)
@@ -531,7 +531,7 @@ static void erratum_a010539(void)
 
        porsr1 = in_be32(&gur->porsr1);
        porsr1 &= ~FSL_CHASSIS2_CCSR_PORSR1_RCW_MASK;
-       out_be32((void *)(CONFIG_SYS_DCSR_DCFG_ADDR + DCFG_DCSR_PORCR1),
+       out_be32((void *)(CFG_SYS_DCSR_DCFG_ADDR + DCFG_DCSR_PORCR1),
                 porsr1);
        out_be32((void *)(CFG_SYS_FSL_SCFG_ADDR + 0x1a8), 0xffffffff);
 #endif
@@ -643,8 +643,8 @@ void init_pfe_scfg_dcfg_regs(void)
        out_be32(&scfg->rd_qos1, (unsigned int)(SCFG_RD_QOS1_PFE1_QOS
                 | SCFG_RD_QOS1_PFE2_QOS));
 
-       ecccr2 = in_be32(CONFIG_SYS_DCSR_DCFG_ADDR + DCFG_DCSR_ECCCR2);
-       out_be32((void *)CONFIG_SYS_DCSR_DCFG_ADDR + DCFG_DCSR_ECCCR2,
+       ecccr2 = in_be32(CFG_SYS_DCSR_DCFG_ADDR + DCFG_DCSR_ECCCR2);
+       out_be32((void *)CFG_SYS_DCSR_DCFG_ADDR + DCFG_DCSR_ECCCR2,
                 ecccr2 | (unsigned int)DISABLE_PFE_ECC);
 }
 #endif
index 3a4b665f244fd2caf4196bdc436e4676bd899f65..61fced451eb5d28a194303f78dc595b49d1381d7 100644 (file)
@@ -116,7 +116,7 @@ void board_init_f(ulong dummy)
 #endif
        dram_init();
 #ifdef CONFIG_SPL_FSL_LS_PPA
-#ifndef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifndef CFG_SYS_MEM_RESERVE_SECURE
 #error Need secure RAM for PPA
 #endif
        /*
index 540436ba028016de939925204542f1cdd5039aa0..c0e8726346f584636a3c0f14f6124f48cefae8ac 100644 (file)
@@ -198,7 +198,7 @@ static int sec_firmware_load_image(const void *sec_firmware_img,
                goto out;
        }
 
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
        /*
         * The SEC Firmware must be stored in secure memory.
         * Append SEC Firmware to secure mmu table.
@@ -211,7 +211,7 @@ static int sec_firmware_load_image(const void *sec_firmware_img,
        sec_firmware_addr = (gd->arch.secure_ram & MEM_RESERVE_SECURE_ADDR_MASK) +
                        gd->arch.tlb_size;
 #else
-#error "The CONFIG_SYS_MEM_RESERVE_SECURE must be defined when enabled SEC Firmware support"
+#error "The CFG_SYS_MEM_RESERVE_SECURE must be defined when enabled SEC Firmware support"
 #endif
 
        /* Align SEC Firmware base address to 4K */
index 0669222fed7f0af30abd3b36763055a1752abae6..c9c72e3271727b8dfe756d91bbf0649a1b17da51 100644 (file)
  * Reserve secure memory
  * To be aligned with MMU block size
  */
-#define CONFIG_SYS_MEM_RESERVE_SECURE  (66 * 1024 * 1024)      /* 66MB */
+#define CFG_SYS_MEM_RESERVE_SECURE     (66 * 1024 * 1024)      /* 66MB */
 #define SPL_TLB_SETBACK        0x1000000       /* 16MB under effective memory top */
 
 #ifdef CONFIG_ARCH_LS2080A
 #define CFG_SYS_FSL_CLUSTER_CLOCKS             { 1, 1, 4, 4 }
 #define        SRDS_MAX_LANES  8
-#define CONFIG_SYS_PAGE_SIZE           0x10000
+#define CFG_SYS_PAGE_SIZE              0x10000
 #ifndef L1_CACHE_BYTES
 #define L1_CACHE_SHIFT         6
 #define L1_CACHE_BYTES         BIT(L1_CACHE_SHIFT)
@@ -37,8 +37,8 @@
 #define CFG_SYS_FSL_OCRAM_SIZE 0x00020000 /* Real size 128K */
 
 /* DDR */
-#define CONFIG_SYS_DDR_BLOCK1_SIZE     ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED          CONFIG_SYS_DDR_BLOCK1_SIZE
+#define CFG_SYS_DDR_BLOCK1_SIZE        ((phys_size_t)2 << 30)
+#define CONFIG_MAX_MEM_MAPPED          CFG_SYS_DDR_BLOCK1_SIZE
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE                      0x06000000
@@ -96,7 +96,7 @@
 
 #elif defined(CONFIG_ARCH_LS1088A)
 #define CFG_SYS_FSL_CLUSTER_CLOCKS             { 1, 1 }
-#define CONFIG_SYS_PAGE_SIZE           0x10000
+#define CFG_SYS_PAGE_SIZE              0x10000
 
 #define        SRDS_MAX_LANES  4
 #define        SRDS_BITS_PER_LANE      4
 #define SMMU_BASE                      0x05000000 /* GR0 Base */
 
 /* DDR */
-#define CONFIG_SYS_DDR_BLOCK1_SIZE     ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED          CONFIG_SYS_DDR_BLOCK1_SIZE
+#define CFG_SYS_DDR_BLOCK1_SIZE        ((phys_size_t)2 << 30)
+#define CONFIG_MAX_MEM_MAPPED          CFG_SYS_DDR_BLOCK1_SIZE
 
 /* DCFG - GUR */
 #define CFG_SYS_FSL_OCRAM_BASE 0x18000000 /* initial RAM */
 #endif
 #define CFG_SYS_FSL_CLUSTER_CLOCKS             { 1, 1, 1, 1, 4, 4, 4, 4 }
 
-#define CONFIG_SYS_PAGE_SIZE                   0x10000
+#define CFG_SYS_PAGE_SIZE                      0x10000
 
 #define CFG_SYS_FSL_OCRAM_BASE         0x18000000 /* initial RAM */
 #define SYS_FSL_OCRAM_SPACE_SIZE               0x00200000 /* 2M space */
 #define CFG_SYS_FSL_OCRAM_SIZE         0x00040000 /* Real size 256K */
 
 /* DDR */
-#define CONFIG_SYS_DDR_BLOCK1_SIZE             ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED                  CONFIG_SYS_DDR_BLOCK1_SIZE
+#define CFG_SYS_DDR_BLOCK1_SIZE                ((phys_size_t)2 << 30)
+#define CONFIG_MAX_MEM_MAPPED                  CFG_SYS_DDR_BLOCK1_SIZE
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE                              0x06000000
 #define SMMU_BASE                              0x05000000 /* GR0 Base */
 
 /* DDR */
-#define CONFIG_SYS_DDR_BLOCK1_SIZE     ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED          CONFIG_SYS_DDR_BLOCK1_SIZE
+#define CFG_SYS_DDR_BLOCK1_SIZE        ((phys_size_t)2 << 30)
+#define CONFIG_MAX_MEM_MAPPED          CFG_SYS_DDR_BLOCK1_SIZE
 
 /* SEC */
 
 #define CFG_SYS_NUM_FMAN                       1
 #define CFG_SYS_NUM_FM1_DTSEC          7
 #define CFG_SYS_NUM_FM1_10GEC          1
-#define CONFIG_SYS_DDR_BLOCK1_SIZE             ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED                  CONFIG_SYS_DDR_BLOCK1_SIZE
+#define CFG_SYS_DDR_BLOCK1_SIZE                ((phys_size_t)2 << 30)
+#define CONFIG_MAX_MEM_MAPPED                  CFG_SYS_DDR_BLOCK1_SIZE
 
 #define QE_MURAM_SIZE          0x6000UL
 #define MAX_QE_RISC            1
 #elif defined(CONFIG_ARCH_LS1012A)
 #define GICD_BASE              0x01401000
 #define GICC_BASE              0x01402000
-#define CONFIG_SYS_DDR_BLOCK1_SIZE     ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED          CONFIG_SYS_DDR_BLOCK1_SIZE
+#define CFG_SYS_DDR_BLOCK1_SIZE        ((phys_size_t)2 << 30)
+#define CONFIG_MAX_MEM_MAPPED          CFG_SYS_DDR_BLOCK1_SIZE
 
 #elif defined(CONFIG_ARCH_LS1046A)
 #define CFG_SYS_NUM_FMAN                       1
 #define CFG_SYS_NUM_FM1_DTSEC          8
 #define CFG_SYS_NUM_FM1_10GEC          2
-#define CONFIG_SYS_DDR_BLOCK1_SIZE  ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED           CONFIG_SYS_DDR_BLOCK1_SIZE
+#define CFG_SYS_DDR_BLOCK1_SIZE  ((phys_size_t)2 << 30)
+#define CONFIG_MAX_MEM_MAPPED           CFG_SYS_DDR_BLOCK1_SIZE
 
 /* SMMU Defintions */
 #define SMMU_BASE              0x09000000
index 9cddb41a89c84b3035fc9f373021df30a0858902..d5f63f4a7ed76f3e9a665a0b0cddb05c2bc20ccb 100644 (file)
@@ -75,7 +75,7 @@ void fdt_fixup_icid(void *blob);
 
 #define SET_USB_ICID(usb_num, compat, streamid) \
        SET_SCFG_ICID(compat, streamid, usb##usb_num##_icid,\
-               CONFIG_SYS_XHCI_USB##usb_num##_ADDR)
+               CFG_SYS_XHCI_USB##usb_num##_ADDR)
 
 #define SET_SATA_ICID(compat, streamid) \
        SET_SCFG_ICID(compat, streamid, sata_icid,\
@@ -142,7 +142,7 @@ extern int fman_icid_tbl_sz;
 
 #define SET_USB_ICID(usb_num, compat, streamid) \
        SET_GUR_ICID(compat, streamid, usb##usb_num##_amqr,\
-               CONFIG_SYS_XHCI_USB##usb_num##_ADDR)
+               CFG_SYS_XHCI_USB##usb_num##_ADDR)
 
 #define SET_SATA_ICID(sata_num, compat, streamid) \
        SET_GUR_ICID(compat, streamid, sata##sata_num##_amqr, \
index 64dc7c88b7f8a175506834dab22ffeffd84072d0..9794db044996578a6ff2a792eb459b6aba35b4fb 100644 (file)
 #include <linux/bitops.h>
 #endif
 
-#define CONFIG_SYS_DCSRBAR                     0x20000000
-#define CONFIG_SYS_DCSR_DCFG_ADDR      (CONFIG_SYS_DCSRBAR + 0x00140000)
+#define CFG_SYS_DCSRBAR                        0x20000000
+#define CFG_SYS_DCSR_DCFG_ADDR (CFG_SYS_DCSRBAR + 0x00140000)
 
 #define CFG_SYS_FSL_DDR_ADDR                   (CONFIG_SYS_IMMR + 0x00080000)
-#define CONFIG_SYS_IFC_ADDR                    (CONFIG_SYS_IMMR + 0x00530000)
+#define CFG_SYS_IFC_ADDR                       (CONFIG_SYS_IMMR + 0x00530000)
 #define SYS_FSL_QSPI_ADDR                      (CONFIG_SYS_IMMR + 0x00550000)
 #define CFG_SYS_FSL_ESDHC_ADDR         (CONFIG_SYS_IMMR + 0x00560000)
 #define CFG_SYS_FSL_CSU_ADDR                   (CONFIG_SYS_IMMR + 0x00510000)
 #define CFG_SYS_NS16550_COM2                   (CONFIG_SYS_IMMR + 0x011c0600)
 #define CFG_SYS_NS16550_COM3                   (CONFIG_SYS_IMMR + 0x011d0500)
 #define CFG_SYS_NS16550_COM4                   (CONFIG_SYS_IMMR + 0x011d0600)
-#define CONFIG_SYS_XHCI_USB1_ADDR              (CONFIG_SYS_IMMR + 0x01f00000)
-#define CONFIG_SYS_XHCI_USB2_ADDR              (CONFIG_SYS_IMMR + 0x02000000)
-#define CONFIG_SYS_XHCI_USB3_ADDR              (CONFIG_SYS_IMMR + 0x02100000)
+#define CFG_SYS_XHCI_USB1_ADDR         (CONFIG_SYS_IMMR + 0x01f00000)
+#define CFG_SYS_XHCI_USB2_ADDR         (CONFIG_SYS_IMMR + 0x02000000)
+#define CFG_SYS_XHCI_USB3_ADDR         (CONFIG_SYS_IMMR + 0x02100000)
 #define CFG_SYS_PCIE1_ADDR                     (CONFIG_SYS_IMMR + 0x2400000)
 #define CFG_SYS_PCIE2_ADDR                     (CONFIG_SYS_IMMR + 0x2500000)
-#define CONFIG_SYS_SEC_MON_ADDR                        (CONFIG_SYS_IMMR + 0xe90000)
-#define CONFIG_SYS_SFP_ADDR                    (CONFIG_SYS_IMMR + 0xe80200)
-
-#define CONFIG_SYS_BMAN_NUM_PORTALS    10
-#define CONFIG_SYS_BMAN_MEM_BASE       0x508000000
-#define CONFIG_SYS_BMAN_MEM_PHYS       (0xf00000000ull + \
-                                               CONFIG_SYS_BMAN_MEM_BASE)
-#define CONFIG_SYS_BMAN_MEM_SIZE       0x08000000
-#define CONFIG_SYS_BMAN_SP_CENA_SIZE    0x10000
-#define CONFIG_SYS_BMAN_SP_CINH_SIZE    0x10000
-#define CONFIG_SYS_BMAN_CENA_BASE       CONFIG_SYS_BMAN_MEM_BASE
-#define CONFIG_SYS_BMAN_CENA_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_CINH_BASE       (CONFIG_SYS_BMAN_MEM_BASE + \
-                                       CONFIG_SYS_BMAN_CENA_SIZE)
-#define CONFIG_SYS_BMAN_CINH_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_SWP_ISDR_REG    0x3E80
-#define CONFIG_SYS_QMAN_NUM_PORTALS    10
-#define CONFIG_SYS_QMAN_MEM_BASE       0x500000000
-#define CONFIG_SYS_QMAN_MEM_PHYS       CONFIG_SYS_QMAN_MEM_BASE
-#define CONFIG_SYS_QMAN_MEM_SIZE       0x08000000
-#define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x10000
-#define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
-                                       CONFIG_SYS_QMAN_CENA_SIZE)
-#define CONFIG_SYS_QMAN_CINH_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_SWP_ISDR_REG   0x3680
+#define CFG_SYS_SEC_MON_ADDR                   (CONFIG_SYS_IMMR + 0xe90000)
+#define CFG_SYS_SFP_ADDR                       (CONFIG_SYS_IMMR + 0xe80200)
+
+#define CFG_SYS_BMAN_NUM_PORTALS       10
+#define CFG_SYS_BMAN_MEM_BASE  0x508000000
+#define CFG_SYS_BMAN_MEM_PHYS  (0xf00000000ull + \
+                                               CFG_SYS_BMAN_MEM_BASE)
+#define CFG_SYS_BMAN_MEM_SIZE  0x08000000
+#define CFG_SYS_BMAN_SP_CENA_SIZE    0x10000
+#define CFG_SYS_BMAN_SP_CINH_SIZE    0x10000
+#define CFG_SYS_BMAN_CENA_BASE       CFG_SYS_BMAN_MEM_BASE
+#define CFG_SYS_BMAN_CENA_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_CINH_BASE       (CFG_SYS_BMAN_MEM_BASE + \
+                                       CFG_SYS_BMAN_CENA_SIZE)
+#define CFG_SYS_BMAN_CINH_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_SWP_ISDR_REG    0x3E80
+#define CFG_SYS_QMAN_NUM_PORTALS       10
+#define CFG_SYS_QMAN_MEM_BASE  0x500000000
+#define CFG_SYS_QMAN_MEM_PHYS  CFG_SYS_QMAN_MEM_BASE
+#define CFG_SYS_QMAN_MEM_SIZE  0x08000000
+#define CFG_SYS_QMAN_SP_CINH_SIZE    0x10000
+#define CFG_SYS_QMAN_CENA_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_CINH_BASE       (CFG_SYS_QMAN_MEM_BASE + \
+                                       CFG_SYS_QMAN_CENA_SIZE)
+#define CFG_SYS_QMAN_CINH_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_SWP_ISDR_REG      0x3680
 
 #define CFG_SYS_FSL_TIMER_ADDR         0x02b00000
 
 #define TP_CLUSTER_INIT_MASK    0x0000003f      /* initiator mask */
 #define TP_INIT_PER_CLUSTER     4
 
-#ifndef CONFIG_SYS_CCSRBAR
-#define CONFIG_SYS_CCSRBAR             0x01000000
+#ifndef CFG_SYS_CCSRBAR
+#define CFG_SYS_CCSRBAR                0x01000000
 #endif
 
-#ifndef CONFIG_SYS_CCSRBAR_PHYS_HIGH
-#define CONFIG_SYS_CCSRBAR_PHYS_HIGH   0
+#ifndef CFG_SYS_CCSRBAR_PHYS_HIGH
+#define CFG_SYS_CCSRBAR_PHYS_HIGH      0
 #endif
 
-#ifndef CONFIG_SYS_CCSRBAR_PHYS_LOW
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW    0x01000000
+#ifndef CFG_SYS_CCSRBAR_PHYS_LOW
+#define CFG_SYS_CCSRBAR_PHYS_LOW       0x01000000
 #endif
 
-#define CONFIG_SYS_CCSRBAR_PHYS ((CONFIG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
-                                CONFIG_SYS_CCSRBAR_PHYS_LOW)
+#define CFG_SYS_CCSRBAR_PHYS ((CFG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
+                                CFG_SYS_CCSRBAR_PHYS_LOW)
 
 struct sys_info {
        unsigned long freq_processor[CONFIG_MAX_CPUS];
index cd112402e0c829b89c11649554a172db5529690a..ca5e33379ba91af74ac0c291b502763010ccdf75 100644 (file)
@@ -33,7 +33,7 @@
 #define FSL_ESDHC1_BASE_ADDR                   CFG_SYS_FSL_ESDHC_ADDR
 #define FSL_ESDHC2_BASE_ADDR                   (CONFIG_SYS_IMMR + 0x01150000)
 #ifndef CONFIG_NXP_LSCH3_2
-#define CONFIG_SYS_IFC_ADDR                    (CONFIG_SYS_IMMR + 0x01240000)
+#define CFG_SYS_IFC_ADDR                       (CONFIG_SYS_IMMR + 0x01240000)
 #endif
 #define CFG_SYS_NS16550_COM1                   (CONFIG_SYS_IMMR + 0x011C0500)
 #define CFG_SYS_NS16550_COM2                   (CONFIG_SYS_IMMR + 0x011C0600)
@@ -67,8 +67,8 @@
 #define GPIO4_GPDIR_ADDR                       (GPIO4_BASE_ADDR + 0x0)
 #define GPIO4_GPDAT_ADDR                       (GPIO4_BASE_ADDR + 0x8)
 
-#define CONFIG_SYS_XHCI_USB1_ADDR              (CONFIG_SYS_IMMR + 0x02100000)
-#define CONFIG_SYS_XHCI_USB2_ADDR              (CONFIG_SYS_IMMR + 0x02110000)
+#define CFG_SYS_XHCI_USB1_ADDR         (CONFIG_SYS_IMMR + 0x02100000)
+#define CFG_SYS_XHCI_USB2_ADDR         (CONFIG_SYS_IMMR + 0x02110000)
 
 /* TZ Address Space Controller Definitions */
 #define TZASC1_BASE                    0x01100000      /* as per CCSR map. */
 #define GPU_BASE_ADDR                          (CONFIG_SYS_IMMR + 0x0e0c0000)
 
 /* SFP */
-#define CONFIG_SYS_SFP_ADDR            (CONFIG_SYS_IMMR + 0x00e80200)
+#define CFG_SYS_SFP_ADDR               (CONFIG_SYS_IMMR + 0x00e80200)
 
 /* SEC */
 #define CFG_SYS_FSL_SEC_OFFSET         0x07000000ull
 #endif
 
 /* Security Monitor */
-#define CONFIG_SYS_SEC_MON_ADDR                (CONFIG_SYS_IMMR + 0x00e90000)
+#define CFG_SYS_SEC_MON_ADDR           (CONFIG_SYS_IMMR + 0x00e90000)
 
 /* MMU 500 */
 #define SMMU_SCR0                      (SMMU_BASE + 0x0)
index 6de431f6bbbc60a5bb92767f8360b1869b097825..3ad78cb1e645264e7d9d47a6898a16216d680b89 100644 (file)
@@ -23,7 +23,7 @@
 #define CFG_SYS_NS16550_CLK            13000000
 #endif
 
-#define CONFIG_SYS_BAUDRATE_TABLE      \
+#define CFG_SYS_BAUDRATE_TABLE \
                { 9600, 19200, 38400, 57600, 115200, 230400, 460800 }
 
 /* NAND */
@@ -49,7 +49,7 @@
 
 /* USB OHCI */
 #if defined(CONFIG_USB_OHCI_LPC32XX)
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          USB_BASE
+#define CFG_SYS_USB_OHCI_REGS_BASE             USB_BASE
 #endif
 
 #endif /* _LPC32XX_CONFIG_H */
index 62026bda9e2b71eb570f54e7bec8bc4b401077c4..6413a307d273065eb516fbf374361e08a2b651f9 100644 (file)
 #define OCRAM_BASE_S_ADDR                      0x10010000
 #define OCRAM_S_SIZE                           0x00010000
 
-#define CONFIG_SYS_DCSRBAR                     0x20000000
+#define CFG_SYS_DCSRBAR                        0x20000000
 
-#define CONFIG_SYS_DCSR_DCFG_ADDR      (CONFIG_SYS_DCSRBAR + 0x00220000)
-#define SYS_FSL_DCSR_RCPM_ADDR (CONFIG_SYS_DCSRBAR + 0x00222000)
+#define CFG_SYS_DCSR_DCFG_ADDR (CFG_SYS_DCSRBAR + 0x00220000)
+#define SYS_FSL_DCSR_RCPM_ADDR (CFG_SYS_DCSRBAR + 0x00222000)
 
 #define SYS_FSL_GIC_ADDR                       (CONFIG_SYS_IMMR + 0x00400000)
 #define CFG_SYS_FSL_DDR_ADDR                   (CONFIG_SYS_IMMR + 0x00080000)
 #define CFG_SYS_FSL_CSU_ADDR                 (CONFIG_SYS_IMMR + 0x00510000)
-#define CONFIG_SYS_IFC_ADDR                    (CONFIG_SYS_IMMR + 0x00530000)
+#define CFG_SYS_IFC_ADDR                       (CONFIG_SYS_IMMR + 0x00530000)
 #define CFG_SYS_FSL_ESDHC_ADDR         (CONFIG_SYS_IMMR + 0x00560000)
 #define CFG_SYS_FSL_SCFG_ADDR          (CONFIG_SYS_IMMR + 0x00570000)
 #define CFG_SYS_FSL_SEC_ADDR                   (CONFIG_SYS_IMMR + 0x700000)
 #define CFG_SYS_FSL_JR0_ADDR                   (CONFIG_SYS_IMMR + 0x710000)
-#define CONFIG_SYS_SEC_MON_ADDR                        (CONFIG_SYS_IMMR + 0x00e90000)
-#define CONFIG_SYS_SFP_ADDR                    (CONFIG_SYS_IMMR + 0x00e80200)
+#define CFG_SYS_SEC_MON_ADDR                   (CONFIG_SYS_IMMR + 0x00e90000)
+#define CFG_SYS_SFP_ADDR                       (CONFIG_SYS_IMMR + 0x00e80200)
 #define CFG_SYS_FSL_SERDES_ADDR                (CONFIG_SYS_IMMR + 0x00ea0000)
 #define CFG_SYS_FSL_GUTS_ADDR          (CONFIG_SYS_IMMR + 0x00ee0000)
 #define CFG_SYS_FSL_LS1_CLK_ADDR               (CONFIG_SYS_IMMR + 0x00ee1000)
 #define CFG_SYS_FSL_RCPM_ADDR          (CONFIG_SYS_IMMR + 0x00ee2000)
 #define CFG_SYS_NS16550_COM1                   (CONFIG_SYS_IMMR + 0x011c0500)
 #define CFG_SYS_NS16550_COM2                   (CONFIG_SYS_IMMR + 0x011d0500)
-#define CONFIG_SYS_XHCI_USB1_ADDR              (CONFIG_SYS_IMMR + 0x02100000)
+#define CFG_SYS_XHCI_USB1_ADDR         (CONFIG_SYS_IMMR + 0x02100000)
 
 #define CFG_SYS_FSL_SEC_OFFSET         0x00700000
 #define CFG_SYS_FSL_JR0_OFFSET         0x00710000
-#define CONFIG_SYS_TSEC1_OFFSET                        0x01d10000
-#define CONFIG_SYS_MDIO1_OFFSET                        0x01d24000
+#define CFG_SYS_TSEC1_OFFSET                   0x01d10000
+#define CFG_SYS_MDIO1_OFFSET                   0x01d24000
 
-#define TSEC_BASE_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_TSEC1_OFFSET)
-#define MDIO_BASE_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MDIO1_OFFSET)
+#define TSEC_BASE_ADDR (CONFIG_SYS_IMMR + CFG_SYS_TSEC1_OFFSET)
+#define MDIO_BASE_ADDR (CONFIG_SYS_IMMR + CFG_SYS_MDIO1_OFFSET)
 
 #define SCTR_BASE_ADDR                         (CONFIG_SYS_IMMR + 0x01b00000)
 
index b0acf677984bd7ba5439e189b36ffd659538396d..a0c3da7f46d97f8fe2a7750d332666e7beeadf21 100644 (file)
 
 #define DCFG_DCSR_PORCR1               0
 
-#ifndef CONFIG_SYS_CCSRBAR
-#define CONFIG_SYS_CCSRBAR             CONFIG_SYS_IMMR
+#ifndef CFG_SYS_CCSRBAR
+#define CFG_SYS_CCSRBAR                CONFIG_SYS_IMMR
 #endif
 
-#ifndef CONFIG_SYS_CCSRBAR_PHYS_HIGH
+#ifndef CFG_SYS_CCSRBAR_PHYS_HIGH
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_CCSRBAR_PHYS_HIGH   0xf
+#define CFG_SYS_CCSRBAR_PHYS_HIGH      0xf
 #else
-#define CONFIG_SYS_CCSRBAR_PHYS_HIGH   0
+#define CFG_SYS_CCSRBAR_PHYS_HIGH      0
 #endif
 #endif
 
-#ifndef CONFIG_SYS_CCSRBAR_PHYS_LOW
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_IMMR
+#ifndef CFG_SYS_CCSRBAR_PHYS_LOW
+#define CFG_SYS_CCSRBAR_PHYS_LOW       CONFIG_SYS_IMMR
 #endif
 
-#define CONFIG_SYS_CCSRBAR_PHYS ((CONFIG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
-                                CONFIG_SYS_CCSRBAR_PHYS_LOW)
+#define CFG_SYS_CCSRBAR_PHYS ((CFG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
+                                CFG_SYS_CCSRBAR_PHYS_LOW)
 
 struct sys_info {
        unsigned long freq_processor[CONFIG_MAX_CPUS];
index fb5ded890783ee4c0d18fee018317c3eaae321e3..acd8c69f694d5fbf583da5e7532163af6f05ea15 100644 (file)
        { .compat = name, \
          .id = { idA }, .num_ids = 1, \
          .reg_offset = off + CONFIG_SYS_IMMR, \
-         .compat_offset = compatoff + CONFIG_SYS_CCSRBAR_PHYS, \
+         .compat_offset = compatoff + CFG_SYS_CCSRBAR_PHYS, \
        }
 
 #define SET_LIODN_ENTRY_2(name, idA, idB, off, compatoff) \
        { .compat = name, \
          .id = { idA, idB }, .num_ids = 2, \
          .reg_offset = off + CONFIG_SYS_IMMR, \
-         .compat_offset = compatoff + CONFIG_SYS_CCSRBAR_PHYS, \
+         .compat_offset = compatoff + CFG_SYS_CCSRBAR_PHYS, \
        }
 
 /*
index d5c0ed8e6c2bb482b37ec192d8f280257bac7555..a0ab3a0e665c711cf04facb2a7c285649716f2ec 100644 (file)
@@ -899,9 +899,9 @@ struct esdc_regs {
  * Generic timer support
  */
 #ifdef CONFIG_MX31_CLK32
-#define        CONFIG_SYS_TIMER_RATE   CONFIG_MX31_CLK32
+#define        CFG_SYS_TIMER_RATE      CONFIG_MX31_CLK32
 #else
-#define        CONFIG_SYS_TIMER_RATE   32768
+#define        CFG_SYS_TIMER_RATE      32768
 #endif
 
 #endif /* __ASM_ARCH_MX31_IMX_REGS_H */
index 5b12d90d5859c621b8589be0b66e539a23beb221..eb1ddca600281ec3441e9e512c9abb69a85ac8f7 100644 (file)
@@ -36,6 +36,6 @@ struct gpt_regs *const gpt1_regs_ptr =
 #define GPT_FREE_RUNNING               0xFFFF
 
 /* Timer, HZ specific defines */
-#define CONFIG_SYS_HZ_CLOCK            ((27 * 1000 * 1000) / GPT_PRESCALER_128)
+#define CFG_SYS_HZ_CLOCK               ((27 * 1000 * 1000) / GPT_PRESCALER_128)
 
 #endif
index 3525f22e7df7a6d8092391d70bfcd0f0e3bdfc13..241b44928a95a018d08a6dc08ba0cb4529cdf4c9 100644 (file)
@@ -18,6 +18,6 @@
 #endif
 
 /* This is abp0-clk on sun4i/5i/7i / abp1-clk on sun6i/sun8i which is 24MHz */
-#define CONFIG_SYS_TCLK                24000000
+#define CFG_SYS_TCLK           24000000
 
 #endif
index cd6112dfcda530a1c0ee9bc2e52ba3d36967a536..9e746e380a21393845324c82150a202639c4de8d 100644 (file)
@@ -54,7 +54,7 @@ struct arch_global_data {
        unsigned long tlb_emerg;
 #endif
 #endif
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
 #define MEM_RESERVE_SECURE_SECURED     0x1
 #define MEM_RESERVE_SECURE_MAINTAINED  0x2
 #define MEM_RESERVE_SECURE_ADDR_MASK   (~0x3)
index 826e09e72c09555ca9a872b44e3f3f7d3456eaf1..5e6eaad968d6ef0bd0b62871ee1ac2f3670008b8 100644 (file)
@@ -29,7 +29,7 @@ void arch_print_bdinfo(void)
        struct bd_info *bd = gd->bd;
 
        bdinfo_print_num_l("arch_number", bd->bi_arch_number);
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
        if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) {
                bdinfo_print_num_ll("Secure ram",
                                    gd->arch.secure_ram &
index bbaaaa4157a5e79b07766ecf4970ebb4395e9c96..d05314ee57fc1fc03d5e6fd79ae1200b26206c97 100644 (file)
@@ -11,7 +11,7 @@
 #include <config.h>
 #include <common.h>
 
-struct pl310_regs *const pl310 = (struct pl310_regs *)CONFIG_SYS_PL310_BASE;
+struct pl310_regs *const pl310 = (struct pl310_regs *)CFG_SYS_PL310_BASE;
 
 static void pl310_cache_sync(void)
 {
index a2bf2e57b9417a5a704ead87e613e59b6316d9d1..1a589c7e2a0da419d4ceadc5b9442246d583d0ea 100644 (file)
@@ -152,7 +152,7 @@ __weak int arm_reserve_mmu(void)
        debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr,
              gd->arch.tlb_addr + gd->arch.tlb_size);
 
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+#ifdef CFG_SYS_MEM_RESERVE_SECURE
        /*
         * Record allocated tlb_addr in case gd->tlb_addr to be overwritten
         * with location within secure ram.
index a54c84b062b1fa1f80a6dce5ce9e84c01354ad30..7cf7d1636f54c68f8e023d4e3fc94f1b1965cd33 100644 (file)
@@ -83,8 +83,8 @@
  */
 
 _start:
-#ifdef CONFIG_SYS_DV_NOR_BOOT_CFG
-       .word   CONFIG_SYS_DV_NOR_BOOT_CFG
+#ifdef CFG_SYS_DV_NOR_BOOT_CFG
+       .word   CFG_SYS_DV_NOR_BOOT_CFG
 #endif
        ARM_VECTORS
 #endif /* !defined(CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK) */
index c7440278d8f8ea17723d116160f1783d5bbc1042..09ac66d619d24a0fff2b98685deda2a97db32f91 100644 (file)
@@ -26,7 +26,7 @@ static unsigned long at91_css_to_rate(unsigned long css)
 {
        switch (css) {
        case AT91_PMC_MCKR_CSS_SLOW:
-               return CONFIG_SYS_AT91_SLOW_CLOCK;
+               return CFG_SYS_AT91_SLOW_CLOCK;
        case AT91_PMC_MCKR_CSS_MAIN:
                return gd->arch.main_clk_rate_hz;
        case AT91_PMC_MCKR_CSS_PLLA:
@@ -107,7 +107,7 @@ int at91_clock_init(unsigned long main_clock)
 {
        unsigned freq, mckr;
        at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
-#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
+#ifndef CFG_SYS_AT91_MAIN_CLOCK
        unsigned tmp;
        /*
         * When the bootloader initialized the main oscillator correctly,
@@ -120,7 +120,7 @@ int at91_clock_init(unsigned long main_clock)
                        tmp = readl(&pmc->mcfr);
                } while (!(tmp & AT91_PMC_MCFR_MAINRDY));
                tmp &= AT91_PMC_MCFR_MAINF_MASK;
-               main_clock = tmp * (CONFIG_SYS_AT91_SLOW_CLOCK / 16);
+               main_clock = tmp * (CFG_SYS_AT91_SLOW_CLOCK / 16);
        }
 #endif
        gd->arch.main_clk_rate_hz = main_clock;
index 44c079c0fdd9baea90f9ada849aff5f02762504c..9bf03fd68ecc6e8704d3f8899f1de33cd0ded45c 100644 (file)
 #include <asm/arch/hardware.h>
 #include <asm/arch/clk.h>
 
-#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
-#define CONFIG_SYS_AT91_MAIN_CLOCK 0
+#ifndef CFG_SYS_AT91_MAIN_CLOCK
+#define CFG_SYS_AT91_MAIN_CLOCK 0
 #endif
 
 int arch_cpu_init(void)
 {
-       return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
+       return at91_clock_init(CFG_SYS_AT91_MAIN_CLOCK);
 }
index 3b91a0cba33ea1caad0d9c31102f31c2979ec030..6b7d3cbc71076ebef4fce8f93fb8410ef714e9cd 100644 (file)
@@ -94,11 +94,11 @@ SMRDATA:
        .word AT91_ASM_MC_SMC_CSR0
        .word CONFIG_SYS_SMC_CSR0_VAL
        .word AT91_ASM_PMC_PLLAR
-       .word CONFIG_SYS_PLLAR_VAL
+       .word CFG_SYS_PLLAR_VAL
        .word AT91_ASM_PMC_PLLBR
        .word CONFIG_SYS_PLLBR_VAL
        .word AT91_ASM_PMC_MCKR
-       .word CONFIG_SYS_MCKR_VAL
+       .word CFG_SYS_MCKR_VAL
 SMRDATAE:
        /* here there's a delay */
 SMRDATA1:
@@ -107,17 +107,17 @@ SMRDATA1:
        .word AT91_ASM_PIOC_BSR
        .word CONFIG_SYS_PIOC_BSR_VAL
        .word AT91_ASM_PIOC_PDR
-       .word CONFIG_SYS_PIOC_PDR_VAL
+       .word CFG_SYS_PIOC_PDR_VAL
        .word AT91_ASM_MC_EBI_CSA
        .word CONFIG_SYS_EBI_CSA_VAL
        .word AT91_ASM_MC_SDRAMC_CR
-       .word CONFIG_SYS_SDRC_CR_VAL
+       .word CFG_SYS_SDRC_CR_VAL
        .word AT91_ASM_MC_SDRAMC_MR
-       .word CONFIG_SYS_SDRC_MR_VAL
+       .word CFG_SYS_SDRC_MR_VAL
        .word CFG_SYS_SDRAM
        .word CFG_SYS_SDRAM_VAL
        .word AT91_ASM_MC_SDRAMC_MR
-       .word CONFIG_SYS_SDRC_MR_VAL1
+       .word CFG_SYS_SDRC_MR_VAL1
        .word CFG_SYS_SDRAM
        .word CFG_SYS_SDRAM_VAL
        .word CFG_SYS_SDRAM
@@ -135,15 +135,15 @@ SMRDATA1:
        .word CFG_SYS_SDRAM
        .word CFG_SYS_SDRAM_VAL
        .word AT91_ASM_MC_SDRAMC_MR
-       .word CONFIG_SYS_SDRC_MR_VAL2
+       .word CFG_SYS_SDRC_MR_VAL2
        .word CFG_SYS_SDRAM1
        .word CFG_SYS_SDRAM_VAL
        .word AT91_ASM_MC_SDRAMC_TR
-       .word CONFIG_SYS_SDRC_TR_VAL
+       .word CFG_SYS_SDRC_TR_VAL
        .word CFG_SYS_SDRAM
        .word CFG_SYS_SDRAM_VAL
        .word AT91_ASM_MC_SDRAMC_MR
-       .word CONFIG_SYS_SDRC_MR_VAL3
+       .word CFG_SYS_SDRC_MR_VAL3
        .word CFG_SYS_SDRAM
        .word CFG_SYS_SDRAM_VAL
 SMRDATA1E:
index c400e8781356f56b57d96e08efea121edbce0db5..8ef5764e3153acfdf634d594fb5e51a942a4f5f7 100644 (file)
@@ -27,7 +27,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 /* the number of clocks per CONFIG_SYS_HZ */
-#define TIMER_LOAD_VAL (CONFIG_SYS_HZ_CLOCK/CONFIG_SYS_HZ)
+#define TIMER_LOAD_VAL (CFG_SYS_HZ_CLOCK/CONFIG_SYS_HZ)
 
 int timer_init(void)
 {
@@ -92,7 +92,7 @@ void __udelay(unsigned long usec)
        u32 endtime;
        signed long diff;
 
-       tmo = CONFIG_SYS_HZ_CLOCK / 1000;
+       tmo = CFG_SYS_HZ_CLOCK / 1000;
        tmo *= usec;
        tmo /= 1000;
 
index c68e0c0c3c449203f1c5c85a057e8e3f9ce4265c..013daf43b742469be895b459185eda00d34430b7 100644 (file)
@@ -26,7 +26,7 @@ static unsigned long at91_css_to_rate(unsigned long css)
 {
        switch (css) {
        case AT91_PMC_MCKR_CSS_SLOW:
-               return CONFIG_SYS_AT91_SLOW_CLOCK;
+               return CFG_SYS_AT91_SLOW_CLOCK;
        case AT91_PMC_MCKR_CSS_MAIN:
                return gd->arch.main_clk_rate_hz;
        case AT91_PMC_MCKR_CSS_PLLA:
@@ -115,7 +115,7 @@ int at91_clock_init(unsigned long main_clock)
 {
        unsigned freq, mckr;
        at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
-#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
+#ifndef CFG_SYS_AT91_MAIN_CLOCK
        unsigned tmp;
        /*
         * When the bootloader initialized the main oscillator correctly,
@@ -128,7 +128,7 @@ int at91_clock_init(unsigned long main_clock)
                        tmp = readl(&pmc->mcfr);
                } while (!(tmp & AT91_PMC_MCFR_MAINRDY));
                tmp &= AT91_PMC_MCFR_MAINF_MASK;
-               main_clock = tmp * (CONFIG_SYS_AT91_SLOW_CLOCK / 16);
+               main_clock = tmp * (CFG_SYS_AT91_SLOW_CLOCK / 16);
        }
 #endif
        gd->arch.main_clk_rate_hz = main_clock;
index 761edb6df58959a6dbeb3eff56a8e0913aceb81f..5e84b0a40e1388b5e430e377a83c459c9839ecfc 100644 (file)
 #include <asm/arch/at91_gpbr.h>
 #include <asm/arch/clk.h>
 
-#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
-#define CONFIG_SYS_AT91_MAIN_CLOCK 0
+#ifndef CFG_SYS_AT91_MAIN_CLOCK
+#define CFG_SYS_AT91_MAIN_CLOCK 0
 #endif
 
 int arch_cpu_init(void)
 {
-       return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
+       return at91_clock_init(CFG_SYS_AT91_MAIN_CLOCK);
 }
 
 void arch_preboot_os(void)
index ecfe589e45593ce99de426d5569ef9c692b36835..e159a74eeac3dac17ef5039e429b59848942b753 100644 (file)
@@ -21,8 +21,8 @@
 #ifdef CONFIG_ATMEL_LEGACY
 #include <asm/arch/at91sam9_matrix.h>
 #endif
-#ifndef CONFIG_SYS_MATRIX_EBICSA_VAL
-#define CONFIG_SYS_MATRIX_EBICSA_VAL CONFIG_SYS_MATRIX_EBI0CSA_VAL
+#ifndef CFG_SYS_MATRIX_EBICSA_VAL
+#define CFG_SYS_MATRIX_EBICSA_VAL CFG_SYS_MATRIX_EBI0CSA_VAL
 #endif
 
 .globl lowlevel_init
@@ -67,7 +67,7 @@ POS1:
        ldr     r1, =(AT91_ASM_PMC_MOR)
        ldr     r2, =(AT91_ASM_PMC_SR)
        /* Main oscillator Enable register PMC_MOR: */
-       ldr     r0, =CONFIG_SYS_MOR_VAL
+       ldr     r0, =CFG_SYS_MOR_VAL
        str     r0, [r1]
 
        /* Reading the PMC Status to detect when the Main Oscillator is enabled */
@@ -85,7 +85,7 @@ MOSCS_Loop:
  * ----------------------------------------------------------------------------
  */
        ldr     r1, =(AT91_ASM_PMC_PLLAR)
-       ldr     r0, =CONFIG_SYS_PLLAR_VAL
+       ldr     r0, =CFG_SYS_PLLAR_VAL
        str     r0, [r1]
 
        /* Reading the PMC Status register to detect when the PLLA is locked */
@@ -105,7 +105,7 @@ MOSCS_Loop1:
        ldr     r1, =(AT91_ASM_PMC_MCKR)
 
        /* -Master Clock Controller register PMC_MCKR */
-       ldr     r0, =CONFIG_SYS_MCKR1_VAL
+       ldr     r0, =CFG_SYS_MCKR1_VAL
        str     r0, [r1]
 
        /* Reading the PMC Status to detect when the Master clock is ready */
@@ -116,7 +116,7 @@ MCKRDY_Loop:
        cmp     r3, #AT91_PMC_IXR_MCKRDY
        bne     MCKRDY_Loop
 
-       ldr     r0, =CONFIG_SYS_MCKR2_VAL
+       ldr     r0, =CFG_SYS_MCKR2_VAL
        str     r0, [r1]
 
        /* Reading the PMC Status to detect when the Master clock is ready */
@@ -158,53 +158,53 @@ SDRAM_setup_end:
 
 SMRDATA:
        .word AT91_ASM_WDT_MR
-       .word CONFIG_SYS_WDTC_WDMR_VAL
+       .word CFG_SYS_WDTC_WDMR_VAL
        /* configure PIOx as EBI0 D[16-31] */
 #if defined(CONFIG_AT91SAM9263)
        .word AT91_ASM_PIOD_PDR
-       .word CONFIG_SYS_PIOD_PDR_VAL1
+       .word CFG_SYS_PIOD_PDR_VAL1
        .word AT91_ASM_PIOD_PUDR
-       .word CONFIG_SYS_PIOD_PPUDR_VAL
+       .word CFG_SYS_PIOD_PPUDR_VAL
        .word AT91_ASM_PIOD_ASR
-       .word CONFIG_SYS_PIOD_PPUDR_VAL
+       .word CFG_SYS_PIOD_PPUDR_VAL
 #elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9261) \
        || defined(CONFIG_AT91SAM9G20)
        .word AT91_ASM_PIOC_PDR
-       .word CONFIG_SYS_PIOC_PDR_VAL1
+       .word CFG_SYS_PIOC_PDR_VAL1
        .word AT91_ASM_PIOC_PUDR
-       .word CONFIG_SYS_PIOC_PPUDR_VAL
+       .word CFG_SYS_PIOC_PPUDR_VAL
 #endif
        .word AT91_ASM_MATRIX_CSA0
-       .word CONFIG_SYS_MATRIX_EBICSA_VAL
+       .word CFG_SYS_MATRIX_EBICSA_VAL
 
        /* flash */
        .word AT91_ASM_SMC_MODE0
-       .word CONFIG_SYS_SMC0_MODE0_VAL
+       .word CFG_SYS_SMC0_MODE0_VAL
 
        .word AT91_ASM_SMC_CYCLE0
-       .word CONFIG_SYS_SMC0_CYCLE0_VAL
+       .word CFG_SYS_SMC0_CYCLE0_VAL
 
        .word AT91_ASM_SMC_PULSE0
-       .word CONFIG_SYS_SMC0_PULSE0_VAL
+       .word CFG_SYS_SMC0_PULSE0_VAL
 
        .word AT91_ASM_SMC_SETUP0
-       .word CONFIG_SYS_SMC0_SETUP0_VAL
+       .word CFG_SYS_SMC0_SETUP0_VAL
 
 SMRDATA1:
        .word AT91_ASM_SDRAMC_MR
-       .word CONFIG_SYS_SDRC_MR_VAL1
+       .word CFG_SYS_SDRC_MR_VAL1
        .word AT91_ASM_SDRAMC_TR
-       .word CONFIG_SYS_SDRC_TR_VAL1
+       .word CFG_SYS_SDRC_TR_VAL1
        .word AT91_ASM_SDRAMC_CR
-       .word CONFIG_SYS_SDRC_CR_VAL
+       .word CFG_SYS_SDRC_CR_VAL
        .word AT91_ASM_SDRAMC_MDR
-       .word CONFIG_SYS_SDRC_MDR_VAL
+       .word CFG_SYS_SDRC_MDR_VAL
        .word AT91_ASM_SDRAMC_MR
-       .word CONFIG_SYS_SDRC_MR_VAL2
+       .word CFG_SYS_SDRC_MR_VAL2
        .word CFG_SYS_SDRAM_BASE
        .word CFG_SYS_SDRAM_VAL1
        .word AT91_ASM_SDRAMC_MR
-       .word CONFIG_SYS_SDRC_MR_VAL3
+       .word CFG_SYS_SDRC_MR_VAL3
        .word CFG_SYS_SDRAM_BASE
        .word CFG_SYS_SDRAM_VAL2
        .word CFG_SYS_SDRAM_BASE
@@ -222,20 +222,20 @@ SMRDATA1:
        .word CFG_SYS_SDRAM_BASE
        .word CFG_SYS_SDRAM_VAL9
        .word AT91_ASM_SDRAMC_MR
-       .word CONFIG_SYS_SDRC_MR_VAL4
+       .word CFG_SYS_SDRC_MR_VAL4
        .word CFG_SYS_SDRAM_BASE
        .word CFG_SYS_SDRAM_VAL10
        .word AT91_ASM_SDRAMC_MR
-       .word CONFIG_SYS_SDRC_MR_VAL5
+       .word CFG_SYS_SDRC_MR_VAL5
        .word CFG_SYS_SDRAM_BASE
        .word CFG_SYS_SDRAM_VAL11
        .word AT91_ASM_SDRAMC_TR
-       .word CONFIG_SYS_SDRC_TR_VAL2
+       .word CFG_SYS_SDRC_TR_VAL2
        .word CFG_SYS_SDRAM_BASE
        .word CFG_SYS_SDRAM_VAL12
        /* User reset enable*/
        .word AT91_ASM_RSTC_MR
-       .word CONFIG_SYS_RSTC_RMR_VAL
+       .word CFG_SYS_RSTC_RMR_VAL
 #ifdef CONFIG_SYS_MATRIX_MCFG_REMAP
        /* MATRIX_MCFG - REMAP all masters */
        .word AT91_ASM_MATRIX_MCFG
index aa6bb6bf31e0597bc6e5440f4132fe42d78fafb6..6bfa02d1d0a3ac06e646f964f3fe3e6c1b41f16b 100644 (file)
@@ -28,7 +28,7 @@ static unsigned long at91_css_to_rate(unsigned long css)
 {
        switch (css) {
        case AT91_PMC_MCKR_CSS_SLOW:
-               return CONFIG_SYS_AT91_SLOW_CLOCK;
+               return CFG_SYS_AT91_SLOW_CLOCK;
        case AT91_PMC_MCKR_CSS_MAIN:
                return gd->arch.main_clk_rate_hz;
        case AT91_PMC_MCKR_CSS_PLLA:
@@ -58,7 +58,7 @@ int at91_clock_init(unsigned long main_clock)
 {
        unsigned freq, mckr;
        struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
-#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
+#ifndef CFG_SYS_AT91_MAIN_CLOCK
        unsigned tmp;
        /*
         * When the bootloader initialized the main oscillator correctly,
@@ -71,7 +71,7 @@ int at91_clock_init(unsigned long main_clock)
                        tmp = readl(&pmc->mcfr);
                } while (!(tmp & AT91_PMC_MCFR_MAINRDY));
                tmp &= AT91_PMC_MCFR_MAINF_MASK;
-               main_clock = tmp * (CONFIG_SYS_AT91_SLOW_CLOCK / 16);
+               main_clock = tmp * (CFG_SYS_AT91_SLOW_CLOCK / 16);
        }
 #endif
        gd->arch.main_clk_rate_hz = main_clock;
@@ -271,7 +271,7 @@ u32 at91_get_periph_generated_clk(u32 id)
        clk_source = regval & AT91_PMC_PCR_GCKCSS;
        switch (clk_source) {
        case AT91_PMC_PCR_GCKCSS_SLOW_CLK:
-               freq = CONFIG_SYS_AT91_SLOW_CLOCK;
+               freq = CFG_SYS_AT91_SLOW_CLOCK;
                break;
        case AT91_PMC_PCR_GCKCSS_MAIN_CLK:
                freq = gd->arch.main_clk_rate_hz;
index 9b3753491eb2d2def3a59a88c76b2628170f2a37..616621a1f9dede2bc4cf5e048c0802caf691c263 100644 (file)
@@ -18,8 +18,8 @@
 #include <asm/arch/at91_gpbr.h>
 #include <asm/arch/clk.h>
 
-#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
-#define CONFIG_SYS_AT91_MAIN_CLOCK 0
+#ifndef CFG_SYS_AT91_MAIN_CLOCK
+#define CFG_SYS_AT91_MAIN_CLOCK 0
 #endif
 
 int arch_cpu_init(void)
@@ -27,7 +27,7 @@ int arch_cpu_init(void)
 #if defined(CONFIG_CLK_CCF)
        return 0;
 #else
-       return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
+       return at91_clock_init(CFG_SYS_AT91_MAIN_CLOCK);
 #endif
 }
 
index 2daeb4fef8f8c1d12a3ba0337cc81b5e2fc9684b..103db2695335d6688730dd741ee805ceea7d507e 100644 (file)
 #define ATMEL_BASE_CS7         0x80000000
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfffffd3c
+#define CFG_SYS_TIMER_COUNTER  0xfffffd3c
 
 /*
  * Other misc defines
index d5de8d5551079ca4fefde2a359b29dc35be1d6d6..2b252f1e1edaac2c5339b37f09535bbdd8364454 100644 (file)
 #define ATMEL_BASE_CS7         0x80000000
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfffffd3c
+#define CFG_SYS_TIMER_COUNTER  0xfffffd3c
 
 /*
  * Other misc defines
index c9fff934da4263c4c2059af8af7fce9c8416036e..0aa1862567c46babe333146c591835fb2657ee57 100644 (file)
 #define ATMEL_BASE_CS7         0x80000000
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfffffd3c
+#define CFG_SYS_TIMER_COUNTER  0xfffffd3c
 
 /*
  * Other misc defines
index 588032582b2a46df89bbe2ad2f91b5e9a2fe8ff7..22116f375b8f956b8f48a5f0f19746b29b7532c6 100644 (file)
 #define ATMEL_BASE_CS7         0x80000000
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfffffd3c
+#define CFG_SYS_TIMER_COUNTER  0xfffffd3c
 
 /*
  * Other misc defines
index 8f9155c9ea68758c88c040cb19c8ce026ed06c77..b2c074e93ec67af9443a721449a088d98054f58f 100644 (file)
 #define ATMEL_BASE_CS5         0x60000000      /* Compact Flash Slot 1 */
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfffffd3c
+#define CFG_SYS_TIMER_COUNTER  0xfffffd3c
 
 /*
  * Other misc defines
index e3c494c5d5d47b9595ec6b01bfed230b84db831c..0efb4a9f6d61b05a53fdf880d80da1728b3827e4 100644 (file)
 #endif
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfffffe3c
+#define CFG_SYS_TIMER_COUNTER  0xfffffe3c
 
 /*
  * Other misc defines
index c08d19c6917b2b8d3306907535e60f6a42cdd5ae..47c7c7209e376cf6d4c6353b9f6c394e37b6bb4f 100644 (file)
 #define ATMEL_CPU_NAME get_cpu_name()
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfffffe4c
+#define CFG_SYS_TIMER_COUNTER  0xfffffe4c
 
 /*
  * Other misc defines
index 5ff20e957328a6bdad76eccd1226b312c8628ac6..567cdd3cbacf30ce41adcb65342bd9011be2128b 100644 (file)
 #define cpu_is_sama5d2 _cpu_is_sama5d2
 
 /* PIT Timer(PIT_PIIR) */
-#define CONFIG_SYS_TIMER_COUNTER       0xf804803c
+#define CFG_SYS_TIMER_COUNTER  0xf804803c
 
 #ifndef __ASSEMBLY__
 unsigned int get_chip_id(void);
index 83f18a8148f77c5cec0cd0dc83f59ec2c63dca23..9efcf5f4fab5f15778fe5be5e16322b81a07ff24 100644 (file)
 #define CPU_HAS_PCR
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfffffe3c
+#define CFG_SYS_TIMER_COUNTER  0xfffffe3c
 
 /*
  * PMECC table in ROM
index e2edb6a51b119959f84cc86a1da309111a327937..9c80286adeccd6dc1abbf821cf5f3bc3ce8a5e48 100644 (file)
                (get_extension_chip_id() == ARCH_EXID_SAMA5D44))
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfc06863c
+#define CFG_SYS_TIMER_COUNTER  0xfc06863c
 
 /*
  * No PMECC Galois table in ROM
index ea19ec322e81cadadd7f3de98d17381972c4076f..dfba9f730c12a9a22efad578433e794bf41e4bd7 100644 (file)
@@ -101,17 +101,17 @@ void board_init_f(ulong dummy)
        at91_pllicpr_init(0x00);
 
        /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */
-       at91_plla_init(CONFIG_SYS_AT91_PLLA);
+       at91_plla_init(CFG_SYS_AT91_PLLA);
 
        /* PCK = PLLA = 2 * MCK */
-       at91_mck_init(CONFIG_SYS_MCKR);
+       at91_mck_init(CFG_SYS_MCKR);
 
        /* Switch MCK on PLLA output */
-       at91_mck_init(CONFIG_SYS_MCKR_CSS);
+       at91_mck_init(CFG_SYS_MCKR_CSS);
 
-#if defined(CONFIG_SYS_AT91_PLLB)
+#if defined(CFG_SYS_AT91_PLLB)
        /* Configure PLLB */
-       at91_pllb_init(CONFIG_SYS_AT91_PLLB);
+       at91_pllb_init(CFG_SYS_AT91_PLLB);
 #endif
 
        /* Enable External Reset */
@@ -120,7 +120,7 @@ void board_init_f(ulong dummy)
        /* Initialize matrix */
        matrix_init();
 
-       gd->arch.mck_rate_hz = CONFIG_SYS_MASTER_CLOCK;
+       gd->arch.mck_rate_hz = CFG_SYS_MASTER_CLOCK;
        /*
         * init timer long enough for using in spl.
         */
index 217ed12e31ef27512f7faf5a971b4f955de3f713..a30c4f6c075f2ad1e13093b111b2463af047a7c0 100644 (file)
@@ -124,7 +124,7 @@ void board_init_f(ulong dummy)
        /* PMC configuration */
        at91_pmc_init();
 
-       at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
+       at91_clock_init(CFG_SYS_AT91_MAIN_CLOCK);
 
        matrix_init();
 
index 0f68f9fe59e5377b42e1a331dcd26b26004850ad..dae60262f5b7b86ab51e7cc0075ddfc98bc0b3cf 100644 (file)
@@ -42,7 +42,7 @@ int clk_get(enum davinci_clk_ids id)
        int pll_out;
        unsigned int pll_base;
 
-       pll_out = CONFIG_SYS_OSCIN_FREQ;
+       pll_out = CFG_SYS_OSCIN_FREQ;
 
        if (id == DAVINCI_AUXCLK_CLKID)
                goto out;
index 2319ac6d5631e75dae497d3afa3e2165bb616697..08c8f59252437296cf062973101732d51c1128ba 100644 (file)
@@ -185,9 +185,9 @@ static int da850_ddr_setup(void)
                setbits_le32(&davinci_syscfg1_regs->vtpio_ctl, VTP_POWERDWN);
        }
        setbits_le32(&davinci_syscfg1_regs->vtpio_ctl, VTP_IOPWRDWN);
-       writel(CONFIG_SYS_DA850_DDR2_DDRPHYCR, &dv_ddr2_regs_ctrl->ddrphycr);
+       writel(CFG_SYS_DA850_DDR2_DDRPHYCR, &dv_ddr2_regs_ctrl->ddrphycr);
 
-       if (CONFIG_SYS_DA850_DDR2_SDBCR & (1 << DV_DDR_SDCR_DDR2EN_SHIFT)) {
+       if (CFG_SYS_DA850_DDR2_SDBCR & (1 << DV_DDR_SDCR_DDR2EN_SHIFT)) {
                /* DDR2 */
                clrbits_le32(&davinci_syscfg1_regs->ddr_slew,
                        (1 << DDR_SLEW_DDR_PDENA_BIT) |
@@ -211,19 +211,19 @@ static int da850_ddr_setup(void)
         * At the same time, set the TIMUNLOCK bit to allow changing
         * the timing registers
         */
-       tmp = CONFIG_SYS_DA850_DDR2_SDBCR;
+       tmp = CFG_SYS_DA850_DDR2_SDBCR;
        tmp &= ~DV_DDR_BOOTUNLOCK;
        tmp |= DV_DDR_TIMUNLOCK;
        writel(tmp, &dv_ddr2_regs_ctrl->sdbcr);
 
        /* write memory configuration and timing */
-       if (!(CONFIG_SYS_DA850_DDR2_SDBCR & (1 << DV_DDR_SDCR_DDR2EN_SHIFT))) {
+       if (!(CFG_SYS_DA850_DDR2_SDBCR & (1 << DV_DDR_SDCR_DDR2EN_SHIFT))) {
                /* MOBILE DDR only*/
-               writel(CONFIG_SYS_DA850_DDR2_SDBCR2,
+               writel(CFG_SYS_DA850_DDR2_SDBCR2,
                        &dv_ddr2_regs_ctrl->sdbcr2);
        }
-       writel(CONFIG_SYS_DA850_DDR2_SDTIMR, &dv_ddr2_regs_ctrl->sdtimr);
-       writel(CONFIG_SYS_DA850_DDR2_SDTIMR2, &dv_ddr2_regs_ctrl->sdtimr2);
+       writel(CFG_SYS_DA850_DDR2_SDTIMR, &dv_ddr2_regs_ctrl->sdtimr);
+       writel(CFG_SYS_DA850_DDR2_SDTIMR2, &dv_ddr2_regs_ctrl->sdtimr2);
 
        /* clear the TIMUNLOCK bit and write the value of the CL field */
        tmp &= ~DV_DDR_TIMUNLOCK;
@@ -233,7 +233,7 @@ static int da850_ddr_setup(void)
         * LPMODEN and MCLKSTOPEN must be set!
         * Without this bits set, PSC don;t switch states !!
         */
-       writel(CONFIG_SYS_DA850_DDR2_SDRCR |
+       writel(CFG_SYS_DA850_DDR2_SDRCR |
                (1 << DV_DDR_SRCR_LPMODEN_SHIFT) |
                (1 << DV_DDR_SRCR_MCLKSTOPEN_SHIFT),
                &dv_ddr2_regs_ctrl->sdrcr);
@@ -246,7 +246,7 @@ static int da850_ddr_setup(void)
        /* disable self refresh */
        clrbits_le32(&dv_ddr2_regs_ctrl->sdrcr,
                DV_DDR_SDRCR_LPMODEN | DV_DDR_SDRCR_MCLKSTOPEN);
-       writel(CONFIG_SYS_DA850_DDR2_PBBPR, &dv_ddr2_regs_ctrl->pbbpr);
+       writel(CFG_SYS_DA850_DDR2_PBBPR, &dv_ddr2_regs_ctrl->pbbpr);
 
        return 0;
 }
@@ -265,7 +265,7 @@ int arch_cpu_init(void)
        writel(DV_SYSCFG_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
 
        dv_maskbits(&davinci_syscfg_regs->suspsrc,
-               CONFIG_SYS_DA850_SYSCFG_SUSPSRC);
+               CFG_SYS_DA850_SYSCFG_SUSPSRC);
 
        /* configure pinmux settings */
        if (davinci_configure_pin_mux_items(pinmuxes, pinmuxes_size))
@@ -273,8 +273,8 @@ int arch_cpu_init(void)
 
 #if defined(CONFIG_SYS_DA850_PLL_INIT)
        /* PLL setup */
-       da850_pll_init(davinci_pllc0_regs, CONFIG_SYS_DA850_PLL0_PLLM);
-       da850_pll_init(davinci_pllc1_regs, CONFIG_SYS_DA850_PLL1_PLLM);
+       da850_pll_init(davinci_pllc0_regs, CFG_SYS_DA850_PLL0_PLLM);
+       da850_pll_init(davinci_pllc1_regs, CFG_SYS_DA850_PLL1_PLLM);
 #endif
        /* setup CSn config */
 #if defined(CONFIG_SYS_DA850_CS2CFG)
index 43e0574901eee12b3e77716f088dda67c9d7f30e..83c190b620e79163dc98c9a287eb3b1cc7582999 100644 (file)
@@ -32,7 +32,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 static struct davinci_timer * const timer =
-       (struct davinci_timer *)CONFIG_SYS_TIMERBASE;
+       (struct davinci_timer *)CFG_SYS_TIMERBASE;
 
 #define TIMER_LOAD_VAL 0xffffffff
 
@@ -47,7 +47,7 @@ int timer_init(void)
        writel(0x0, &timer->tim34);
        writel(TIMER_LOAD_VAL, &timer->prd34);
        writel(2 << 22, &timer->tcr);
-       gd->arch.timer_rate_hz = CONFIG_SYS_HZ_CLOCK / TIM_CLK_DIV;
+       gd->arch.timer_rate_hz = CFG_SYS_HZ_CLOCK / TIM_CLK_DIV;
        gd->arch.timer_reset_value = 0;
 
        return(0);
index f5185390571bae62854ccd3802d62f23232322bf..553dac75b61d6faa8c4cb23cd1c718c4d6da91db 100644 (file)
@@ -141,7 +141,7 @@ static void exynos_spi_copy(unsigned int uboot_size, unsigned int uboot_addr)
 {
        int upto, todo;
        int i, timeout = 100;
-       struct exynos_spi *regs = (struct exynos_spi *)CONFIG_SYS_SPI_BASE;
+       struct exynos_spi *regs = (struct exynos_spi *)CFG_SYS_SPI_BASE;
 
        set_spi_clk(PERIPH_ID_SPI1, 50000000); /* set spi clock to 50Mhz */
        /* set the spi1 GPIO */
index 0e76786482214797221a458b961ba10684e42d32..06ee608c4a46e3493e31dda7adcff3eaf5515e52 100644 (file)
@@ -248,13 +248,13 @@ unsigned long spl_nor_get_uboot_base(void)
        int end;
 
        /* Calculate the image set end,
-        * if it is less than CONFIG_SYS_UBOOT_BASE(0x8281000),
-        * we use CONFIG_SYS_UBOOT_BASE
+        * if it is less than CFG_SYS_UBOOT_BASE(0x8281000),
+        * we use CFG_SYS_UBOOT_BASE
         * Otherwise, use the calculated address
         */
        end = get_imageset_end((void *)NULL, QSPI_NOR_DEV);
-       if (end <= CONFIG_SYS_UBOOT_BASE)
-               end = CONFIG_SYS_UBOOT_BASE;
+       if (end <= CFG_SYS_UBOOT_BASE)
+               end = CFG_SYS_UBOOT_BASE;
        else
                end = ROUND(end, SZ_1K);
 
index b42cc3e9e43a6ad13bb692b8955a9550dc27e00b..6ec38dcfa4eaa1ff9052dcc7a2ec02648a8326ec 100644 (file)
@@ -205,7 +205,7 @@ setup_pll_func:
 
        /* Switch peripheral to PLL 3 */
        ldr r0, =CCM_BASE_ADDR
-       ldr r1, =0x000010C0 | CONFIG_SYS_DDR_CLKSEL
+       ldr r1, =0x000010C0 | CFG_SYS_DDR_CLKSEL
        str r1, [r0, #CLKCTL_CBCMR]
        ldr r1, =0x13239145
        str r1, [r0, #CLKCTL_CBCDR]
@@ -215,7 +215,7 @@ setup_pll_func:
        ldr r0, =CCM_BASE_ADDR
        ldr r1, =0x19239145
        str r1, [r0, #CLKCTL_CBCDR]
-       ldr r1, =0x000020C0 | CONFIG_SYS_DDR_CLKSEL
+       ldr r1, =0x000020C0 | CFG_SYS_DDR_CLKSEL
        str r1, [r0, #CLKCTL_CBCMR]
 
        setup_pll PLL3_BASE_ADDR, 216
@@ -240,10 +240,10 @@ setup_pll_func:
 
        /* setup the rest */
        /* Use lp_apm (24MHz) source for perclk */
-       ldr r1, =0x000020C2 | CONFIG_SYS_DDR_CLKSEL
+       ldr r1, =0x000020C2 | CFG_SYS_DDR_CLKSEL
        str r1, [r0, #CLKCTL_CBCMR]
        /* ddr clock from PLL 1, all perclk dividers are 1 since using 24MHz */
-       ldr r1, =CONFIG_SYS_CLKTL_CBCDR
+       ldr r1, =CFG_SYS_CLKTL_CBCDR
        str r1, [r0, #CLKCTL_CBCDR]
 
        /* Restore the default values in the Gate registers */
@@ -378,7 +378,7 @@ ENTRY(lowlevel_init)
        mov r10, lr
        mov r4, #0      /* Fix R4 to 0 */
 
-#if defined(CONFIG_SYS_MAIN_PWR_ON)
+#if defined(CFG_SYS_MAIN_PWR_ON)
        ldr r0, =GPIO1_BASE_ADDR
        ldr r1, [r0, #0x0]
        orr r1, r1, #1 << 23
index 9cc1f9eb24fa777aabb2aa7a74cd60510303ceee..7bc8af813a6b9146d06f038714f469b9e16f9484 100644 (file)
@@ -30,7 +30,7 @@ tispl.bin_HS: $(obj)/u-boot-spl-nodtb.bin_HS $(patsubst %,$(obj)/dts/%.dtb_HS,$(
        $(call if_changed,mkfitimage)
 
 MKIMAGEFLAGS_u-boot.img_HS = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
-       -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
+       -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \
        -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \
        $(patsubst %,-b arch/$(ARCH)/dts/%.dtb_HS,$(subst ",,$(CONFIG_OF_LIST)))
 
index 4734e4c7143ba56ba7a4e85bef03ce037702893f..dc97bac8550181ec0b07f166f7faa0a414c64158 100644 (file)
@@ -23,7 +23,7 @@ static int do_mon_install(struct cmd_tbl *cmdtp, int flag, int argc,
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       freq = CONFIG_SYS_HZ_CLOCK;
+       freq = CFG_SYS_HZ_CLOCK;
 
        addr = hextoul(argv[1], NULL);
 
index 98a8f058df4a3eb7e2b3c65e502d1f7bd0160cef..424c32a4bee3218424e17a69ffa7a234f93a97d6 100644 (file)
@@ -263,7 +263,7 @@ typedef volatile unsigned int   *dv_reg_p;
 /* MSMC segment size shift bits */
 #define KS2_MSMC_SEG_SIZE_SHIFT                12
 #define KS2_MSMC_MAP_SEG_NUM           (2 << (30 - KS2_MSMC_SEG_SIZE_SHIFT))
-#define KS2_MSMC_DST_SEG_BASE          (CONFIG_SYS_LPAE_SDRAM_BASE >> \
+#define KS2_MSMC_DST_SEG_BASE          (CFG_SYS_LPAE_SDRAM_BASE >> \
                                        KS2_MSMC_SEG_SIZE_SHIFT)
 
 /* Device speed */
index 5186f6e4f9ad2b0c932b08e5844b0e4bc924a495..a2781e25a23bf8eedeb7ab9149f16287b74f35fe 100644 (file)
@@ -52,8 +52,8 @@
 
 /* Use common timer */
 #ifndef CONFIG_TIMER
-#define CONFIG_SYS_TIMER_COUNTER       (MVEBU_TIMER_BASE + 0x14)
-#define CONFIG_SYS_TIMER_RATE          CONFIG_SYS_TCLK
+#define CFG_SYS_TIMER_COUNTER  (MVEBU_TIMER_BASE + 0x14)
+#define CFG_SYS_TIMER_RATE             CFG_SYS_TCLK
 #endif
 
 #endif /* _KW_CONFIG_H */
index c44eacfc1b9fecba81893168c7e0178ec74b2577..d3a3a83657647baa55438b243984a9d1c38e8fb8 100644 (file)
@@ -15,6 +15,6 @@
 #define KW_REGS_PHY_BASE               KW88F6192_REGS_PHYS_BASE
 
 /* TCLK Core Clock defination */
-#define CONFIG_SYS_TCLK          166000000 /* 166MHz */
+#define CFG_SYS_TCLK     166000000 /* 166MHz */
 
 #endif /* _CONFIG_KW88F6192_H */
index f86cd0bb601313d8ca1c3c852ab1543c9e72bd93..7f8e156a6bdcd49935a4fe2c12364ad82492996f 100644 (file)
@@ -15,7 +15,7 @@
 #define KW_REGS_PHY_BASE               KW88F6281_REGS_PHYS_BASE
 
 /* TCLK Core Clock definition */
-#define CONFIG_SYS_TCLK                        ((readl(CONFIG_SAR_REG) & BIT(21)) ? \
+#define CFG_SYS_TCLK                   ((readl(CONFIG_SAR_REG) & BIT(21)) ? \
                                        166666667 : 200000000)
 
 #endif /* _ASM_ARCH_KW88F6281_H */
index 1f8cdf8744e6cf1c2e4f82af4d88e008de63540c..67ad5e5907be0cedf371b44cfa48b0814fe989da 100644 (file)
@@ -659,7 +659,7 @@ void enable_caches(void)
 void v7_outer_cache_enable(void)
 {
        struct pl310_regs *const pl310 =
-               (struct pl310_regs *)CONFIG_SYS_PL310_BASE;
+               (struct pl310_regs *)CFG_SYS_PL310_BASE;
 
        /* The L2 cache is already disabled at this point */
 
@@ -691,7 +691,7 @@ void v7_outer_cache_enable(void)
 void v7_outer_cache_disable(void)
 {
        struct pl310_regs *const pl310 =
-               (struct pl310_regs *)CONFIG_SYS_PL310_BASE;
+               (struct pl310_regs *)CFG_SYS_PL310_BASE;
 
        clrbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
 }
index 3b9618852c6d4ee62d61756b5f38a33feee1247a..e6383d4a86e2ee6a884a7028523ca11488b432ff 100644 (file)
@@ -54,7 +54,7 @@
 
 #define MVEBU_SDRAM_SCRATCH    (MVEBU_REGISTER(0x01504))
 #define MVEBU_L2_CACHE_BASE    (MVEBU_REGISTER(0x08000))
-#define CONFIG_SYS_PL310_BASE  MVEBU_L2_CACHE_BASE
+#define CFG_SYS_PL310_BASE     MVEBU_L2_CACHE_BASE
 #define MVEBU_TWSI_BASE                (MVEBU_REGISTER(0x11000))
 #define MVEBU_TWSI1_BASE       (MVEBU_REGISTER(0x11100))
 #define MVEBU_MPP_BASE         (MVEBU_REGISTER(0x18000))
 #define BOOT_FROM_UART         0x30
 #define BOOT_FROM_SPI          0x38
 
-#define CONFIG_SYS_TCLK                ((readl(CONFIG_SAR_REG) & BIT(20)) ? \
+#define CFG_SYS_TCLK           ((readl(CONFIG_SAR_REG) & BIT(20)) ? \
                                 200000000 : 166000000)
 #elif defined(CONFIG_ARMADA_38X)
 /* SAR values for Armada 38x */
 #define BOOT_FROM_MMC          0x30
 #define BOOT_FROM_MMC_ALT      0x31
 
-#define CONFIG_SYS_TCLK                ((readl(CONFIG_SAR_REG) & BIT(15)) ? \
+#define CFG_SYS_TCLK           ((readl(CONFIG_SAR_REG) & BIT(15)) ? \
                                 200000000 : 250000000)
 #elif defined(CONFIG_ARMADA_MSYS)
 /* SAR values for MSYS */
 #define BOOT_FROM_UART         0x2
 #define BOOT_FROM_SPI          0x3
 
-#define CONFIG_SYS_TCLK                200000000       /* 200MHz */
+#define CFG_SYS_TCLK           200000000       /* 200MHz */
 #elif defined(CONFIG_ARMADA_XP)
 /* SAR values for Armada XP */
 #define CONFIG_SAR_REG         (MVEBU_REGISTER(0x18230))
 #define BOOT_FROM_UART         0x2
 #define BOOT_FROM_SPI          0x3
 
-#define CONFIG_SYS_TCLK                250000000       /* 250MHz */
+#define CFG_SYS_TCLK           250000000       /* 250MHz */
 #endif
 
 #endif /* _MVEBU_SOC_H */
index 60c2072c354bbcb0e5fd1ed45fd73c14d12669e2..6c9783aa63fbe63035b4b69b0a8ce0abee792545 100644 (file)
@@ -35,10 +35,10 @@ ENTRY(arch_very_early_init)
         * Disable L2 cache
         *
         * NOTE: Internal registers are still at address INTREG_BASE_ADDR_REG
-        *       but CONFIG_SYS_PL310_BASE is already calculated from base
+        *       but CFG_SYS_PL310_BASE is already calculated from base
         *       address SOC_REGS_PHY_BASE.
         */
-       ldr     r1, =(CONFIG_SYS_PL310_BASE - SOC_REGS_PHY_BASE + INTREG_BASE_ADDR_REG)
+       ldr     r1, =(CFG_SYS_PL310_BASE - SOC_REGS_PHY_BASE + INTREG_BASE_ADDR_REG)
        ldr     r0, [r1, #L2X0_CTRL_OFF]
        bic     r0, #L2X0_CTRL_EN
        str     r0, [r1, #L2X0_CTRL_OFF]
index cba2e342dc232c0db92431a4e9c376904c49b6d3..ed4b1ca5c9833483d63e83ab488a2f31a7de7899 100644 (file)
@@ -11,7 +11,7 @@ void l2_pl310_init(void);
 
 void set_pl310_ctrl(u32 enable)
 {
-       struct pl310_regs *const pl310 = (struct pl310_regs *)CONFIG_SYS_PL310_BASE;
+       struct pl310_regs *const pl310 = (struct pl310_regs *)CFG_SYS_PL310_BASE;
 
        writel(enable, &pl310->pl310_ctrl);
 }
index f76262bb0ce8ff1ff6db019c1628612a1c2c8263..24ddcdb9614eccde4886f93841a1c7050ad1eed0 100644 (file)
@@ -102,7 +102,7 @@ u-boot_HS_XIP_X-LOADER: $(obj)/u-boot.bin FORCE
 ifdef CONFIG_SPL_LOAD_FIT
 
 MKIMAGEFLAGS_u-boot_HS.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
-       -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
+       -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \
        -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \
        $(patsubst %,-b arch/$(ARCH)/dts/%.dtb_HS,$(subst ",,$(CONFIG_OF_LIST)))
 
index 803dc7fb71d613465ad4fad3368455329d769d45..19197482aa42352b215eb5c262463970fe365653 100644 (file)
@@ -124,11 +124,11 @@ void set_gpmc_cs0(int flash_type)
 #if defined(CONFIG_NOR)
        case MTD_DEV_TYPE_NOR:
                gpmc_regs = gpmc_regs_nor;
-               base = CONFIG_SYS_FLASH_BASE;
-               size = (CONFIG_SYS_FLASH_SIZE > 0x08000000) ? GPMC_SIZE_256M :
-                     ((CONFIG_SYS_FLASH_SIZE > 0x04000000) ? GPMC_SIZE_128M :
-                     ((CONFIG_SYS_FLASH_SIZE > 0x02000000) ? GPMC_SIZE_64M  :
-                     ((CONFIG_SYS_FLASH_SIZE > 0x01000000) ? GPMC_SIZE_32M  :
+               base = CFG_SYS_FLASH_BASE;
+               size = (CFG_SYS_FLASH_SIZE > 0x08000000) ? GPMC_SIZE_256M :
+                     ((CFG_SYS_FLASH_SIZE > 0x04000000) ? GPMC_SIZE_128M :
+                     ((CFG_SYS_FLASH_SIZE > 0x02000000) ? GPMC_SIZE_64M  :
+                     ((CFG_SYS_FLASH_SIZE > 0x01000000) ? GPMC_SIZE_32M  :
                                                              GPMC_SIZE_16M)));
                break;
 #endif
@@ -142,7 +142,7 @@ void set_gpmc_cs0(int flash_type)
 #if defined(CONFIG_CMD_ONENAND)
        case MTD_DEV_TYPE_ONENAND:
                gpmc_regs = gpmc_regs_onenand;
-               base = CONFIG_SYS_ONENAND_BASE;
+               base = CFG_SYS_ONENAND_BASE;
                size = GPMC_SIZE_128M;
                break;
 #endif
index 00d91c10136d98f1915e977cae512e226d597932..71fdf5bf487c79b1ebb90923bd253bd0577e1663 100644 (file)
@@ -27,7 +27,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static struct gptimer *timer_base = (struct gptimer *)CONFIG_SYS_TIMERBASE;
+static struct gptimer *timer_base = (struct gptimer *)CFG_SYS_TIMERBASE;
 static ulong get_timer_masked(void);
 
 /*
index 0e9fe0dc51af361a7d21bedf039c8945d1ca483e..ee0aa94bf2c2d1768bffa6059c8aa1a871459df8 100644 (file)
@@ -18,6 +18,6 @@
 #define ORION5X_REGS_PHY_BASE          F88F5182_REGS_PHYS_BASE
 
 /* TCLK Core Clock defination */
-#define CONFIG_SYS_TCLK                        166000000 /* 166MHz */
+#define CFG_SYS_TCLK                   166000000 /* 166MHz */
 
 #endif /* _CONFIG_88F5182_H */
index d7ea2e3943fc4a581324f0b3db11478625682aee..b373e59e6fe3cc06a7cab5046bfb8cbd68e6a0a7 100644 (file)
@@ -74,7 +74,7 @@ struct orion5x_tmr_registers *orion5x_tmr_regs =
 static inline ulong read_timer(void)
 {
        return readl(CNTMR_VAL_REG(UBOOT_CNTR))
-             / (CONFIG_SYS_TCLK / 1000);
+             / (CFG_SYS_TCLK / 1000);
 }
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -92,7 +92,7 @@ static ulong get_timer_masked(void)
        } else {
                /* we have an overflow ... */
                timestamp += lastdec +
-                       (TIMER_LOAD_VAL / (CONFIG_SYS_TCLK / 1000)) - now;
+                       (TIMER_LOAD_VAL / (CFG_SYS_TCLK / 1000)) - now;
        }
        lastdec = now;
 
@@ -115,7 +115,7 @@ void __udelay(unsigned long usec)
        ulong delayticks;
 
        current = uboot_cntr_val();
-       delayticks = (usec * (CONFIG_SYS_TCLK / 1000000));
+       delayticks = (usec * (CFG_SYS_TCLK / 1000000));
 
        if (current < delayticks) {
                delayticks -= current;
index 28669e3c7717e71d147e9a351ff3a0bf2766169d..485ea7e28d11e4606efa2a0d8cf3d84e817e1af6 100644 (file)
@@ -24,7 +24,7 @@
 #define MSTP11_BITS    0x00000000
 
 /* SDHI */
-#define CONFIG_SYS_SH_SDHI_NR_CHANNEL 4
+#define CFG_SYS_SH_SDHI_NR_CHANNEL 4
 
 #define R8A7790_CUT_ES2X       2
 #define IS_R8A7790_ES2()       \
index 37d134c5bf29b4279d0ceb04e4e6561811e40f09..2006ad58a52d8342ddcbdea791d0f9e35d264f16 100644 (file)
@@ -14,7 +14,7 @@
  */
 
 /* SDHI */
-#define CONFIG_SYS_SH_SDHI_NR_CHANNEL 3
+#define CFG_SYS_SH_SDHI_NR_CHANNEL 3
 
 #define DBSC3_1_QOS_R0_BASE    0xE67A1000
 #define DBSC3_1_QOS_R1_BASE    0xE67A1100
index 06db64af6cfcad40393708164af78184cac15f0f..cc1b00db33f5471a83dc2e28a9c8902d2fc78920 100644 (file)
@@ -24,6 +24,6 @@
 #define MSTP11_BITS    0x00000008
 
 /* SDHI */
-#define CONFIG_SYS_SH_SDHI_NR_CHANNEL 1
+#define CFG_SYS_SH_SDHI_NR_CHANNEL 1
 
 #endif /* __ASM_ARCH_R8A7792_H */
index 85f59d9771251b13b2800c4de56d96ec112f870c..02f4286ef1ac134991d80ebdfee75a180c59848a 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 /* SDHI */
-#define CONFIG_SYS_SH_SDHI_NR_CHANNEL 3
+#define CFG_SYS_SH_SDHI_NR_CHANNEL 3
 
 #define DBSC3_1_QOS_R0_BASE    0xE67A1000
 #define DBSC3_1_QOS_R1_BASE    0xE67A1100
index 2bd6e469c815322136a68ffb4a2dc1551c6f051c..a2a949d4d61cb32a60fc3e3d45ee4c7a245bfcaa 100644 (file)
@@ -24,7 +24,7 @@
 #define MSTP11_BITS    0x000001C0
 
 /* SDHI */
-#define CONFIG_SYS_SH_SDHI_NR_CHANNEL 3
+#define CFG_SYS_SH_SDHI_NR_CHANNEL 3
 
 #define R8A7794_CUT_ES2                2
 #define IS_R8A7794_ES2()       \
index ba06535e4c2a696bb3e1e5a7281d0f2e3f8157c9..293c23b5e2541fbbbd89e0c3b737260077904867 100644 (file)
@@ -40,8 +40,8 @@ static u64 get_time_us(void)
 {
        u64 timer = get_cpu_global_timer();
 
-       timer = ((timer << 2) + (CLK2MHZ(CONFIG_SYS_CPU_CLK) >> 1));
-       do_div(timer, CLK2MHZ(CONFIG_SYS_CPU_CLK));
+       timer = ((timer << 2) + (CLK2MHZ(CFG_SYS_CPU_CLK) >> 1));
+       do_div(timer, CLK2MHZ(CFG_SYS_CPU_CLK));
        return timer;
 }
 
@@ -65,7 +65,7 @@ void __udelay(unsigned long usec)
        u64 wait;
 
        start = get_cpu_global_timer();
-       wait = (u64)((usec * CLK2MHZ(CONFIG_SYS_CPU_CLK)) >> 2);
+       wait = (u64)((usec * CLK2MHZ(CFG_SYS_CPU_CLK)) >> 2);
        do {
                current = get_cpu_global_timer();
        } while ((current - start) < wait);
@@ -83,5 +83,5 @@ unsigned long long get_ticks(void)
 
 ulong get_tbclk(void)
 {
-       return (ulong)(CONFIG_SYS_CPU_CLK >> 2);
+       return (ulong)(CFG_SYS_CPU_CLK >> 2);
 }
index 9c19157de71b4825896b8b5c3bba5ad804442107..5b5a81a255d525400ea7edb4bba11c59a770ea10 100644 (file)
@@ -34,7 +34,7 @@ phys_addr_t socfpga_sysmgr_base __section(".data");
 
 #ifdef CONFIG_SYS_L2_PL310
 static const struct pl310_regs *const pl310 =
-       (struct pl310_regs *)CONFIG_SYS_PL310_BASE;
+       (struct pl310_regs *)CFG_SYS_PL310_BASE;
 #endif
 
 struct bsel bsel_str[] = {
index 7ce888d1979796d9579e3dbf7dc026e1e3eaa570..93c9e8b0fb408d60cce4a9ae3df465e47b4ff9aa 100644 (file)
@@ -60,7 +60,7 @@ static Altera_desc altera_fpga[] = {
 
 #if defined(CONFIG_SPL_BUILD)
 static struct pl310_regs *const pl310 =
-       (struct pl310_regs *)CONFIG_SYS_PL310_BASE;
+       (struct pl310_regs *)CFG_SYS_PL310_BASE;
 static const struct socfpga_noc_fw_ocram *noc_fw_ocram_base =
        (void *)SOCFPGA_SDR_FIREWALL_OCRAM_ADDRESS;
 
@@ -256,7 +256,7 @@ void dram_bank_mmu_setup(int bank)
        /* If we're still in OCRAM, don't set the XN bit on it */
        if (!(gd->flags & GD_FLG_RELOC)) {
                set_section_dcache(
-                       CONFIG_SYS_INIT_RAM_ADDR >> MMU_SECTION_SHIFT,
+                       CFG_SYS_INIT_RAM_ADDR >> MMU_SECTION_SHIFT,
                        DCACHE_WRITETHROUGH);
        }
 
index 4edf4f9b5c16910f2210c4a26e43f99bdb59c99d..e7500c16f720985f62e05e576630366d392ded5a 100644 (file)
@@ -31,7 +31,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 static struct pl310_regs *const pl310 =
-       (struct pl310_regs *)CONFIG_SYS_PL310_BASE;
+       (struct pl310_regs *)CFG_SYS_PL310_BASE;
 static struct nic301_registers *nic301_regs =
        (struct nic301_registers *)SOCFPGA_L3REGS_ADDRESS;
 static struct scu_registers *scu_regs =
index 2c567edd502ecc345a9f4b2080e4bb99e93e6b17..9edbbf4a29c35a35d2f0a230cec5f3e1229d5211 100644 (file)
@@ -41,7 +41,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #define BOOTROM_SHARED_MEM_SIZE                0x800   /* 2KB */
-#define BOOTROM_SHARED_MEM_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + \
+#define BOOTROM_SHARED_MEM_ADDR                (CFG_SYS_INIT_RAM_ADDR + \
                                         SOCFPGA_PHYS_OCRAM_SIZE - \
                                         BOOTROM_SHARED_MEM_SIZE)
 #define RST_STATUS_SHARED_ADDR         (BOOTROM_SHARED_MEM_ADDR + 0x438)
index a58f1cf9d3a1a3a4edd02fede3376723536016b0..d9e8c84bfcfee74baff9e7193a8338a334380edd 100644 (file)
@@ -10,7 +10,7 @@
 
 #define TIMER_LOAD_VAL         0xFFFFFFFF
 
-static const struct socfpga_timer *timer_base = (void *)CONFIG_SYS_TIMERBASE;
+static const struct socfpga_timer *timer_base = (void *)CFG_SYS_TIMERBASE;
 
 /*
  * Timer initialization
index f9fd4fe7d33718b65333360b7f3656a04c8a0020..05a91346a897310123534471bf9d4f70068c901b 100644 (file)
@@ -22,7 +22,7 @@ void enable_caches(void)
 #ifdef CONFIG_SYS_L2_PL310
 void v7_outer_cache_disable(void)
 {
-       struct pl310_regs *const pl310 = (struct pl310_regs *)CONFIG_SYS_PL310_BASE;
+       struct pl310_regs *const pl310 = (struct pl310_regs *)CFG_SYS_PL310_BASE;
 
        /*
         * Linux expects the L2 cache to be turned off by the bootloader.
index a40bdf17055e841b2f64512cf6b8160face671c7..58247c2738aa23b3d1a7c3765adf0cc1e762beca 100644 (file)
@@ -10,7 +10,7 @@
 #include "arm-mpcore.h"
 
 #define PERIPHCLK (50 * 1000 * 1000) /* 50 MHz */
-#define PRESCALER ((PERIPHCLK) / (CONFIG_SYS_TIMER_RATE) - 1)
+#define PRESCALER ((PERIPHCLK) / (CFG_SYS_TIMER_RATE) - 1)
 
 static void *get_global_timer_base(void)
 {
index 739cb2997ad70ea9e9458e1c656411e880116a61..b471412186d19abf136cb0826427e9b314c841b7 100644 (file)
@@ -36,9 +36,9 @@ int timer_init (void)
        ulong   tmr_ctrl_val;
 
        /* 1st disable the Timer */
-       tmr_ctrl_val = *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 8);
+       tmr_ctrl_val = *(volatile ulong *)(CFG_SYS_TIMERBASE + 8);
        tmr_ctrl_val &= ~TIMER_ENABLE;
-       *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 8) = tmr_ctrl_val;
+       *(volatile ulong *)(CFG_SYS_TIMERBASE + 8) = tmr_ctrl_val;
 
        /*
         * The Timer Control Register has one Undefined/Shouldn't Use Bit
@@ -52,11 +52,11 @@ int timer_init (void)
         * Tmr Siz : 16 Bit Counter
         * Tmr in Wrapping Mode
         */
-       tmr_ctrl_val = *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 8);
+       tmr_ctrl_val = *(volatile ulong *)(CFG_SYS_TIMERBASE + 8);
        tmr_ctrl_val &= ~(TIMER_MODE_MSK | TIMER_INT_EN | TIMER_PRS_MSK | TIMER_SIZE_MSK | TIMER_ONE_SHT );
        tmr_ctrl_val |= (TIMER_ENABLE | TIMER_PRS_8S);
 
-       *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 8) = tmr_ctrl_val;
+       *(volatile ulong *)(CFG_SYS_TIMERBASE + 8) = tmr_ctrl_val;
 
        return 0;
 }
index e44656db5f23f3ac79baa99561ebbcbbb9af536d..6d87908965d2f5a1c293f4d6f829f36dcd3afdd5 100644 (file)
@@ -92,7 +92,7 @@ int watchdog_init(void)
        u32 wdog_module = 0;
 
        /* set timeout and enable watchdog */
-       wdog_module = ((CONFIG_SYS_CLK / CONFIG_SYS_HZ) * CONFIG_WATCHDOG_TIMEOUT);
+       wdog_module = ((CFG_SYS_CLK / CONFIG_SYS_HZ) * CONFIG_WATCHDOG_TIMEOUT);
        wdog_module |= (wdog_module / 8192);
        out_be16(&wdp->mr, wdog_module);
 
index 87effa71dc37a6c8d90f4577fcbe0f3108a9753a..10be73822fa5f28a4d08029467a0e5585d22f433 100644 (file)
@@ -47,36 +47,36 @@ void cpu_init_f(void)
        out_be16(&wdog->cr, 0);
 #endif
 
-       out_be32(&scm->rambar, CONFIG_SYS_INIT_RAM_ADDR | SCM_RAMBAR_BDE);
+       out_be32(&scm->rambar, CFG_SYS_INIT_RAM_ADDR | SCM_RAMBAR_BDE);
 
        /* Port configuration */
        out_8(&gpio->par_cs, 0);
 
-#if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) && defined(CONFIG_SYS_CS0_CTRL))
-       out_be_fbcs_reg(&fbcs->csar0, CONFIG_SYS_CS0_BASE);
-       out_be_fbcs_reg(&fbcs->cscr0, CONFIG_SYS_CS0_CTRL);
-       out_be32(&fbcs->csmr0, CONFIG_SYS_CS0_MASK);
+#if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) && defined(CFG_SYS_CS0_CTRL))
+       out_be_fbcs_reg(&fbcs->csar0, CFG_SYS_CS0_BASE);
+       out_be_fbcs_reg(&fbcs->cscr0, CFG_SYS_CS0_CTRL);
+       out_be32(&fbcs->csmr0, CFG_SYS_CS0_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) && defined(CONFIG_SYS_CS1_CTRL))
+#if (defined(CFG_SYS_CS1_BASE) && defined(CFG_SYS_CS1_MASK) && defined(CFG_SYS_CS1_CTRL))
        setbits_8(&gpio->par_cs, GPIO_PAR_CS_CS1);
-       out_be_fbcs_reg(&fbcs->csar1, CONFIG_SYS_CS1_BASE);
-       out_be_fbcs_reg(&fbcs->cscr1, CONFIG_SYS_CS1_CTRL);
-       out_be32(&fbcs->csmr1, CONFIG_SYS_CS1_MASK);
+       out_be_fbcs_reg(&fbcs->csar1, CFG_SYS_CS1_BASE);
+       out_be_fbcs_reg(&fbcs->cscr1, CFG_SYS_CS1_CTRL);
+       out_be32(&fbcs->csmr1, CFG_SYS_CS1_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS2_BASE) && defined(CONFIG_SYS_CS2_MASK) && defined(CONFIG_SYS_CS2_CTRL))
+#if (defined(CFG_SYS_CS2_BASE) && defined(CFG_SYS_CS2_MASK) && defined(CFG_SYS_CS2_CTRL))
        setbits_8(&gpio->par_cs, GPIO_PAR_CS_CS2);
-       out_be_fbcs_reg(&fbcs->csar2, CONFIG_SYS_CS2_BASE);
-       out_be_fbcs_reg(&fbcs->cscr2, CONFIG_SYS_CS2_CTRL);
-       out_be32(&fbcs->csmr2, CONFIG_SYS_CS2_MASK);
+       out_be_fbcs_reg(&fbcs->csar2, CFG_SYS_CS2_BASE);
+       out_be_fbcs_reg(&fbcs->cscr2, CFG_SYS_CS2_CTRL);
+       out_be32(&fbcs->csmr2, CFG_SYS_CS2_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS3_BASE) && defined(CONFIG_SYS_CS3_MASK) && defined(CONFIG_SYS_CS3_CTRL))
+#if (defined(CFG_SYS_CS3_BASE) && defined(CFG_SYS_CS3_MASK) && defined(CFG_SYS_CS3_CTRL))
        setbits_8(&gpio->par_cs, GPIO_PAR_CS_CS3);
-       out_be_fbcs_reg(&fbcs->csar3, CONFIG_SYS_CS3_BASE);
-       out_be_fbcs_reg(&fbcs->cscr3, CONFIG_SYS_CS3_CTRL);
-       out_be32(&fbcs->csmr3, CONFIG_SYS_CS3_MASK);
+       out_be_fbcs_reg(&fbcs->csar3, CFG_SYS_CS3_BASE);
+       out_be_fbcs_reg(&fbcs->cscr3, CFG_SYS_CS3_CTRL);
+       out_be32(&fbcs->csmr3, CFG_SYS_CS3_MASK);
 #endif
 
 #if (defined(CONFIG_SYS_CS4_BASE) && defined(CONFIG_SYS_CS4_MASK) && defined(CONFIG_SYS_CS4_CTRL))
@@ -108,8 +108,8 @@ void cpu_init_f(void)
 #endif
 
 #ifdef CONFIG_SYS_I2C_FSL
-       CONFIG_SYS_I2C_PINMUX_REG &= CONFIG_SYS_I2C_PINMUX_CLR;
-       CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET;
+       CFG_SYS_I2C_PINMUX_REG &= CFG_SYS_I2C_PINMUX_CLR;
+       CFG_SYS_I2C_PINMUX_REG |= CFG_SYS_I2C_PINMUX_SET;
 #endif
 
        icache_enable();
index f41f977d7f5f0d189021b91f3704448bfef8d22c..6b08a12af0b69f1aa52da4cd53ddac041aa922d1 100644 (file)
@@ -29,7 +29,7 @@ int get_clocks(void)
        while (!(in_be32(&pll->synsr) & PLL_SYNSR_LOCK))
                ;
 
-       gd->bus_clk = CONFIG_SYS_CLK;
+       gd->bus_clk = CFG_SYS_CLK;
        gd->cpu_clk = (gd->bus_clk * 2);
 
 #ifdef CONFIG_SYS_I2C_FSL
index 4c9c96d7831e4e88a4237a38f1b7cdf0fda91b62..d2a21c3279b98d9ac14fc7cbf4242bc6d5ef1875 100644 (file)
@@ -91,10 +91,10 @@ _start:
        move.w  #0x2700,%sr             /* Mask off Interrupt */
 
        /* Set vector base register at the beginning of the Flash */
-       move.l  #CONFIG_SYS_FLASH_BASE, %d0
+       move.l  #CFG_SYS_FLASH_BASE, %d0
        movec   %d0, %VBR
 
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_CTRL), %d0
        movec   %d0, %RAMBAR1
 
        /* invalidate and disable cache */
@@ -116,7 +116,7 @@ _start:
        move.l  #__got_start, %a5
 
        /* setup stack initially on top of internal static ram  */
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_SIZE), %sp
 
        /*
         * if configured, malloc_f arena will be reserved first,
index 8f72ef567feb6cc66c905b24ff5a4ae94df91b3e..d21d82fef758cb7c234f4d0ed1d2cdf8dbff604b 100644 (file)
@@ -132,11 +132,11 @@ int print_cpuinfo(void)
 
        if (cpu_model)
                printf("CPU:   Freescale ColdFire MCF%s rev. %hu, at %s MHz\n",
-                      cpu_model, prn, strmhz(buf, CONFIG_SYS_CLK));
+                      cpu_model, prn, strmhz(buf, CFG_SYS_CLK));
        else
                printf("CPU:   Unknown - Freescale ColdFire MCF5271 family"
                       " (PIN: 0x%x) rev. %hu, at %s MHz\n",
-                      pin, prn, strmhz(buf, CONFIG_SYS_CLK));
+                      pin, prn, strmhz(buf, CFG_SYS_CLK));
 
        return 0;
 }
@@ -284,7 +284,7 @@ int print_cpuinfo(void)
        char buf[32];
 
        printf("CPU:   Freescale Coldfire MCF5275 at %s MHz\n",
-                       strmhz(buf, CONFIG_SYS_CLK));
+                       strmhz(buf, CFG_SYS_CLK));
        return 0;
 };
 #endif /* CONFIG_DISPLAY_CPUINFO */
@@ -370,7 +370,7 @@ int print_cpuinfo(void)
        char buf[32];
 
        printf("CPU:   Freescale Coldfire MCF5249 at %s MHz\n",
-              strmhz(buf, CONFIG_SYS_CLK));
+              strmhz(buf, CFG_SYS_CLK));
        return 0;
 }
 #endif /* CONFIG_DISPLAY_CPUINFO */
@@ -394,7 +394,7 @@ int print_cpuinfo(void)
 
        unsigned char resetsource = mbar_readLong(SIM_RSR);
        printf("CPU:   Freescale Coldfire MCF5253 at %s MHz\n",
-              strmhz(buf, CONFIG_SYS_CLK));
+              strmhz(buf, CFG_SYS_CLK));
 
        if ((resetsource & SIM_RSR_HRST) || (resetsource & SIM_RSR_SWTR)) {
                printf("Reset:%s%s\n",
index 9d4a10f028d1765ba310e24920f45e08d61a3c07..99eb61f16758dbcef1fd21af8940d815b526fc93 100644 (file)
@@ -36,31 +36,31 @@ void init_fbcs(void)
 {
        fbcs_t *fbcs = (fbcs_t *) (MMAP_FBCS);
 
-#if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) \
-     && defined(CONFIG_SYS_CS0_CTRL))
-       out_be32(&fbcs->csar0, CONFIG_SYS_CS0_BASE);
-       out_be32(&fbcs->cscr0, CONFIG_SYS_CS0_CTRL);
-       out_be32(&fbcs->csmr0, CONFIG_SYS_CS0_MASK);
+#if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) \
+     && defined(CFG_SYS_CS0_CTRL))
+       out_be32(&fbcs->csar0, CFG_SYS_CS0_BASE);
+       out_be32(&fbcs->cscr0, CFG_SYS_CS0_CTRL);
+       out_be32(&fbcs->csmr0, CFG_SYS_CS0_MASK);
 #else
 #warning "Chip Select 0 are not initialized/used"
 #endif
-#if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) \
-     && defined(CONFIG_SYS_CS1_CTRL))
-       out_be32(&fbcs->csar1, CONFIG_SYS_CS1_BASE);
-       out_be32(&fbcs->cscr1, CONFIG_SYS_CS1_CTRL);
-       out_be32(&fbcs->csmr1, CONFIG_SYS_CS1_MASK);
+#if (defined(CFG_SYS_CS1_BASE) && defined(CFG_SYS_CS1_MASK) \
+     && defined(CFG_SYS_CS1_CTRL))
+       out_be32(&fbcs->csar1, CFG_SYS_CS1_BASE);
+       out_be32(&fbcs->cscr1, CFG_SYS_CS1_CTRL);
+       out_be32(&fbcs->csmr1, CFG_SYS_CS1_MASK);
 #endif
-#if (defined(CONFIG_SYS_CS2_BASE) && defined(CONFIG_SYS_CS2_MASK) \
-     && defined(CONFIG_SYS_CS2_CTRL))
-       out_be32(&fbcs->csar2, CONFIG_SYS_CS2_BASE);
-       out_be32(&fbcs->cscr2, CONFIG_SYS_CS2_CTRL);
-       out_be32(&fbcs->csmr2, CONFIG_SYS_CS2_MASK);
+#if (defined(CFG_SYS_CS2_BASE) && defined(CFG_SYS_CS2_MASK) \
+     && defined(CFG_SYS_CS2_CTRL))
+       out_be32(&fbcs->csar2, CFG_SYS_CS2_BASE);
+       out_be32(&fbcs->cscr2, CFG_SYS_CS2_CTRL);
+       out_be32(&fbcs->csmr2, CFG_SYS_CS2_MASK);
 #endif
-#if (defined(CONFIG_SYS_CS3_BASE) && defined(CONFIG_SYS_CS3_MASK) \
-     && defined(CONFIG_SYS_CS3_CTRL))
-       out_be32(&fbcs->csar3, CONFIG_SYS_CS3_BASE);
-       out_be32(&fbcs->cscr3, CONFIG_SYS_CS3_CTRL);
-       out_be32(&fbcs->csmr3, CONFIG_SYS_CS3_MASK);
+#if (defined(CFG_SYS_CS3_BASE) && defined(CFG_SYS_CS3_MASK) \
+     && defined(CFG_SYS_CS3_CTRL))
+       out_be32(&fbcs->csar3, CFG_SYS_CS3_BASE);
+       out_be32(&fbcs->cscr3, CFG_SYS_CS3_CTRL);
+       out_be32(&fbcs->csmr3, CFG_SYS_CS3_MASK);
 #endif
 #if (defined(CONFIG_SYS_CS4_BASE) && defined(CONFIG_SYS_CS4_MASK) \
      && defined(CONFIG_SYS_CS4_CTRL))
@@ -214,9 +214,9 @@ void cpu_init_f(void)
        init_fbcs();
 
 #ifdef CONFIG_SYS_I2C_FSL
-       CONFIG_SYS_I2C_PINMUX_REG =
-           CONFIG_SYS_I2C_PINMUX_REG & CONFIG_SYS_I2C_PINMUX_CLR;
-       CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET;
+       CFG_SYS_I2C_PINMUX_REG =
+           CFG_SYS_I2C_PINMUX_REG & CFG_SYS_I2C_PINMUX_CLR;
+       CFG_SYS_I2C_PINMUX_REG |= CFG_SYS_I2C_PINMUX_SET;
 #ifdef CONFIG_SYS_I2C2_OFFSET
        CONFIG_SYS_I2C2_PINMUX_REG &= CONFIG_SYS_I2C2_PINMUX_CLR;
        CONFIG_SYS_I2C2_PINMUX_REG |= CONFIG_SYS_I2C2_PINMUX_SET;
@@ -335,21 +335,21 @@ void cpu_init_f(void)
         * already initialized.
         */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
-       sysctrl_t *sysctrl = (sysctrl_t *) (CONFIG_SYS_MBAR);
+       sysctrl_t *sysctrl = (sysctrl_t *) (CFG_SYS_MBAR);
        gpio_t *gpio = (gpio_t *) (MMAP_GPIO);
        csctrl_t *csctrl = (csctrl_t *) (MMAP_FBCS);
 
-       out_be16(&sysctrl->sc_scr, CONFIG_SYS_SCR);
-       out_be16(&sysctrl->sc_spr, CONFIG_SYS_SPR);
+       out_be16(&sysctrl->sc_scr, CFG_SYS_SCR);
+       out_be16(&sysctrl->sc_spr, CFG_SYS_SPR);
 
        /* Setup Ports: */
-       out_be32(&gpio->gpio_pacnt, CONFIG_SYS_PACNT);
-       out_be16(&gpio->gpio_paddr, CONFIG_SYS_PADDR);
-       out_be16(&gpio->gpio_padat, CONFIG_SYS_PADAT);
-       out_be32(&gpio->gpio_pbcnt, CONFIG_SYS_PBCNT);
-       out_be16(&gpio->gpio_pbddr, CONFIG_SYS_PBDDR);
-       out_be16(&gpio->gpio_pbdat, CONFIG_SYS_PBDAT);
-       out_be32(&gpio->gpio_pdcnt, CONFIG_SYS_PDCNT);
+       out_be32(&gpio->gpio_pacnt, CFG_SYS_PACNT);
+       out_be16(&gpio->gpio_paddr, CFG_SYS_PADDR);
+       out_be16(&gpio->gpio_padat, CFG_SYS_PADAT);
+       out_be32(&gpio->gpio_pbcnt, CFG_SYS_PBCNT);
+       out_be16(&gpio->gpio_pbddr, CFG_SYS_PBDDR);
+       out_be16(&gpio->gpio_pbdat, CFG_SYS_PBDAT);
+       out_be32(&gpio->gpio_pdcnt, CFG_SYS_PDCNT);
 
        /* Memory Controller: */
        out_be32(&csctrl->cs_br0, CONFIG_SYS_BR0_PRELIM);
@@ -472,8 +472,8 @@ void cpu_init_f(void)
 #endif                         /* #ifndef CONFIG_MONITOR_IS_IN_RAM */
 
 #ifdef CONFIG_SYS_I2C_FSL
-       CONFIG_SYS_I2C_PINMUX_REG &= CONFIG_SYS_I2C_PINMUX_CLR;
-       CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET;
+       CFG_SYS_I2C_PINMUX_REG &= CFG_SYS_I2C_PINMUX_CLR;
+       CFG_SYS_I2C_PINMUX_REG |= CFG_SYS_I2C_PINMUX_SET;
 #endif
 
        /* enable instruction cache now */
@@ -560,8 +560,8 @@ void cpu_init_f(void)
 #ifndef CONFIG_MONITOR_IS_IN_RAM
        /* Set speed /PLL */
        MCFCLOCK_SYNCR =
-           MCFCLOCK_SYNCR_MFD(CONFIG_SYS_MFD) |
-           MCFCLOCK_SYNCR_RFD(CONFIG_SYS_RFD);
+           MCFCLOCK_SYNCR_MFD(CFG_SYS_MFD) |
+           MCFCLOCK_SYNCR_RFD(CFG_SYS_RFD);
        while (!(MCFCLOCK_SYNSR & MCFCLOCK_SYNSR_LOCK)) ;
 
        MCFGPIO_PBCDPAR = 0xc0;
@@ -573,17 +573,17 @@ void cpu_init_f(void)
 #ifdef CONFIG_SYS_PFPAR
        MCFGPIO_PFPAR = CONFIG_SYS_PFPAR;
 #endif
-#ifdef CONFIG_SYS_PJPAR
-       MCFGPIO_PJPAR = CONFIG_SYS_PJPAR;
+#ifdef CFG_SYS_PJPAR
+       MCFGPIO_PJPAR = CFG_SYS_PJPAR;
 #endif
 #ifdef CONFIG_SYS_PSDPAR
        MCFGPIO_PSDPAR = CONFIG_SYS_PSDPAR;
 #endif
-#ifdef CONFIG_SYS_PASPAR
-       MCFGPIO_PASPAR = CONFIG_SYS_PASPAR;
+#ifdef CFG_SYS_PASPAR
+       MCFGPIO_PASPAR = CFG_SYS_PASPAR;
 #endif
-#ifdef CONFIG_SYS_PEHLPAR
-       MCFGPIO_PEHLPAR = CONFIG_SYS_PEHLPAR;
+#ifdef CFG_SYS_PEHLPAR
+       MCFGPIO_PEHLPAR = CFG_SYS_PEHLPAR;
 #endif
 #ifdef CONFIG_SYS_PQSPAR
        MCFGPIO_PQSPAR = CONFIG_SYS_PQSPAR;
@@ -600,15 +600,15 @@ void cpu_init_f(void)
 #ifdef CONFIG_SYS_PTDPAR
        MCFGPIO_PTDPAR = CONFIG_SYS_PTDPAR;
 #endif
-#ifdef CONFIG_SYS_PUAPAR
-       MCFGPIO_PUAPAR = CONFIG_SYS_PUAPAR;
+#ifdef CFG_SYS_PUAPAR
+       MCFGPIO_PUAPAR = CFG_SYS_PUAPAR;
 #endif
 
 #if defined(CONFIG_SYS_DDRD)
        MCFGPIO_DDRD = CONFIG_SYS_DDRD;
 #endif
-#ifdef CONFIG_SYS_DDRUA
-       MCFGPIO_DDRUA = CONFIG_SYS_DDRUA;
+#ifdef CFG_SYS_DDRUA
+       MCFGPIO_DDRUA = CFG_SYS_DDRUA;
 #endif
 
        /* FlexBus Chipselect */
@@ -652,10 +652,10 @@ int fecpin_setclear(fec_info_t *info, int setclear)
 {
        if (setclear) {
                MCFGPIO_PASPAR |= 0x0F00;
-               MCFGPIO_PEHLPAR = CONFIG_SYS_PEHLPAR;
+               MCFGPIO_PEHLPAR = CFG_SYS_PEHLPAR;
        } else {
                MCFGPIO_PASPAR &= 0xF0FF;
-               MCFGPIO_PEHLPAR &= ~CONFIG_SYS_PEHLPAR;
+               MCFGPIO_PEHLPAR &= ~CFG_SYS_PEHLPAR;
        }
        return 0;
 }
@@ -678,12 +678,12 @@ void cpu_init_f(void)
         *        which is their primary function.
         *        ~Jeremy
         */
-       mbar2_writeLong(MCFSIM_GPIO_FUNC, CONFIG_SYS_GPIO_FUNC);
-       mbar2_writeLong(MCFSIM_GPIO1_FUNC, CONFIG_SYS_GPIO1_FUNC);
-       mbar2_writeLong(MCFSIM_GPIO_EN, CONFIG_SYS_GPIO_EN);
-       mbar2_writeLong(MCFSIM_GPIO1_EN, CONFIG_SYS_GPIO1_EN);
-       mbar2_writeLong(MCFSIM_GPIO_OUT, CONFIG_SYS_GPIO_OUT);
-       mbar2_writeLong(MCFSIM_GPIO1_OUT, CONFIG_SYS_GPIO1_OUT);
+       mbar2_writeLong(MCFSIM_GPIO_FUNC, CFG_SYS_GPIO_FUNC);
+       mbar2_writeLong(MCFSIM_GPIO1_FUNC, CFG_SYS_GPIO1_FUNC);
+       mbar2_writeLong(MCFSIM_GPIO_EN, CFG_SYS_GPIO_EN);
+       mbar2_writeLong(MCFSIM_GPIO1_EN, CFG_SYS_GPIO1_EN);
+       mbar2_writeLong(MCFSIM_GPIO_OUT, CFG_SYS_GPIO_OUT);
+       mbar2_writeLong(MCFSIM_GPIO1_OUT, CFG_SYS_GPIO1_OUT);
 
        /*
         *  dBug Compliance:
index 045908a13d403f5e8aaa41425c9c55b5014d0266..6c7628252b5945046f292b9df67eb2d07ba568d7 100644 (file)
@@ -23,19 +23,19 @@ int get_clocks(void)
 #if defined(CONFIG_M5208)
        pll_t *pll = (pll_t *) MMAP_PLL;
 
-       out_8(&pll->odr, CONFIG_SYS_PLL_ODR);
-       out_8(&pll->fdr, CONFIG_SYS_PLL_FDR);
+       out_8(&pll->odr, CFG_SYS_PLL_ODR);
+       out_8(&pll->fdr, CFG_SYS_PLL_FDR);
 #endif
 
 #if defined(CONFIG_M5249) || defined(CONFIG_M5253)
        volatile unsigned long cpll = mbar2_readLong(MCFSIM_PLLCR);
        unsigned long pllcr;
 
-#ifndef CONFIG_SYS_PLL_BYPASS
+#ifndef CFG_SYS_PLL_BYPASS
 
 #ifdef CONFIG_M5249
        /* Setup the PLL to run at the specified speed */
-#ifdef CONFIG_SYS_FAST_CLK
+#ifdef CFG_SYS_FAST_CLK
        pllcr = 0x925a3100;     /* ~140MHz clock (PLL bypass = 0) */
 #else
        pllcr = 0x135a4140;     /* ~72MHz clock (PLL bypass = 0) */
@@ -43,7 +43,7 @@ int get_clocks(void)
 #endif                         /* CONFIG_M5249 */
 
 #ifdef CONFIG_M5253
-       pllcr = CONFIG_SYS_PLLCR;
+       pllcr = CFG_SYS_PLLCR;
 #endif                         /* CONFIG_M5253 */
 
        cpll = cpll & 0xfffffffe;       /* Set PLL bypass mode = 0 (PSTCLK = crystal) */
@@ -52,7 +52,7 @@ int get_clocks(void)
        pllcr ^= 0x00000001;    /* Set pll bypass to 1 */
        mbar2_writeLong(MCFSIM_PLLCR, pllcr);   /* Start locking (pll bypass = 1) */
        udelay(0x20);           /* Wait for a lock ... */
-#endif                         /* #ifndef CONFIG_SYS_PLL_BYPASS */
+#endif                         /* #ifndef CFG_SYS_PLL_BYPASS */
 
 #endif                         /* CONFIG_M5249 || CONFIG_M5253 */
 
@@ -68,7 +68,7 @@ int get_clocks(void)
                ;
 #endif
 
-       gd->cpu_clk = CONFIG_SYS_CLK;
+       gd->cpu_clk = CFG_SYS_CLK;
 #if defined(CONFIG_M5208) || defined(CONFIG_M5249) || defined(CONFIG_M5253) || \
     defined(CONFIG_M5271) || defined(CONFIG_M5275)
        gd->bus_clk = gd->cpu_clk / 2;
index 6dddbe76f3a2d1672a34a71bfeba3f5ebb76e57b..d48d0192eea2a95668c3c2374bebaf0c016ffbc7 100644 (file)
@@ -35,7 +35,7 @@
  */
 _vectors:
 .long  0x00000000              /* Flash offset is 0 until we setup CS0 */
-#if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
+#if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE)
 .long  _start - CONFIG_TEXT_BASE
 #else
 .long  _START
@@ -81,9 +81,9 @@ _vectors:
 
 .text
 
-#if defined(CONFIG_SYS_INT_FLASH_BASE) && \
+#if defined(CFG_SYS_INT_FLASH_BASE) && \
     (defined(CONFIG_M5282) || defined(CONFIG_M5281))
-#if (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
+#if (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE)
 .long  0x55AA55AA,0xAA55AA55           /* CFM Backdoorkey */
 .long  0xFFFFFFFF                      /* all sectors protected */
 .long  0x00000000                      /* supervisor/User restriction */
@@ -100,53 +100,53 @@ _start:
 
 #if defined(CONFIG_M5208)
        /* Initialize RAMBAR: locate SRAM and validate it */
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_CTRL), %d0
        movec   %d0, %RAMBAR1
 #endif
 
 #if defined(CONFIG_M5272) || defined(CONFIG_M5249) || defined(CONFIG_M5253)
        /* set MBAR address + valid flag */
-       move.l  #(CONFIG_SYS_MBAR + 1), %d0
+       move.l  #(CFG_SYS_MBAR + 1), %d0
        move.c  %d0, %MBAR
 
        /*** The 5249 has MBAR2 as well ***/
-#ifdef CONFIG_SYS_MBAR2
+#ifdef CFG_SYS_MBAR2
        /* Get MBAR2 address */
-       move.l  #(CONFIG_SYS_MBAR2 + 1), %d0
+       move.l  #(CFG_SYS_MBAR2 + 1), %d0
         /* Set MBAR2 */
        movec   %d0, #0xc0e
 #endif
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + 1), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + 1), %d0
        movec   %d0, %RAMBAR0
 #endif /* CONFIG_M5272 || CONFIG_M5249 || CONFIG_M5253 */
 
 #if defined(CONFIG_M5282) || defined(CONFIG_M5271)
        /* set MBAR address + valid flag */
-       move.l  #(CONFIG_SYS_MBAR + 1), %d0
+       move.l  #(CFG_SYS_MBAR + 1), %d0
        move.l  %d0, 0x40000000
 
        /* Initialize RAMBAR1: locate SRAM and validate it */
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + 0x21), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + 0x21), %d0
        movec   %d0, %RAMBAR1
 
 #if defined(CONFIG_M5282)
-#if (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
+#if (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE)
        /*
         * Setup code in SRAM to initialize FLASHBAR,
         * if start from internal Flash
         */
-       move.l  #(_flashbar_setup-CONFIG_SYS_INT_FLASH_BASE), %a0
-       move.l  #(_flashbar_setup_end-CONFIG_SYS_INT_FLASH_BASE), %a1
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR), %a2
+       move.l  #(_flashbar_setup-CFG_SYS_INT_FLASH_BASE), %a0
+       move.l  #(_flashbar_setup_end-CFG_SYS_INT_FLASH_BASE), %a1
+       move.l  #(CFG_SYS_INIT_RAM_ADDR), %a2
 _copy_flash:
        move.l  (%a0)+, (%a2)+
        cmp.l   %a0, %a1
        bgt.s   _copy_flash
-       jmp     CONFIG_SYS_INIT_RAM_ADDR
+       jmp     CFG_SYS_INIT_RAM_ADDR
 
 _flashbar_setup:
        /* Initialize FLASHBAR: locate internal Flash and validate it */
-       move.l  #(CONFIG_SYS_INT_FLASH_BASE + CONFIG_SYS_INT_FLASH_ENABLE), %d0
+       move.l  #(CFG_SYS_INT_FLASH_BASE + CFG_SYS_INT_FLASH_ENABLE), %d0
        movec   %d0, %FLASHBAR
        jmp     _after_flashbar_copy.L  /* Force jump to absolute address */
 _flashbar_setup_end:
@@ -154,9 +154,9 @@ _flashbar_setup_end:
 _after_flashbar_copy:
 #else
        /* Setup code to initialize FLASHBAR, if start from external Memory */
-       move.l  #(CONFIG_SYS_INT_FLASH_BASE + CONFIG_SYS_INT_FLASH_ENABLE), %d0
+       move.l  #(CFG_SYS_INT_FLASH_BASE + CFG_SYS_INT_FLASH_ENABLE), %d0
        movec   %d0, %FLASHBAR
-#endif /* (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) */
+#endif /* (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE) */
 
 #endif
 #endif
@@ -165,22 +165,22 @@ _after_flashbar_copy:
         * therefore no VBR to set
         */
 #if !defined(CONFIG_MONITOR_IS_IN_RAM)
-#if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
-       move.l  #CONFIG_SYS_INT_FLASH_BASE, %d0
+#if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE)
+       move.l  #CFG_SYS_INT_FLASH_BASE, %d0
 #else
-       move.l  #CONFIG_SYS_FLASH_BASE, %d0
+       move.l  #CFG_SYS_FLASH_BASE, %d0
 #endif
        movec   %d0, %VBR
 #endif
 
 #ifdef CONFIG_M5275
        /* set MBAR address + valid flag */
-       move.l  #(CONFIG_SYS_MBAR + 1), %d0
+       move.l  #(CFG_SYS_MBAR + 1), %d0
        move.l  %d0, 0x40000000
 /*     movec   %d0, %MBAR */
 
        /* Initialize RAMBAR: locate SRAM and validate it */
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + 0x21), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + 0x21), %d0
        movec   %d0, %RAMBAR1
 #endif
 
@@ -195,7 +195,7 @@ _after_flashbar_copy:
        move.l  #__got_start, %a5
 
        /* setup stack initially on top of internal static ram  */
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_SIZE), %sp
 
        /*
         * if configured, malloc_f arena will be reserved first,
index 0659bf6558119f22059df20b9d996880e5d08e0e..53a25d8362cd33e0994bb28ebba3f1bab8c9bc90 100644 (file)
@@ -33,7 +33,7 @@ int print_cpuinfo(void)
        char buf[32];
 
        printf("CPU:   Freescale Coldfire MCF5307 at %s MHz\n",
-              strmhz(buf, CONFIG_SYS_CPU_CLK));
+              strmhz(buf, CFG_SYS_CPU_CLK));
        return 0;
 }
 #endif /* CONFIG_DISPLAY_CPUINFO */
index 83529408eb3e5aabd91a459cdad4245f8a40863a..dad47d87ab31ad8d4ab3359770f093a598be0a7d 100644 (file)
@@ -40,35 +40,35 @@ void init_csm(void)
 {
        csm_t *csm = (csm_t *)(MMAP_CSM);
 
-#if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) && \
-       defined(CONFIG_SYS_CS0_CTRL))
-       out_be16(&csm->csar0, CONFIG_SYS_CS0_BASE);
-       out_be32(&csm->csmr0, CONFIG_SYS_CS0_MASK);
-       out_be16(&csm->cscr0, CONFIG_SYS_CS0_CTRL);
-       MCF5307_SP_ERR_FIX(CONFIG_SYS_CS0_BASE, csm->csmr0);
+#if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) && \
+       defined(CFG_SYS_CS0_CTRL))
+       out_be16(&csm->csar0, CFG_SYS_CS0_BASE);
+       out_be32(&csm->csmr0, CFG_SYS_CS0_MASK);
+       out_be16(&csm->cscr0, CFG_SYS_CS0_CTRL);
+       MCF5307_SP_ERR_FIX(CFG_SYS_CS0_BASE, csm->csmr0);
 #else
 #warning "Chip Select 0 are not initialized/used"
 #endif
-#if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) && \
-       defined(CONFIG_SYS_CS1_CTRL))
-       out_be16(&csm->csar1, CONFIG_SYS_CS1_BASE);
-       out_be32(&csm->csmr1, CONFIG_SYS_CS1_MASK);
-       out_be16(&csm->cscr1, CONFIG_SYS_CS1_CTRL);
-       MCF5307_SP_ERR_FIX(CONFIG_SYS_CS1_BASE, csm->csmr1);
+#if (defined(CFG_SYS_CS1_BASE) && defined(CFG_SYS_CS1_MASK) && \
+       defined(CFG_SYS_CS1_CTRL))
+       out_be16(&csm->csar1, CFG_SYS_CS1_BASE);
+       out_be32(&csm->csmr1, CFG_SYS_CS1_MASK);
+       out_be16(&csm->cscr1, CFG_SYS_CS1_CTRL);
+       MCF5307_SP_ERR_FIX(CFG_SYS_CS1_BASE, csm->csmr1);
 #endif
-#if (defined(CONFIG_SYS_CS2_BASE) && defined(CONFIG_SYS_CS2_MASK) && \
-       defined(CONFIG_SYS_CS2_CTRL))
-       out_be16(&csm->csar2, CONFIG_SYS_CS2_BASE);
-       out_be32(&csm->csmr2, CONFIG_SYS_CS2_MASK);
-       out_be16(&csm->cscr2, CONFIG_SYS_CS2_CTRL);
-       MCF5307_SP_ERR_FIX(CONFIG_SYS_CS2_BASE, csm->csmr2);
+#if (defined(CFG_SYS_CS2_BASE) && defined(CFG_SYS_CS2_MASK) && \
+       defined(CFG_SYS_CS2_CTRL))
+       out_be16(&csm->csar2, CFG_SYS_CS2_BASE);
+       out_be32(&csm->csmr2, CFG_SYS_CS2_MASK);
+       out_be16(&csm->cscr2, CFG_SYS_CS2_CTRL);
+       MCF5307_SP_ERR_FIX(CFG_SYS_CS2_BASE, csm->csmr2);
 #endif
-#if (defined(CONFIG_SYS_CS3_BASE) && defined(CONFIG_SYS_CS3_MASK) && \
-       defined(CONFIG_SYS_CS3_CTRL))
-       out_be16(&csm->csar3, CONFIG_SYS_CS3_BASE);
-       out_be32(&csm->csmr3, CONFIG_SYS_CS3_MASK);
-       out_be16(&csm->cscr3, CONFIG_SYS_CS3_CTRL);
-       MCF5307_SP_ERR_FIX(CONFIG_SYS_CS3_BASE, csm->csmr3);
+#if (defined(CFG_SYS_CS3_BASE) && defined(CFG_SYS_CS3_MASK) && \
+       defined(CFG_SYS_CS3_CTRL))
+       out_be16(&csm->csar3, CFG_SYS_CS3_BASE);
+       out_be32(&csm->csmr3, CFG_SYS_CS3_MASK);
+       out_be16(&csm->cscr3, CFG_SYS_CS3_CTRL);
+       MCF5307_SP_ERR_FIX(CFG_SYS_CS3_BASE, csm->csmr3);
 #endif
 #if (defined(CONFIG_SYS_CS4_BASE) && defined(CONFIG_SYS_CS4_MASK) && \
        defined(CONFIG_SYS_CS4_CTRL))
index 03d9abeb182b812a39ca18ef0d2bec4e09b675c2..c8d079016f2e2a9da933547ada0609b02bfb4d0a 100644 (file)
@@ -16,8 +16,8 @@ DECLARE_GLOBAL_DATA_PTR;
 int get_clocks(void)
 {
 #if defined(CONFIG_M5307)
-       gd->bus_clk = CONFIG_SYS_CLK;
-       gd->cpu_clk = CONFIG_SYS_CPU_CLK;
+       gd->bus_clk = CFG_SYS_CLK;
+       gd->cpu_clk = CFG_SYS_CPU_CLK;
 #endif
 
        return 0;
index 644c372bdd25a1506cdbbaea1436049c8419d7d0..dbe2b54e4101af8f0c591e5b6b48360dcae75440 100644 (file)
@@ -39,7 +39,7 @@ _vectors:
 /* Flash offset is 0 until we setup CS0 */
 .long  0x00000000
 #if defined(CONFIG_M5307) && \
-          (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
+          (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE)
 .long  _start - CONFIG_TEXT_BASE
 #else
 .long  _START
@@ -92,10 +92,10 @@ _start:
        move.w  #0x2700,%sr
 
        /* set MBAR address + valid flag */
-       move.l  #(CONFIG_SYS_MBAR + 1), %d0
+       move.l  #(CFG_SYS_MBAR + 1), %d0
        move.c  %d0, %MBAR
 
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + 1), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + 1), %d0
        move.c  %d0, %RAMBAR
 
        /* DS 4.8.2 (Cache Organization) invalidate and disable cache */
@@ -110,7 +110,7 @@ _start:
         * therefore no VBR to set
         */
 #if !defined(CONFIG_MONITOR_IS_IN_RAM)
-       move.l  #CONFIG_SYS_FLASH_BASE, %d0
+       move.l  #CFG_SYS_FLASH_BASE, %d0
        movec   %d0, %VBR
 #endif
 
@@ -125,7 +125,7 @@ _start:
        move.l  #__got_start, %a5
 
        /* setup stack initially on top of internal static ram  */
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_SIZE), %sp
 
        /*
         * if configured, malloc_f arena will be reserved first,
index 1dadffd4ca3633e7fa7e88231734e18dde242861..8a48d73475c8b10166aa25cc0b13bc57d76ed2e5 100644 (file)
@@ -131,7 +131,7 @@ int watchdog_init(void)
        u32 wdog_module = 0;
 
        /* set timeout and enable watchdog */
-       wdog_module = ((CONFIG_SYS_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT);
+       wdog_module = ((CFG_SYS_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT);
 #ifdef CONFIG_M5329
        out_be16(&wdp->mr, wdog_module / 8192);
 #else
index 1311f3967c9a579ea6642309ded97561bede4422..844d2cd7600fd62f4060ecae1a0416013905f24e 100644 (file)
@@ -37,34 +37,34 @@ void cpu_init_f(void)
        out_be32(&scm1->pacrf, 0);
        out_be32(&scm1->pacrg, 0);
 
-#if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) \
-     && defined(CONFIG_SYS_CS0_CTRL))
+#if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) \
+     && defined(CFG_SYS_CS0_CTRL))
        setbits_8(&gpio->par_cs, GPIO_PAR_CS0_CS0);
-       out_be32(&fbcs->csar0, CONFIG_SYS_CS0_BASE);
-       out_be32(&fbcs->cscr0, CONFIG_SYS_CS0_CTRL);
-       out_be32(&fbcs->csmr0, CONFIG_SYS_CS0_MASK);
+       out_be32(&fbcs->csar0, CFG_SYS_CS0_BASE);
+       out_be32(&fbcs->cscr0, CFG_SYS_CS0_CTRL);
+       out_be32(&fbcs->csmr0, CFG_SYS_CS0_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) \
-     && defined(CONFIG_SYS_CS1_CTRL))
+#if (defined(CFG_SYS_CS1_BASE) && defined(CFG_SYS_CS1_MASK) \
+     && defined(CFG_SYS_CS1_CTRL))
        setbits_8(&gpio->par_cs, GPIO_PAR_CS1_CS1);
-       out_be32(&fbcs->csar1, CONFIG_SYS_CS1_BASE);
-       out_be32(&fbcs->cscr1, CONFIG_SYS_CS1_CTRL);
-       out_be32(&fbcs->csmr1, CONFIG_SYS_CS1_MASK);
+       out_be32(&fbcs->csar1, CFG_SYS_CS1_BASE);
+       out_be32(&fbcs->cscr1, CFG_SYS_CS1_CTRL);
+       out_be32(&fbcs->csmr1, CFG_SYS_CS1_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS2_BASE) && defined(CONFIG_SYS_CS2_MASK) \
-     && defined(CONFIG_SYS_CS2_CTRL))
-       out_be32(&fbcs->csar2, CONFIG_SYS_CS2_BASE);
-       out_be32(&fbcs->cscr2, CONFIG_SYS_CS2_CTRL);
-       out_be32(&fbcs->csmr2, CONFIG_SYS_CS2_MASK);
+#if (defined(CFG_SYS_CS2_BASE) && defined(CFG_SYS_CS2_MASK) \
+     && defined(CFG_SYS_CS2_CTRL))
+       out_be32(&fbcs->csar2, CFG_SYS_CS2_BASE);
+       out_be32(&fbcs->cscr2, CFG_SYS_CS2_CTRL);
+       out_be32(&fbcs->csmr2, CFG_SYS_CS2_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS3_BASE) && defined(CONFIG_SYS_CS3_MASK) \
-     && defined(CONFIG_SYS_CS3_CTRL))
-       out_be32(&fbcs->csar3, CONFIG_SYS_CS3_BASE);
-       out_be32(&fbcs->cscr3, CONFIG_SYS_CS3_CTRL);
-       out_be32(&fbcs->csmr3, CONFIG_SYS_CS3_MASK);
+#if (defined(CFG_SYS_CS3_BASE) && defined(CFG_SYS_CS3_MASK) \
+     && defined(CFG_SYS_CS3_CTRL))
+       out_be32(&fbcs->csar3, CFG_SYS_CS3_BASE);
+       out_be32(&fbcs->cscr3, CFG_SYS_CS3_CTRL);
+       out_be32(&fbcs->csmr3, CFG_SYS_CS3_MASK);
 #endif
 
 #if (defined(CONFIG_SYS_CS4_BASE) && defined(CONFIG_SYS_CS4_MASK) \
@@ -102,8 +102,8 @@ int cpu_init_r(void)
        rtc_t *rtc = (rtc_t *) (CONFIG_SYS_MCFRTC_BASE);
        rtcex_t *rtcex = (rtcex_t *) &rtc->extended;
 
-       out_be32(&rtcex->gocu, CONFIG_SYS_RTC_CNT);
-       out_be32(&rtcex->gocl, CONFIG_SYS_RTC_SETUP);
+       out_be32(&rtcex->gocu, CFG_SYS_RTC_CNT);
+       out_be32(&rtcex->gocl, CFG_SYS_RTC_SETUP);
 
 #endif
 #ifdef CONFIG_MCFFEC
@@ -236,36 +236,36 @@ void cpu_init_f(void)
        /* Port configuration */
        out_8(&gpio->par_cs, 0);
 
-#if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) \
-     && defined(CONFIG_SYS_CS0_CTRL))
-       out_be32(&fbcs->csar0, CONFIG_SYS_CS0_BASE);
-       out_be32(&fbcs->cscr0, CONFIG_SYS_CS0_CTRL);
-       out_be32(&fbcs->csmr0, CONFIG_SYS_CS0_MASK);
+#if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) \
+     && defined(CFG_SYS_CS0_CTRL))
+       out_be32(&fbcs->csar0, CFG_SYS_CS0_BASE);
+       out_be32(&fbcs->cscr0, CFG_SYS_CS0_CTRL);
+       out_be32(&fbcs->csmr0, CFG_SYS_CS0_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) \
-     && defined(CONFIG_SYS_CS1_CTRL))
+#if (defined(CFG_SYS_CS1_BASE) && defined(CFG_SYS_CS1_MASK) \
+     && defined(CFG_SYS_CS1_CTRL))
        /* Latch chipselect */
        setbits_8(&gpio->par_cs, GPIO_PAR_CS1);
-       out_be32(&fbcs->csar1, CONFIG_SYS_CS1_BASE);
-       out_be32(&fbcs->cscr1, CONFIG_SYS_CS1_CTRL);
-       out_be32(&fbcs->csmr1, CONFIG_SYS_CS1_MASK);
+       out_be32(&fbcs->csar1, CFG_SYS_CS1_BASE);
+       out_be32(&fbcs->cscr1, CFG_SYS_CS1_CTRL);
+       out_be32(&fbcs->csmr1, CFG_SYS_CS1_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS2_BASE) && defined(CONFIG_SYS_CS2_MASK) \
-     && defined(CONFIG_SYS_CS2_CTRL))
+#if (defined(CFG_SYS_CS2_BASE) && defined(CFG_SYS_CS2_MASK) \
+     && defined(CFG_SYS_CS2_CTRL))
        setbits_8(&gpio->par_cs, GPIO_PAR_CS2);
-       out_be32(&fbcs->csar2, CONFIG_SYS_CS2_BASE);
-       out_be32(&fbcs->cscr2, CONFIG_SYS_CS2_CTRL);
-       out_be32(&fbcs->csmr2, CONFIG_SYS_CS2_MASK);
+       out_be32(&fbcs->csar2, CFG_SYS_CS2_BASE);
+       out_be32(&fbcs->cscr2, CFG_SYS_CS2_CTRL);
+       out_be32(&fbcs->csmr2, CFG_SYS_CS2_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS3_BASE) && defined(CONFIG_SYS_CS3_MASK) \
-     && defined(CONFIG_SYS_CS3_CTRL))
+#if (defined(CFG_SYS_CS3_BASE) && defined(CFG_SYS_CS3_MASK) \
+     && defined(CFG_SYS_CS3_CTRL))
        setbits_8(&gpio->par_cs, GPIO_PAR_CS3);
-       out_be32(&fbcs->csar3, CONFIG_SYS_CS3_BASE);
-       out_be32(&fbcs->cscr3, CONFIG_SYS_CS3_CTRL);
-       out_be32(&fbcs->csmr3, CONFIG_SYS_CS3_MASK);
+       out_be32(&fbcs->csar3, CFG_SYS_CS3_BASE);
+       out_be32(&fbcs->cscr3, CFG_SYS_CS3_CTRL);
+       out_be32(&fbcs->csmr3, CFG_SYS_CS3_MASK);
 #endif
 
 #if (defined(CONFIG_SYS_CS4_BASE) && defined(CONFIG_SYS_CS4_MASK) \
@@ -327,7 +327,7 @@ void uart_port_conf(int port)
                clrbits_8(&gpio->par_feci2c, 0x00ff);
                setbits_8(&gpio->par_feci2c,
                        GPIO_PAR_FECI2C_SCL_UTXD2 | GPIO_PAR_FECI2C_SDA_URXD2);
-#elif defined(CONFIG_SYS_UART2_ALT3_GPIO)
+#elif defined(CFG_SYS_UART2_ALT3_GPIO)
                clrbits_be16(&gpio->par_ssi, 0x0f00);
                setbits_be16(&gpio->par_ssi,
                        GPIO_PAR_SSI_RXD(2) | GPIO_PAR_SSI_TXD(2));
index dac2229f72e19414800fd21335fe445fbcda3ea0..32ffac08135d39f7577840b857b1ad22ba1f52b5 100644 (file)
@@ -252,7 +252,7 @@ int clock_pll(int fsys, int flags)
 /* get_clocks() fills in gd->cpu_clock and gd->bus_clk */
 int get_clocks(void)
 {
-       gd->bus_clk = clock_pll(CONFIG_SYS_CLK / 1000, 0) * 1000;
+       gd->bus_clk = clock_pll(CFG_SYS_CLK / 1000, 0) * 1000;
        gd->cpu_clk = (gd->bus_clk * 3);
 
 #ifdef CONFIG_SYS_I2C_FSL
index 26728919160e83174e5e73a01e4b6d9fe126459a..72a2f99b7dd2cb1cf0f723626708d0ad2e033dc0 100644 (file)
@@ -98,11 +98,11 @@ _start:
 
 #if !defined(CONFIG_MONITOR_IS_IN_RAM)
        /* Set vector base register at the beginning of the Flash */
-       move.l  #CONFIG_SYS_FLASH_BASE, %d0
+       move.l  #CFG_SYS_FLASH_BASE, %d0
        movec   %d0, %VBR
 #endif
 
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_CTRL), %d0
        movec   %d0, %RAMBAR1
 
        /* invalidate and disable cache */
@@ -131,7 +131,7 @@ _start:
        move.l  #__got_start, %a5
 
        /* setup stack initially on top of internal static ram  */
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_SIZE), %sp
 
        /*
         * if configured, malloc_f arena will be reserved first,
index 9b3f9f0fe133bec032cd057f5c9f4c48c507c3cf..1ce244872f14740c3c56eb0335525f89b841c6dc 100644 (file)
@@ -29,30 +29,30 @@ void init_fbcs(void)
        fbcs_t *fbcs __maybe_unused = (fbcs_t *) MMAP_FBCS;
 
 #if !defined(CONFIG_SERIAL_BOOT)
-#if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) && defined(CONFIG_SYS_CS0_CTRL))
-       out_be32(&fbcs->csar0, CONFIG_SYS_CS0_BASE);
-       out_be32(&fbcs->cscr0, CONFIG_SYS_CS0_CTRL);
-       out_be32(&fbcs->csmr0, CONFIG_SYS_CS0_MASK);
+#if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) && defined(CFG_SYS_CS0_CTRL))
+       out_be32(&fbcs->csar0, CFG_SYS_CS0_BASE);
+       out_be32(&fbcs->cscr0, CFG_SYS_CS0_CTRL);
+       out_be32(&fbcs->csmr0, CFG_SYS_CS0_MASK);
 #endif
 #endif
 
-#if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) && defined(CONFIG_SYS_CS1_CTRL))
+#if (defined(CFG_SYS_CS1_BASE) && defined(CFG_SYS_CS1_MASK) && defined(CFG_SYS_CS1_CTRL))
        /* Latch chipselect */
-       out_be32(&fbcs->csar1, CONFIG_SYS_CS1_BASE);
-       out_be32(&fbcs->cscr1, CONFIG_SYS_CS1_CTRL);
-       out_be32(&fbcs->csmr1, CONFIG_SYS_CS1_MASK);
+       out_be32(&fbcs->csar1, CFG_SYS_CS1_BASE);
+       out_be32(&fbcs->cscr1, CFG_SYS_CS1_CTRL);
+       out_be32(&fbcs->csmr1, CFG_SYS_CS1_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS2_BASE) && defined(CONFIG_SYS_CS2_MASK) && defined(CONFIG_SYS_CS2_CTRL))
-       out_be32(&fbcs->csar2, CONFIG_SYS_CS2_BASE);
-       out_be32(&fbcs->cscr2, CONFIG_SYS_CS2_CTRL);
-       out_be32(&fbcs->csmr2, CONFIG_SYS_CS2_MASK);
+#if (defined(CFG_SYS_CS2_BASE) && defined(CFG_SYS_CS2_MASK) && defined(CFG_SYS_CS2_CTRL))
+       out_be32(&fbcs->csar2, CFG_SYS_CS2_BASE);
+       out_be32(&fbcs->cscr2, CFG_SYS_CS2_CTRL);
+       out_be32(&fbcs->csmr2, CFG_SYS_CS2_MASK);
 #endif
 
-#if (defined(CONFIG_SYS_CS3_BASE) && defined(CONFIG_SYS_CS3_MASK) && defined(CONFIG_SYS_CS3_CTRL))
-       out_be32(&fbcs->csar3, CONFIG_SYS_CS3_BASE);
-       out_be32(&fbcs->cscr3, CONFIG_SYS_CS3_CTRL);
-       out_be32(&fbcs->csmr3, CONFIG_SYS_CS3_MASK);
+#if (defined(CFG_SYS_CS3_BASE) && defined(CFG_SYS_CS3_MASK) && defined(CFG_SYS_CS3_CTRL))
+       out_be32(&fbcs->csar3, CFG_SYS_CS3_BASE);
+       out_be32(&fbcs->cscr3, CFG_SYS_CS3_CTRL);
+       out_be32(&fbcs->csmr3, CFG_SYS_CS3_MASK);
 #endif
 
 #if (defined(CONFIG_SYS_CS4_BASE) && defined(CONFIG_SYS_CS4_MASK) && defined(CONFIG_SYS_CS4_CTRL))
@@ -208,14 +208,14 @@ void cpu_init_f(void)
        /* FlexBus Chipselect */
        init_fbcs();
 
-#ifdef CONFIG_SYS_CS0_BASE
+#ifdef CFG_SYS_CS0_BASE
        /*
         * now the flash base address is no longer at 0 (Newer ColdFire family
         * boot at address 0 instead of 0xFFnn_nnnn). The vector table must
         * also move to the new location.
         */
-       if (CONFIG_SYS_CS0_BASE != 0)
-               setvbr(CONFIG_SYS_CS0_BASE);
+       if (CFG_SYS_CS0_BASE != 0)
+               setvbr(CFG_SYS_CS0_BASE);
 #endif
 
        icache_enable();
index aea8f3090fef83c81e6ab802feaac7ef39a9131b..a083c3d45d277ee552e859cd732de4aab2491578 100644 (file)
 
 #if defined(CONFIG_SERIAL_BOOT)
 #define ASM_DRAMINIT   (asm_dram_init - CONFIG_TEXT_BASE + \
-       CONFIG_SYS_INIT_RAM_ADDR)
+       CFG_SYS_INIT_RAM_ADDR)
 #define ASM_DRAMINIT_N (asm_dram_init - CONFIG_TEXT_BASE)
 #define ASM_SBF_IMG_HDR        (asm_sbf_img_hdr - CONFIG_TEXT_BASE + \
-       CONFIG_SYS_INIT_RAM_ADDR)
+       CFG_SYS_INIT_RAM_ADDR)
 #endif
 
 .text
@@ -123,18 +123,18 @@ asm_dram_init:
 
 #ifdef CONFIG_SYS_NAND_BOOT
        /* for assembly stack */
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_CTRL), %d0
        movec   %d0, %RAMBAR1
 
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_SP_OFFSET), %sp
        clr.l   %sp@-
 #endif
 
 #ifdef CONFIG_CF_SBF
-       move.l  #CONFIG_SYS_INIT_RAM_ADDR, %d0
+       move.l  #CFG_SYS_INIT_RAM_ADDR, %d0
        movec   %d0, %VBR
 
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_CTRL), %d0
        movec   %d0, %RAMBAR1
 
        /* initialize general use internal ram */
@@ -145,7 +145,7 @@ asm_dram_init:
        move.l  %d0, (%a2)
 
        /* invalidate and disable cache */
-       move.l  #(CONFIG_SYS_ICACHE_INV + CONFIG_SYS_DCACHE_INV), %d0
+       move.l  #(CFG_SYS_ICACHE_INV + CFG_SYS_DCACHE_INV), %d0
        movec   %d0, %CACR              /* Invalidate cache */
        move.l  #0, %d0
        movec   %d0, %ACR0
@@ -153,17 +153,17 @@ asm_dram_init:
        movec   %d0, %ACR2
        movec   %d0, %ACR3
 
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_SP_OFFSET), %sp
        clr.l   %sp@-
 
-#ifdef CONFIG_SYS_CS0_BASE
+#ifdef CFG_SYS_CS0_BASE
        /* Must disable global address */
        move.l  #0xFC008000, %a1
-       move.l  #(CONFIG_SYS_CS0_BASE), (%a1)
+       move.l  #(CFG_SYS_CS0_BASE), (%a1)
        move.l  #0xFC008008, %a1
-       move.l  #(CONFIG_SYS_CS0_CTRL), (%a1)
+       move.l  #(CFG_SYS_CS0_CTRL), (%a1)
        move.l  #0xFC008004, %a1
-       move.l  #(CONFIG_SYS_CS0_MASK), (%a1)
+       move.l  #(CFG_SYS_CS0_MASK), (%a1)
 #endif
 #endif /* CONFIG_CF_SBF */
 
@@ -216,8 +216,8 @@ asm_dspi_init:
        move.l  (%a1)+, %d5
        move.l  (%a1), %a4
 
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_SBFHDR_DATA_OFFSET), %a0
-       move.l  #(CONFIG_SYS_SBFHDR_SIZE), %d4
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_SBFHDR_DATA_OFFSET), %a0
+       move.l  #(CFG_SYS_SBFHDR_SIZE), %d4
 
        move.l  #0xFC05C02C, %a1        /* dspi status */
 
@@ -334,14 +334,14 @@ asm_nand_init:
        movec   %d0, %ACR2
        movec   %d0, %ACR3
 
-#ifdef CONFIG_SYS_CS0_BASE
+#ifdef CFG_SYS_CS0_BASE
        /* Must disable global address */
        move.l  #0xFC008000, %a1
-       move.l  #(CONFIG_SYS_CS0_BASE), (%a1)
+       move.l  #(CFG_SYS_CS0_BASE), (%a1)
        move.l  #0xFC008008, %a1
-       move.l  #(CONFIG_SYS_CS0_CTRL), (%a1)
+       move.l  #(CFG_SYS_CS0_CTRL), (%a1)
        move.l  #0xFC008004, %a1
-       move.l  #(CONFIG_SYS_CS0_MASK), (%a1)
+       move.l  #(CFG_SYS_CS0_MASK), (%a1)
 #endif
 
        /* NAND port configuration */
@@ -442,10 +442,10 @@ _start:
        move.w  #0x2700,%sr             /* Mask off Interrupt */
 
        /* Set vector base register at the beginning of the Flash */
-       move.l  #CONFIG_SYS_FLASH_BASE, %d0
+       move.l  #CFG_SYS_FLASH_BASE, %d0
        movec   %d0, %VBR
 
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_CTRL), %d0
        movec   %d0, %RAMBAR1
 
        /* initialize general use internal ram */
@@ -456,7 +456,7 @@ _start:
        move.l  %d0, (%a2)
 
        /* invalidate and disable cache */
-       move.l  #(CONFIG_SYS_ICACHE_INV + CONFIG_SYS_DCACHE_INV), %d0
+       move.l  #(CFG_SYS_ICACHE_INV + CFG_SYS_DCACHE_INV), %d0
        movec   %d0, %CACR              /* Invalidate cache */
        move.l  #0, %d0
        movec   %d0, %ACR0
@@ -464,7 +464,7 @@ _start:
        movec   %d0, %ACR2
        movec   %d0, %ACR3
 #else
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_CTRL), %d0
        movec   %d0, %RAMBAR1
 #endif
 
@@ -472,7 +472,7 @@ _start:
        move.l  #__got_start, %a5
 
        /* setup stack initially on top of internal static ram  */
-       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+       move.l  #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_SIZE), %sp
 
        /*
         * if configured, malloc_f arena will be reserved first,
index ceb462f438f27bfae7af87108351b1b116201514..c05356fc930c39c5c7ed2a8d9ea4f5d1352b2298 100644 (file)
 #endif                         /* CONFIG_CF_V4 */
 
 
-#ifndef CONFIG_SYS_CACHE_ICACR
-#define CONFIG_SYS_CACHE_ICACR 0
+#ifndef CFG_SYS_CACHE_ICACR
+#define CFG_SYS_CACHE_ICACR    0
 #endif
 
-#ifndef CONFIG_SYS_CACHE_DCACR
-#ifdef CONFIG_SYS_CACHE_ICACR
-#define CONFIG_SYS_CACHE_DCACR CONFIG_SYS_CACHE_ICACR
+#ifndef CFG_SYS_CACHE_DCACR
+#ifdef CFG_SYS_CACHE_ICACR
+#define CFG_SYS_CACHE_DCACR    CFG_SYS_CACHE_ICACR
 #else
-#define CONFIG_SYS_CACHE_DCACR 0
+#define CFG_SYS_CACHE_DCACR    0
 #endif
 #endif
 
-#ifndef CONFIG_SYS_CACHE_ACR0
-#define CONFIG_SYS_CACHE_ACR0  0
+#ifndef CFG_SYS_CACHE_ACR0
+#define CFG_SYS_CACHE_ACR0     0
 #endif
 
-#ifndef CONFIG_SYS_CACHE_ACR1
-#define CONFIG_SYS_CACHE_ACR1  0
+#ifndef CFG_SYS_CACHE_ACR1
+#define CFG_SYS_CACHE_ACR1     0
 #endif
 
-#ifndef CONFIG_SYS_CACHE_ACR2
-#define CONFIG_SYS_CACHE_ACR2  0
+#ifndef CFG_SYS_CACHE_ACR2
+#define CFG_SYS_CACHE_ACR2     0
 #endif
 
 #ifndef CONFIG_SYS_CACHE_ACR3
index 672aa0bb14ea8ab95f8e91440590793428c4ff9a..dab8b26a70378274d78277da3d69be3cd035f43e 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/m520x.h>
 
 #define CONFIG_SYS_FEC0_IOBASE         (MMAP_FEC0)
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x4000))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000))
 
 /* Timer */
 #ifdef CONFIG_MCFTMR
@@ -37,7 +37,7 @@
 #include <asm/m5235.h>
 
 #define CONFIG_SYS_FEC0_IOBASE         (MMAP_FEC)
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x40))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 /* Timer */
 #ifdef CONFIG_MCFTMR
@@ -59,7 +59,7 @@
 #include <asm/immap_5249.h>
 #include <asm/m5249.h>
 
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x40))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC)
 #define CONFIG_SYS_NUM_IRQS            (64)
@@ -82,7 +82,7 @@
 #include <asm/m5249.h>
 #include <asm/m5253.h>
 
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x40))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC)
 #define CONFIG_SYS_NUM_IRQS            (64)
 #include <asm/m5271.h>
 
 #define CONFIG_SYS_FEC0_IOBASE         (MMAP_FEC)
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x40))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 /* Timer */
 #ifdef CONFIG_MCFTMR
 #include <asm/m5272.h>
 
 #define CONFIG_SYS_FEC0_IOBASE         (MMAP_FEC)
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x40))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC)
 #define CONFIG_SYS_NUM_IRQS            (64)
 
 #define CONFIG_SYS_FEC0_IOBASE         (MMAP_FEC0)
 #define CONFIG_SYS_FEC1_IOBASE         (MMAP_FEC1)
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x40))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS            (192)
 #include <asm/m5282.h>
 
 #define CONFIG_SYS_FEC0_IOBASE         (MMAP_FEC)
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x40))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS            (128)
 #include <asm/m5307.h>
 
 #define CONFIG_SYS_UART_BASE            (MMAP_UART0 + \
-                                       (CONFIG_SYS_UART_PORT * 0x40))
+                                       (CFG_SYS_UART_PORT * 0x40))
 #define CONFIG_SYS_INTR_BASE            (MMAP_INTC)
 #define CONFIG_SYS_NUM_IRQS             (64)
 
 
 #define CONFIG_SYS_FEC0_IOBASE         (MMAP_FEC0)
 #define CONFIG_SYS_FEC1_IOBASE         (MMAP_FEC1)
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x4000))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000))
 
 /* Timer */
 #ifdef CONFIG_MCFTMR
 #include <asm/m5329.h>
 
 #define CONFIG_SYS_FEC0_IOBASE         (MMAP_FEC)
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x4000))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000))
 
 /* Timer */
 #ifdef CONFIG_MCFTMR
 #define CONFIG_SYS_FEC0_IOBASE         (MMAP_FEC0)
 #define CONFIG_SYS_FEC1_IOBASE         (MMAP_FEC1)
 
-#if (CONFIG_SYS_UART_PORT < 4)
+#if (CFG_SYS_UART_PORT < 4)
 #define CONFIG_SYS_UART_BASE           (MMAP_UART0 + \
-                                       (CONFIG_SYS_UART_PORT * 0x4000))
+                                       (CFG_SYS_UART_PORT * 0x4000))
 #else
 #define CONFIG_SYS_UART_BASE           (MMAP_UART4 + \
-                                       ((CONFIG_SYS_UART_PORT - 4) * 0x4000))
+                                       ((CFG_SYS_UART_PORT - 4) * 0x4000))
 #endif
 
 #define MMAP_DSPI                      MMAP_DSPI0
 #define FEC1_TX_INIT           31
 #endif
 
-#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x100))
+#define CONFIG_SYS_UART_BASE           (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x100))
 
 #ifdef CONFIG_SLTTMR
 #define CONFIG_SYS_UDELAY_BASE         (MMAP_SLT1)
 #ifdef CONFIG_PCI
 #define CFG_SYS_PCI_BAR0               (0x40000000)
 #define CFG_SYS_PCI_BAR1               (CFG_SYS_SDRAM_BASE)
-#define CFG_SYS_PCI_TBATR0             (CONFIG_SYS_MBAR)
+#define CFG_SYS_PCI_TBATR0             (CFG_SYS_MBAR)
 #define CFG_SYS_PCI_TBATR1             (CFG_SYS_SDRAM_BASE)
 #endif
 #endif                         /* CONFIG_M547x */
index bb1237453ff144df681510bd6843ae55568c3fb4..7c7443b96885c7118771529b068ed86813956e62 100644 (file)
@@ -9,32 +9,32 @@
 #ifndef __IMMAP_520X__
 #define __IMMAP_520X__
 
-#define MMAP_SCM1      (CONFIG_SYS_MBAR + 0x00000000)
-#define MMAP_XBS       (CONFIG_SYS_MBAR + 0x00004000)
-#define MMAP_FBCS      (CONFIG_SYS_MBAR + 0x00008000)
-#define MMAP_FEC0      (CONFIG_SYS_MBAR + 0x00030000)
-#define MMAP_SCM2      (CONFIG_SYS_MBAR + 0x00040000)
-#define MMAP_EDMA      (CONFIG_SYS_MBAR + 0x00044000)
-#define MMAP_INTC0     (CONFIG_SYS_MBAR + 0x00048000)
-#define MMAP_INTCACK   (CONFIG_SYS_MBAR + 0x00054000)
-#define MMAP_I2C       (CONFIG_SYS_MBAR + 0x00058000)
-#define MMAP_QSPI      (CONFIG_SYS_MBAR + 0x0005C000)
-#define MMAP_UART0     (CONFIG_SYS_MBAR + 0x00060000)
-#define MMAP_UART1     (CONFIG_SYS_MBAR + 0x00064000)
-#define MMAP_UART2     (CONFIG_SYS_MBAR + 0x00068000)
-#define MMAP_DTMR0     (CONFIG_SYS_MBAR + 0x00070000)
-#define MMAP_DTMR1     (CONFIG_SYS_MBAR + 0x00074000)
-#define MMAP_DTMR2     (CONFIG_SYS_MBAR + 0x00078000)
-#define MMAP_DTMR3     (CONFIG_SYS_MBAR + 0x0007C000)
-#define MMAP_PIT0      (CONFIG_SYS_MBAR + 0x00080000)
-#define MMAP_PIT1      (CONFIG_SYS_MBAR + 0x00084000)
-#define MMAP_EPORT0    (CONFIG_SYS_MBAR + 0x00088000)
-#define MMAP_WDOG      (CONFIG_SYS_MBAR + 0x0008C000)
-#define MMAP_PLL       (CONFIG_SYS_MBAR + 0x00090000)
-#define MMAP_RCM       (CONFIG_SYS_MBAR + 0x000A0000)
-#define MMAP_CCM       (CONFIG_SYS_MBAR + 0x000A0004)
-#define MMAP_GPIO      (CONFIG_SYS_MBAR + 0x000A4000)
-#define MMAP_SDRAM     (CONFIG_SYS_MBAR + 0x000A8000)
+#define MMAP_SCM1      (CFG_SYS_MBAR + 0x00000000)
+#define MMAP_XBS       (CFG_SYS_MBAR + 0x00004000)
+#define MMAP_FBCS      (CFG_SYS_MBAR + 0x00008000)
+#define MMAP_FEC0      (CFG_SYS_MBAR + 0x00030000)
+#define MMAP_SCM2      (CFG_SYS_MBAR + 0x00040000)
+#define MMAP_EDMA      (CFG_SYS_MBAR + 0x00044000)
+#define MMAP_INTC0     (CFG_SYS_MBAR + 0x00048000)
+#define MMAP_INTCACK   (CFG_SYS_MBAR + 0x00054000)
+#define MMAP_I2C       (CFG_SYS_MBAR + 0x00058000)
+#define MMAP_QSPI      (CFG_SYS_MBAR + 0x0005C000)
+#define MMAP_UART0     (CFG_SYS_MBAR + 0x00060000)
+#define MMAP_UART1     (CFG_SYS_MBAR + 0x00064000)
+#define MMAP_UART2     (CFG_SYS_MBAR + 0x00068000)
+#define MMAP_DTMR0     (CFG_SYS_MBAR + 0x00070000)
+#define MMAP_DTMR1     (CFG_SYS_MBAR + 0x00074000)
+#define MMAP_DTMR2     (CFG_SYS_MBAR + 0x00078000)
+#define MMAP_DTMR3     (CFG_SYS_MBAR + 0x0007C000)
+#define MMAP_PIT0      (CFG_SYS_MBAR + 0x00080000)
+#define MMAP_PIT1      (CFG_SYS_MBAR + 0x00084000)
+#define MMAP_EPORT0    (CFG_SYS_MBAR + 0x00088000)
+#define MMAP_WDOG      (CFG_SYS_MBAR + 0x0008C000)
+#define MMAP_PLL       (CFG_SYS_MBAR + 0x00090000)
+#define MMAP_RCM       (CFG_SYS_MBAR + 0x000A0000)
+#define MMAP_CCM       (CFG_SYS_MBAR + 0x000A0004)
+#define MMAP_GPIO      (CFG_SYS_MBAR + 0x000A4000)
+#define MMAP_SDRAM     (CFG_SYS_MBAR + 0x000A8000)
 
 #include <asm/coldfire/crossbar.h>
 #include <asm/coldfire/edma.h>
index 27d905ef94194a4bf1d42f41eb9d5a3b6a99b923..a1825c2a944fa0dc66b871f201bff1c9f3fa1a29 100644 (file)
@@ -9,42 +9,42 @@
 #ifndef __IMMAP_5235__
 #define __IMMAP_5235__
 
-#define MMAP_SCM       (CONFIG_SYS_MBAR + 0x00000000)
-#define MMAP_SDRAM     (CONFIG_SYS_MBAR + 0x00000040)
-#define MMAP_FBCS      (CONFIG_SYS_MBAR + 0x00000080)
-#define MMAP_DMA0      (CONFIG_SYS_MBAR + 0x00000100)
-#define MMAP_DMA1      (CONFIG_SYS_MBAR + 0x00000110)
-#define MMAP_DMA2      (CONFIG_SYS_MBAR + 0x00000120)
-#define MMAP_DMA3      (CONFIG_SYS_MBAR + 0x00000130)
-#define MMAP_UART0     (CONFIG_SYS_MBAR + 0x00000200)
-#define MMAP_UART1     (CONFIG_SYS_MBAR + 0x00000240)
-#define MMAP_UART2     (CONFIG_SYS_MBAR + 0x00000280)
-#define MMAP_I2C       (CONFIG_SYS_MBAR + 0x00000300)
-#define MMAP_QSPI      (CONFIG_SYS_MBAR + 0x00000340)
-#define MMAP_DTMR0     (CONFIG_SYS_MBAR + 0x00000400)
-#define MMAP_DTMR1     (CONFIG_SYS_MBAR + 0x00000440)
-#define MMAP_DTMR2     (CONFIG_SYS_MBAR + 0x00000480)
-#define MMAP_DTMR3     (CONFIG_SYS_MBAR + 0x000004C0)
-#define MMAP_INTC0     (CONFIG_SYS_MBAR + 0x00000C00)
-#define MMAP_INTC1     (CONFIG_SYS_MBAR + 0x00000D00)
-#define MMAP_INTCACK   (CONFIG_SYS_MBAR + 0x00000F00)
-#define MMAP_FEC       (CONFIG_SYS_MBAR + 0x00001000)
-#define MMAP_FECFIFO   (CONFIG_SYS_MBAR + 0x00001400)
-#define MMAP_GPIO      (CONFIG_SYS_MBAR + 0x00100000)
-#define MMAP_CCM       (CONFIG_SYS_MBAR + 0x00110000)
-#define MMAP_PLL       (CONFIG_SYS_MBAR + 0x00120000)
-#define MMAP_EPORT     (CONFIG_SYS_MBAR + 0x00130000)
-#define MMAP_WDOG      (CONFIG_SYS_MBAR + 0x00140000)
-#define MMAP_PIT0      (CONFIG_SYS_MBAR + 0x00150000)
-#define MMAP_PIT1      (CONFIG_SYS_MBAR + 0x00160000)
-#define MMAP_PIT2      (CONFIG_SYS_MBAR + 0x00170000)
-#define MMAP_PIT3      (CONFIG_SYS_MBAR + 0x00180000)
-#define MMAP_MDHA      (CONFIG_SYS_MBAR + 0x00190000)
-#define MMAP_RNG       (CONFIG_SYS_MBAR + 0x001A0000)
-#define MMAP_SKHA      (CONFIG_SYS_MBAR + 0x001B0000)
-#define MMAP_CAN1      (CONFIG_SYS_MBAR + 0x001C0000)
-#define MMAP_ETPU      (CONFIG_SYS_MBAR + 0x001D0000)
-#define MMAP_CAN2      (CONFIG_SYS_MBAR + 0x001F0000)
+#define MMAP_SCM       (CFG_SYS_MBAR + 0x00000000)
+#define MMAP_SDRAM     (CFG_SYS_MBAR + 0x00000040)
+#define MMAP_FBCS      (CFG_SYS_MBAR + 0x00000080)
+#define MMAP_DMA0      (CFG_SYS_MBAR + 0x00000100)
+#define MMAP_DMA1      (CFG_SYS_MBAR + 0x00000110)
+#define MMAP_DMA2      (CFG_SYS_MBAR + 0x00000120)
+#define MMAP_DMA3      (CFG_SYS_MBAR + 0x00000130)
+#define MMAP_UART0     (CFG_SYS_MBAR + 0x00000200)
+#define MMAP_UART1     (CFG_SYS_MBAR + 0x00000240)
+#define MMAP_UART2     (CFG_SYS_MBAR + 0x00000280)
+#define MMAP_I2C       (CFG_SYS_MBAR + 0x00000300)
+#define MMAP_QSPI      (CFG_SYS_MBAR + 0x00000340)
+#define MMAP_DTMR0     (CFG_SYS_MBAR + 0x00000400)
+#define MMAP_DTMR1     (CFG_SYS_MBAR + 0x00000440)
+#define MMAP_DTMR2     (CFG_SYS_MBAR + 0x00000480)
+#define MMAP_DTMR3     (CFG_SYS_MBAR + 0x000004C0)
+#define MMAP_INTC0     (CFG_SYS_MBAR + 0x00000C00)
+#define MMAP_INTC1     (CFG_SYS_MBAR + 0x00000D00)
+#define MMAP_INTCACK   (CFG_SYS_MBAR + 0x00000F00)
+#define MMAP_FEC       (CFG_SYS_MBAR + 0x00001000)
+#define MMAP_FECFIFO   (CFG_SYS_MBAR + 0x00001400)
+#define MMAP_GPIO      (CFG_SYS_MBAR + 0x00100000)
+#define MMAP_CCM       (CFG_SYS_MBAR + 0x00110000)
+#define MMAP_PLL       (CFG_SYS_MBAR + 0x00120000)
+#define MMAP_EPORT     (CFG_SYS_MBAR + 0x00130000)
+#define MMAP_WDOG      (CFG_SYS_MBAR + 0x00140000)
+#define MMAP_PIT0      (CFG_SYS_MBAR + 0x00150000)
+#define MMAP_PIT1      (CFG_SYS_MBAR + 0x00160000)
+#define MMAP_PIT2      (CFG_SYS_MBAR + 0x00170000)
+#define MMAP_PIT3      (CFG_SYS_MBAR + 0x00180000)
+#define MMAP_MDHA      (CFG_SYS_MBAR + 0x00190000)
+#define MMAP_RNG       (CFG_SYS_MBAR + 0x001A0000)
+#define MMAP_SKHA      (CFG_SYS_MBAR + 0x001B0000)
+#define MMAP_CAN1      (CFG_SYS_MBAR + 0x001C0000)
+#define MMAP_ETPU      (CFG_SYS_MBAR + 0x001D0000)
+#define MMAP_CAN2      (CFG_SYS_MBAR + 0x001F0000)
 
 #include <asm/coldfire/eport.h>
 #include <asm/coldfire/flexbus.h>
index b599ca6e81c4b378816099e219e13a0546c14f09..aa4c3ef42fadb7145b943de6bcd6ad01601460a2 100644 (file)
@@ -8,13 +8,13 @@
 #ifndef __IMMAP_5249__
 #define __IMMAP_5249__
 
-#define MMAP_INTC              (CONFIG_SYS_MBAR + 0x00000040)
-#define MMAP_FBCS              (CONFIG_SYS_MBAR + 0x00000080)
-#define MMAP_DTMR0             (CONFIG_SYS_MBAR + 0x00000140)
-#define MMAP_DTMR1             (CONFIG_SYS_MBAR + 0x00000180)
-#define MMAP_UART0             (CONFIG_SYS_MBAR + 0x000001C0)
-#define MMAP_UART1             (CONFIG_SYS_MBAR + 0x00000200)
-#define MMAP_QSPI              (CONFIG_SYS_MBAR + 0x00000400)
+#define MMAP_INTC              (CFG_SYS_MBAR + 0x00000040)
+#define MMAP_FBCS              (CFG_SYS_MBAR + 0x00000080)
+#define MMAP_DTMR0             (CFG_SYS_MBAR + 0x00000140)
+#define MMAP_DTMR1             (CFG_SYS_MBAR + 0x00000180)
+#define MMAP_UART0             (CFG_SYS_MBAR + 0x000001C0)
+#define MMAP_UART1             (CFG_SYS_MBAR + 0x00000200)
+#define MMAP_QSPI              (CFG_SYS_MBAR + 0x00000400)
 
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/qspi.h>
index 883782aa97cef8a8d90712e7f18c476e24752429..1ab7243dfd8a0b7ab4f26d1b3c5c26c76f222e88 100644 (file)
@@ -9,20 +9,20 @@
 #ifndef __IMMAP_5253__
 #define __IMMAP_5253__
 
-#define MMAP_INTC              (CONFIG_SYS_MBAR + 0x00000040)
-#define MMAP_FBCS              (CONFIG_SYS_MBAR + 0x00000080)
-#define MMAP_DTMR0             (CONFIG_SYS_MBAR + 0x00000140)
-#define MMAP_DTMR1             (CONFIG_SYS_MBAR + 0x00000180)
-#define MMAP_UART0             (CONFIG_SYS_MBAR + 0x000001C0)
-#define MMAP_UART1             (CONFIG_SYS_MBAR + 0x00000200)
-#define MMAP_I2C0              (CONFIG_SYS_MBAR + 0x00000280)
-#define MMAP_QSPI              (CONFIG_SYS_MBAR + 0x00000400)
-#define MMAP_CAN0              (CONFIG_SYS_MBAR + 0x00010000)
-#define MMAP_CAN1              (CONFIG_SYS_MBAR + 0x00011000)
+#define MMAP_INTC              (CFG_SYS_MBAR + 0x00000040)
+#define MMAP_FBCS              (CFG_SYS_MBAR + 0x00000080)
+#define MMAP_DTMR0             (CFG_SYS_MBAR + 0x00000140)
+#define MMAP_DTMR1             (CFG_SYS_MBAR + 0x00000180)
+#define MMAP_UART0             (CFG_SYS_MBAR + 0x000001C0)
+#define MMAP_UART1             (CFG_SYS_MBAR + 0x00000200)
+#define MMAP_I2C0              (CFG_SYS_MBAR + 0x00000280)
+#define MMAP_QSPI              (CFG_SYS_MBAR + 0x00000400)
+#define MMAP_CAN0              (CFG_SYS_MBAR + 0x00010000)
+#define MMAP_CAN1              (CFG_SYS_MBAR + 0x00011000)
 
-#define MMAP_PAR               (CONFIG_SYS_MBAR2 + 0x0000019C)
-#define MMAP_I2C1              (CONFIG_SYS_MBAR2 + 0x00000440)
-#define MMAP_UART2             (CONFIG_SYS_MBAR2 + 0x00000C00)
+#define MMAP_PAR               (CFG_SYS_MBAR2 + 0x0000019C)
+#define MMAP_I2C1              (CFG_SYS_MBAR2 + 0x00000440)
+#define MMAP_UART2             (CFG_SYS_MBAR2 + 0x00000C00)
 
 #include <asm/coldfire/ata.h>
 #include <asm/coldfire/flexbus.h>
index 27d786139938d0ae0d74fb9824882a3ae5f9b2cb..a5bf18c4b8488521ed4e1ed239e5ef5f1bfda11f 100644 (file)
@@ -9,42 +9,42 @@
 #ifndef __IMMAP_5271__
 #define __IMMAP_5271__
 
-#define MMAP_SCM       (CONFIG_SYS_MBAR + 0x00000000)
-#define MMAP_SDRAM     (CONFIG_SYS_MBAR + 0x00000040)
-#define MMAP_FBCS      (CONFIG_SYS_MBAR + 0x00000080)
-#define MMAP_DMA0      (CONFIG_SYS_MBAR + 0x00000100)
-#define MMAP_DMA1      (CONFIG_SYS_MBAR + 0x00000110)
-#define MMAP_DMA2      (CONFIG_SYS_MBAR + 0x00000120)
-#define MMAP_DMA3      (CONFIG_SYS_MBAR + 0x00000130)
-#define MMAP_UART0     (CONFIG_SYS_MBAR + 0x00000200)
-#define MMAP_UART1     (CONFIG_SYS_MBAR + 0x00000240)
-#define MMAP_UART2     (CONFIG_SYS_MBAR + 0x00000280)
-#define MMAP_I2C       (CONFIG_SYS_MBAR + 0x00000300)
-#define MMAP_QSPI      (CONFIG_SYS_MBAR + 0x00000340)
-#define MMAP_DTMR0     (CONFIG_SYS_MBAR + 0x00000400)
-#define MMAP_DTMR1     (CONFIG_SYS_MBAR + 0x00000440)
-#define MMAP_DTMR2     (CONFIG_SYS_MBAR + 0x00000480)
-#define MMAP_DTMR3     (CONFIG_SYS_MBAR + 0x000004C0)
-#define MMAP_INTC0     (CONFIG_SYS_MBAR + 0x00000C00)
-#define MMAP_INTC1     (CONFIG_SYS_MBAR + 0x00000D00)
-#define MMAP_INTCACK   (CONFIG_SYS_MBAR + 0x00000F00)
-#define MMAP_FEC       (CONFIG_SYS_MBAR + 0x00001000)
-#define MMAP_FECFIFO   (CONFIG_SYS_MBAR + 0x00001400)
-#define MMAP_GPIO      (CONFIG_SYS_MBAR + 0x00100000)
-#define MMAP_CCM       (CONFIG_SYS_MBAR + 0x00110000)
-#define MMAP_PLL       (CONFIG_SYS_MBAR + 0x00120000)
-#define MMAP_EPORT     (CONFIG_SYS_MBAR + 0x00130000)
-#define MMAP_WDOG      (CONFIG_SYS_MBAR + 0x00140000)
-#define MMAP_PIT0      (CONFIG_SYS_MBAR + 0x00150000)
-#define MMAP_PIT1      (CONFIG_SYS_MBAR + 0x00160000)
-#define MMAP_PIT2      (CONFIG_SYS_MBAR + 0x00170000)
-#define MMAP_PIT3      (CONFIG_SYS_MBAR + 0x00180000)
-#define MMAP_MDHA      (CONFIG_SYS_MBAR + 0x00190000)
-#define MMAP_RNG       (CONFIG_SYS_MBAR + 0x001A0000)
-#define MMAP_SKHA      (CONFIG_SYS_MBAR + 0x001B0000)
-#define MMAP_CAN1      (CONFIG_SYS_MBAR + 0x001C0000)
-#define MMAP_ETPU      (CONFIG_SYS_MBAR + 0x001D0000)
-#define MMAP_CAN2      (CONFIG_SYS_MBAR + 0x001F0000)
+#define MMAP_SCM       (CFG_SYS_MBAR + 0x00000000)
+#define MMAP_SDRAM     (CFG_SYS_MBAR + 0x00000040)
+#define MMAP_FBCS      (CFG_SYS_MBAR + 0x00000080)
+#define MMAP_DMA0      (CFG_SYS_MBAR + 0x00000100)
+#define MMAP_DMA1      (CFG_SYS_MBAR + 0x00000110)
+#define MMAP_DMA2      (CFG_SYS_MBAR + 0x00000120)
+#define MMAP_DMA3      (CFG_SYS_MBAR + 0x00000130)
+#define MMAP_UART0     (CFG_SYS_MBAR + 0x00000200)
+#define MMAP_UART1     (CFG_SYS_MBAR + 0x00000240)
+#define MMAP_UART2     (CFG_SYS_MBAR + 0x00000280)
+#define MMAP_I2C       (CFG_SYS_MBAR + 0x00000300)
+#define MMAP_QSPI      (CFG_SYS_MBAR + 0x00000340)
+#define MMAP_DTMR0     (CFG_SYS_MBAR + 0x00000400)
+#define MMAP_DTMR1     (CFG_SYS_MBAR + 0x00000440)
+#define MMAP_DTMR2     (CFG_SYS_MBAR + 0x00000480)
+#define MMAP_DTMR3     (CFG_SYS_MBAR + 0x000004C0)
+#define MMAP_INTC0     (CFG_SYS_MBAR + 0x00000C00)
+#define MMAP_INTC1     (CFG_SYS_MBAR + 0x00000D00)
+#define MMAP_INTCACK   (CFG_SYS_MBAR + 0x00000F00)
+#define MMAP_FEC       (CFG_SYS_MBAR + 0x00001000)
+#define MMAP_FECFIFO   (CFG_SYS_MBAR + 0x00001400)
+#define MMAP_GPIO      (CFG_SYS_MBAR + 0x00100000)
+#define MMAP_CCM       (CFG_SYS_MBAR + 0x00110000)
+#define MMAP_PLL       (CFG_SYS_MBAR + 0x00120000)
+#define MMAP_EPORT     (CFG_SYS_MBAR + 0x00130000)
+#define MMAP_WDOG      (CFG_SYS_MBAR + 0x00140000)
+#define MMAP_PIT0      (CFG_SYS_MBAR + 0x00150000)
+#define MMAP_PIT1      (CFG_SYS_MBAR + 0x00160000)
+#define MMAP_PIT2      (CFG_SYS_MBAR + 0x00170000)
+#define MMAP_PIT3      (CFG_SYS_MBAR + 0x00180000)
+#define MMAP_MDHA      (CFG_SYS_MBAR + 0x00190000)
+#define MMAP_RNG       (CFG_SYS_MBAR + 0x001A0000)
+#define MMAP_SKHA      (CFG_SYS_MBAR + 0x001B0000)
+#define MMAP_CAN1      (CFG_SYS_MBAR + 0x001C0000)
+#define MMAP_ETPU      (CFG_SYS_MBAR + 0x001D0000)
+#define MMAP_CAN2      (CFG_SYS_MBAR + 0x001F0000)
 
 #include <asm/coldfire/eport.h>
 #include <asm/coldfire/flexbus.h>
index cd7b67256cfb5fde36ec086da2e2fe46812fb41b..c5c3cc751258c97879484ae5402cb5113a36c55f 100644 (file)
@@ -8,24 +8,24 @@
 #ifndef __IMMAP_5272__
 #define __IMMAP_5272__
 
-#define MMAP_CFG       (CONFIG_SYS_MBAR + 0x00000000)
-#define MMAP_INTC      (CONFIG_SYS_MBAR + 0x00000020)
-#define MMAP_FBCS      (CONFIG_SYS_MBAR + 0x00000040)
-#define MMAP_GPIO      (CONFIG_SYS_MBAR + 0x00000080)
-#define MMAP_QSPI      (CONFIG_SYS_MBAR + 0x000000A0)
-#define MMAP_PWM       (CONFIG_SYS_MBAR + 0x000000C0)
-#define MMAP_DMA0      (CONFIG_SYS_MBAR + 0x000000E0)
-#define MMAP_UART0     (CONFIG_SYS_MBAR + 0x00000100)
-#define MMAP_UART1     (CONFIG_SYS_MBAR + 0x00000140)
-#define MMAP_SDRAM     (CONFIG_SYS_MBAR + 0x00000180)
-#define MMAP_TMR0      (CONFIG_SYS_MBAR + 0x00000200)
-#define MMAP_TMR1      (CONFIG_SYS_MBAR + 0x00000220)
-#define MMAP_TMR2      (CONFIG_SYS_MBAR + 0x00000240)
-#define MMAP_TMR3      (CONFIG_SYS_MBAR + 0x00000260)
-#define MMAP_WDOG      (CONFIG_SYS_MBAR + 0x00000280)
-#define MMAP_PLIC      (CONFIG_SYS_MBAR + 0x00000300)
-#define MMAP_FEC       (CONFIG_SYS_MBAR + 0x00000840)
-#define MMAP_USB       (CONFIG_SYS_MBAR + 0x00001000)
+#define MMAP_CFG       (CFG_SYS_MBAR + 0x00000000)
+#define MMAP_INTC      (CFG_SYS_MBAR + 0x00000020)
+#define MMAP_FBCS      (CFG_SYS_MBAR + 0x00000040)
+#define MMAP_GPIO      (CFG_SYS_MBAR + 0x00000080)
+#define MMAP_QSPI      (CFG_SYS_MBAR + 0x000000A0)
+#define MMAP_PWM       (CFG_SYS_MBAR + 0x000000C0)
+#define MMAP_DMA0      (CFG_SYS_MBAR + 0x000000E0)
+#define MMAP_UART0     (CFG_SYS_MBAR + 0x00000100)
+#define MMAP_UART1     (CFG_SYS_MBAR + 0x00000140)
+#define MMAP_SDRAM     (CFG_SYS_MBAR + 0x00000180)
+#define MMAP_TMR0      (CFG_SYS_MBAR + 0x00000200)
+#define MMAP_TMR1      (CFG_SYS_MBAR + 0x00000220)
+#define MMAP_TMR2      (CFG_SYS_MBAR + 0x00000240)
+#define MMAP_TMR3      (CFG_SYS_MBAR + 0x00000260)
+#define MMAP_WDOG      (CFG_SYS_MBAR + 0x00000280)
+#define MMAP_PLIC      (CFG_SYS_MBAR + 0x00000300)
+#define MMAP_FEC       (CFG_SYS_MBAR + 0x00000840)
+#define MMAP_USB       (CFG_SYS_MBAR + 0x00001000)
 
 #include <asm/coldfire/pwm.h>
 
index 8b1a08b4f24f8465b23b58b8f5e1304c46090c76..9b8d71d30d44cd15f60bf1f2ddb6f2157c9d3952 100644 (file)
 #ifndef __IMMAP_5275__
 #define __IMMAP_5275__
 
-#define MMAP_SCM       (CONFIG_SYS_MBAR + 0x00000000)
-#define MMAP_SDRAM     (CONFIG_SYS_MBAR + 0x00000040)
-#define MMAP_FBCS      (CONFIG_SYS_MBAR + 0x00000080)
-#define MMAP_DMA0      (CONFIG_SYS_MBAR + 0x00000100)
-#define MMAP_DMA1      (CONFIG_SYS_MBAR + 0x00000110)
-#define MMAP_DMA2      (CONFIG_SYS_MBAR + 0x00000120)
-#define MMAP_DMA3      (CONFIG_SYS_MBAR + 0x00000130)
-#define MMAP_UART0     (CONFIG_SYS_MBAR + 0x00000200)
-#define MMAP_UART1     (CONFIG_SYS_MBAR + 0x00000240)
-#define MMAP_UART2     (CONFIG_SYS_MBAR + 0x00000280)
-#define MMAP_I2C       (CONFIG_SYS_MBAR + 0x00000300)
-#define MMAP_QSPI      (CONFIG_SYS_MBAR + 0x00000340)
-#define MMAP_DTMR0     (CONFIG_SYS_MBAR + 0x00000400)
-#define MMAP_DTMR1     (CONFIG_SYS_MBAR + 0x00000440)
-#define MMAP_DTMR2     (CONFIG_SYS_MBAR + 0x00000480)
-#define MMAP_DTMR3     (CONFIG_SYS_MBAR + 0x000004C0)
-#define MMAP_INTC0     (CONFIG_SYS_MBAR + 0x00000C00)
-#define MMAP_INTC1     (CONFIG_SYS_MBAR + 0x00000D00)
-#define MMAP_INTCACK   (CONFIG_SYS_MBAR + 0x00000F00)
-#define MMAP_FEC0      (CONFIG_SYS_MBAR + 0x00001000)
-#define MMAP_FEC0FIFO  (CONFIG_SYS_MBAR + 0x00001400)
-#define MMAP_FEC1      (CONFIG_SYS_MBAR + 0x00001800)
-#define MMAP_FEC1FIFO  (CONFIG_SYS_MBAR + 0x00001C00)
-#define MMAP_GPIO      (CONFIG_SYS_MBAR + 0x00100000)
-#define MMAP_RCM       (CONFIG_SYS_MBAR + 0x00110000)
-#define MMAP_CCM       (CONFIG_SYS_MBAR + 0x00110004)
-#define MMAP_PLL       (CONFIG_SYS_MBAR + 0x00120000)
-#define MMAP_EPORT     (CONFIG_SYS_MBAR + 0x00130000)
-#define MMAP_WDOG      (CONFIG_SYS_MBAR + 0x00140000)
-#define MMAP_PIT0      (CONFIG_SYS_MBAR + 0x00150000)
-#define MMAP_PIT1      (CONFIG_SYS_MBAR + 0x00160000)
-#define MMAP_PIT2      (CONFIG_SYS_MBAR + 0x00170000)
-#define MMAP_PIT3      (CONFIG_SYS_MBAR + 0x00180000)
-#define MMAP_MDHA      (CONFIG_SYS_MBAR + 0x00190000)
-#define MMAP_RNG       (CONFIG_SYS_MBAR + 0x001A0000)
-#define MMAP_SKHA      (CONFIG_SYS_MBAR + 0x001B0000)
-#define MMAP_USB       (CONFIG_SYS_MBAR + 0x001C0000)
-#define MMAP_PWM0      (CONFIG_SYS_MBAR + 0x001D0000)
+#define MMAP_SCM       (CFG_SYS_MBAR + 0x00000000)
+#define MMAP_SDRAM     (CFG_SYS_MBAR + 0x00000040)
+#define MMAP_FBCS      (CFG_SYS_MBAR + 0x00000080)
+#define MMAP_DMA0      (CFG_SYS_MBAR + 0x00000100)
+#define MMAP_DMA1      (CFG_SYS_MBAR + 0x00000110)
+#define MMAP_DMA2      (CFG_SYS_MBAR + 0x00000120)
+#define MMAP_DMA3      (CFG_SYS_MBAR + 0x00000130)
+#define MMAP_UART0     (CFG_SYS_MBAR + 0x00000200)
+#define MMAP_UART1     (CFG_SYS_MBAR + 0x00000240)
+#define MMAP_UART2     (CFG_SYS_MBAR + 0x00000280)
+#define MMAP_I2C       (CFG_SYS_MBAR + 0x00000300)
+#define MMAP_QSPI      (CFG_SYS_MBAR + 0x00000340)
+#define MMAP_DTMR0     (CFG_SYS_MBAR + 0x00000400)
+#define MMAP_DTMR1     (CFG_SYS_MBAR + 0x00000440)
+#define MMAP_DTMR2     (CFG_SYS_MBAR + 0x00000480)
+#define MMAP_DTMR3     (CFG_SYS_MBAR + 0x000004C0)
+#define MMAP_INTC0     (CFG_SYS_MBAR + 0x00000C00)
+#define MMAP_INTC1     (CFG_SYS_MBAR + 0x00000D00)
+#define MMAP_INTCACK   (CFG_SYS_MBAR + 0x00000F00)
+#define MMAP_FEC0      (CFG_SYS_MBAR + 0x00001000)
+#define MMAP_FEC0FIFO  (CFG_SYS_MBAR + 0x00001400)
+#define MMAP_FEC1      (CFG_SYS_MBAR + 0x00001800)
+#define MMAP_FEC1FIFO  (CFG_SYS_MBAR + 0x00001C00)
+#define MMAP_GPIO      (CFG_SYS_MBAR + 0x00100000)
+#define MMAP_RCM       (CFG_SYS_MBAR + 0x00110000)
+#define MMAP_CCM       (CFG_SYS_MBAR + 0x00110004)
+#define MMAP_PLL       (CFG_SYS_MBAR + 0x00120000)
+#define MMAP_EPORT     (CFG_SYS_MBAR + 0x00130000)
+#define MMAP_WDOG      (CFG_SYS_MBAR + 0x00140000)
+#define MMAP_PIT0      (CFG_SYS_MBAR + 0x00150000)
+#define MMAP_PIT1      (CFG_SYS_MBAR + 0x00160000)
+#define MMAP_PIT2      (CFG_SYS_MBAR + 0x00170000)
+#define MMAP_PIT3      (CFG_SYS_MBAR + 0x00180000)
+#define MMAP_MDHA      (CFG_SYS_MBAR + 0x00190000)
+#define MMAP_RNG       (CFG_SYS_MBAR + 0x001A0000)
+#define MMAP_SKHA      (CFG_SYS_MBAR + 0x001B0000)
+#define MMAP_USB       (CFG_SYS_MBAR + 0x001C0000)
+#define MMAP_PWM0      (CFG_SYS_MBAR + 0x001D0000)
 
 #include <asm/coldfire/eport.h>
 #include <asm/coldfire/flexbus.h>
index d7c68f5749a2bfa46f4e8c1fd01d26a25fba759d..f810a4dd5cb544b0992bdbb60b89ee2b8e073aaf 100644 (file)
@@ -8,42 +8,42 @@
 #ifndef __IMMAP_5282__
 #define __IMMAP_5282__
 
-#define MMAP_SCM       (CONFIG_SYS_MBAR + 0x00000000)
-#define MMAP_SDRAMC    (CONFIG_SYS_MBAR + 0x00000040)
-#define MMAP_FBCS      (CONFIG_SYS_MBAR + 0x00000080)
-#define MMAP_DMA0      (CONFIG_SYS_MBAR + 0x00000100)
-#define MMAP_DMA1      (CONFIG_SYS_MBAR + 0x00000140)
-#define MMAP_DMA2      (CONFIG_SYS_MBAR + 0x00000180)
-#define MMAP_DMA3      (CONFIG_SYS_MBAR + 0x000001C0)
-#define MMAP_UART0     (CONFIG_SYS_MBAR + 0x00000200)
-#define MMAP_UART1     (CONFIG_SYS_MBAR + 0x00000240)
-#define MMAP_UART2     (CONFIG_SYS_MBAR + 0x00000280)
-#define MMAP_I2C       (CONFIG_SYS_MBAR + 0x00000300)
-#define MMAP_QSPI      (CONFIG_SYS_MBAR + 0x00000340)
-#define MMAP_DTMR0     (CONFIG_SYS_MBAR + 0x00000400)
-#define MMAP_DTMR1     (CONFIG_SYS_MBAR + 0x00000440)
-#define MMAP_DTMR2     (CONFIG_SYS_MBAR + 0x00000480)
-#define MMAP_DTMR3     (CONFIG_SYS_MBAR + 0x000004C0)
-#define MMAP_INTC0     (CONFIG_SYS_MBAR + 0x00000C00)
-#define MMAP_INTC1     (CONFIG_SYS_MBAR + 0x00000D00)
-#define MMAP_INTCACK   (CONFIG_SYS_MBAR + 0x00000F00)
-#define MMAP_FEC       (CONFIG_SYS_MBAR + 0x00001000)
-#define MMAP_FECFIFO   (CONFIG_SYS_MBAR + 0x00001400)
-#define MMAP_GPIO      (CONFIG_SYS_MBAR + 0x00100000)
-#define MMAP_CCM       (CONFIG_SYS_MBAR + 0x00110000)
-#define MMAP_PLL       (CONFIG_SYS_MBAR + 0x00120000)
-#define MMAP_EPORT     (CONFIG_SYS_MBAR + 0x00130000)
-#define MMAP_WDOG      (CONFIG_SYS_MBAR + 0x00140000)
-#define MMAP_PIT0      (CONFIG_SYS_MBAR + 0x00150000)
-#define MMAP_PIT1      (CONFIG_SYS_MBAR + 0x00160000)
-#define MMAP_PIT2      (CONFIG_SYS_MBAR + 0x00170000)
-#define MMAP_PIT3      (CONFIG_SYS_MBAR + 0x00180000)
-#define MMAP_QADC      (CONFIG_SYS_MBAR + 0x00190000)
-#define MMAP_GPTMRA    (CONFIG_SYS_MBAR + 0x001A0000)
-#define MMAP_GPTMRB    (CONFIG_SYS_MBAR + 0x001B0000)
-#define MMAP_CAN       (CONFIG_SYS_MBAR + 0x001C0000)
-#define MMAP_CFMC      (CONFIG_SYS_MBAR + 0x001D0000)
-#define MMAP_CFMMEM    (CONFIG_SYS_MBAR + 0x04000000)
+#define MMAP_SCM       (CFG_SYS_MBAR + 0x00000000)
+#define MMAP_SDRAMC    (CFG_SYS_MBAR + 0x00000040)
+#define MMAP_FBCS      (CFG_SYS_MBAR + 0x00000080)
+#define MMAP_DMA0      (CFG_SYS_MBAR + 0x00000100)
+#define MMAP_DMA1      (CFG_SYS_MBAR + 0x00000140)
+#define MMAP_DMA2      (CFG_SYS_MBAR + 0x00000180)
+#define MMAP_DMA3      (CFG_SYS_MBAR + 0x000001C0)
+#define MMAP_UART0     (CFG_SYS_MBAR + 0x00000200)
+#define MMAP_UART1     (CFG_SYS_MBAR + 0x00000240)
+#define MMAP_UART2     (CFG_SYS_MBAR + 0x00000280)
+#define MMAP_I2C       (CFG_SYS_MBAR + 0x00000300)
+#define MMAP_QSPI      (CFG_SYS_MBAR + 0x00000340)
+#define MMAP_DTMR0     (CFG_SYS_MBAR + 0x00000400)
+#define MMAP_DTMR1     (CFG_SYS_MBAR + 0x00000440)
+#define MMAP_DTMR2     (CFG_SYS_MBAR + 0x00000480)
+#define MMAP_DTMR3     (CFG_SYS_MBAR + 0x000004C0)
+#define MMAP_INTC0     (CFG_SYS_MBAR + 0x00000C00)
+#define MMAP_INTC1     (CFG_SYS_MBAR + 0x00000D00)
+#define MMAP_INTCACK   (CFG_SYS_MBAR + 0x00000F00)
+#define MMAP_FEC       (CFG_SYS_MBAR + 0x00001000)
+#define MMAP_FECFIFO   (CFG_SYS_MBAR + 0x00001400)
+#define MMAP_GPIO      (CFG_SYS_MBAR + 0x00100000)
+#define MMAP_CCM       (CFG_SYS_MBAR + 0x00110000)
+#define MMAP_PLL       (CFG_SYS_MBAR + 0x00120000)
+#define MMAP_EPORT     (CFG_SYS_MBAR + 0x00130000)
+#define MMAP_WDOG      (CFG_SYS_MBAR + 0x00140000)
+#define MMAP_PIT0      (CFG_SYS_MBAR + 0x00150000)
+#define MMAP_PIT1      (CFG_SYS_MBAR + 0x00160000)
+#define MMAP_PIT2      (CFG_SYS_MBAR + 0x00170000)
+#define MMAP_PIT3      (CFG_SYS_MBAR + 0x00180000)
+#define MMAP_QADC      (CFG_SYS_MBAR + 0x00190000)
+#define MMAP_GPTMRA    (CFG_SYS_MBAR + 0x001A0000)
+#define MMAP_GPTMRB    (CFG_SYS_MBAR + 0x001B0000)
+#define MMAP_CAN       (CFG_SYS_MBAR + 0x001C0000)
+#define MMAP_CFMC      (CFG_SYS_MBAR + 0x001D0000)
+#define MMAP_CFMMEM    (CFG_SYS_MBAR + 0x04000000)
 
 #include <asm/coldfire/eport.h>
 #include <asm/coldfire/flexbus.h>
index 29e60863bfde6c3359aefb794027b7195176a3cc..e1f7858b100762c90451cab521d84cc80f0fab9e 100644 (file)
@@ -9,46 +9,46 @@
 #ifndef __IMMAP_5301X__
 #define __IMMAP_5301X__
 
-#define MMAP_SCM1      (CONFIG_SYS_MBAR + 0x00000000)
-#define MMAP_XBS       (CONFIG_SYS_MBAR + 0x00004000)
-#define MMAP_FBCS      (CONFIG_SYS_MBAR + 0x00008000)
-#define MMAP_MPU       (CONFIG_SYS_MBAR + 0x00014000)
-#define MMAP_FEC0      (CONFIG_SYS_MBAR + 0x00030000)
-#define MMAP_FEC1      (CONFIG_SYS_MBAR + 0x00034000)
-#define MMAP_SCM2      (CONFIG_SYS_MBAR + 0x00040000)
-#define MMAP_EDMA      (CONFIG_SYS_MBAR + 0x00044000)
-#define MMAP_INTC0     (CONFIG_SYS_MBAR + 0x00048000)
-#define MMAP_INTC1     (CONFIG_SYS_MBAR + 0x0004C000)
-#define MMAP_INTCACK   (CONFIG_SYS_MBAR + 0x00054000)
-#define MMAP_I2C       (CONFIG_SYS_MBAR + 0x00058000)
-#define MMAP_DSPI      (CONFIG_SYS_MBAR + 0x0005C000)
-#define MMAP_UART0     (CONFIG_SYS_MBAR + 0x00060000)
-#define MMAP_UART1     (CONFIG_SYS_MBAR + 0x00064000)
-#define MMAP_UART2     (CONFIG_SYS_MBAR + 0x00068000)
-#define MMAP_DTMR0     (CONFIG_SYS_MBAR + 0x00070000)
-#define MMAP_DTMR1     (CONFIG_SYS_MBAR + 0x00074000)
-#define MMAP_DTMR2     (CONFIG_SYS_MBAR + 0x00078000)
-#define MMAP_DTMR3     (CONFIG_SYS_MBAR + 0x0007C000)
-#define MMAP_PIT0      (CONFIG_SYS_MBAR + 0x00080000)
-#define MMAP_PIT1      (CONFIG_SYS_MBAR + 0x00084000)
-#define MMAP_PIT2      (CONFIG_SYS_MBAR + 0x00088000)
-#define MMAP_PIT3      (CONFIG_SYS_MBAR + 0x0008C000)
-#define MMAP_EPORT0    (CONFIG_SYS_MBAR + 0x00090000)
-#define MMAP_EPORT1    (CONFIG_SYS_MBAR + 0x00094000)
-#define MMAP_VOICOD    (CONFIG_SYS_MBAR + 0x0009C000)
-#define MMAP_RCM       (CONFIG_SYS_MBAR + 0x000A0000)
-#define MMAP_CCM       (CONFIG_SYS_MBAR + 0x000A0004)
-#define MMAP_GPIO      (CONFIG_SYS_MBAR + 0x000A4000)
-#define MMAP_RTC       (CONFIG_SYS_MBAR + 0x000A8000)
-#define MMAP_SIM       (CONFIG_SYS_MBAR + 0x000AC000)
-#define MMAP_USBOTG    (CONFIG_SYS_MBAR + 0x000B0000)
-#define MMAP_USBH      (CONFIG_SYS_MBAR + 0x000B4000)
-#define MMAP_SDRAM     (CONFIG_SYS_MBAR + 0x000B8000)
-#define MMAP_SSI       (CONFIG_SYS_MBAR + 0x000BC000)
-#define MMAP_PLL       (CONFIG_SYS_MBAR + 0x000C0000)
-#define MMAP_RNG       (CONFIG_SYS_MBAR + 0x000C4000)
-#define MMAP_IIM       (CONFIG_SYS_MBAR + 0x000C8000)
-#define MMAP_ESDHC     (CONFIG_SYS_MBAR + 0x000CC000)
+#define MMAP_SCM1      (CFG_SYS_MBAR + 0x00000000)
+#define MMAP_XBS       (CFG_SYS_MBAR + 0x00004000)
+#define MMAP_FBCS      (CFG_SYS_MBAR + 0x00008000)
+#define MMAP_MPU       (CFG_SYS_MBAR + 0x00014000)
+#define MMAP_FEC0      (CFG_SYS_MBAR + 0x00030000)
+#define MMAP_FEC1      (CFG_SYS_MBAR + 0x00034000)
+#define MMAP_SCM2      (CFG_SYS_MBAR + 0x00040000)
+#define MMAP_EDMA      (CFG_SYS_MBAR + 0x00044000)
+#define MMAP_INTC0     (CFG_SYS_MBAR + 0x00048000)
+#define MMAP_INTC1     (CFG_SYS_MBAR + 0x0004C000)
+#define MMAP_INTCACK   (CFG_SYS_MBAR + 0x00054000)
+#define MMAP_I2C       (CFG_SYS_MBAR + 0x00058000)
+#define MMAP_DSPI      (CFG_SYS_MBAR + 0x0005C000)
+#define MMAP_UART0     (CFG_SYS_MBAR + 0x00060000)
+#define MMAP_UART1     (CFG_SYS_MBAR + 0x00064000)
+#define MMAP_UART2     (CFG_SYS_MBAR + 0x00068000)
+#define MMAP_DTMR0     (CFG_SYS_MBAR + 0x00070000)
+#define MMAP_DTMR1     (CFG_SYS_MBAR + 0x00074000)
+#define MMAP_DTMR2     (CFG_SYS_MBAR + 0x00078000)
+#define MMAP_DTMR3     (CFG_SYS_MBAR + 0x0007C000)
+#define MMAP_PIT0      (CFG_SYS_MBAR + 0x00080000)
+#define MMAP_PIT1      (CFG_SYS_MBAR + 0x00084000)
+#define MMAP_PIT2      (CFG_SYS_MBAR + 0x00088000)
+#define MMAP_PIT3      (CFG_SYS_MBAR + 0x0008C000)
+#define MMAP_EPORT0    (CFG_SYS_MBAR + 0x00090000)
+#define MMAP_EPORT1    (CFG_SYS_MBAR + 0x00094000)
+#define MMAP_VOICOD    (CFG_SYS_MBAR + 0x0009C000)
+#define MMAP_RCM       (CFG_SYS_MBAR + 0x000A0000)
+#define MMAP_CCM       (CFG_SYS_MBAR + 0x000A0004)
+#define MMAP_GPIO      (CFG_SYS_MBAR + 0x000A4000)
+#define MMAP_RTC       (CFG_SYS_MBAR + 0x000A8000)
+#define MMAP_SIM       (CFG_SYS_MBAR + 0x000AC000)
+#define MMAP_USBOTG    (CFG_SYS_MBAR + 0x000B0000)
+#define MMAP_USBH      (CFG_SYS_MBAR + 0x000B4000)
+#define MMAP_SDRAM     (CFG_SYS_MBAR + 0x000B8000)
+#define MMAP_SSI       (CFG_SYS_MBAR + 0x000BC000)
+#define MMAP_PLL       (CFG_SYS_MBAR + 0x000C0000)
+#define MMAP_RNG       (CFG_SYS_MBAR + 0x000C4000)
+#define MMAP_IIM       (CFG_SYS_MBAR + 0x000C8000)
+#define MMAP_ESDHC     (CFG_SYS_MBAR + 0x000CC000)
 
 #include <asm/coldfire/crossbar.h>
 #include <asm/coldfire/dspi.h>
index 930e0899e8ca55369bfdda11773c87d7218f7631..d6442d95b4ba6b4e9c1c2aa8c41171254731d3f2 100644 (file)
@@ -7,15 +7,15 @@
 #ifndef __IMMAP_5307__
 #define __IMMAP_5307__
 
-#define MMAP_SIM       (CONFIG_SYS_MBAR + 0x00000000)
-#define MMAP_INTC      (CONFIG_SYS_MBAR + 0x00000040)
-#define MMAP_CSM       (CONFIG_SYS_MBAR + 0x00000080)
-#define MMAP_DRAMC     (CONFIG_SYS_MBAR + 0x00000100)
-#define MMAP_DTMR0     (CONFIG_SYS_MBAR + 0x00000140)
-#define MMAP_DTMR1     (CONFIG_SYS_MBAR + 0x00000180)
-#define MMAP_UART0     (CONFIG_SYS_MBAR + 0x000001C0)
-#define MMAP_UART1     (CONFIG_SYS_MBAR + 0x00000200)
-#define MMAP_GPIO      (CONFIG_SYS_MBAR + 0x00000244)
+#define MMAP_SIM       (CFG_SYS_MBAR + 0x00000000)
+#define MMAP_INTC      (CFG_SYS_MBAR + 0x00000040)
+#define MMAP_CSM       (CFG_SYS_MBAR + 0x00000080)
+#define MMAP_DRAMC     (CFG_SYS_MBAR + 0x00000100)
+#define MMAP_DTMR0     (CFG_SYS_MBAR + 0x00000140)
+#define MMAP_DTMR1     (CFG_SYS_MBAR + 0x00000180)
+#define MMAP_UART0     (CFG_SYS_MBAR + 0x000001C0)
+#define MMAP_UART1     (CFG_SYS_MBAR + 0x00000200)
+#define MMAP_GPIO      (CFG_SYS_MBAR + 0x00000244)
 
 typedef struct sim {
        u8  rsr;
index 9303629e4b2a8975dc5215b339ef652b3b6b699b..afafb4e547dcc8fc6546ef08195a434764fb8b83 100644 (file)
 /*
  * useful definitions for reading/writing MBAR offset memory
  */
-#define mbar_readLong(x)       *((volatile unsigned long *) (CONFIG_SYS_MBAR + x))
-#define mbar_writeLong(x,y)    *((volatile unsigned long *) (CONFIG_SYS_MBAR + x)) = y
-#define mbar_writeShort(x,y)   *((volatile unsigned short *) (CONFIG_SYS_MBAR + x)) = y
-#define mbar_writeByte(x,y)    *((volatile unsigned char *) (CONFIG_SYS_MBAR + x)) = y
-#define mbar2_readLong(x)      *((volatile unsigned long *) (CONFIG_SYS_MBAR2 + x))
-#define mbar2_writeLong(x,y)   *((volatile unsigned long *) (CONFIG_SYS_MBAR2 + x)) = y
-#define mbar2_writeShort(x,y)  *((volatile unsigned short *) (CONFIG_SYS_MBAR2 + x)) = y
-#define mbar2_writeByte(x,y)   *((volatile unsigned char *) (CONFIG_SYS_MBAR2 + x)) = y
+#define mbar_readLong(x)       *((volatile unsigned long *) (CFG_SYS_MBAR + x))
+#define mbar_writeLong(x,y)    *((volatile unsigned long *) (CFG_SYS_MBAR + x)) = y
+#define mbar_writeShort(x,y)   *((volatile unsigned short *) (CFG_SYS_MBAR + x)) = y
+#define mbar_writeByte(x,y)    *((volatile unsigned char *) (CFG_SYS_MBAR + x)) = y
+#define mbar2_readLong(x)      *((volatile unsigned long *) (CFG_SYS_MBAR2 + x))
+#define mbar2_writeLong(x,y)   *((volatile unsigned long *) (CFG_SYS_MBAR2 + x)) = y
+#define mbar2_writeShort(x,y)  *((volatile unsigned short *) (CFG_SYS_MBAR2 + x)) = y
+#define mbar2_writeByte(x,y)   *((volatile unsigned char *) (CFG_SYS_MBAR2 + x)) = y
 
 /*
  * Size of internal RAM
index 7ebeddbb683b0f7fa4ed5a5d22cb77219421e198..e63b42c00de327defada7b146da938c90f2b8546 100644 (file)
 #ifndef        _MCF5271_H_
 #define        _MCF5271_H_
 
-#define mbar_readLong(x)       *((volatile unsigned long *) (CONFIG_SYS_MBAR + x))
-#define mbar_readShort(x)      *((volatile unsigned short *) (CONFIG_SYS_MBAR + x))
-#define mbar_readByte(x)       *((volatile unsigned char *) (CONFIG_SYS_MBAR + x))
-#define mbar_writeLong(x,y)    *((volatile unsigned long *) (CONFIG_SYS_MBAR + x)) = y
-#define mbar_writeShort(x,y)   *((volatile unsigned short *) (CONFIG_SYS_MBAR + x)) = y
-#define mbar_writeByte(x,y)    *((volatile unsigned char *) (CONFIG_SYS_MBAR + x)) = y
+#define mbar_readLong(x)       *((volatile unsigned long *) (CFG_SYS_MBAR + x))
+#define mbar_readShort(x)      *((volatile unsigned short *) (CFG_SYS_MBAR + x))
+#define mbar_readByte(x)       *((volatile unsigned char *) (CFG_SYS_MBAR + x))
+#define mbar_writeLong(x,y)    *((volatile unsigned long *) (CFG_SYS_MBAR + x)) = y
+#define mbar_writeShort(x,y)   *((volatile unsigned short *) (CFG_SYS_MBAR + x)) = y
+#define mbar_writeByte(x,y)    *((volatile unsigned char *) (CFG_SYS_MBAR + x)) = y
 
 #define MCF_FMPLL_SYNCR                                0x120000
 #define MCF_FMPLL_SYNSR                                0x120004
index 0c91cf491e24c74e10c807f7e5717c08d931dc11..180f20386fc780a021f1b15d872182abb8805841 100644 (file)
 
 /* General Purpose I/O Module GPIO */
 
-#define MCFGPIO_PORTA          (*(vu_char *) (CONFIG_SYS_MBAR+0x100000))
-#define MCFGPIO_PORTB          (*(vu_char *) (CONFIG_SYS_MBAR+0x100001))
-#define MCFGPIO_PORTC          (*(vu_char *) (CONFIG_SYS_MBAR+0x100002))
-#define MCFGPIO_PORTD          (*(vu_char *) (CONFIG_SYS_MBAR+0x100003))
-#define MCFGPIO_PORTE          (*(vu_char *) (CONFIG_SYS_MBAR+0x100004))
-#define MCFGPIO_PORTF          (*(vu_char *) (CONFIG_SYS_MBAR+0x100005))
-#define MCFGPIO_PORTG          (*(vu_char *) (CONFIG_SYS_MBAR+0x100006))
-#define MCFGPIO_PORTH          (*(vu_char *) (CONFIG_SYS_MBAR+0x100007))
-#define MCFGPIO_PORTJ          (*(vu_char *) (CONFIG_SYS_MBAR+0x100008))
-#define MCFGPIO_PORTDD         (*(vu_char *) (CONFIG_SYS_MBAR+0x100009))
-#define MCFGPIO_PORTEH         (*(vu_char *) (CONFIG_SYS_MBAR+0x10000A))
-#define MCFGPIO_PORTEL         (*(vu_char *) (CONFIG_SYS_MBAR+0x10000B))
-#define MCFGPIO_PORTAS         (*(vu_char *) (CONFIG_SYS_MBAR+0x10000C))
-#define MCFGPIO_PORTQS         (*(vu_char *) (CONFIG_SYS_MBAR+0x10000D))
-#define MCFGPIO_PORTSD         (*(vu_char *) (CONFIG_SYS_MBAR+0x10000E))
-#define MCFGPIO_PORTTC         (*(vu_char *) (CONFIG_SYS_MBAR+0x10000F))
-#define MCFGPIO_PORTTD         (*(vu_char *) (CONFIG_SYS_MBAR+0x100010))
-#define MCFGPIO_PORTUA         (*(vu_char *) (CONFIG_SYS_MBAR+0x100011))
-
-#define MCFGPIO_DDRA           (*(vu_char *) (CONFIG_SYS_MBAR+0x100014))
-#define MCFGPIO_DDRB           (*(vu_char *) (CONFIG_SYS_MBAR+0x100015))
-#define MCFGPIO_DDRC           (*(vu_char *) (CONFIG_SYS_MBAR+0x100016))
-#define MCFGPIO_DDRD           (*(vu_char *) (CONFIG_SYS_MBAR+0x100017))
-#define MCFGPIO_DDRE           (*(vu_char *) (CONFIG_SYS_MBAR+0x100018))
-#define MCFGPIO_DDRF           (*(vu_char *) (CONFIG_SYS_MBAR+0x100019))
-#define MCFGPIO_DDRG           (*(vu_char *) (CONFIG_SYS_MBAR+0x10001A))
-#define MCFGPIO_DDRH           (*(vu_char *) (CONFIG_SYS_MBAR+0x10001B))
-#define MCFGPIO_DDRJ           (*(vu_char *) (CONFIG_SYS_MBAR+0x10001C))
-#define MCFGPIO_DDRDD          (*(vu_char *) (CONFIG_SYS_MBAR+0x10001D))
-#define MCFGPIO_DDREH          (*(vu_char *) (CONFIG_SYS_MBAR+0x10001E))
-#define MCFGPIO_DDREL          (*(vu_char *) (CONFIG_SYS_MBAR+0x10001F))
-#define MCFGPIO_DDRAS          (*(vu_char *) (CONFIG_SYS_MBAR+0x100020))
-#define MCFGPIO_DDRQS          (*(vu_char *) (CONFIG_SYS_MBAR+0x100021))
-#define MCFGPIO_DDRSD          (*(vu_char *) (CONFIG_SYS_MBAR+0x100022))
-#define MCFGPIO_DDRTC          (*(vu_char *) (CONFIG_SYS_MBAR+0x100023))
-#define MCFGPIO_DDRTD          (*(vu_char *) (CONFIG_SYS_MBAR+0x100024))
-#define MCFGPIO_DDRUA          (*(vu_char *) (CONFIG_SYS_MBAR+0x100025))
-
-#define MCFGPIO_PORTAP         (*(vu_char *) (CONFIG_SYS_MBAR+0x100028))
-#define MCFGPIO_PORTBP         (*(vu_char *) (CONFIG_SYS_MBAR+0x100029))
-#define MCFGPIO_PORTCP         (*(vu_char *) (CONFIG_SYS_MBAR+0x10002A))
-#define MCFGPIO_PORTDP         (*(vu_char *) (CONFIG_SYS_MBAR+0x10002B))
-#define MCFGPIO_PORTEP         (*(vu_char *) (CONFIG_SYS_MBAR+0x10002C))
-#define MCFGPIO_PORTFP         (*(vu_char *) (CONFIG_SYS_MBAR+0x10002D))
-#define MCFGPIO_PORTGP         (*(vu_char *) (CONFIG_SYS_MBAR+0x10002E))
-#define MCFGPIO_PORTHP         (*(vu_char *) (CONFIG_SYS_MBAR+0x10002F))
-#define MCFGPIO_PORTJP         (*(vu_char *) (CONFIG_SYS_MBAR+0x100030))
-#define MCFGPIO_PORTDDP                (*(vu_char *) (CONFIG_SYS_MBAR+0x100031))
-#define MCFGPIO_PORTEHP                (*(vu_char *) (CONFIG_SYS_MBAR+0x100032))
-#define MCFGPIO_PORTELP                (*(vu_char *) (CONFIG_SYS_MBAR+0x100033))
-#define MCFGPIO_PORTASP                (*(vu_char *) (CONFIG_SYS_MBAR+0x100034))
-#define MCFGPIO_PORTQSP                (*(vu_char *) (CONFIG_SYS_MBAR+0x100035))
-#define MCFGPIO_PORTSDP                (*(vu_char *) (CONFIG_SYS_MBAR+0x100036))
-#define MCFGPIO_PORTTCP                (*(vu_char *) (CONFIG_SYS_MBAR+0x100037))
-#define MCFGPIO_PORTTDP                (*(vu_char *) (CONFIG_SYS_MBAR+0x100038))
-#define MCFGPIO_PORTUAP                (*(vu_char *) (CONFIG_SYS_MBAR+0x100039))
-
-#define MCFGPIO_SETA           (*(vu_char *) (CONFIG_SYS_MBAR+0x100028))
-#define MCFGPIO_SETB           (*(vu_char *) (CONFIG_SYS_MBAR+0x100029))
-#define MCFGPIO_SETC           (*(vu_char *) (CONFIG_SYS_MBAR+0x10002A))
-#define MCFGPIO_SETD           (*(vu_char *) (CONFIG_SYS_MBAR+0x10002B))
-#define MCFGPIO_SETE           (*(vu_char *) (CONFIG_SYS_MBAR+0x10002C))
-#define MCFGPIO_SETF           (*(vu_char *) (CONFIG_SYS_MBAR+0x10002D))
-#define MCFGPIO_SETG           (*(vu_char *) (CONFIG_SYS_MBAR+0x10002E))
-#define MCFGPIO_SETH           (*(vu_char *) (CONFIG_SYS_MBAR+0x10002F))
-#define MCFGPIO_SETJ           (*(vu_char *) (CONFIG_SYS_MBAR+0x100030))
-#define MCFGPIO_SETDD          (*(vu_char *) (CONFIG_SYS_MBAR+0x100031))
-#define MCFGPIO_SETEH          (*(vu_char *) (CONFIG_SYS_MBAR+0x100032))
-#define MCFGPIO_SETEL          (*(vu_char *) (CONFIG_SYS_MBAR+0x100033))
-#define MCFGPIO_SETAS          (*(vu_char *) (CONFIG_SYS_MBAR+0x100034))
-#define MCFGPIO_SETQS          (*(vu_char *) (CONFIG_SYS_MBAR+0x100035))
-#define MCFGPIO_SETSD          (*(vu_char *) (CONFIG_SYS_MBAR+0x100036))
-#define MCFGPIO_SETTC          (*(vu_char *) (CONFIG_SYS_MBAR+0x100037))
-#define MCFGPIO_SETTD          (*(vu_char *) (CONFIG_SYS_MBAR+0x100038))
-#define MCFGPIO_SETUA          (*(vu_char *) (CONFIG_SYS_MBAR+0x100039))
-
-#define MCFGPIO_CLRA           (*(vu_char *) (CONFIG_SYS_MBAR+0x10003C))
-#define MCFGPIO_CLRB           (*(vu_char *) (CONFIG_SYS_MBAR+0x10003D))
-#define MCFGPIO_CLRC           (*(vu_char *) (CONFIG_SYS_MBAR+0x10003E))
-#define MCFGPIO_CLRD           (*(vu_char *) (CONFIG_SYS_MBAR+0x10003F))
-#define MCFGPIO_CLRE           (*(vu_char *) (CONFIG_SYS_MBAR+0x100040))
-#define MCFGPIO_CLRF           (*(vu_char *) (CONFIG_SYS_MBAR+0x100041))
-#define MCFGPIO_CLRG           (*(vu_char *) (CONFIG_SYS_MBAR+0x100042))
-#define MCFGPIO_CLRH           (*(vu_char *) (CONFIG_SYS_MBAR+0x100043))
-#define MCFGPIO_CLRJ           (*(vu_char *) (CONFIG_SYS_MBAR+0x100044))
-#define MCFGPIO_CLRDD          (*(vu_char *) (CONFIG_SYS_MBAR+0x100045))
-#define MCFGPIO_CLREH          (*(vu_char *) (CONFIG_SYS_MBAR+0x100046))
-#define MCFGPIO_CLREL          (*(vu_char *) (CONFIG_SYS_MBAR+0x100047))
-#define MCFGPIO_CLRAS          (*(vu_char *) (CONFIG_SYS_MBAR+0x100048))
-#define MCFGPIO_CLRQS          (*(vu_char *) (CONFIG_SYS_MBAR+0x100049))
-#define MCFGPIO_CLRSD          (*(vu_char *) (CONFIG_SYS_MBAR+0x10004A))
-#define MCFGPIO_CLRTC          (*(vu_char *) (CONFIG_SYS_MBAR+0x10004B))
-#define MCFGPIO_CLRTD          (*(vu_char *) (CONFIG_SYS_MBAR+0x10004C))
-#define MCFGPIO_CLRUA          (*(vu_char *) (CONFIG_SYS_MBAR+0x10004D))
-
-#define MCFGPIO_PBCDPAR        (*(vu_char *) (CONFIG_SYS_MBAR+0x100050))
-#define MCFGPIO_PFPAR          (*(vu_char *) (CONFIG_SYS_MBAR+0x100051))
-#define MCFGPIO_PEPAR          (*(vu_short *)(CONFIG_SYS_MBAR+0x100052))
-#define MCFGPIO_PJPAR          (*(vu_char *) (CONFIG_SYS_MBAR+0x100054))
-#define MCFGPIO_PSDPAR         (*(vu_char *) (CONFIG_SYS_MBAR+0x100055))
-#define MCFGPIO_PASPAR         (*(vu_short *)(CONFIG_SYS_MBAR+0x100056))
-#define MCFGPIO_PEHLPAR                (*(vu_char *) (CONFIG_SYS_MBAR+0x100058))
-#define MCFGPIO_PQSPAR         (*(vu_char *) (CONFIG_SYS_MBAR+0x100059))
-#define MCFGPIO_PTCPAR         (*(vu_char *) (CONFIG_SYS_MBAR+0x10005A))
-#define MCFGPIO_PTDPAR         (*(vu_char *) (CONFIG_SYS_MBAR+0x10005B))
-#define MCFGPIO_PUAPAR         (*(vu_char *) (CONFIG_SYS_MBAR+0x10005C))
+#define MCFGPIO_PORTA          (*(vu_char *) (CFG_SYS_MBAR+0x100000))
+#define MCFGPIO_PORTB          (*(vu_char *) (CFG_SYS_MBAR+0x100001))
+#define MCFGPIO_PORTC          (*(vu_char *) (CFG_SYS_MBAR+0x100002))
+#define MCFGPIO_PORTD          (*(vu_char *) (CFG_SYS_MBAR+0x100003))
+#define MCFGPIO_PORTE          (*(vu_char *) (CFG_SYS_MBAR+0x100004))
+#define MCFGPIO_PORTF          (*(vu_char *) (CFG_SYS_MBAR+0x100005))
+#define MCFGPIO_PORTG          (*(vu_char *) (CFG_SYS_MBAR+0x100006))
+#define MCFGPIO_PORTH          (*(vu_char *) (CFG_SYS_MBAR+0x100007))
+#define MCFGPIO_PORTJ          (*(vu_char *) (CFG_SYS_MBAR+0x100008))
+#define MCFGPIO_PORTDD         (*(vu_char *) (CFG_SYS_MBAR+0x100009))
+#define MCFGPIO_PORTEH         (*(vu_char *) (CFG_SYS_MBAR+0x10000A))
+#define MCFGPIO_PORTEL         (*(vu_char *) (CFG_SYS_MBAR+0x10000B))
+#define MCFGPIO_PORTAS         (*(vu_char *) (CFG_SYS_MBAR+0x10000C))
+#define MCFGPIO_PORTQS         (*(vu_char *) (CFG_SYS_MBAR+0x10000D))
+#define MCFGPIO_PORTSD         (*(vu_char *) (CFG_SYS_MBAR+0x10000E))
+#define MCFGPIO_PORTTC         (*(vu_char *) (CFG_SYS_MBAR+0x10000F))
+#define MCFGPIO_PORTTD         (*(vu_char *) (CFG_SYS_MBAR+0x100010))
+#define MCFGPIO_PORTUA         (*(vu_char *) (CFG_SYS_MBAR+0x100011))
+
+#define MCFGPIO_DDRA           (*(vu_char *) (CFG_SYS_MBAR+0x100014))
+#define MCFGPIO_DDRB           (*(vu_char *) (CFG_SYS_MBAR+0x100015))
+#define MCFGPIO_DDRC           (*(vu_char *) (CFG_SYS_MBAR+0x100016))
+#define MCFGPIO_DDRD           (*(vu_char *) (CFG_SYS_MBAR+0x100017))
+#define MCFGPIO_DDRE           (*(vu_char *) (CFG_SYS_MBAR+0x100018))
+#define MCFGPIO_DDRF           (*(vu_char *) (CFG_SYS_MBAR+0x100019))
+#define MCFGPIO_DDRG           (*(vu_char *) (CFG_SYS_MBAR+0x10001A))
+#define MCFGPIO_DDRH           (*(vu_char *) (CFG_SYS_MBAR+0x10001B))
+#define MCFGPIO_DDRJ           (*(vu_char *) (CFG_SYS_MBAR+0x10001C))
+#define MCFGPIO_DDRDD          (*(vu_char *) (CFG_SYS_MBAR+0x10001D))
+#define MCFGPIO_DDREH          (*(vu_char *) (CFG_SYS_MBAR+0x10001E))
+#define MCFGPIO_DDREL          (*(vu_char *) (CFG_SYS_MBAR+0x10001F))
+#define MCFGPIO_DDRAS          (*(vu_char *) (CFG_SYS_MBAR+0x100020))
+#define MCFGPIO_DDRQS          (*(vu_char *) (CFG_SYS_MBAR+0x100021))
+#define MCFGPIO_DDRSD          (*(vu_char *) (CFG_SYS_MBAR+0x100022))
+#define MCFGPIO_DDRTC          (*(vu_char *) (CFG_SYS_MBAR+0x100023))
+#define MCFGPIO_DDRTD          (*(vu_char *) (CFG_SYS_MBAR+0x100024))
+#define MCFGPIO_DDRUA          (*(vu_char *) (CFG_SYS_MBAR+0x100025))
+
+#define MCFGPIO_PORTAP         (*(vu_char *) (CFG_SYS_MBAR+0x100028))
+#define MCFGPIO_PORTBP         (*(vu_char *) (CFG_SYS_MBAR+0x100029))
+#define MCFGPIO_PORTCP         (*(vu_char *) (CFG_SYS_MBAR+0x10002A))
+#define MCFGPIO_PORTDP         (*(vu_char *) (CFG_SYS_MBAR+0x10002B))
+#define MCFGPIO_PORTEP         (*(vu_char *) (CFG_SYS_MBAR+0x10002C))
+#define MCFGPIO_PORTFP         (*(vu_char *) (CFG_SYS_MBAR+0x10002D))
+#define MCFGPIO_PORTGP         (*(vu_char *) (CFG_SYS_MBAR+0x10002E))
+#define MCFGPIO_PORTHP         (*(vu_char *) (CFG_SYS_MBAR+0x10002F))
+#define MCFGPIO_PORTJP         (*(vu_char *) (CFG_SYS_MBAR+0x100030))
+#define MCFGPIO_PORTDDP                (*(vu_char *) (CFG_SYS_MBAR+0x100031))
+#define MCFGPIO_PORTEHP                (*(vu_char *) (CFG_SYS_MBAR+0x100032))
+#define MCFGPIO_PORTELP                (*(vu_char *) (CFG_SYS_MBAR+0x100033))
+#define MCFGPIO_PORTASP                (*(vu_char *) (CFG_SYS_MBAR+0x100034))
+#define MCFGPIO_PORTQSP                (*(vu_char *) (CFG_SYS_MBAR+0x100035))
+#define MCFGPIO_PORTSDP                (*(vu_char *) (CFG_SYS_MBAR+0x100036))
+#define MCFGPIO_PORTTCP                (*(vu_char *) (CFG_SYS_MBAR+0x100037))
+#define MCFGPIO_PORTTDP                (*(vu_char *) (CFG_SYS_MBAR+0x100038))
+#define MCFGPIO_PORTUAP                (*(vu_char *) (CFG_SYS_MBAR+0x100039))
+
+#define MCFGPIO_SETA           (*(vu_char *) (CFG_SYS_MBAR+0x100028))
+#define MCFGPIO_SETB           (*(vu_char *) (CFG_SYS_MBAR+0x100029))
+#define MCFGPIO_SETC           (*(vu_char *) (CFG_SYS_MBAR+0x10002A))
+#define MCFGPIO_SETD           (*(vu_char *) (CFG_SYS_MBAR+0x10002B))
+#define MCFGPIO_SETE           (*(vu_char *) (CFG_SYS_MBAR+0x10002C))
+#define MCFGPIO_SETF           (*(vu_char *) (CFG_SYS_MBAR+0x10002D))
+#define MCFGPIO_SETG           (*(vu_char *) (CFG_SYS_MBAR+0x10002E))
+#define MCFGPIO_SETH           (*(vu_char *) (CFG_SYS_MBAR+0x10002F))
+#define MCFGPIO_SETJ           (*(vu_char *) (CFG_SYS_MBAR+0x100030))
+#define MCFGPIO_SETDD          (*(vu_char *) (CFG_SYS_MBAR+0x100031))
+#define MCFGPIO_SETEH          (*(vu_char *) (CFG_SYS_MBAR+0x100032))
+#define MCFGPIO_SETEL          (*(vu_char *) (CFG_SYS_MBAR+0x100033))
+#define MCFGPIO_SETAS          (*(vu_char *) (CFG_SYS_MBAR+0x100034))
+#define MCFGPIO_SETQS          (*(vu_char *) (CFG_SYS_MBAR+0x100035))
+#define MCFGPIO_SETSD          (*(vu_char *) (CFG_SYS_MBAR+0x100036))
+#define MCFGPIO_SETTC          (*(vu_char *) (CFG_SYS_MBAR+0x100037))
+#define MCFGPIO_SETTD          (*(vu_char *) (CFG_SYS_MBAR+0x100038))
+#define MCFGPIO_SETUA          (*(vu_char *) (CFG_SYS_MBAR+0x100039))
+
+#define MCFGPIO_CLRA           (*(vu_char *) (CFG_SYS_MBAR+0x10003C))
+#define MCFGPIO_CLRB           (*(vu_char *) (CFG_SYS_MBAR+0x10003D))
+#define MCFGPIO_CLRC           (*(vu_char *) (CFG_SYS_MBAR+0x10003E))
+#define MCFGPIO_CLRD           (*(vu_char *) (CFG_SYS_MBAR+0x10003F))
+#define MCFGPIO_CLRE           (*(vu_char *) (CFG_SYS_MBAR+0x100040))
+#define MCFGPIO_CLRF           (*(vu_char *) (CFG_SYS_MBAR+0x100041))
+#define MCFGPIO_CLRG           (*(vu_char *) (CFG_SYS_MBAR+0x100042))
+#define MCFGPIO_CLRH           (*(vu_char *) (CFG_SYS_MBAR+0x100043))
+#define MCFGPIO_CLRJ           (*(vu_char *) (CFG_SYS_MBAR+0x100044))
+#define MCFGPIO_CLRDD          (*(vu_char *) (CFG_SYS_MBAR+0x100045))
+#define MCFGPIO_CLREH          (*(vu_char *) (CFG_SYS_MBAR+0x100046))
+#define MCFGPIO_CLREL          (*(vu_char *) (CFG_SYS_MBAR+0x100047))
+#define MCFGPIO_CLRAS          (*(vu_char *) (CFG_SYS_MBAR+0x100048))
+#define MCFGPIO_CLRQS          (*(vu_char *) (CFG_SYS_MBAR+0x100049))
+#define MCFGPIO_CLRSD          (*(vu_char *) (CFG_SYS_MBAR+0x10004A))
+#define MCFGPIO_CLRTC          (*(vu_char *) (CFG_SYS_MBAR+0x10004B))
+#define MCFGPIO_CLRTD          (*(vu_char *) (CFG_SYS_MBAR+0x10004C))
+#define MCFGPIO_CLRUA          (*(vu_char *) (CFG_SYS_MBAR+0x10004D))
+
+#define MCFGPIO_PBCDPAR        (*(vu_char *) (CFG_SYS_MBAR+0x100050))
+#define MCFGPIO_PFPAR          (*(vu_char *) (CFG_SYS_MBAR+0x100051))
+#define MCFGPIO_PEPAR          (*(vu_short *)(CFG_SYS_MBAR+0x100052))
+#define MCFGPIO_PJPAR          (*(vu_char *) (CFG_SYS_MBAR+0x100054))
+#define MCFGPIO_PSDPAR         (*(vu_char *) (CFG_SYS_MBAR+0x100055))
+#define MCFGPIO_PASPAR         (*(vu_short *)(CFG_SYS_MBAR+0x100056))
+#define MCFGPIO_PEHLPAR                (*(vu_char *) (CFG_SYS_MBAR+0x100058))
+#define MCFGPIO_PQSPAR         (*(vu_char *) (CFG_SYS_MBAR+0x100059))
+#define MCFGPIO_PTCPAR         (*(vu_char *) (CFG_SYS_MBAR+0x10005A))
+#define MCFGPIO_PTDPAR         (*(vu_char *) (CFG_SYS_MBAR+0x10005B))
+#define MCFGPIO_PUAPAR         (*(vu_char *) (CFG_SYS_MBAR+0x10005C))
 
 /* Bit level definitions and macros */
 #define MCFGPIO_PORT7                  (0x80)
 
 /* System Conrol Module SCM */
 
-#define MCFSCM_RAMBAR          (*(vu_long *) (CONFIG_SYS_MBAR+0x00000008))
-#define MCFSCM_CRSR            (*(vu_char *) (CONFIG_SYS_MBAR+0x00000010))
-#define MCFSCM_CWCR            (*(vu_char *) (CONFIG_SYS_MBAR+0x00000011))
-#define MCFSCM_LPICR           (*(vu_char *) (CONFIG_SYS_MBAR+0x00000012))
-#define MCFSCM_CWSR            (*(vu_char *) (CONFIG_SYS_MBAR+0x00000013))
-
-#define MCFSCM_MPARK           (*(vu_long *) (CONFIG_SYS_MBAR+0x0000001C))
-#define MCFSCM_MPR             (*(vu_char *) (CONFIG_SYS_MBAR+0x00000020))
-#define MCFSCM_PACR0           (*(vu_char *) (CONFIG_SYS_MBAR+0x00000024))
-#define MCFSCM_PACR1           (*(vu_char *) (CONFIG_SYS_MBAR+0x00000025))
-#define MCFSCM_PACR2           (*(vu_char *) (CONFIG_SYS_MBAR+0x00000026))
-#define MCFSCM_PACR3           (*(vu_char *) (CONFIG_SYS_MBAR+0x00000027))
-#define MCFSCM_PACR4           (*(vu_char *) (CONFIG_SYS_MBAR+0x00000028))
-#define MCFSCM_PACR5           (*(vu_char *) (CONFIG_SYS_MBAR+0x0000002A))
-#define MCFSCM_PACR6           (*(vu_char *) (CONFIG_SYS_MBAR+0x0000002B))
-#define MCFSCM_PACR7           (*(vu_char *) (CONFIG_SYS_MBAR+0x0000002C))
-#define MCFSCM_PACR8           (*(vu_char *) (CONFIG_SYS_MBAR+0x0000002E))
-#define MCFSCM_GPACR0          (*(vu_char *) (CONFIG_SYS_MBAR+0x00000030))
-#define MCFSCM_GPACR1          (*(vu_char *) (CONFIG_SYS_MBAR+0x00000031))
+#define MCFSCM_RAMBAR          (*(vu_long *) (CFG_SYS_MBAR+0x00000008))
+#define MCFSCM_CRSR            (*(vu_char *) (CFG_SYS_MBAR+0x00000010))
+#define MCFSCM_CWCR            (*(vu_char *) (CFG_SYS_MBAR+0x00000011))
+#define MCFSCM_LPICR           (*(vu_char *) (CFG_SYS_MBAR+0x00000012))
+#define MCFSCM_CWSR            (*(vu_char *) (CFG_SYS_MBAR+0x00000013))
+
+#define MCFSCM_MPARK           (*(vu_long *) (CFG_SYS_MBAR+0x0000001C))
+#define MCFSCM_MPR             (*(vu_char *) (CFG_SYS_MBAR+0x00000020))
+#define MCFSCM_PACR0           (*(vu_char *) (CFG_SYS_MBAR+0x00000024))
+#define MCFSCM_PACR1           (*(vu_char *) (CFG_SYS_MBAR+0x00000025))
+#define MCFSCM_PACR2           (*(vu_char *) (CFG_SYS_MBAR+0x00000026))
+#define MCFSCM_PACR3           (*(vu_char *) (CFG_SYS_MBAR+0x00000027))
+#define MCFSCM_PACR4           (*(vu_char *) (CFG_SYS_MBAR+0x00000028))
+#define MCFSCM_PACR5           (*(vu_char *) (CFG_SYS_MBAR+0x0000002A))
+#define MCFSCM_PACR6           (*(vu_char *) (CFG_SYS_MBAR+0x0000002B))
+#define MCFSCM_PACR7           (*(vu_char *) (CFG_SYS_MBAR+0x0000002C))
+#define MCFSCM_PACR8           (*(vu_char *) (CFG_SYS_MBAR+0x0000002E))
+#define MCFSCM_GPACR0          (*(vu_char *) (CFG_SYS_MBAR+0x00000030))
+#define MCFSCM_GPACR1          (*(vu_char *) (CFG_SYS_MBAR+0x00000031))
 
 #define MCFSCM_CRSR_EXT                (0x80)
 #define MCFSCM_CRSR_CWDR       (0x20)
 
 /* Reset Controller Module RCM */
 
-#define MCFRESET_RCR           (*(vu_char *) (CONFIG_SYS_MBAR+0x00110000))
-#define MCFRESET_RSR           (*(vu_char *) (CONFIG_SYS_MBAR+0x00110001))
+#define MCFRESET_RCR           (*(vu_char *) (CFG_SYS_MBAR+0x00110000))
+#define MCFRESET_RSR           (*(vu_char *) (CFG_SYS_MBAR+0x00110001))
 
 #define MCFRESET_RCR_SOFTRST   (0x80)
 #define MCFRESET_RCR_FRCRSTOUT (0x40)
 
 /* Chip Configuration Module CCM */
 
-#define MCFCCM_CCR             (*(vu_short *)(CONFIG_SYS_MBAR+0x00110004))
-#define MCFCCM_RCON            (*(vu_short *)(CONFIG_SYS_MBAR+0x00110008))
-#define MCFCCM_CIR             (*(vu_short *)(CONFIG_SYS_MBAR+0x0011000A))
+#define MCFCCM_CCR             (*(vu_short *)(CFG_SYS_MBAR+0x00110004))
+#define MCFCCM_RCON            (*(vu_short *)(CFG_SYS_MBAR+0x00110008))
+#define MCFCCM_CIR             (*(vu_short *)(CFG_SYS_MBAR+0x0011000A))
 
 /* Bit level definitions and macros */
 #define MCFCCM_CCR_LOAD                (0x8000)
 
 /* Clock Module */
 
-#define MCFCLOCK_SYNCR         (*(vu_short *)(CONFIG_SYS_MBAR+0x120000))
-#define MCFCLOCK_SYNSR         (*(vu_char *) (CONFIG_SYS_MBAR+0x120002))
+#define MCFCLOCK_SYNCR         (*(vu_short *)(CFG_SYS_MBAR+0x120000))
+#define MCFCLOCK_SYNSR         (*(vu_char *) (CFG_SYS_MBAR+0x120002))
 
 #define MCFCLOCK_SYNCR_MFD(x)  (((x)&0x0007)<<12)
 #define MCFCLOCK_SYNCR_RFD(x)  (((x)&0x0007)<<8)
 #define MCFCLOCK_SYNSR_LOCK    0x08
 
-#define MCFSDRAMC_DCR          (*(vu_short *)(CONFIG_SYS_MBAR+0x00000040))
-#define MCFSDRAMC_DACR0                (*(vu_long *) (CONFIG_SYS_MBAR+0x00000048))
-#define MCFSDRAMC_DMR0         (*(vu_long *) (CONFIG_SYS_MBAR+0x0000004c))
-#define MCFSDRAMC_DACR1                (*(vu_long *) (CONFIG_SYS_MBAR+0x00000050))
-#define MCFSDRAMC_DMR1         (*(vu_long *) (CONFIG_SYS_MBAR+0x00000054))
+#define MCFSDRAMC_DCR          (*(vu_short *)(CFG_SYS_MBAR+0x00000040))
+#define MCFSDRAMC_DACR0                (*(vu_long *) (CFG_SYS_MBAR+0x00000048))
+#define MCFSDRAMC_DMR0         (*(vu_long *) (CFG_SYS_MBAR+0x0000004c))
+#define MCFSDRAMC_DACR1                (*(vu_long *) (CFG_SYS_MBAR+0x00000050))
+#define MCFSDRAMC_DMR1         (*(vu_long *) (CFG_SYS_MBAR+0x00000054))
 
 #define MCFSDRAMC_DCR_NAM      (0x2000)
 #define MCFSDRAMC_DCR_COC      (0x1000)
 #define MCFSDRAMC_DMR_UD       (0x00000002)
 #define MCFSDRAMC_DMR_V                (0x00000001)
 
-#define MCFWTM_WCR             (*(vu_short *)(CONFIG_SYS_MBAR+0x00140000))
-#define MCFWTM_WMR             (*(vu_short *)(CONFIG_SYS_MBAR+0x00140002))
-#define MCFWTM_WCNTR           (*(vu_short *)(CONFIG_SYS_MBAR+0x00140004))
-#define MCFWTM_WSR             (*(vu_short *)(CONFIG_SYS_MBAR+0x00140006))
+#define MCFWTM_WCR             (*(vu_short *)(CFG_SYS_MBAR+0x00140000))
+#define MCFWTM_WMR             (*(vu_short *)(CFG_SYS_MBAR+0x00140002))
+#define MCFWTM_WCNTR           (*(vu_short *)(CFG_SYS_MBAR+0x00140004))
+#define MCFWTM_WSR             (*(vu_short *)(CFG_SYS_MBAR+0x00140006))
 
 /*********************************************************************
 * General Purpose Timer (GPT) Module
 *********************************************************************/
 
-#define MCFGPTA_GPTIOS         (*(vu_char *)(CONFIG_SYS_MBAR+0x1A0000))
-#define MCFGPTA_GPTCFORC       (*(vu_char *)(CONFIG_SYS_MBAR+0x1A0001))
-#define MCFGPTA_GPTOC3M                (*(vu_char *)(CONFIG_SYS_MBAR+0x1A0002))
-#define MCFGPTA_GPTOC3D                (*(vu_char *)(CONFIG_SYS_MBAR+0x1A0003))
-#define MCFGPTA_GPTCNT         (*(vu_short *)(CONFIG_SYS_MBAR+0x1A0004))
-#define MCFGPTA_GPTSCR1                (*(vu_char *)(CONFIG_SYS_MBAR+0x1A0006))
-#define MCFGPTA_GPTTOV         (*(vu_char *)(CONFIG_SYS_MBAR+0x1A0008))
-#define MCFGPTA_GPTCTL1                (*(vu_char *)(CONFIG_SYS_MBAR+0x1A0009))
-#define MCFGPTA_GPTCTL2                (*(vu_char *)(CONFIG_SYS_MBAR+0x1A000B))
-#define MCFGPTA_GPTIE          (*(vu_char *)(CONFIG_SYS_MBAR+0x1A000C))
-#define MCFGPTA_GPTSCR2                (*(vu_char *)(CONFIG_SYS_MBAR+0x1A000D))
-#define MCFGPTA_GPTFLG1                (*(vu_char *)(CONFIG_SYS_MBAR+0x1A000E))
-#define MCFGPTA_GPTFLG2                (*(vu_char *)(CONFIG_SYS_MBAR+0x1A000F))
-#define MCFGPTA_GPTC0          (*(vu_short *)(CONFIG_SYS_MBAR+0x1A0010))
-#define MCFGPTA_GPTC1          (*(vu_short *)(CONFIG_SYS_MBAR+0x1A0012))
-#define MCFGPTA_GPTC2          (*(vu_short *)(CONFIG_SYS_MBAR+0x1A0014))
-#define MCFGPTA_GPTC3          (*(vu_short *)(CONFIG_SYS_MBAR+0x1A0016))
-#define MCFGPTA_GPTPACTL       (*(vu_char *)(CONFIG_SYS_MBAR+0x1A0018))
-#define MCFGPTA_GPTPAFLG       (*(vu_char *)(CONFIG_SYS_MBAR+0x1A0019))
-#define MCFGPTA_GPTPACNT       (*(vu_short *)(CONFIG_SYS_MBAR+0x1A001A))
-#define MCFGPTA_GPTPORT                (*(vu_char *)(CONFIG_SYS_MBAR+0x1A001D))
-#define MCFGPTA_GPTDDR         (*(vu_char *)(CONFIG_SYS_MBAR+0x1A001E))
-
-#define MCFGPTB_GPTIOS         (*(vu_char *)(CONFIG_SYS_MBAR+0x1B0000))
-#define MCFGPTB_GPTCFORC       (*(vu_char *)(CONFIG_SYS_MBAR+0x1B0001))
-#define MCFGPTB_GPTOC3M                (*(vu_char *)(CONFIG_SYS_MBAR+0x1B0002))
-#define MCFGPTB_GPTOC3D                (*(vu_char *)(CONFIG_SYS_MBAR+0x1B0003))
-#define MCFGPTB_GPTCNT         (*(vu_short *)(CONFIG_SYS_MBAR+0x1B0004))
-#define MCFGPTB_GPTSCR1                (*(vu_char *)(CONFIG_SYS_MBAR+0x1B0006))
-#define MCFGPTB_GPTTOV         (*(vu_char *)(CONFIG_SYS_MBAR+0x1B0008))
-#define MCFGPTB_GPTCTL1                (*(vu_char *)(CONFIG_SYS_MBAR+0x1B0009))
-#define MCFGPTB_GPTCTL2                (*(vu_char *)(CONFIG_SYS_MBAR+0x1B000B))
-#define MCFGPTB_GPTIE          (*(vu_char *)(CONFIG_SYS_MBAR+0x1B000C))
-#define MCFGPTB_GPTSCR2                (*(vu_char *)(CONFIG_SYS_MBAR+0x1B000D))
-#define MCFGPTB_GPTFLG1                (*(vu_char *)(CONFIG_SYS_MBAR+0x1B000E))
-#define MCFGPTB_GPTFLG2                (*(vu_char *)(CONFIG_SYS_MBAR+0x1B000F))
-#define MCFGPTB_GPTC0          (*(vu_short *)(CONFIG_SYS_MBAR+0x1B0010))
-#define MCFGPTB_GPTC1          (*(vu_short *)(CONFIG_SYS_MBAR+0x1B0012))
-#define MCFGPTB_GPTC2          (*(vu_short *)(CONFIG_SYS_MBAR+0x1B0014))
-#define MCFGPTB_GPTC3          (*(vu_short *)(CONFIG_SYS_MBAR+0x1B0016))
-#define MCFGPTB_GPTPACTL       (*(vu_char *)(CONFIG_SYS_MBAR+0x1B0018))
-#define MCFGPTB_GPTPAFLG       (*(vu_char *)(CONFIG_SYS_MBAR+0x1B0019))
-#define MCFGPTB_GPTPACNT       (*(vu_short *)(CONFIG_SYS_MBAR+0x1B001A))
-#define MCFGPTB_GPTPORT                (*(vu_char *)(CONFIG_SYS_MBAR+0x1B001D))
-#define MCFGPTB_GPTDDR         (*(vu_char *)(CONFIG_SYS_MBAR+0x1B001E))
+#define MCFGPTA_GPTIOS         (*(vu_char *)(CFG_SYS_MBAR+0x1A0000))
+#define MCFGPTA_GPTCFORC       (*(vu_char *)(CFG_SYS_MBAR+0x1A0001))
+#define MCFGPTA_GPTOC3M                (*(vu_char *)(CFG_SYS_MBAR+0x1A0002))
+#define MCFGPTA_GPTOC3D                (*(vu_char *)(CFG_SYS_MBAR+0x1A0003))
+#define MCFGPTA_GPTCNT         (*(vu_short *)(CFG_SYS_MBAR+0x1A0004))
+#define MCFGPTA_GPTSCR1                (*(vu_char *)(CFG_SYS_MBAR+0x1A0006))
+#define MCFGPTA_GPTTOV         (*(vu_char *)(CFG_SYS_MBAR+0x1A0008))
+#define MCFGPTA_GPTCTL1                (*(vu_char *)(CFG_SYS_MBAR+0x1A0009))
+#define MCFGPTA_GPTCTL2                (*(vu_char *)(CFG_SYS_MBAR+0x1A000B))
+#define MCFGPTA_GPTIE          (*(vu_char *)(CFG_SYS_MBAR+0x1A000C))
+#define MCFGPTA_GPTSCR2                (*(vu_char *)(CFG_SYS_MBAR+0x1A000D))
+#define MCFGPTA_GPTFLG1                (*(vu_char *)(CFG_SYS_MBAR+0x1A000E))
+#define MCFGPTA_GPTFLG2                (*(vu_char *)(CFG_SYS_MBAR+0x1A000F))
+#define MCFGPTA_GPTC0          (*(vu_short *)(CFG_SYS_MBAR+0x1A0010))
+#define MCFGPTA_GPTC1          (*(vu_short *)(CFG_SYS_MBAR+0x1A0012))
+#define MCFGPTA_GPTC2          (*(vu_short *)(CFG_SYS_MBAR+0x1A0014))
+#define MCFGPTA_GPTC3          (*(vu_short *)(CFG_SYS_MBAR+0x1A0016))
+#define MCFGPTA_GPTPACTL       (*(vu_char *)(CFG_SYS_MBAR+0x1A0018))
+#define MCFGPTA_GPTPAFLG       (*(vu_char *)(CFG_SYS_MBAR+0x1A0019))
+#define MCFGPTA_GPTPACNT       (*(vu_short *)(CFG_SYS_MBAR+0x1A001A))
+#define MCFGPTA_GPTPORT                (*(vu_char *)(CFG_SYS_MBAR+0x1A001D))
+#define MCFGPTA_GPTDDR         (*(vu_char *)(CFG_SYS_MBAR+0x1A001E))
+
+#define MCFGPTB_GPTIOS         (*(vu_char *)(CFG_SYS_MBAR+0x1B0000))
+#define MCFGPTB_GPTCFORC       (*(vu_char *)(CFG_SYS_MBAR+0x1B0001))
+#define MCFGPTB_GPTOC3M                (*(vu_char *)(CFG_SYS_MBAR+0x1B0002))
+#define MCFGPTB_GPTOC3D                (*(vu_char *)(CFG_SYS_MBAR+0x1B0003))
+#define MCFGPTB_GPTCNT         (*(vu_short *)(CFG_SYS_MBAR+0x1B0004))
+#define MCFGPTB_GPTSCR1                (*(vu_char *)(CFG_SYS_MBAR+0x1B0006))
+#define MCFGPTB_GPTTOV         (*(vu_char *)(CFG_SYS_MBAR+0x1B0008))
+#define MCFGPTB_GPTCTL1                (*(vu_char *)(CFG_SYS_MBAR+0x1B0009))
+#define MCFGPTB_GPTCTL2                (*(vu_char *)(CFG_SYS_MBAR+0x1B000B))
+#define MCFGPTB_GPTIE          (*(vu_char *)(CFG_SYS_MBAR+0x1B000C))
+#define MCFGPTB_GPTSCR2                (*(vu_char *)(CFG_SYS_MBAR+0x1B000D))
+#define MCFGPTB_GPTFLG1                (*(vu_char *)(CFG_SYS_MBAR+0x1B000E))
+#define MCFGPTB_GPTFLG2                (*(vu_char *)(CFG_SYS_MBAR+0x1B000F))
+#define MCFGPTB_GPTC0          (*(vu_short *)(CFG_SYS_MBAR+0x1B0010))
+#define MCFGPTB_GPTC1          (*(vu_short *)(CFG_SYS_MBAR+0x1B0012))
+#define MCFGPTB_GPTC2          (*(vu_short *)(CFG_SYS_MBAR+0x1B0014))
+#define MCFGPTB_GPTC3          (*(vu_short *)(CFG_SYS_MBAR+0x1B0016))
+#define MCFGPTB_GPTPACTL       (*(vu_char *)(CFG_SYS_MBAR+0x1B0018))
+#define MCFGPTB_GPTPAFLG       (*(vu_char *)(CFG_SYS_MBAR+0x1B0019))
+#define MCFGPTB_GPTPACNT       (*(vu_short *)(CFG_SYS_MBAR+0x1B001A))
+#define MCFGPTB_GPTPORT                (*(vu_char *)(CFG_SYS_MBAR+0x1B001D))
+#define MCFGPTB_GPTDDR         (*(vu_char *)(CFG_SYS_MBAR+0x1B001E))
 
 /* Bit level definitions and macros */
 #define MCFGPT_GPTIOS_IOS3             (0x08)
 
 /* Coldfire Flash Module CFM */
 
-#define MCFCFM_MCR                     (*(vu_short *)(CONFIG_SYS_MBAR+0x1D0000))
+#define MCFCFM_MCR                     (*(vu_short *)(CFG_SYS_MBAR+0x1D0000))
 #define MCFCFM_MCR_LOCK                        (0x0400)
 #define MCFCFM_MCR_PVIE                        (0x0200)
 #define MCFCFM_MCR_AEIE                        (0x0100)
 #define MCFCFM_MCR_CCIE                        (0x0040)
 #define MCFCFM_MCR_KEYACC              (0x0020)
 
-#define MCFCFM_CLKD                    (*(vu_char *)(CONFIG_SYS_MBAR+0x1D0002))
+#define MCFCFM_CLKD                    (*(vu_char *)(CFG_SYS_MBAR+0x1D0002))
 
-#define MCFCFM_SEC                     (*(vu_long*) (CONFIG_SYS_MBAR+0x1D0008))
+#define MCFCFM_SEC                     (*(vu_long*) (CFG_SYS_MBAR+0x1D0008))
 #define MCFCFM_SEC_KEYEN               (0x80000000)
 #define MCFCFM_SEC_SECSTAT             (0x40000000)
 
-#define MCFCFM_PROT                    (*(vu_long*) (CONFIG_SYS_MBAR+0x1D0010))
-#define MCFCFM_SACC                    (*(vu_long*) (CONFIG_SYS_MBAR+0x1D0014))
-#define MCFCFM_DACC                    (*(vu_long*) (CONFIG_SYS_MBAR+0x1D0018))
-#define MCFCFM_USTAT                   (*(vu_char*) (CONFIG_SYS_MBAR+0x1D0020))
+#define MCFCFM_PROT                    (*(vu_long*) (CFG_SYS_MBAR+0x1D0010))
+#define MCFCFM_SACC                    (*(vu_long*) (CFG_SYS_MBAR+0x1D0014))
+#define MCFCFM_DACC                    (*(vu_long*) (CFG_SYS_MBAR+0x1D0018))
+#define MCFCFM_USTAT                   (*(vu_char*) (CFG_SYS_MBAR+0x1D0020))
 #define MCFCFM_USTAT_CBEIF             0x80
 #define MCFCFM_USTAT_CCIF              0x40
 #define MCFCFM_USTAT_PVIOL             0x20
 #define MCFCFM_USTAT_ACCERR            0x10
 #define MCFCFM_USTAT_BLANK             0x04
 
-#define MCFCFM_CMD                     (*(vu_char*) (CONFIG_SYS_MBAR+0x1D0024))
+#define MCFCFM_CMD                     (*(vu_char*) (CFG_SYS_MBAR+0x1D0024))
 #define MCFCFM_CMD_ERSVER              0x05
 #define MCFCFM_CMD_PGERSVER            0x06
 #define MCFCFM_CMD_PGM                 0x20
index 7eca6725a65824a557015526838ea5bf0cd47793..0b4629f1c8a777c05d7b499c07b35f1ad6b26a78 100644 (file)
@@ -16,7 +16,7 @@ int arch_setup_bdinfo(void)
 {
        struct bd_info *bd = gd->bd;
 
-       bd->bi_mbar_base = CONFIG_SYS_MBAR; /* base of internal registers */
+       bd->bi_mbar_base = CFG_SYS_MBAR; /* base of internal registers */
 
        bd->bi_intfreq = gd->cpu_clk;   /* Internal Freq, in Hz */
        bd->bi_busfreq = gd->bus_clk;   /* Bus Freq,      in Hz */
@@ -38,7 +38,7 @@ void arch_print_bdinfo(void)
        struct bd_info *bd = gd->bd;
 
        bdinfo_print_mhz("busfreq", bd->bi_busfreq);
-#if defined(CONFIG_SYS_MBAR)
+#if defined(CFG_SYS_MBAR)
        bdinfo_print_num_l("mbar", bd->bi_mbar_base);
 #endif
        bdinfo_print_mhz("cpufreq", bd->bi_intfreq);
index aa2b93e0e0fb4c9a2abfc072f1c74ddb0b982793..4ddda69f5a38e3c6105e9f534d8777d754823055 100644 (file)
@@ -34,18 +34,18 @@ void icache_enable(void)
        *cf_icache_status = 1;
 
 #if defined(CONFIG_CF_V4) || defined(CONFIG_CF_V4E)
-       __asm__ __volatile__("movec %0, %%acr2"::"r"(CONFIG_SYS_CACHE_ACR2));
+       __asm__ __volatile__("movec %0, %%acr2"::"r"(CFG_SYS_CACHE_ACR2));
        __asm__ __volatile__("movec %0, %%acr3"::"r"(CONFIG_SYS_CACHE_ACR3));
 #if defined(CONFIG_CF_V4E)
        __asm__ __volatile__("movec %0, %%acr6"::"r"(CONFIG_SYS_CACHE_ACR6));
        __asm__ __volatile__("movec %0, %%acr7"::"r"(CONFIG_SYS_CACHE_ACR7));
 #endif
 #else
-       __asm__ __volatile__("movec %0, %%acr0"::"r"(CONFIG_SYS_CACHE_ACR0));
-       __asm__ __volatile__("movec %0, %%acr1"::"r"(CONFIG_SYS_CACHE_ACR1));
+       __asm__ __volatile__("movec %0, %%acr0"::"r"(CFG_SYS_CACHE_ACR0));
+       __asm__ __volatile__("movec %0, %%acr1"::"r"(CFG_SYS_CACHE_ACR1));
 #endif
 
-       __asm__ __volatile__("movec %0, %%cacr"::"r"(CONFIG_SYS_CACHE_ICACR));
+       __asm__ __volatile__("movec %0, %%cacr"::"r"(CFG_SYS_CACHE_ICACR));
 }
 
 void icache_disable(void)
@@ -72,9 +72,9 @@ void icache_invalid(void)
 {
        u32 temp;
 
-       temp = CONFIG_SYS_ICACHE_INV;
+       temp = CFG_SYS_ICACHE_INV;
        if (*cf_icache_status)
-               temp |= CONFIG_SYS_CACHE_ICACR;
+               temp |= CFG_SYS_CACHE_ICACR;
 
        __asm__ __volatile__("movec %0, %%cacr"::"r"(temp));
 }
@@ -89,15 +89,15 @@ void dcache_enable(void)
        *cf_dcache_status = 1;
 
 #if defined(CONFIG_CF_V4) || defined(CONFIG_CF_V4E)
-       __asm__ __volatile__("movec %0, %%acr0"::"r"(CONFIG_SYS_CACHE_ACR0));
-       __asm__ __volatile__("movec %0, %%acr1"::"r"(CONFIG_SYS_CACHE_ACR1));
+       __asm__ __volatile__("movec %0, %%acr0"::"r"(CFG_SYS_CACHE_ACR0));
+       __asm__ __volatile__("movec %0, %%acr1"::"r"(CFG_SYS_CACHE_ACR1));
 #if defined(CONFIG_CF_V4E)
        __asm__ __volatile__("movec %0, %%acr4"::"r"(CONFIG_SYS_CACHE_ACR4));
        __asm__ __volatile__("movec %0, %%acr5"::"r"(CONFIG_SYS_CACHE_ACR5));
 #endif
 #endif
 
-       __asm__ __volatile__("movec %0, %%cacr"::"r"(CONFIG_SYS_CACHE_DCACR));
+       __asm__ __volatile__("movec %0, %%cacr"::"r"(CFG_SYS_CACHE_DCACR));
 }
 
 void dcache_disable(void)
@@ -124,11 +124,11 @@ void dcache_invalid(void)
 #if defined(CONFIG_CF_V4) || defined(CONFIG_CF_V4E)
        u32 temp;
 
-       temp = CONFIG_SYS_DCACHE_INV;
+       temp = CFG_SYS_DCACHE_INV;
        if (*cf_dcache_status)
-               temp |= CONFIG_SYS_CACHE_DCACR;
+               temp |= CFG_SYS_CACHE_DCACR;
        if (*cf_icache_status)
-               temp |= CONFIG_SYS_CACHE_ICACR;
+               temp |= CFG_SYS_CACHE_ICACR;
 
        __asm__ __volatile__("movec %0, %%cacr"::"r"(temp));
 #endif
index 6b9f253952a16da6e7c54c866601d6bca0865753..7063f32610b720dbc7078358da0f405cb10dbdc5 100644 (file)
@@ -19,7 +19,7 @@
 
 #ifndef CONFIG_SYS_INIT_SP_ADDR
 #define CONFIG_SYS_INIT_SP_ADDR        (CFG_SYS_SDRAM_BASE + \
-                               CONFIG_SYS_INIT_SP_OFFSET)
+                               CFG_SYS_INIT_SP_OFFSET)
 #endif
 
 #define SP_ADDR_TEMP           0xbe10dff0
index 33835eeec2a86443815ba2826d696eee42ff2cce..63c2729411c771fcbbfd9bc0b6fbba253a49e82c 100644 (file)
@@ -77,10 +77,10 @@ void cpu_init_f (volatile immap_t * im)
 #ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */
                SCCR_TSECCM |
 #endif
-#ifdef CONFIG_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
+#ifdef CFG_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
                SCCR_TSEC1CM |
 #endif
-#ifdef CONFIG_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
+#ifdef CFG_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
                SCCR_TSEC2CM |
 #endif
 #ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */
@@ -92,10 +92,10 @@ void cpu_init_f (volatile immap_t * im)
 #ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */
                SCCR_USBMPHCM |
 #endif
-#ifdef CONFIG_SYS_SCCR_USBDRCM /* USB DR clock mode */
+#ifdef CFG_SYS_SCCR_USBDRCM /* USB DR clock mode */
                SCCR_USBDRCM |
 #endif
-#ifdef CONFIG_SYS_SCCR_SATACM /* SATA controller clock mode */
+#ifdef CFG_SYS_SCCR_SATACM /* SATA controller clock mode */
                SCCR_SATACM |
 #endif
                0;
@@ -115,11 +115,11 @@ void cpu_init_f (volatile immap_t * im)
 #ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */
                (CONFIG_SYS_SCCR_TSECCM << SCCR_TSECCM_SHIFT) |
 #endif
-#ifdef CONFIG_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
-               (CONFIG_SYS_SCCR_TSEC1CM << SCCR_TSEC1CM_SHIFT) |
+#ifdef CFG_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
+               (CFG_SYS_SCCR_TSEC1CM << SCCR_TSEC1CM_SHIFT) |
 #endif
-#ifdef CONFIG_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
-               (CONFIG_SYS_SCCR_TSEC2CM << SCCR_TSEC2CM_SHIFT) |
+#ifdef CFG_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
+               (CFG_SYS_SCCR_TSEC2CM << SCCR_TSEC2CM_SHIFT) |
 #endif
 #ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */
                (CONFIG_SYS_SCCR_TSEC1ON << SCCR_TSEC1ON_SHIFT) |
@@ -130,11 +130,11 @@ void cpu_init_f (volatile immap_t * im)
 #ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */
                (CONFIG_SYS_SCCR_USBMPHCM << SCCR_USBMPHCM_SHIFT) |
 #endif
-#ifdef CONFIG_SYS_SCCR_USBDRCM /* USB DR clock mode */
-               (CONFIG_SYS_SCCR_USBDRCM << SCCR_USBDRCM_SHIFT) |
+#ifdef CFG_SYS_SCCR_USBDRCM /* USB DR clock mode */
+               (CFG_SYS_SCCR_USBDRCM << SCCR_USBDRCM_SHIFT) |
 #endif
-#ifdef CONFIG_SYS_SCCR_SATACM /* SATA controller clock mode */
-               (CONFIG_SYS_SCCR_SATACM << SCCR_SATACM_SHIFT) |
+#ifdef CFG_SYS_SCCR_SATACM /* SATA controller clock mode */
+               (CFG_SYS_SCCR_SATACM << SCCR_SATACM_SHIFT) |
 #endif
                0;
 
@@ -175,26 +175,26 @@ void cpu_init_f (volatile immap_t * im)
        setbits_be32(&im->sysconf.spcr, SPCR_TBEN);
 
        /* System General Purpose Register */
-#ifdef CONFIG_SYS_SICRH
+#ifdef CFG_SYS_SICRH
 #if defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC8313)
        /* regarding to MPC34x manual rev.1 bits 28..29 must be preserved */
-       __raw_writel((im->sysconf.sicrh & 0x0000000C) | CONFIG_SYS_SICRH,
+       __raw_writel((im->sysconf.sicrh & 0x0000000C) | CFG_SYS_SICRH,
                     &im->sysconf.sicrh);
 #else
-       __raw_writel(CONFIG_SYS_SICRH, &im->sysconf.sicrh);
+       __raw_writel(CFG_SYS_SICRH, &im->sysconf.sicrh);
 #endif
 #endif
-#ifdef CONFIG_SYS_SICRL
-       __raw_writel(CONFIG_SYS_SICRL, &im->sysconf.sicrl);
+#ifdef CFG_SYS_SICRL
+       __raw_writel(CFG_SYS_SICRL, &im->sysconf.sicrl);
 #endif
-#ifdef CONFIG_SYS_GPR1
-       __raw_writel(CONFIG_SYS_GPR1, &im->sysconf.gpr1);
+#ifdef CFG_SYS_GPR1
+       __raw_writel(CFG_SYS_GPR1, &im->sysconf.gpr1);
 #endif
-#ifdef CONFIG_SYS_DDRCDR /* DDR control driver register */
-       __raw_writel(CONFIG_SYS_DDRCDR, &im->sysconf.ddrcdr);
+#ifdef CFG_SYS_DDRCDR /* DDR control driver register */
+       __raw_writel(CFG_SYS_DDRCDR, &im->sysconf.ddrcdr);
 #endif
-#ifdef CONFIG_SYS_OBIR /* Output buffer impedance register */
-       __raw_writel(CONFIG_SYS_OBIR, &im->sysconf.obir);
+#ifdef CFG_SYS_OBIR /* Output buffer impedance register */
+       __raw_writel(CFG_SYS_OBIR, &im->sysconf.obir);
 #endif
 
 #if !defined(CONFIG_PINCTRL)
index 6d1c6b055c6b6bda47d4382b48086e444bd20cce..4f982b8303ae5ef7f7b9966cfed2e25a684c6802 100644 (file)
@@ -59,9 +59,9 @@ void board_add_ram_info(int use_default)
 
        printf(", %s MHz)", strmhz(buf, gd->mem_clk));
 
-#if defined(CONFIG_SYS_LB_SDRAM) && defined(CONFIG_SYS_LBC_SDRAM_SIZE)
+#if defined(CONFIG_SYS_LB_SDRAM) && defined(CFG_SYS_LBC_SDRAM_SIZE)
        puts("\nSDRAM: ");
-       print_size (CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, " (local bus)");
+       print_size (CFG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, " (local bus)");
 #endif
 }
 
@@ -204,12 +204,12 @@ long int spd_sdram()
                return 0;
        }
 
-#ifdef CONFIG_SYS_DDRCDR_VALUE
+#ifdef CFG_SYS_DDRCDR_VALUE
        /*
         * Adjust DDR II IO voltage biasing.  It just makes it work.
         */
        if(spd.mem_type == SPD_MEMTYPE_DDR2) {
-               immap->sysconf.ddrcdr = CONFIG_SYS_DDRCDR_VALUE;
+               immap->sysconf.ddrcdr = CFG_SYS_DDRCDR_VALUE;
        }
        udelay(50000);
 #endif
@@ -693,7 +693,7 @@ long int spd_sdram()
                ddr->sdram_mode =
                        (0
                         | (1 << (16 + 10))             /* DQS Differential disable */
-#ifdef CONFIG_SYS_DDR_MODE_WEAK
+#ifdef CFG_SYS_DDR_MODE_WEAK
                         | (1 << (16 + 1))              /* weak driver (~60%) */
 #endif
                         | (add_lat << (16 + 3))        /* Additive Latency in EMRS1 */
@@ -767,8 +767,8 @@ long int spd_sdram()
                debug("DDR: sdram_cfg2  = 0x%08x\n", ddr->sdram_cfg2);
        }
 
-#ifdef CONFIG_SYS_DDR_SDRAM_CLK_CNTL   /* Optional platform specific value */
-       ddr->sdram_clk_cntl = CONFIG_SYS_DDR_SDRAM_CLK_CNTL;
+#ifdef CFG_SYS_DDR_SDRAM_CLK_CNTL      /* Optional platform specific value */
+       ddr->sdram_clk_cntl = CFG_SYS_DDR_SDRAM_CLK_CNTL;
 #endif
        debug("DDR:sdram_clk_cntl=0x%08x\n", ddr->sdram_clk_cntl);
 
index 8fcf20854ed948876f19d57b4b2cdaa60974461c..7cc0383afbfc102826f931ad057362dfe5467a4e 100644 (file)
@@ -54,12 +54,12 @@ void cpu_init_f (volatile immap_t * im)
        im->sysconf.spcr |= SPCR_TBEN;
 
        /* DDR control driver register */
-#ifdef CONFIG_SYS_DDRCDR
-       im->sysconf.ddrcdr = CONFIG_SYS_DDRCDR;
+#ifdef CFG_SYS_DDRCDR
+       im->sysconf.ddrcdr = CFG_SYS_DDRCDR;
 #endif
        /* Output buffer impedance register */
-#ifdef CONFIG_SYS_OBIR
-       im->sysconf.obir = CONFIG_SYS_OBIR;
+#ifdef CFG_SYS_OBIR
+       im->sysconf.obir = CFG_SYS_OBIR;
 #endif
 
        /*
index 8a351b927c056f2cba1fefe44c1284918981cbd9..52326f0ec1556adc5cf98f5bf19aefeb381fccc9 100644 (file)
@@ -246,7 +246,7 @@ in_flash:
 
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
 
-#if CONFIG_VAL(SYS_MALLOC_F_LEN) + GENERATED_GBL_DATA_SIZE > CONFIG_SYS_INIT_RAM_SIZE
+#if CONFIG_VAL(SYS_MALLOC_F_LEN) + GENERATED_GBL_DATA_SIZE > CFG_SYS_INIT_RAM_SIZE
 #error "SYS_MALLOC_F_LEN too large to fit into initial RAM."
 #endif
 
@@ -486,7 +486,7 @@ init_e300_core: /* time t 10 */
 #if defined(CONFIG_WATCHDOG)
        /* Initialise the Watchdog values and reset it (if req) */
        /*------------------------------------------------------*/
-       lis r4, CONFIG_SYS_WATCHDOG_VALUE
+       lis r4, CFG_SYS_WATCHDOG_VALUE
        ori r4, r4, (SWCRR_SWEN | SWCRR_SWRI | SWCRR_SWPR)
        stw r4, SWCRR(r3)
 
@@ -1048,10 +1048,10 @@ trap_init:
 lock_ram_in_cache:
        /* Allocate Initial RAM in data cache.
         */
-       lis     r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@h
-       ori     r3, r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@l
-       li      r4, ((CONFIG_SYS_INIT_RAM_SIZE & ~31) + \
-                    (CONFIG_SYS_INIT_RAM_ADDR & 31) + 31) / 32
+       lis     r3, (CFG_SYS_INIT_RAM_ADDR & ~31)@h
+       ori     r3, r3, (CFG_SYS_INIT_RAM_ADDR & ~31)@l
+       li      r4, ((CFG_SYS_INIT_RAM_SIZE & ~31) + \
+                    (CFG_SYS_INIT_RAM_ADDR & 31) + 31) / 32
        mtctr   r4
 1:
        dcbz    r0, r3
@@ -1070,10 +1070,10 @@ lock_ram_in_cache:
 .globl unlock_ram_in_cache
 unlock_ram_in_cache:
        /* invalidate the INIT_RAM section */
-       lis     r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@h
-       ori     r3, r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@l
-       li      r4, ((CONFIG_SYS_INIT_RAM_SIZE & ~31) + \
-                    (CONFIG_SYS_INIT_RAM_ADDR & 31) + 31) / 32
+       lis     r3, (CFG_SYS_INIT_RAM_ADDR & ~31)@h
+       ori     r3, r3, (CFG_SYS_INIT_RAM_ADDR & ~31)@l
+       li      r4, ((CFG_SYS_INIT_RAM_SIZE & ~31) + \
+                    (CFG_SYS_INIT_RAM_ADDR & 31) + 31) / 32
        mtctr   r4
 1:     icbi    r0, r3
        dcbi    r0, r3
@@ -1122,14 +1122,14 @@ map_flash_by_law1:
         * LBIU Local Access Widow 0 will not cover this memory space.  So, we
         * need another window to map in it.
         */
-       lis r4, (CONFIG_SYS_FLASH_BASE)@h
-       ori r4, r4, (CONFIG_SYS_FLASH_BASE)@l
-       stw r4, LBLAWBAR1(r3) /* LBLAWBAR1 <= CONFIG_SYS_FLASH_BASE */
+       lis r4, (CFG_SYS_FLASH_BASE)@h
+       ori r4, r4, (CFG_SYS_FLASH_BASE)@l
+       stw r4, LBLAWBAR1(r3) /* LBLAWBAR1 <= CFG_SYS_FLASH_BASE */
 
-       /* Store 0x80000012 + log2(CONFIG_SYS_FLASH_SIZE) into LBLAWAR1 */
+       /* Store 0x80000012 + log2(CFG_SYS_FLASH_SIZE) into LBLAWAR1 */
        lis r4, (0x80000012)@h
        ori r4, r4, (0x80000012)@l
-       li r5, CONFIG_SYS_FLASH_SIZE
+       li r5, CFG_SYS_FLASH_SIZE
 1:     srawi. r5, r5, 1        /* r5 = r5 >> 1 */
        addi r4, r4, 1
        bne 1b
@@ -1150,24 +1150,24 @@ remap_flash_by_law0:
        lwz r4, BR0(r3)
        li  r5, 0x7FFF
        and r4, r4, r5
-       lis r5, (CONFIG_SYS_FLASH_BASE & 0xFFFF8000)@h
-       ori r5, r5, (CONFIG_SYS_FLASH_BASE & 0xFFFF8000)@l
+       lis r5, (CFG_SYS_FLASH_BASE & 0xFFFF8000)@h
+       ori r5, r5, (CFG_SYS_FLASH_BASE & 0xFFFF8000)@l
        or  r5, r5, r4
-       stw r5, BR0(r3) /* r5 <= (CONFIG_SYS_FLASH_BASE & 0xFFFF8000) | (BR0 & 0x00007FFF) */
+       stw r5, BR0(r3) /* r5 <= (CFG_SYS_FLASH_BASE & 0xFFFF8000) | (BR0 & 0x00007FFF) */
 
        lwz r4, OR0(r3)
-       lis r5, ~((CONFIG_SYS_FLASH_SIZE << 4) - 1)
+       lis r5, ~((CFG_SYS_FLASH_SIZE << 4) - 1)
        or r4, r4, r5
        stw r4, OR0(r3)
 
-       lis r4, (CONFIG_SYS_FLASH_BASE)@h
-       ori r4, r4, (CONFIG_SYS_FLASH_BASE)@l
-       stw r4, LBLAWBAR0(r3) /* LBLAWBAR0 <= CONFIG_SYS_FLASH_BASE */
+       lis r4, (CFG_SYS_FLASH_BASE)@h
+       ori r4, r4, (CFG_SYS_FLASH_BASE)@l
+       stw r4, LBLAWBAR0(r3) /* LBLAWBAR0 <= CFG_SYS_FLASH_BASE */
 
-       /* Store 0x80000012 + log2(CONFIG_SYS_FLASH_SIZE) into LBLAWAR0 */
+       /* Store 0x80000012 + log2(CFG_SYS_FLASH_SIZE) into LBLAWAR0 */
        lis r4, (0x80000012)@h
        ori r4, r4, (0x80000012)@l
-       li r5, CONFIG_SYS_FLASH_SIZE
+       li r5, CFG_SYS_FLASH_SIZE
 1:     srawi. r5, r5, 1 /* r5 = r5 >> 1 */
        addi r4, r4, 1
        bne 1b
index f8c2f104c1b9fc566848a23f541631b7c03040c4..b2f98074fc068ef44dc0e6b5ee809e4888c07844 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef CONFIG_ARCH_MPC8308
 
-#ifndef CONFIG_SYS_SICRL
-#define CONFIG_SYS_SICRL (\
+#ifndef CFG_SYS_SICRL
+#define CFG_SYS_SICRL (\
        CONFIG_SICRL_SPI |\
        CONFIG_SICRL_UART |\
        CONFIG_SICRL_IRQ |\
@@ -10,8 +10,8 @@
 )
 #endif
 
-#ifndef CONFIG_SYS_SICRH
-#define CONFIG_SYS_SICRH (\
+#ifndef CFG_SYS_SICRH
+#define CFG_SYS_SICRH (\
        CONFIG_SICRH_ESDHC_A |\
        CONFIG_SICRH_ESDHC_B |\
        CONFIG_SICRH_ESDHC_C |\
index 3dccc0e1068e6c9e05c6f27dd4a1cfcb664dbd0e..013a171ed87b04d7afea841a91f06d34c2c6e499 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/fsl_liodn.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
        SET_QP_INFO(1, 27, 1, 0),
        SET_QP_INFO(2, 28, 1, 0),
index ed890114ec48c8ff034227a1c847e1b6e965993b..c7d473d4a1b43dea063f7d0f4ba5f2dba75e0ed0 100644 (file)
@@ -23,7 +23,7 @@
  */
 static void check_erratum_a4849(uint32_t svr)
 {
-       void __iomem *dcsr = (void *)CONFIG_SYS_DCSRBAR + 0xb0000;
+       void __iomem *dcsr = (void *)CFG_SYS_DCSRBAR + 0xb0000;
        unsigned int i;
 
 #if defined(CONFIG_ARCH_P2041) || defined(CONFIG_ARCH_P3041)
@@ -120,7 +120,7 @@ static void check_erratum_a4580(uint32_t svr)
  */
 static void check_erratum_a007212(void)
 {
-       u32 __iomem *plldgdcr = (void *)(CONFIG_SYS_DCSRBAR + 0x21c20);
+       u32 __iomem *plldgdcr = (void *)(CFG_SYS_DCSRBAR + 0x21c20);
 
        if (in_be32(plldgdcr) & 0x1fe) {
                /* check if PLL ratio is set by workaround */
index 6acd31d284791f7a684911608df57d463bdc60a6..74ad7483dc101b746eb24c4ed3f85f0a6ecda3a9 100644 (file)
@@ -417,7 +417,7 @@ void print_reginfo(void)
 /* Common ddr init for non-corenet fsl 85xx platforms */
 #ifndef CONFIG_FSL_CORENET
 #if (defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_SPL)) && \
-       !defined(CONFIG_SYS_INIT_L2_ADDR)
+       !defined(CFG_SYS_INIT_L2_ADDR)
 int dram_init(void)
 {
 #if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD) || \
@@ -486,7 +486,7 @@ int dram_init(void)
 #endif /* CONFIG_SYS_RAMBOOT */
 #endif
 
-#if CONFIG_POST & CONFIG_SYS_POST_MEMORY
+#if CONFIG_POST & CFG_SYS_POST_MEMORY
 
 /* Board-specific functions defined in each board's ddr.c */
 void fsl_ddr_get_spd(generic_spd_eeprom_t *ctrl_dimms_spd,
@@ -591,7 +591,7 @@ static void dump_spd_ddr_reg(void)
 /* invalid the TLBs for DDR and setup new ones to cover p_addr */
 static int reset_tlb(phys_addr_t p_addr, u32 size, phys_addr_t *phys_offset)
 {
-       u32 vstart = CONFIG_SYS_DDR_SDRAM_BASE;
+       u32 vstart = CFG_SYS_DDR_SDRAM_BASE;
        unsigned long epn;
        u32 tsize, valid, ptr;
        int ddr_esel;
@@ -624,8 +624,8 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
        phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED);
 
 #if !defined(CONFIG_PHYS_64BIT) || \
-    !defined(CONFIG_SYS_INIT_RAM_ADDR_PHYS) || \
-       (CONFIG_SYS_INIT_RAM_ADDR_PHYS < 0x100000000ull)
+    !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \
+       (CFG_SYS_INIT_RAM_ADDR_PHYS < 0x100000000ull)
                test_cap = p_size;
 #else
                test_cap = gd->ram_size;
@@ -635,7 +635,7 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
                p_size = min(test_cap - p_addr, CONFIG_MAX_MEM_MAPPED);
                if (reset_tlb(p_addr, p_size, phys_offset) == -1)
                        return -1;
-               *vstart = CONFIG_SYS_DDR_SDRAM_BASE;
+               *vstart = CFG_SYS_DDR_SDRAM_BASE;
                *size = (u32) p_size;
                printf("Testing 0x%08llx - 0x%08llx\n",
                        (u64)(*vstart) + (*phys_offset),
@@ -651,13 +651,13 @@ int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
        phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED);
 
-       *vstart = CONFIG_SYS_DDR_SDRAM_BASE;
+       *vstart = CFG_SYS_DDR_SDRAM_BASE;
        *size = (u32) p_size;   /* CONFIG_MAX_MEM_MAPPED < 4G */
        *phys_offset = 0;
 
 #if !defined(CONFIG_PHYS_64BIT) || \
-    !defined(CONFIG_SYS_INIT_RAM_ADDR_PHYS) || \
-       (CONFIG_SYS_INIT_RAM_ADDR_PHYS < 0x100000000ull)
+    !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \
+       (CFG_SYS_INIT_RAM_ADDR_PHYS < 0x100000000ull)
                if (gd->ram_size > CONFIG_MAX_MEM_MAPPED) {
                        puts("Cannot test more than ");
                        print_size(CONFIG_MAX_MEM_MAPPED,
index 2c320b202ea222fe1a01dbb9e80ecf155bfbda5c..f07e8ab388e8fb9f1f8086604a21c21658a60757 100644 (file)
@@ -165,7 +165,7 @@ void disable_cpc_sram(void)
        for (i = 0; i < CFG_SYS_NUM_CPC; i++, cpc++) {
                if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN) {
                        /* find and disable LAW of SRAM */
-                       struct law_entry law = find_law(CONFIG_SYS_INIT_L3_ADDR);
+                       struct law_entry law = find_law(CFG_SYS_INIT_L3_ADDR);
 
                        if (law.index == -1) {
                                printf("\nFatal error happened\n");
@@ -315,15 +315,15 @@ void fsl_erratum_a007212_workaround(void)
 {
        ccsr_gur_t __iomem *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
        u32 ddr_pll_ratio;
-       u32 __iomem *plldgdcr1 = (void *)(CONFIG_SYS_DCSRBAR + 0x21c20);
-       u32 __iomem *plldadcr1 = (void *)(CONFIG_SYS_DCSRBAR + 0x21c28);
-       u32 __iomem *dpdovrcr4 = (void *)(CONFIG_SYS_DCSRBAR + 0x21e80);
+       u32 __iomem *plldgdcr1 = (void *)(CFG_SYS_DCSRBAR + 0x21c20);
+       u32 __iomem *plldadcr1 = (void *)(CFG_SYS_DCSRBAR + 0x21c28);
+       u32 __iomem *dpdovrcr4 = (void *)(CFG_SYS_DCSRBAR + 0x21e80);
 #if (CONFIG_SYS_NUM_DDR_CTLRS >= 2)
-       u32 __iomem *plldgdcr2 = (void *)(CONFIG_SYS_DCSRBAR + 0x21c40);
-       u32 __iomem *plldadcr2 = (void *)(CONFIG_SYS_DCSRBAR + 0x21c48);
+       u32 __iomem *plldgdcr2 = (void *)(CFG_SYS_DCSRBAR + 0x21c40);
+       u32 __iomem *plldadcr2 = (void *)(CFG_SYS_DCSRBAR + 0x21c48);
 #if (CONFIG_SYS_NUM_DDR_CTLRS >= 3)
-       u32 __iomem *plldgdcr3 = (void *)(CONFIG_SYS_DCSRBAR + 0x21c60);
-       u32 __iomem *plldadcr3 = (void *)(CONFIG_SYS_DCSRBAR + 0x21c68);
+       u32 __iomem *plldgdcr3 = (void *)(CFG_SYS_DCSRBAR + 0x21c60);
+       u32 __iomem *plldadcr3 = (void *)(CFG_SYS_DCSRBAR + 0x21c68);
 #endif
 #endif
        /*
@@ -378,7 +378,7 @@ void fsl_erratum_a007212_workaround(void)
 ulong cpu_init_f(void)
 {
        extern void m8560_cpm_reset (void);
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
+#ifdef CFG_SYS_DCSRBAR_PHYS
        ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
 #endif
 #if defined(CONFIG_NXP_ESBC) && !defined(CONFIG_SYS_RAMBOOT)
@@ -403,7 +403,7 @@ ulong cpu_init_f(void)
 
 #if defined(CONFIG_NXP_ESBC) && !defined(CONFIG_SYS_RAMBOOT)
        /* Disable the LAW created for NOR flash by the PBI commands */
-       law = find_law(CONFIG_SYS_PBI_FLASH_BASE);
+       law = find_law(CFG_SYS_PBI_FLASH_BASE);
        if (law.index != -1)
                disable_law(law.index);
 
@@ -430,7 +430,7 @@ ulong cpu_init_f(void)
        /* Invalidate the CPC before DDR gets enabled */
        invalidate_cpc();
 
- #ifdef CONFIG_SYS_DCSRBAR_PHYS
+ #ifdef CFG_SYS_DCSRBAR_PHYS
        /* set DCSRCR so that DCSR space is 1G */
        setbits_be32(&gur->dcsrcr, FSL_CORENET_DCSR_SZ_1G);
        in_be32(&gur->dcsrcr);
@@ -533,7 +533,7 @@ int l2cache_init(void)
        asm("msync;isync");
        cache_ctl = l2cache->l2ctl;
 
-#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L2_ADDR)
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CFG_SYS_INIT_L2_ADDR)
        if (cache_ctl & MPC85xx_L2CTL_L2E) {
                /* Clear L2 SRAM memory-mapped base address */
                out_be32(&l2cache->l2srbar0, 0x0);
@@ -590,15 +590,15 @@ int l2cache_init(void)
 
        if (l2cache->l2ctl & MPC85xx_L2CTL_L2E) {
                puts("already enabled");
-#if defined(CONFIG_SYS_INIT_L2_ADDR) && defined(CONFIG_SYS_FLASH_BASE)
+#if defined(CFG_SYS_INIT_L2_ADDR) && defined(CFG_SYS_FLASH_BASE)
                u32 l2srbar = l2cache->l2srbar0;
                if (l2cache->l2ctl & MPC85xx_L2CTL_L2SRAM_ENTIRE
-                               && l2srbar >= CONFIG_SYS_FLASH_BASE) {
-                       l2srbar = CONFIG_SYS_INIT_L2_ADDR;
+                               && l2srbar >= CFG_SYS_FLASH_BASE) {
+                       l2srbar = CFG_SYS_INIT_L2_ADDR;
                        l2cache->l2srbar0 = l2srbar;
-                       printf(", moving to 0x%08x", CONFIG_SYS_INIT_L2_ADDR);
+                       printf(", moving to 0x%08x", CFG_SYS_INIT_L2_ADDR);
                }
-#endif /* CONFIG_SYS_INIT_L2_ADDR */
+#endif /* CFG_SYS_INIT_L2_ADDR */
                puts("\n");
        } else {
                asm("msync;isync");
@@ -625,9 +625,9 @@ int l2cache_init(void)
 #endif
 
        /* enable the cache */
-       mtspr(SPRN_L2CSR0, CONFIG_SYS_INIT_L2CSR0);
+       mtspr(SPRN_L2CSR0, CFG_SYS_INIT_L2CSR0);
 
-       if (CONFIG_SYS_INIT_L2CSR0 & L2CSR0_L2E) {
+       if (CFG_SYS_INIT_L2CSR0 & L2CSR0_L2E) {
                while (!(mfspr(SPRN_L2CSR0) & L2CSR0_L2E))
                        ;
                print_size((l2cfg0 & 0x3fff) * 64 * 1024, " enabled\n");
@@ -656,7 +656,7 @@ skip_l2:
 int cpu_init_r(void)
 {
        __maybe_unused u32 svr = get_svr();
-#ifdef CONFIG_SYS_LBC_LCRR
+#ifdef CFG_SYS_LBC_LCRR
        fsl_lbc_t *lbc = (void __iomem *)LBC_BASE_ADDR;
 #endif
 #if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
@@ -763,13 +763,13 @@ int cpu_init_r(void)
 #ifdef CONFIG_SYS_FSL_ERRATUM_A005871
        if (IS_SVR_REV(svr, 1, 0)) {
                int i;
-               __be32 *p = (void __iomem *)CONFIG_SYS_DCSRBAR + 0xb004c;
+               __be32 *p = (void __iomem *)CFG_SYS_DCSRBAR + 0xb004c;
 
                for (i = 0; i < 12; i++) {
                        p += i + (i > 5 ? 11 : 0);
                        out_be32(p, 0x2);
                }
-               p = (void __iomem *)CONFIG_SYS_DCSRBAR + 0xb0108;
+               p = (void __iomem *)CFG_SYS_DCSRBAR + 0xb0108;
                out_be32(p, 0x34);
        }
 #endif
@@ -799,18 +799,18 @@ int cpu_init_r(void)
        {
                if (SVR_MAJ(svr) < 3) {
                        void *p;
-                       p = (void *)CONFIG_SYS_DCSRBAR + 0x20520;
+                       p = (void *)CFG_SYS_DCSRBAR + 0x20520;
                        setbits_be32(p, 1 << (31 - 14));
                }
        }
 #endif
 
-#ifdef CONFIG_SYS_LBC_LCRR
+#ifdef CFG_SYS_LBC_LCRR
        /*
         * Modify the CLKDIV field of LCRR register to improve the writing
         * speed for NOR flash.
         */
-       clrsetbits_be32(&lbc->lcrr, LCRR_CLKDIV, CONFIG_SYS_LBC_LCRR);
+       clrsetbits_be32(&lbc->lcrr, LCRR_CLKDIV, CFG_SYS_LBC_LCRR);
        __raw_readl(&lbc->lcrr);
        isync();
 #ifdef CONFIG_SYS_FSL_ERRATUM_NMG_LBC103
@@ -850,7 +850,7 @@ int cpu_init_r(void)
         */
        if (IS_SVR_REV(get_svr(), 1, 0)) {
                struct dcsr_dcfg_regs *dcfg = (struct dcsr_dcfg_regs *)
-                       (CONFIG_SYS_DCSRBAR + CONFIG_SYS_DCSR_DCFG_OFFSET);
+                       (CFG_SYS_DCSRBAR + CFG_SYS_DCSR_DCFG_OFFSET);
                setbits_be32(&dcfg->ecccr1,
                                (DCSR_DCFG_ECC_DISABLE_USB1 |
                                 DCSR_DCFG_ECC_DISABLE_USB2));
index 18bfa2aed14ea4b8bdd1dab8ec366235b5e1d83a..a67f37e3af96eb23b5f9f9c693bbce6e369f2786 100644 (file)
@@ -17,15 +17,15 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_A003399_NOR_WORKAROUND
 void setup_ifc(void)
 {
-       struct fsl_ifc ifc_regs = {(void *)CONFIG_SYS_IFC_ADDR, (void *)NULL};
+       struct fsl_ifc ifc_regs = {(void *)CFG_SYS_IFC_ADDR, (void *)NULL};
        u32 _mas0, _mas1, _mas2, _mas3, _mas7;
-       phys_addr_t flash_phys = CONFIG_SYS_FLASH_BASE_PHYS;
+       phys_addr_t flash_phys = CFG_SYS_FLASH_BASE_PHYS;
 
        /*
         * Adjust the TLB we were running out of to match the phys addr of the
         * chip select we are adjusting and will return to.
         */
-       flash_phys += (~CONFIG_SYS_AMASK0) + 1 - 4*1024*1024;
+       flash_phys += (~CFG_SYS_AMASK0) + 1 - 4*1024*1024;
 
        _mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(15);
        _mas1 = MAS1_VALID | MAS1_TID(0) | MAS1_TS | MAS1_IPROT |
@@ -52,7 +52,7 @@ void setup_ifc(void)
  *
  * TLB entry is created for IVPR + IVOR15 to map on valid OP code address
  * bacause flash's physical address is going to change as
- * CONFIG_SYS_FLASH_BASE_PHYS.
+ * CFG_SYS_FLASH_BASE_PHYS.
  */
        _mas0 = MAS0_TLBSEL(1) |
                        MAS0_ESEL(CONFIG_SYS_PPC_E500_DEBUG_TLB);
@@ -72,9 +72,9 @@ void setup_ifc(void)
 #endif
 
        /* Change flash's physical address */
-       ifc_out32(&(ifc_regs.gregs->cspr_cs[0].cspr), CONFIG_SYS_CSPR0);
-       ifc_out32(&(ifc_regs.gregs->csor_cs[0].csor), CONFIG_SYS_CSOR0);
-       ifc_out32(&(ifc_regs.gregs->amask_cs[0].amask), CONFIG_SYS_AMASK0);
+       ifc_out32(&(ifc_regs.gregs->cspr_cs[0].cspr), CFG_SYS_CSPR0);
+       ifc_out32(&(ifc_regs.gregs->csor_cs[0].csor), CFG_SYS_CSOR0);
+       ifc_out32(&(ifc_regs.gregs->amask_cs[0].amask), CFG_SYS_AMASK0);
 
        return;
 }
@@ -101,7 +101,7 @@ void cpu_init_early_f(void *fdt)
 
 #ifdef CONFIG_ARCH_QEMU_E500
        /*
-        * CONFIG_SYS_CCSRBAR_PHYS below may use gd->fdt_blob on ePAPR systems,
+        * CFG_SYS_CCSRBAR_PHYS below may use gd->fdt_blob on ePAPR systems,
         * so we need to populate it before it accesses it.
         */
        gd->fdt_blob = fdt;
@@ -109,9 +109,9 @@ void cpu_init_early_f(void *fdt)
 
        mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(13);
        mas1 = MAS1_VALID | MAS1_TID(0) | MAS1_TS | MAS1_TSIZE(BOOKE_PAGESZ_1M);
-       mas2 = FSL_BOOKE_MAS2(CONFIG_SYS_CCSRBAR, MAS2_I|MAS2_G);
-       mas3 = FSL_BOOKE_MAS3(CONFIG_SYS_CCSRBAR_PHYS, 0, MAS3_SW|MAS3_SR);
-       mas7 = FSL_BOOKE_MAS7(CONFIG_SYS_CCSRBAR_PHYS);
+       mas2 = FSL_BOOKE_MAS2(CFG_SYS_CCSRBAR, MAS2_I|MAS2_G);
+       mas3 = FSL_BOOKE_MAS3(CFG_SYS_CCSRBAR_PHYS, 0, MAS3_SW|MAS3_SR);
+       mas7 = FSL_BOOKE_MAS7(CFG_SYS_CCSRBAR_PHYS);
 
        write_tlb(mas0, mas1, mas2, mas3, mas7);
 
index 32348b4e147f4edb4fde0dc43b7f29287d22f4ef..a7e1df104d7349205cdb604c658e848a33d64898 100644 (file)
@@ -144,14 +144,14 @@ void ft_fixup_cpu(void *blob, u64 memory_limit)
        }
 #ifdef CONFIG_DEEP_SLEEP
 #ifdef CONFIG_SPL_MMC_BOOT
-       off = fdt_add_mem_rsv(blob, CONFIG_SYS_MMC_U_BOOT_START,
-               CONFIG_SYS_MMC_U_BOOT_SIZE);
+       off = fdt_add_mem_rsv(blob, CFG_SYS_MMC_U_BOOT_START,
+               CFG_SYS_MMC_U_BOOT_SIZE);
        if (off < 0)
                printf("Failed to reserve memory for SD deep sleep: %s\n",
                       fdt_strerror(off));
 #elif defined(CONFIG_SPL_SPI_BOOT)
-       off = fdt_add_mem_rsv(blob, CONFIG_SYS_SPI_FLASH_U_BOOT_START,
-               CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE);
+       off = fdt_add_mem_rsv(blob, CFG_SYS_SPI_FLASH_U_BOOT_START,
+               CFG_SYS_SPI_FLASH_U_BOOT_SIZE);
        if (off < 0)
                printf("Failed to reserve memory for SPI deep sleep: %s\n",
                       fdt_strerror(off));
@@ -448,7 +448,7 @@ void fdt_add_enet_stashing(void *fdt)
 static void ft_fixup_clks(void *blob, const char *compat, u32 offset,
                          unsigned long freq)
 {
-       phys_addr_t phys = offset + CONFIG_SYS_CCSRBAR_PHYS;
+       phys_addr_t phys = offset + CFG_SYS_CCSRBAR_PHYS;
        int off = fdt_node_offset_by_compat_reg(blob, compat, phys);
 
        if (off >= 0) {
@@ -679,17 +679,17 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 
        ft_fixup_dpaa_clks(blob);
 
-#if defined(CONFIG_SYS_BMAN_MEM_PHYS)
+#if defined(CFG_SYS_BMAN_MEM_PHYS)
        fdt_portal(blob, "fsl,bman-portal", "bman-portals",
-                       (u64)CONFIG_SYS_BMAN_MEM_PHYS,
-                       CONFIG_SYS_BMAN_MEM_SIZE);
+                       (u64)CFG_SYS_BMAN_MEM_PHYS,
+                       CFG_SYS_BMAN_MEM_SIZE);
        fdt_fixup_bportals(blob);
 #endif
 
-#if defined(CONFIG_SYS_QMAN_MEM_PHYS)
+#if defined(CFG_SYS_QMAN_MEM_PHYS)
        fdt_portal(blob, "fsl,qman-portal", "qman-portals",
-                       (u64)CONFIG_SYS_QMAN_MEM_PHYS,
-                       CONFIG_SYS_QMAN_MEM_SIZE);
+                       (u64)CFG_SYS_QMAN_MEM_PHYS,
+                       CFG_SYS_QMAN_MEM_SIZE);
 
        fdt_fixup_qportals(blob);
 #endif
@@ -737,7 +737,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
  * beginning of CCSR.
  */
 #define CCSR_VIRT_TO_PHYS(x) \
-       (CONFIG_SYS_CCSRBAR_PHYS + ((x) - CONFIG_SYS_CCSRBAR))
+       (CFG_SYS_CCSRBAR_PHYS + ((x) - CFG_SYS_CCSRBAR))
 
 static void msg(const char *name, uint64_t uaddr, uint64_t daddr)
 {
@@ -783,8 +783,8 @@ int ft_verify_fdt(void *fdt)
                return 0;
        }
 
-       if (addr != CONFIG_SYS_CCSRBAR_PHYS) {
-               msg("CCSR", CONFIG_SYS_CCSRBAR_PHYS, addr);
+       if (addr != CFG_SYS_CCSRBAR_PHYS) {
+               msg("CCSR", CFG_SYS_CCSRBAR_PHYS, addr);
                /* No point in checking anything else */
                return 0;
        }
@@ -818,12 +818,12 @@ int ft_verify_fdt(void *fdt)
         * the 'reg' property to be wrong, so check it here.  For now, we
         * only check for "fsl,elbc" nodes.
         */
-#ifdef CONFIG_SYS_LBC_ADDR
+#ifdef CFG_SYS_LBC_ADDR
        off = fdt_node_offset_by_compatible(fdt, -1, "fsl,elbc");
        if (off > 0) {
                const fdt32_t *reg = fdt_getprop(fdt, off, "reg", NULL);
                if (reg) {
-                       uint64_t uaddr = CCSR_VIRT_TO_PHYS(CONFIG_SYS_LBC_ADDR);
+                       uint64_t uaddr = CCSR_VIRT_TO_PHYS(CFG_SYS_LBC_ADDR);
 
                        addr = fdt_translate_address(fdt, off, reg);
                        if (uaddr != addr) {
index 3a6ce32f7e6c1814c232949f1b820b52a36748fc..9b6577e547e573e82850b517bbb40dd58aef5c66 100644 (file)
@@ -203,7 +203,7 @@ void serdes_init(u32 sd, u32 sd_addr, u32 sd_prctl_mask, u32 sd_prctl_shift,
        memset(serdes_prtcl_map, 0, sizeof(u8) * SERDES_PRCTL_COUNT);
 #ifdef CONFIG_SYS_FSL_ERRATUM_A007186
        struct ccsr_sfp_regs  __iomem *sfp_regs =
-                       (struct ccsr_sfp_regs __iomem *)(CONFIG_SYS_SFP_ADDR);
+                       (struct ccsr_sfp_regs __iomem *)(CFG_SYS_SFP_ADDR);
        u32 pll_num, pll_status, bc, dc, fc, pll_cr_upd, pll_cr0, pll_cr1;
        u32 bc_status, fc_status, dc_status, pll_sr2;
        serdes_corenet_t  __iomem *srds_regs = (void *)sd_addr;
index 437ecde61559711b8aca43371cc423e826756e35..7c2de02c4c56b9d9b2907c2be56da88196aeb195 100644 (file)
@@ -264,9 +264,9 @@ void serdes_reset_rx(enum srds_prtcl device)
 }
 #endif
 
-#ifndef CONFIG_SYS_DCSRBAR_PHYS
-#define CONFIG_SYS_DCSRBAR_PHYS        0x80000000 /* Must be 1GB-aligned for rev1.0 */
-#define CONFIG_SYS_DCSRBAR     0x80000000
+#ifndef CFG_SYS_DCSRBAR_PHYS
+#define CFG_SYS_DCSRBAR_PHYS   0x80000000 /* Must be 1GB-aligned for rev1.0 */
+#define CFG_SYS_DCSRBAR        0x80000000
 #define __DCSR_NOT_DEFINED_BY_CONFIG
 #endif
 
@@ -315,16 +315,16 @@ static void enable_bank(ccsr_gur_t *gur, int bank)
         */
        {
 #ifdef __DCSR_NOT_DEFINED_BY_CONFIG
-               struct law_entry law = find_law(CONFIG_SYS_DCSRBAR_PHYS);
+               struct law_entry law = find_law(CFG_SYS_DCSRBAR_PHYS);
                int law_index;
                if (law.index == -1)
-                       law_index = set_next_law(CONFIG_SYS_DCSRBAR_PHYS,
+                       law_index = set_next_law(CFG_SYS_DCSRBAR_PHYS,
                                                 LAW_SIZE_1M, LAW_TRGT_IF_DCSR);
                else
-                       set_law(law.index, CONFIG_SYS_DCSRBAR_PHYS, LAW_SIZE_1M,
+                       set_law(law.index, CFG_SYS_DCSRBAR_PHYS, LAW_SIZE_1M,
                                LAW_TRGT_IF_DCSR);
 #endif
-               u32 *p = (void *)CONFIG_SYS_DCSRBAR + 0x20114;
+               u32 *p = (void *)CFG_SYS_DCSRBAR + 0x20114;
                out_be32(p, rcw5);
 #ifdef __DCSR_NOT_DEFINED_BY_CONFIG
                if (law.index == -1)
index 2b790868e126e0d4dab83586d982b3f673742424..540a6e6e191fbeaa7a5bd4242ce2083e071537d6 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/fsl_liodn.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
        SET_QP_INFO(1,  2,  1, 0),
        SET_QP_INFO(3,  4,  2, 1),
index 7db05d9672b8149aaffd5f534a80282668a14184..8f645258a5fc49ae3176db25d68a426fffd2ec8b 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/fsl_liodn.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
        SET_QP_INFO(1,  2,  1, 0),
        SET_QP_INFO(3,  4,  2, 1),
index ba54b0310a7b56549f3e518179f19f0e4f759cf3..db411162022b0a5fb4faabb79a0fceaed1107e8f 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/fsl_liodn.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
        SET_QP_INFO( 1,  2,  1, 0),
        SET_QP_INFO( 3,  4,  2, 1),
index 6f11c81aba5df7aa6c6597c6c7efeb183ed605e3..bd05eae2551defe2659f69d4a1331754c9c4038a 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/fsl_liodn.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
        SET_QP_INFO(1, 2, 1, 0),
        SET_QP_INFO(3, 4, 2, 1),
index d37e1ccf1e7fdfae016fb92e9c55be046a2655d0..391751ce1e71fe8e8558299df7951a0e990e3aae 100644 (file)
@@ -276,8 +276,8 @@ __secondary_start_page:
        mtspr   SPRN_L2CSR1,r3
 #endif
 
-       lis     r3,CONFIG_SYS_INIT_L2CSR0@h
-       ori     r3,r3,CONFIG_SYS_INIT_L2CSR0@l
+       lis     r3,CFG_SYS_INIT_L2CSR0@h
+       ori     r3,r3,CFG_SYS_INIT_L2CSR0@l
        mtspr   SPRN_L2CSR0,r3
        isync
 2:
index e2bdc2f9f112f2f318b9e0ad15c5a61014644898..a6e352ceabb116812aa3fa23c80b4a97e3b5e19f 100644 (file)
@@ -218,22 +218,22 @@ void get_sys_info(sys_info_t *sys_info)
 #ifndef CONFIG_PME_PLAT_CLK_DIV
        switch ((rcw_tmp & PME_CLK_SEL) >> PME_CLK_SHIFT) {
        case 1:
-               sys_info->freq_pme = freq_c_pll[CONFIG_SYS_PME_CLK];
+               sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK];
                break;
        case 2:
-               sys_info->freq_pme = freq_c_pll[CONFIG_SYS_PME_CLK] / 2;
+               sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK] / 2;
                break;
        case 3:
-               sys_info->freq_pme = freq_c_pll[CONFIG_SYS_PME_CLK] / 3;
+               sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK] / 3;
                break;
        case 4:
-               sys_info->freq_pme = freq_c_pll[CONFIG_SYS_PME_CLK] / 4;
+               sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK] / 4;
                break;
        case 6:
-               sys_info->freq_pme = freq_c_pll[CONFIG_SYS_PME_CLK + 1] / 2;
+               sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK + 1] / 2;
                break;
        case 7:
-               sys_info->freq_pme = freq_c_pll[CONFIG_SYS_PME_CLK + 1] / 3;
+               sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK + 1] / 3;
                break;
        default:
                printf("Error: Unknown PME clock select!\n");
@@ -243,7 +243,7 @@ void get_sys_info(sys_info_t *sys_info)
 
        }
 #else
-       sys_info->freq_pme = sys_info->freq_systembus / CONFIG_SYS_PME_CLK;
+       sys_info->freq_pme = sys_info->freq_systembus / CFG_SYS_PME_CLK;
 
 #endif
 #endif
@@ -380,25 +380,25 @@ void get_sys_info(sys_info_t *sys_info)
 #ifndef CONFIG_FM_PLAT_CLK_DIV
        switch ((rcw_tmp & FM1_CLK_SEL) >> FM1_CLK_SHIFT) {
        case 1:
-               sys_info->freq_fman[0] = freq_c_pll[CONFIG_SYS_FM1_CLK];
+               sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK];
                break;
        case 2:
-               sys_info->freq_fman[0] = freq_c_pll[CONFIG_SYS_FM1_CLK] / 2;
+               sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK] / 2;
                break;
        case 3:
-               sys_info->freq_fman[0] = freq_c_pll[CONFIG_SYS_FM1_CLK] / 3;
+               sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK] / 3;
                break;
        case 4:
-               sys_info->freq_fman[0] = freq_c_pll[CONFIG_SYS_FM1_CLK] / 4;
+               sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK] / 4;
                break;
        case 5:
                sys_info->freq_fman[0] = sys_info->freq_systembus;
                break;
        case 6:
-               sys_info->freq_fman[0] = freq_c_pll[CONFIG_SYS_FM1_CLK + 1] / 2;
+               sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK + 1] / 2;
                break;
        case 7:
-               sys_info->freq_fman[0] = freq_c_pll[CONFIG_SYS_FM1_CLK + 1] / 3;
+               sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK + 1] / 3;
                break;
        default:
                printf("Error: Unknown FMan1 clock select!\n");
@@ -407,31 +407,31 @@ void get_sys_info(sys_info_t *sys_info)
                break;
        }
 #if (CFG_SYS_NUM_FMAN) == 2
-#ifdef CONFIG_SYS_FM2_CLK
+#ifdef CFG_SYS_FM2_CLK
 #define FM2_CLK_SEL    0x00000038
 #define FM2_CLK_SHIFT  3
        rcw_tmp = in_be32(&gur->rcwsr[15]);
        switch ((rcw_tmp & FM2_CLK_SEL) >> FM2_CLK_SHIFT) {
        case 1:
-               sys_info->freq_fman[1] = freq_c_pll[CONFIG_SYS_FM2_CLK + 1];
+               sys_info->freq_fman[1] = freq_c_pll[CFG_SYS_FM2_CLK + 1];
                break;
        case 2:
-               sys_info->freq_fman[1] = freq_c_pll[CONFIG_SYS_FM2_CLK + 1] / 2;
+               sys_info->freq_fman[1] = freq_c_pll[CFG_SYS_FM2_CLK + 1] / 2;
                break;
        case 3:
-               sys_info->freq_fman[1] = freq_c_pll[CONFIG_SYS_FM2_CLK + 1] / 3;
+               sys_info->freq_fman[1] = freq_c_pll[CFG_SYS_FM2_CLK + 1] / 3;
                break;
        case 4:
-               sys_info->freq_fman[1] = freq_c_pll[CONFIG_SYS_FM2_CLK + 1] / 4;
+               sys_info->freq_fman[1] = freq_c_pll[CFG_SYS_FM2_CLK + 1] / 4;
                break;
        case 5:
                sys_info->freq_fman[1] = sys_info->freq_systembus;
                break;
        case 6:
-               sys_info->freq_fman[1] = freq_c_pll[CONFIG_SYS_FM2_CLK] / 2;
+               sys_info->freq_fman[1] = freq_c_pll[CFG_SYS_FM2_CLK] / 2;
                break;
        case 7:
-               sys_info->freq_fman[1] = freq_c_pll[CONFIG_SYS_FM2_CLK] / 3;
+               sys_info->freq_fman[1] = freq_c_pll[CFG_SYS_FM2_CLK] / 3;
                break;
        default:
                printf("Error: Unknown FMan2 clock select!\n");
@@ -442,7 +442,7 @@ void get_sys_info(sys_info_t *sys_info)
 #endif
 #endif /* CFG_SYS_NUM_FMAN == 2 */
 #else
-       sys_info->freq_fman[0] = sys_info->freq_systembus / CONFIG_SYS_FM1_CLK;
+       sys_info->freq_fman[0] = sys_info->freq_systembus / CFG_SYS_FM1_CLK;
 #endif
 #endif
 
index 47df3c2ce19fc8b7f97dced4f4c80b1806e81775..ce2b9c21667780d512d14c60fd07a2d01a9d475f 100644 (file)
@@ -14,10 +14,10 @@ DECLARE_GLOBAL_DATA_PTR;
 
 ulong cpu_init_f(void)
 {
-#ifdef CONFIG_SYS_INIT_L2_ADDR
+#ifdef CFG_SYS_INIT_L2_ADDR
        ccsr_l2cache_t *l2cache = (void *)CFG_SYS_MPC85xx_L2_ADDR;
 
-       out_be32(&l2cache->l2srbar0, CONFIG_SYS_INIT_L2_ADDR);
+       out_be32(&l2cache->l2srbar0, CFG_SYS_INIT_L2_ADDR);
 
        /* set MBECCDIS=1, SBECCDIS=1 */
        out_be32(&l2cache->l2errdis,
index 534175697435df920e659fb26677c2924406be7f..562b6993b9dac7872c78e00aa974de46c9a63f0f 100644 (file)
@@ -128,7 +128,7 @@ bootsect:
        .Lconf_pair_start:
 
        .long CONFIG_SYS_CCSRBAR_DEFAULT + CFG_SYS_MPC85xx_L2_OFFSET + MPC85xx_L2SRBAR0 /* Address: L2 memory-mapped SRAM base addr 0 */
-       .long CONFIG_SYS_INIT_L2_ADDR
+       .long CFG_SYS_INIT_L2_ADDR
 
        .long CONFIG_SYS_CCSRBAR_DEFAULT + CFG_SYS_MPC85xx_L2_OFFSET + MPC85xx_L2ERRDIS /* Address: L2 cache error disable */
        .long MPC85xx_L2ERRDIS_MBECC | MPC85xx_L2ERRDIS_SBECC
@@ -428,12 +428,12 @@ l2_disabled:
        mtspr   SPRN_BUCSR,r0
 #endif
 
-#if defined(CONFIG_SYS_INIT_DBCR)
+#if defined(CFG_SYS_INIT_DBCR)
        lis     r1,0xffff
        ori     r1,r1,0xffff
        mtspr   DBSR,r1                 /* Clear all status bits */
-       lis     r0,CONFIG_SYS_INIT_DBCR@h       /* DBCR0[IDM] must be set */
-       ori     r0,r0,CONFIG_SYS_INIT_DBCR@l
+       lis     r0,CFG_SYS_INIT_DBCR@h  /* DBCR0[IDM] must be set */
+       ori     r0,r0,CFG_SYS_INIT_DBCR@l
        mtspr   DBCR0,r0
 #endif
 
@@ -573,34 +573,34 @@ nexti:    mflr    r1              /* R1 = our PC */
  * As a general rule, TLB0 is used for short-term TLBs, and TLB1 is used for
  * long-term TLBs, so we use TLB0 here.
  */
-#if (CONFIG_SYS_CCSRBAR_DEFAULT != CONFIG_SYS_CCSRBAR_PHYS)
+#if (CONFIG_SYS_CCSRBAR_DEFAULT != CFG_SYS_CCSRBAR_PHYS)
 
-#if !defined(CONFIG_SYS_CCSRBAR_PHYS_HIGH) || !defined(CONFIG_SYS_CCSRBAR_PHYS_LOW)
-#error "CONFIG_SYS_CCSRBAR_PHYS_HIGH and CONFIG_SYS_CCSRBAR_PHYS_LOW) must be defined."
+#if !defined(CFG_SYS_CCSRBAR_PHYS_HIGH) || !defined(CFG_SYS_CCSRBAR_PHYS_LOW)
+#error "CFG_SYS_CCSRBAR_PHYS_HIGH and CFG_SYS_CCSRBAR_PHYS_LOW) must be defined."
 #endif
 
 create_ccsr_new_tlb:
        /*
         * Create a TLB for the new location of CCSR.  Register R8 is reserved
-        * for the virtual address of this TLB (CONFIG_SYS_CCSRBAR).
+        * for the virtual address of this TLB (CFG_SYS_CCSRBAR).
         */
-       lis     r8, CONFIG_SYS_CCSRBAR@h
-       ori     r8, r8, CONFIG_SYS_CCSRBAR@l
-       lis     r9, (CONFIG_SYS_CCSRBAR + 0x1000)@h
-       ori     r9, r9, (CONFIG_SYS_CCSRBAR + 0x1000)@l
+       lis     r8, CFG_SYS_CCSRBAR@h
+       ori     r8, r8, CFG_SYS_CCSRBAR@l
+       lis     r9, (CFG_SYS_CCSRBAR + 0x1000)@h
+       ori     r9, r9, (CFG_SYS_CCSRBAR + 0x1000)@l
        create_tlb0_entry 0, \
                0, BOOKE_PAGESZ_4K, \
-               CONFIG_SYS_CCSRBAR, MAS2_I|MAS2_G, \
-               CONFIG_SYS_CCSRBAR_PHYS_LOW, MAS3_SW|MAS3_SR, \
-               CONFIG_SYS_CCSRBAR_PHYS_HIGH, r3
+               CFG_SYS_CCSRBAR, MAS2_I|MAS2_G, \
+               CFG_SYS_CCSRBAR_PHYS_LOW, MAS3_SW|MAS3_SR, \
+               CFG_SYS_CCSRBAR_PHYS_HIGH, r3
        /*
         * Create a TLB for the current location of CCSR.  Register R9 is reserved
-        * for the virtual address of this TLB (CONFIG_SYS_CCSRBAR + 0x1000).
+        * for the virtual address of this TLB (CFG_SYS_CCSRBAR + 0x1000).
         */
 create_ccsr_old_tlb:
        create_tlb0_entry 1, \
                0, BOOKE_PAGESZ_4K, \
-               CONFIG_SYS_CCSRBAR + 0x1000, MAS2_I|MAS2_G, \
+               CFG_SYS_CCSRBAR + 0x1000, MAS2_I|MAS2_G, \
                CONFIG_SYS_CCSRBAR_DEFAULT, MAS3_SW|MAS3_SR, \
                0, r3 /* The default CCSR address is always a 32-bit number */
 
@@ -634,7 +634,7 @@ infinite_debug_loop:
 
 #ifdef CONFIG_FSL_CORENET
 
-#define CCSR_LAWBARH0  (CONFIG_SYS_CCSRBAR + 0x1000)
+#define CCSR_LAWBARH0  (CFG_SYS_CCSRBAR + 0x1000)
 #define LAW_SIZE_4K    0xb
 #define CCSRBAR_LAWAR  (LAW_EN | (0x1e << 20) | LAW_SIZE_4K)
 #define CCSRAR_C       0x80000000      /* Commit */
@@ -644,10 +644,10 @@ create_temp_law:
         * On CoreNet systems, we create the temporary LAW using a special LAW
         * target ID of 0x1e.  LAWBARH is at offset 0xc00 in CCSR.
         */
-       lis     r0, CONFIG_SYS_CCSRBAR_PHYS_HIGH@h
-       ori     r0, r0, CONFIG_SYS_CCSRBAR_PHYS_HIGH@l
-       lis     r1, CONFIG_SYS_CCSRBAR_PHYS_LOW@h
-       ori     r1, r1, CONFIG_SYS_CCSRBAR_PHYS_LOW@l
+       lis     r0, CFG_SYS_CCSRBAR_PHYS_HIGH@h
+       ori     r0, r0, CFG_SYS_CCSRBAR_PHYS_HIGH@l
+       lis     r1, CFG_SYS_CCSRBAR_PHYS_LOW@h
+       ori     r1, r1, CFG_SYS_CCSRBAR_PHYS_LOW@l
        lis     r2, CCSRBAR_LAWAR@h
        ori     r2, r2, CCSRBAR_LAWAR@l
 
@@ -683,10 +683,10 @@ read_old_ccsrbar:
         * instruction.
         */
 write_new_ccsrbar:
-       lis     r0, CONFIG_SYS_CCSRBAR_PHYS_HIGH@h
-       ori     r0, r0, CONFIG_SYS_CCSRBAR_PHYS_HIGH@l
-       lis     r1, CONFIG_SYS_CCSRBAR_PHYS_LOW@h
-       ori     r1, r1, CONFIG_SYS_CCSRBAR_PHYS_LOW@l
+       lis     r0, CFG_SYS_CCSRBAR_PHYS_HIGH@h
+       ori     r0, r0, CFG_SYS_CCSRBAR_PHYS_HIGH@l
+       lis     r1, CFG_SYS_CCSRBAR_PHYS_LOW@h
+       ori     r1, r1, CFG_SYS_CCSRBAR_PHYS_LOW@l
        lis     r2, CCSRAR_C@h
        ori     r2, r2, CCSRAR_C@l
 
@@ -723,9 +723,9 @@ write_new_ccsrbar:
        lwz     r0, 0(r9)
        isync
 
-/* CONFIG_SYS_CCSRBAR_PHYS right shifted by 12 */
-#define CCSRBAR_PHYS_RS12 ((CONFIG_SYS_CCSRBAR_PHYS_HIGH << 20) | \
-                          (CONFIG_SYS_CCSRBAR_PHYS_LOW >> 12))
+/* CFG_SYS_CCSRBAR_PHYS right shifted by 12 */
+#define CCSRBAR_PHYS_RS12 ((CFG_SYS_CCSRBAR_PHYS_HIGH << 20) | \
+                          (CFG_SYS_CCSRBAR_PHYS_LOW >> 12))
 
        /* Write the new value to CCSRBAR. */
        lis     r0, CCSRBAR_PHYS_RS12@h
@@ -752,10 +752,10 @@ write_new_ccsrbar:
 
        /* Delete the temporary TLBs */
 delete_temp_tlbs:
-       delete_tlb0_entry 0, CONFIG_SYS_CCSRBAR, MAS2_I|MAS2_G, r3
-       delete_tlb0_entry 1, CONFIG_SYS_CCSRBAR + 0x1000, MAS2_I|MAS2_G, r3
+       delete_tlb0_entry 0, CFG_SYS_CCSRBAR, MAS2_I|MAS2_G, r3
+       delete_tlb0_entry 1, CFG_SYS_CCSRBAR + 0x1000, MAS2_I|MAS2_G, r3
 
-#endif /* #if (CONFIG_SYS_CCSRBAR_DEFAULT != CONFIG_SYS_CCSRBAR_PHYS) */
+#endif /* #if (CONFIG_SYS_CCSRBAR_DEFAULT != CFG_SYS_CCSRBAR_PHYS) */
 
 #if defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && defined(CONFIG_E6500)
 create_ccsr_l2_tlb:
@@ -765,14 +765,14 @@ create_ccsr_l2_tlb:
         */
        create_tlb0_entry 0, \
                0, BOOKE_PAGESZ_4K, \
-               CONFIG_SYS_CCSRBAR + 0xC20000, MAS2_I|MAS2_G, \
-               CONFIG_SYS_CCSRBAR_PHYS_LOW + 0xC20000, MAS3_SW|MAS3_SR, \
-               CONFIG_SYS_CCSRBAR_PHYS_HIGH, r3
+               CFG_SYS_CCSRBAR + 0xC20000, MAS2_I|MAS2_G, \
+               CFG_SYS_CCSRBAR_PHYS_LOW + 0xC20000, MAS3_SW|MAS3_SR, \
+               CFG_SYS_CCSRBAR_PHYS_HIGH, r3
 
 enable_l2_cluster_l2:
        /* enable L2 cache */
-       lis     r3, (CONFIG_SYS_CCSRBAR + 0xC20000)@h
-       ori     r3, r3, (CONFIG_SYS_CCSRBAR + 0xC20000)@l
+       lis     r3, (CFG_SYS_CCSRBAR + 0xC20000)@h
+       ori     r3, r3, (CFG_SYS_CCSRBAR + 0xC20000)@l
        li      r4, 33  /* stash id */
        stw     r4, 4(r3)
        lis     r4, (L2CSR0_L2FI|L2CSR0_L2LFC)@h
@@ -813,7 +813,7 @@ enable_l2_cluster_l2:
        beq     1b
 
 delete_ccsr_l2_tlb:
-       delete_tlb0_entry 0, CONFIG_SYS_CCSRBAR + 0xC20000, MAS2_I|MAS2_G, r3
+       delete_tlb0_entry 0, CFG_SYS_CCSRBAR + 0xC20000, MAS2_I|MAS2_G, r3
 #endif
 
        /*
@@ -863,7 +863,7 @@ delete_ccsr_l2_tlb:
        andi.   r1,r3,L1CSR0_DCE@l
        beq     2b
 #ifdef CONFIG_SYS_FSL_ERRATUM_A004510
-#define DCSR_LAWBARH0  (CONFIG_SYS_CCSRBAR + 0x1000)
+#define DCSR_LAWBARH0  (CFG_SYS_CCSRBAR + 0x1000)
 #define LAW_SIZE_1M    0x13
 #define DCSRBAR_LAWAR  (LAW_EN | (0x1d << 20) | LAW_SIZE_1M)
 
@@ -884,13 +884,13 @@ delete_ccsr_l2_tlb:
        rlwimi  r0, r8, 16, MAS0_ESEL_MSK
        lis     r1, FSL_BOOKE_MAS1(1, 1, 0, 0, BOOKE_PAGESZ_16M)@h
        ori     r1, r1, FSL_BOOKE_MAS1(1, 1, 0, 0, BOOKE_PAGESZ_16M)@l
-       lis     r7, CONFIG_SYS_CCSRBAR@h
-       ori     r7, r7, CONFIG_SYS_CCSRBAR@l
+       lis     r7, CFG_SYS_CCSRBAR@h
+       ori     r7, r7, CFG_SYS_CCSRBAR@l
        ori     r2, r7, MAS2_I|MAS2_G
-       lis     r3, FSL_BOOKE_MAS3(CONFIG_SYS_CCSRBAR_PHYS_LOW, 0, (MAS3_SW|MAS3_SR))@h
-       ori     r3, r3, FSL_BOOKE_MAS3(CONFIG_SYS_CCSRBAR_PHYS_LOW, 0, (MAS3_SW|MAS3_SR))@l
-       lis     r4, CONFIG_SYS_CCSRBAR_PHYS_HIGH@h
-       ori     r4, r4, CONFIG_SYS_CCSRBAR_PHYS_HIGH@l
+       lis     r3, FSL_BOOKE_MAS3(CFG_SYS_CCSRBAR_PHYS_LOW, 0, (MAS3_SW|MAS3_SR))@h
+       ori     r3, r3, FSL_BOOKE_MAS3(CFG_SYS_CCSRBAR_PHYS_LOW, 0, (MAS3_SW|MAS3_SR))@l
+       lis     r4, CFG_SYS_CCSRBAR_PHYS_HIGH@h
+       ori     r4, r4, CFG_SYS_CCSRBAR_PHYS_HIGH@l
        mtspr   MAS0, r0
        mtspr   MAS1, r1
        mtspr   MAS2, r2
@@ -1132,7 +1132,7 @@ create_init_ram_area:
        create_tlb1_entry 15, \
                1, BOOKE_PAGESZ_1M, \
                CONFIG_VAL(SYS_MONITOR_BASE) & 0xfff00000, MAS2_I|MAS2_G, \
-               CONFIG_SYS_PBI_FLASH_WINDOW & 0xfff00000, MAS3_SX|MAS3_SW|MAS3_SR, \
+               CFG_SYS_PBI_FLASH_WINDOW & 0xfff00000, MAS3_SX|MAS3_SW|MAS3_SR, \
                0, r6
 
 /*
@@ -1148,7 +1148,7 @@ create_init_ram_area:
        create_tlb1_entry 15, \
                1, BOOKE_PAGESZ_1M, \
                CONFIG_VAL(SYS_MONITOR_BASE) & 0xfff00000, MAS2_I|MAS2_G, \
-               CONFIG_SYS_INIT_L3_ADDR & 0xfff00000, MAS3_SX|MAS3_SW|MAS3_SR, \
+               CFG_SYS_INIT_L3_ADDR & 0xfff00000, MAS3_SX|MAS3_SW|MAS3_SR, \
                0, r6
 
 #else
@@ -1164,19 +1164,19 @@ create_init_ram_area:
 #endif
 
        /* create a temp mapping in AS=1 to the stack */
-#if defined(CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW) && \
-    defined(CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH)
+#if defined(CFG_SYS_INIT_RAM_ADDR_PHYS_LOW) && \
+    defined(CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH)
        create_tlb1_entry 14, \
                1, BOOKE_PAGESZ_16K, \
-               CONFIG_SYS_INIT_RAM_ADDR, 0, \
-               CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW, MAS3_SX|MAS3_SW|MAS3_SR, \
-               CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH, r6
+               CFG_SYS_INIT_RAM_ADDR, 0, \
+               CFG_SYS_INIT_RAM_ADDR_PHYS_LOW, MAS3_SX|MAS3_SW|MAS3_SR, \
+               CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH, r6
 
 #else
        create_tlb1_entry 14, \
                1, BOOKE_PAGESZ_16K, \
-               CONFIG_SYS_INIT_RAM_ADDR, 0, \
-               CONFIG_SYS_INIT_RAM_ADDR, MAS3_SX|MAS3_SW|MAS3_SR, \
+               CFG_SYS_INIT_RAM_ADDR, 0, \
+               CFG_SYS_INIT_RAM_ADDR, MAS3_SX|MAS3_SW|MAS3_SR, \
                0, r6
 #endif
 
@@ -1194,8 +1194,8 @@ switch_as:
 
        /* Allocate Initial RAM in data cache.
         */
-       lis     r3,CONFIG_SYS_INIT_RAM_ADDR@h
-       ori     r3,r3,CONFIG_SYS_INIT_RAM_ADDR@l
+       lis     r3,CFG_SYS_INIT_RAM_ADDR@h
+       ori     r3,r3,CFG_SYS_INIT_RAM_ADDR@l
        mfspr   r2, L1CFG0
        andi.   r2, r2, 0x1ff
        /* cache size * 1024 / (2 * L1 line size) */
@@ -1230,11 +1230,11 @@ switch_as:
        .globl  _start_cont
 _start_cont:
        /* Setup the stack in initial RAM,could be L2-as-SRAM or L1 dcache*/
-       lis     r3,(CONFIG_SYS_INIT_RAM_ADDR)@h
-       ori     r3,r3,((CONFIG_SYS_INIT_SP_OFFSET-16)&~0xf)@l /* Align to 16 */
+       lis     r3,(CFG_SYS_INIT_RAM_ADDR)@h
+       ori     r3,r3,((CFG_SYS_INIT_SP_OFFSET-16)&~0xf)@l /* Align to 16 */
 
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
-#if CONFIG_VAL(SYS_MALLOC_F_LEN) + GENERATED_GBL_DATA_SIZE > CONFIG_SYS_INIT_RAM_SIZE
+#if CONFIG_VAL(SYS_MALLOC_F_LEN) + GENERATED_GBL_DATA_SIZE > CFG_SYS_INIT_RAM_SIZE
 #error "SYS_MALLOC_F_LEN too large to fit into initial RAM."
 #endif
 
@@ -1243,8 +1243,8 @@ _start_cont:
 #endif
 
        /* End of RAM */
-       lis     r4,(CONFIG_SYS_INIT_RAM_ADDR)@h
-       ori     r4,r4,(CONFIG_SYS_INIT_RAM_SIZE)@l
+       lis     r4,(CFG_SYS_INIT_RAM_ADDR)@h
+       ori     r4,r4,(CFG_SYS_INIT_RAM_SIZE)@l
 
        li      r0,0
 
@@ -1826,8 +1826,8 @@ trap_init:
 .globl unlock_ram_in_cache
 unlock_ram_in_cache:
        /* invalidate the INIT_RAM section */
-       lis     r3,(CONFIG_SYS_INIT_RAM_ADDR & ~(CONFIG_SYS_CACHELINE_SIZE-1))@h
-       ori     r3,r3,(CONFIG_SYS_INIT_RAM_ADDR & ~(CONFIG_SYS_CACHELINE_SIZE-1))@l
+       lis     r3,(CFG_SYS_INIT_RAM_ADDR & ~(CONFIG_SYS_CACHELINE_SIZE-1))@h
+       ori     r3,r3,(CFG_SYS_INIT_RAM_ADDR & ~(CONFIG_SYS_CACHELINE_SIZE-1))@l
        mfspr   r4,L1CFG0
        andi.   r4,r4,0x1ff
        slwi    r4,r4,(10 - 1 - L1_CACHE_SHIFT)
@@ -1844,8 +1844,8 @@ unlock_ram_in_cache:
        sync
 
        /* Invalidate the TLB entries for the cache */
-       lis     r3,CONFIG_SYS_INIT_RAM_ADDR@h
-       ori     r3,r3,CONFIG_SYS_INIT_RAM_ADDR@l
+       lis     r3,CFG_SYS_INIT_RAM_ADDR@h
+       ori     r3,r3,CFG_SYS_INIT_RAM_ADDR@l
        tlbivax 0,r3
        addi    r3,r3,0x1000
        tlbivax 0,r3
index d2744bb9f82b5b249bd4ae6c92675fcade593cfa..bab076b2b1809f2edc815c7522fb5a3dd00c1ccb 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/fsl_liodn.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
        SET_QP_INFO(1, 27, 1, 0),
        SET_QP_INFO(2, 28, 1, 0),
index 99b52bacdad6fb5970147ae953989b77b2f948a1..59f4f9c6692c3c4041554eca8b3375ee0a9bdee1 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/fsl_liodn.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
        SET_QP_INFO(1, 27, 1, 0),
        SET_QP_INFO(2, 28, 1, 0),
index 17521dc3a4a82697fce5b508b1fd065edcc1aa2d..390bb1153758977831e6df9ee8fa4350a4384f03 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/fsl_liodn.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
        SET_QP_INFO(1, 27, 1, 0),
        SET_QP_INFO(2, 28, 1, 0),
index 8fe4e96a1140fbec4d884e21e995aa68bfdef3e5..37ea7788ccfc865ca20bb515eca7d607bcab32f9 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/fsl_liodn.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
+struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
        SET_QP_INFO(1, 27, 1, 0),
        SET_QP_INFO(2, 28, 1, 0),
index 81e60722f9fc4a8afcb6b9d2cc7f4889a15b944b..5d21bef58781965148a4acf9af7a814dae6258fd 100644 (file)
@@ -302,7 +302,7 @@ uint64_t tlb_map_range(ulong v_addr, phys_addr_t p_addr, uint64_t size,
 unsigned int setup_ddr_tlbs_phys(phys_addr_t p_addr,
                                 unsigned int memsize_in_meg)
 {
-       unsigned int ram_tlb_address = (unsigned int)CONFIG_SYS_DDR_SDRAM_BASE;
+       unsigned int ram_tlb_address = (unsigned int)CFG_SYS_DDR_SDRAM_BASE;
        u64 memsize = (u64)memsize_in_meg << 20;
        u64 size;
 
@@ -324,13 +324,13 @@ unsigned int setup_ddr_tlbs_phys(phys_addr_t p_addr,
 unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg)
 {
        return
-               setup_ddr_tlbs_phys(CONFIG_SYS_DDR_SDRAM_BASE, memsize_in_meg);
+               setup_ddr_tlbs_phys(CFG_SYS_DDR_SDRAM_BASE, memsize_in_meg);
 }
 
 /* Invalidate the DDR TLBs for the requested size */
 void clear_ddr_tlbs_phys(phys_addr_t p_addr, unsigned int memsize_in_meg)
 {
-       u32 vstart = CONFIG_SYS_DDR_SDRAM_BASE;
+       u32 vstart = CFG_SYS_DDR_SDRAM_BASE;
        unsigned long epn;
        u32 tsize, valid, ptr;
        phys_addr_t rpn = 0;
@@ -351,7 +351,7 @@ void clear_ddr_tlbs_phys(phys_addr_t p_addr, unsigned int memsize_in_meg)
 
 void clear_ddr_tlbs(unsigned int memsize_in_meg)
 {
-       clear_ddr_tlbs_phys(CONFIG_SYS_DDR_SDRAM_BASE, memsize_in_meg);
+       clear_ddr_tlbs_phys(CFG_SYS_DDR_SDRAM_BASE, memsize_in_meg);
 }
 
 
index f28826c5d1a225cd895802aa21ca3ddaabee3339..d918b4395bf41e13810bcd51e0f44b84077bec7e 100644 (file)
@@ -64,7 +64,7 @@ SECTIONS
        _end = .;
 
 #if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
-#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS)
+#if defined(CONFIG_SDCARD) && !defined(CFG_SYS_MMC_U_BOOT_OFFS)
        mmc_u_boot_offs = .;
 #endif
 #endif
@@ -101,7 +101,7 @@ SECTIONS
        .resetvec IMAGE_TEXT_BASE + RESET_VECTOR_OFFSET : {
                KEEP(*(.resetvec))
        } = 0xffff
-#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS)
+#if defined(CONFIG_SDCARD) && !defined(CFG_SYS_MMC_U_BOOT_OFFS)
        mmc_u_boot_offs = .;
 #endif
 #endif
index 0ebb7b33a8bc38b7391098876dcc6c698e5d05ae..1f1107e61d5f73185f380669b762caf6e54ac639 100644 (file)
@@ -141,8 +141,8 @@ in_flash:
        mtspr   DER, r2
 
        /* set up the stack on top of internal DPRAM */
-       lis     r3, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE)@h
-       ori     r3, r3, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE)@l
+       lis     r3, (CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_SIZE)@h
+       ori     r3, r3, (CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_SIZE)@l
        stw     r0, -4(r3)
        stw     r0, -8(r3)
        addi    r1, r3, -8
index 1101b9138f141ca967f58e3e846c20d88bf9b4b2..1c051d18980fe2b8316da0b1a39173a7adc2762b 100644 (file)
@@ -230,7 +230,7 @@ static int pamu_config_spaace(uint32_t liodn,
 
 int pamu_init(void)
 {
-       u32 base_addr = CONFIG_SYS_PAMU_ADDR;
+       u32 base_addr = CFG_SYS_PAMU_ADDR;
        struct ccsr_pamu *regs;
        u32 i = 0;
        u64 ppaact_phys, ppaact_lim, ppaact_size;
@@ -292,7 +292,7 @@ int pamu_init(void)
 void pamu_enable(void)
 {
        u32 i = 0;
-       u32 base_addr = CONFIG_SYS_PAMU_ADDR;
+       u32 base_addr = CFG_SYS_PAMU_ADDR;
        for (i = 0; i < CONFIG_NUM_PAMU; i++) {
                setbits_be32((void *)base_addr + PAMU_PCR_OFFSET,
                             PAMU_PCR_PE);
@@ -304,7 +304,7 @@ void pamu_enable(void)
 void pamu_reset(void)
 {
        u32 i  = 0;
-       u32 base_addr = CONFIG_SYS_PAMU_ADDR;
+       u32 base_addr = CFG_SYS_PAMU_ADDR;
        struct ccsr_pamu *regs;
 
        for (i = 0; i < CONFIG_NUM_PAMU; i++) {
@@ -328,7 +328,7 @@ void pamu_reset(void)
 void pamu_disable(void)
 {
        u32 i  = 0;
-       u32 base_addr = CONFIG_SYS_PAMU_ADDR;
+       u32 base_addr = CFG_SYS_PAMU_ADDR;
 
 
        for (i = 0; i < CONFIG_NUM_PAMU; i++) {
index 71496ab294d2560dc8b7be8818739826071597a5..caad6670cc90c224e2df49af37afafb0090eabf2 100644 (file)
@@ -21,17 +21,17 @@ void construct_pamu_addr_table(struct pamu_addr_tbl *tbl, int *num_entries)
        tbl->end_addr[i] = tbl->start_addr[i] +  tbl->size[i] - 1;
 
        i++;
-#ifdef CONFIG_SYS_FLASH_BASE_PHYS
+#ifdef CFG_SYS_FLASH_BASE_PHYS
        tbl->start_addr[i] =
-               (uint64_t)virt_to_phys((void *)CONFIG_SYS_FLASH_BASE_PHYS);
+               (uint64_t)virt_to_phys((void *)CFG_SYS_FLASH_BASE_PHYS);
        tbl->size[i] = 256 * 1024 * 1024; /* 256MB flash */
        tbl->end_addr[i] = tbl->start_addr[i] +  tbl->size[i] - 1;
 
        i++;
 #endif
-#if (defined(CONFIG_SPL_BUILD) && (CONFIG_SYS_INIT_L3_VADDR))
+#if (defined(CONFIG_SPL_BUILD) && (CFG_SYS_INIT_L3_VADDR))
        tbl->start_addr[i] =
-               (uint64_t)virt_to_phys((void *)CONFIG_SYS_INIT_L3_VADDR);
+               (uint64_t)virt_to_phys((void *)CFG_SYS_INIT_L3_VADDR);
        tbl->size[i] = 256 * 1024; /* 256K CPC flash */
        tbl->end_addr[i] = tbl->start_addr[i] +  tbl->size[i] - 1;
 
index 2edf0d6f83c28da636dfdf7c7287038bd35720be..d9e5a7d62170433c4a26f29cf8bf21fac65f266b 100644 (file)
@@ -43,9 +43,9 @@
 #elif defined(CONFIG_ARCH_P1023)
 #define CFG_SYS_NUM_FMAN               1
 #define CFG_SYS_NUM_FM1_DTSEC  2
-#define CONFIG_SYS_QMAN_NUM_PORTALS    3
-#define CONFIG_SYS_BMAN_NUM_PORTALS    3
-#define CONFIG_SYS_FM_MURAM_SIZE       0x10000
+#define CFG_SYS_QMAN_NUM_PORTALS       3
+#define CFG_SYS_BMAN_NUM_PORTALS       3
+#define CFG_SYS_FM_MURAM_SIZE  0x10000
 
 /* P1024 is lower end variant of P1020 */
 #elif defined(CONFIG_ARCH_P1024)
@@ -68,7 +68,7 @@
 #define CFG_SYS_NUM_FMAN               1
 #define CFG_SYS_NUM_FM1_DTSEC  5
 #define CFG_SYS_NUM_FM1_10GEC  1
-#define CONFIG_SYS_FM_MURAM_SIZE       0x28000
+#define CFG_SYS_FM_MURAM_SIZE  0x28000
 #define CFG_SYS_FSL_SRIO_MAX_PORTS     2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM    9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM    5
@@ -78,7 +78,7 @@
 #define CFG_SYS_NUM_FMAN               1
 #define CFG_SYS_NUM_FM1_DTSEC  5
 #define CFG_SYS_NUM_FM1_10GEC  1
-#define CONFIG_SYS_FM_MURAM_SIZE       0x28000
+#define CFG_SYS_FM_MURAM_SIZE  0x28000
 #define CFG_SYS_FSL_SRIO_MAX_PORTS     2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM    9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM    5
@@ -90,7 +90,7 @@
 #define CFG_SYS_NUM_FM2_DTSEC  4
 #define CFG_SYS_NUM_FM1_10GEC  1
 #define CFG_SYS_NUM_FM2_10GEC  1
-#define CONFIG_SYS_FM_MURAM_SIZE       0x28000
+#define CFG_SYS_FM_MURAM_SIZE  0x28000
 #define CFG_SYS_FSL_SRIO_MAX_PORTS     2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM    9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM    5
 #define CFG_SYS_NUM_FM1_10GEC  1
 #define CFG_SYS_NUM_FM2_DTSEC  5
 #define CFG_SYS_NUM_FM2_10GEC  1
-#define CONFIG_SYS_FM_MURAM_SIZE       0x28000
+#define CFG_SYS_FM_MURAM_SIZE  0x28000
 #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000
 
 #elif defined(CONFIG_ARCH_BSC9131)
 #define CFG_SYS_FSL_SRDS_3
 #define CFG_SYS_FSL_SRDS_4
 #define CFG_SYS_NUM_FMAN               2
-#define CONFIG_SYS_PME_CLK             0
+#define CFG_SYS_PME_CLK                0
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT  8
-#define CONFIG_SYS_FM1_CLK             3
-#define CONFIG_SYS_FM2_CLK             3
-#define CONFIG_SYS_FM_MURAM_SIZE       0x60000
+#define CFG_SYS_FM1_CLK                3
+#define CFG_SYS_FM2_CLK                3
+#define CFG_SYS_FM_MURAM_SIZE  0x60000
 #define CFG_SYS_FSL_SRIO_MAX_PORTS     2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM    9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM    5
 #define CONFIG_SYS_FSL_SRDS_1
 #define CONFIG_SYS_FSL_SRDS_2
 #define CFG_SYS_NUM_FMAN               1
-#define CONFIG_SYS_FM1_CLK             0
+#define CFG_SYS_FM1_CLK                0
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT  4
-#define CONFIG_SYS_FM_MURAM_SIZE       0x60000
+#define CFG_SYS_FM_MURAM_SIZE  0x60000
 
 #ifdef CONFIG_ARCH_B4860
 #define CONFIG_MAX_DSP_CPUS            12
 #define CFG_SYS_NUM_FMAN               1
 #define CFG_SYS_NUM_FM1_DTSEC  5
 #define CONFIG_PME_PLAT_CLK_DIV                2
-#define CONFIG_SYS_PME_CLK             CONFIG_PME_PLAT_CLK_DIV
+#define CFG_SYS_PME_CLK                CONFIG_PME_PLAT_CLK_DIV
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT  8
 #define CONFIG_FM_PLAT_CLK_DIV 1
-#define CONFIG_SYS_FM1_CLK             CONFIG_FM_PLAT_CLK_DIV
-#define CONFIG_SYS_FM_MURAM_SIZE       0x30000
+#define CFG_SYS_FM1_CLK                CONFIG_FM_PLAT_CLK_DIV
+#define CFG_SYS_FM_MURAM_SIZE  0x30000
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
 #define QE_MURAM_SIZE                  0x6000UL
 #define MAX_QE_RISC                    1
 #define CFG_SYS_NUM_FM1_10GEC  1
 #define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT  8
-#define CONFIG_SYS_FM1_CLK             0
+#define CFG_SYS_FM1_CLK                0
 #define CONFIG_QBMAN_CLK_DIV           1
-#define CONFIG_SYS_FM_MURAM_SIZE       0x30000
+#define CFG_SYS_FM_MURAM_SIZE  0x30000
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
 #define QE_MURAM_SIZE                  0x6000UL
 #define MAX_QE_RISC                    1
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM    5
 #endif
 #define CONFIG_PME_PLAT_CLK_DIV                1
-#define CONFIG_SYS_PME_CLK             CONFIG_PME_PLAT_CLK_DIV
-#define CONFIG_SYS_FM1_CLK             0
+#define CFG_SYS_PME_CLK                CONFIG_PME_PLAT_CLK_DIV
+#define CFG_SYS_FM1_CLK                0
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT  8
-#define CONFIG_SYS_FM_MURAM_SIZE       0x28000
+#define CFG_SYS_FM_MURAM_SIZE  0x28000
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
 
 
index 5038cb9f590a7a6c4b8f29f713c713bf42e791ed..a03f091c3059c7325dfb16eccf5c960f3100f936 100644 (file)
@@ -469,7 +469,7 @@ extern void print_lbc_regs(void);
 extern void init_early_memctl_regs(void);
 extern void upmconfig(uint upm, uint *table, uint size);
 
-#define LBC_BASE_ADDR ((fsl_lbc_t *)CONFIG_SYS_LBC_ADDR)
+#define LBC_BASE_ADDR ((fsl_lbc_t *)CFG_SYS_LBC_ADDR)
 #define get_lbc_lcrr() (in_be32(&(LBC_BASE_ADDR)->lcrr))
 #define get_lbc_lbcr() (in_be32(&(LBC_BASE_ADDR)->lbcr))
 #define get_lbc_br(i) (in_be32(&(LBC_BASE_ADDR)->bank[i].br))
index de85bcfdcf967aa94a11cbdcb71eb765ba9e9ac7..0af3d8902ace15906a8d59869cebfd07ac9f5022 100644 (file)
@@ -18,15 +18,15 @@ struct srio_liodn_id_table {
 #define SET_SRIO_LIODN_1(port, idA) \
        { .id = { idA }, .num_ids = 1, .portid = port, \
          .reg_offset[0] = offsetof(ccsr_gur_t, rio##port##liodnr) \
-               + CFG_SYS_MPC85xx_GUTS_OFFSET + CONFIG_SYS_CCSRBAR, \
+               + CFG_SYS_MPC85xx_GUTS_OFFSET + CFG_SYS_CCSRBAR, \
        }
 
 #define SET_SRIO_LIODN_2(port, idA, idB) \
        { .id = { idA, idB }, .num_ids = 2, .portid = port, \
          .reg_offset[0] = offsetof(ccsr_gur_t, rio##port##liodnr) \
-               + CFG_SYS_MPC85xx_GUTS_OFFSET + CONFIG_SYS_CCSRBAR, \
+               + CFG_SYS_MPC85xx_GUTS_OFFSET + CFG_SYS_CCSRBAR, \
          .reg_offset[1] = offsetof(ccsr_gur_t, rio##port##maintliodnr) \
-               + CFG_SYS_MPC85xx_GUTS_OFFSET + CONFIG_SYS_CCSRBAR, \
+               + CFG_SYS_MPC85xx_GUTS_OFFSET + CFG_SYS_CCSRBAR, \
        }
 
 #define SET_SRIO_LIODN_BASE(port, id_a) \
@@ -70,22 +70,22 @@ extern void fdt_fixup_liodn(void *blob);
        { .compat[0] = name1, \
          .compat[1] = name2, \
          .id = { idA }, .num_ids = 1, \
-         .reg_offset = off + CONFIG_SYS_CCSRBAR, \
-         .compat_offset = compatoff + CONFIG_SYS_CCSRBAR_PHYS, \
+         .reg_offset = off + CFG_SYS_CCSRBAR, \
+         .compat_offset = compatoff + CFG_SYS_CCSRBAR_PHYS, \
        }
 
 #define SET_LIODN_ENTRY_1(name, idA, off, compatoff) \
        { .compat = name, \
          .id = { idA }, .num_ids = 1, \
-         .reg_offset = off + CONFIG_SYS_CCSRBAR, \
-         .compat_offset = compatoff + CONFIG_SYS_CCSRBAR_PHYS, \
+         .reg_offset = off + CFG_SYS_CCSRBAR, \
+         .compat_offset = compatoff + CFG_SYS_CCSRBAR_PHYS, \
        }
 
 #define SET_LIODN_ENTRY_2(name, idA, idB, off, compatoff) \
        { .compat = name, \
          .id = { idA, idB }, .num_ids = 2, \
-         .reg_offset = off + CONFIG_SYS_CCSRBAR, \
-         .compat_offset = compatoff + CONFIG_SYS_CCSRBAR_PHYS, \
+         .reg_offset = off + CFG_SYS_CCSRBAR, \
+         .compat_offset = compatoff + CFG_SYS_CCSRBAR_PHYS, \
        }
 
 #define SET_GUTS_LIODN(compat, liodn, name, compatoff) \
index 3e707600f28fbff8a6e6d1714dca3931e70fa566..e8b26802062bf5f5c50e5705434843536dc9ae4d 100644 (file)
@@ -9,11 +9,11 @@
 
 #ifdef CONFIG_NXP_ESBC
 #if defined(CONFIG_FSL_CORENET)
-#define CONFIG_SYS_PBI_FLASH_BASE              0xc0000000
+#define CFG_SYS_PBI_FLASH_BASE         0xc0000000
 #else
-#define CONFIG_SYS_PBI_FLASH_BASE              0xce000000
+#define CFG_SYS_PBI_FLASH_BASE         0xce000000
 #endif
-#define CONFIG_SYS_PBI_FLASH_WINDOW            0xcff80000
+#define CFG_SYS_PBI_FLASH_WINDOW               0xcff80000
 
 #if defined(CONFIG_TARGET_T2080QDS) || \
        defined(CONFIG_TARGET_T2080RDB) || \
        defined(CONFIG_TARGET_T1042D4RDB) || \
        defined(CONFIG_TARGET_T1042RDB_PI) || \
        defined(CONFIG_ARCH_T1024)
-#undef CONFIG_SYS_INIT_L3_ADDR
-#define CONFIG_SYS_INIT_L3_ADDR                        0xbff00000
+#undef CFG_SYS_INIT_L3_ADDR
+#define CFG_SYS_INIT_L3_ADDR                   0xbff00000
 #endif
 
 #if defined(CONFIG_RAMBOOT_PBL)
-#undef CONFIG_SYS_INIT_L3_ADDR
-#ifdef CONFIG_SYS_INIT_L3_VADDR
-#define CONFIG_SYS_INIT_L3_ADDR        \
-                       (CONFIG_SYS_INIT_L3_VADDR & ~0xFFF00000) | \
+#undef CFG_SYS_INIT_L3_ADDR
+#ifdef CFG_SYS_INIT_L3_VADDR
+#define CFG_SYS_INIT_L3_ADDR   \
+                       (CFG_SYS_INIT_L3_VADDR & ~0xFFF00000) | \
                                        0xbff00000
 #else
-#define CONFIG_SYS_INIT_L3_ADDR                0xbff00000
+#define CFG_SYS_INIT_L3_ADDR           0xbff00000
 #endif
 #endif
 
index 8e1820267088fd0bb356436a96bc13a3e73ff839..19774f3053b39aa9b50f9635f8166361ae2690ab 100644 (file)
@@ -871,11 +871,11 @@ struct ccsr_gpio {
 #define CFG_SYS_MPC83xx_ESDHC_ADDR \
                        (CONFIG_SYS_IMMR + CFG_SYS_MPC83xx_ESDHC_OFFSET)
 
-#define CONFIG_SYS_LBC_ADDR (&((immap_t *)CONFIG_SYS_IMMR)->im_lbc)
+#define CFG_SYS_LBC_ADDR (&((immap_t *)CONFIG_SYS_IMMR)->im_lbc)
 
-#define CONFIG_SYS_TSEC1_OFFSET                0x24000
-#define CONFIG_SYS_MDIO1_OFFSET                0x24000
+#define CFG_SYS_TSEC1_OFFSET           0x24000
+#define CFG_SYS_MDIO1_OFFSET           0x24000
 
-#define TSEC_BASE_ADDR         (CONFIG_SYS_IMMR + CONFIG_SYS_TSEC1_OFFSET)
-#define MDIO_BASE_ADDR         (CONFIG_SYS_IMMR + CONFIG_SYS_MDIO1_OFFSET)
+#define TSEC_BASE_ADDR         (CONFIG_SYS_IMMR + CFG_SYS_TSEC1_OFFSET)
+#define MDIO_BASE_ADDR         (CONFIG_SYS_IMMR + CFG_SYS_MDIO1_OFFSET)
 #endif                         /* __IMMAP_83xx__ */
index 9ae698743eee3e23872f4c7118b1193957aea339..283fdf3b458a49cc6f71be83c1bc490455455b8a 100644 (file)
@@ -2445,10 +2445,10 @@ struct ccsr_pman {
 #ifdef CONFIG_SYS_FSL_SFP_VER_3_0
 /* In SFPv3, OSPR register is now at offset 0x200.
  *  * So directly mapping sfp register map to this address */
-#define CONFIG_SYS_OSPR_OFFSET                  0x200
-#define CONFIG_SYS_SFP_OFFSET            (0xE8000 + CONFIG_SYS_OSPR_OFFSET)
+#define CFG_SYS_OSPR_OFFSET                  0x200
+#define CFG_SYS_SFP_OFFSET            (0xE8000 + CFG_SYS_OSPR_OFFSET)
 #else
-#define CONFIG_SYS_SFP_OFFSET                   0xE8000
+#define CFG_SYS_SFP_OFFSET                   0xE8000
 #endif
 #define CFG_SYS_FSL_CORENET_SERDES_OFFSET      0xEA000
 #define CFG_SYS_FSL_CORENET_SERDES2_OFFSET     0xEB000
@@ -2489,7 +2489,7 @@ struct ccsr_pman {
 #define CFG_SYS_MPC85xx_SATA2_OFFSET           0x221000
 #define CFG_SYS_FSL_SEC_OFFSET         0x300000
 #define CFG_SYS_FSL_JR0_OFFSET         0x301000
-#define CONFIG_SYS_SEC_MON_OFFSET              0x314000
+#define CFG_SYS_SEC_MON_OFFSET         0x314000
 #define CFG_SYS_FSL_CORENET_PME_OFFSET 0x316000
 #define CFG_SYS_FSL_QMAN_OFFSET                0x318000
 #define CFG_SYS_FSL_BMAN_OFFSET                0x31a000
@@ -2542,13 +2542,13 @@ struct ccsr_pman {
 #define CFG_SYS_MPC85xx_USB1_PHY_OFFSET        0xE5000
 #define CFG_SYS_MPC85xx_USB2_PHY_OFFSET        0xE5100
 #ifdef CONFIG_TSECV2
-#define CONFIG_SYS_TSEC1_OFFSET                        0xB0000
+#define CFG_SYS_TSEC1_OFFSET                   0xB0000
 #elif defined(CONFIG_TSECV2_1)
-#define CONFIG_SYS_TSEC1_OFFSET                        0x10000
+#define CFG_SYS_TSEC1_OFFSET                   0x10000
 #else
-#define CONFIG_SYS_TSEC1_OFFSET                        0x24000
+#define CFG_SYS_TSEC1_OFFSET                   0x24000
 #endif
-#define CONFIG_SYS_MDIO1_OFFSET                        0x24000
+#define CFG_SYS_MDIO1_OFFSET                   0x24000
 #define CFG_SYS_MPC85xx_ESDHC_OFFSET           0x2e000
 #if defined(CONFIG_ARCH_C29X)
 #define CFG_SYS_FSL_SEC_OFFSET         0x80000
@@ -2559,8 +2559,8 @@ struct ccsr_pman {
 #endif
 #define CFG_SYS_MPC85xx_SERDES2_OFFSET 0xE3100
 #define CFG_SYS_MPC85xx_SERDES1_OFFSET 0xE3000
-#define CONFIG_SYS_SEC_MON_OFFSET              0xE6000
-#define CONFIG_SYS_SFP_OFFSET                  0xE7000
+#define CFG_SYS_SEC_MON_OFFSET         0xE6000
+#define CFG_SYS_SFP_OFFSET                     0xE7000
 #define CFG_SYS_FSL_QMAN_OFFSET                0x88000
 #define CFG_SYS_FSL_BMAN_OFFSET                0x8a000
 #define CFG_SYS_FSL_FM1_OFFSET         0x100000
@@ -2574,9 +2574,9 @@ struct ccsr_pman {
 #define CFG_SYS_FSL_SRIO_OFFSET                0xC0000
 
 #define CFG_SYS_FSL_CPC_ADDR   \
-       (CONFIG_SYS_CCSRBAR + CFG_SYS_FSL_CPC_OFFSET)
+       (CFG_SYS_CCSRBAR + CFG_SYS_FSL_CPC_OFFSET)
 #define CFG_SYS_FSL_SCFG_ADDR  \
-       (CONFIG_SYS_CCSRBAR + CFG_SYS_FSL_SCFG_OFFSET)
+       (CFG_SYS_CCSRBAR + CFG_SYS_FSL_SCFG_OFFSET)
 #define CFG_SYS_FSL_QMAN_ADDR \
        (CONFIG_SYS_IMMR + CFG_SYS_FSL_QMAN_OFFSET)
 #define CFG_SYS_FSL_BMAN_ADDR \
@@ -2603,9 +2603,9 @@ struct ccsr_pman {
        (CONFIG_SYS_IMMR + CFG_SYS_MPC8xxx_DDR2_OFFSET)
 #define CFG_SYS_FSL_DDR3_ADDR \
        (CONFIG_SYS_IMMR + CFG_SYS_MPC8xxx_DDR3_OFFSET)
-#define CONFIG_SYS_LBC_ADDR \
+#define CFG_SYS_LBC_ADDR \
        (CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_LBC_OFFSET)
-#define CONFIG_SYS_IFC_ADDR \
+#define CFG_SYS_IFC_ADDR \
        (CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_IFC_OFFSET)
 #define CFG_SYS_MPC85xx_ESPI_ADDR \
        (CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_ESPI_OFFSET)
@@ -2659,7 +2659,7 @@ struct ccsr_pman {
        (CONFIG_SYS_IMMR + CFG_SYS_FSL_FM2_OFFSET)
 #define CFG_SYS_FSL_SRIO_ADDR \
        (CONFIG_SYS_IMMR + CFG_SYS_FSL_SRIO_OFFSET)
-#define CONFIG_SYS_PAMU_ADDR \
+#define CFG_SYS_PAMU_ADDR \
        (CONFIG_SYS_IMMR + CFG_SYS_FSL_PAMU_OFFSET)
 
 #define CFG_SYS_PCIE1_ADDR \
@@ -2667,14 +2667,14 @@ struct ccsr_pman {
 #define CFG_SYS_PCIE2_ADDR \
        (CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_PCIE2_OFFSET)
 
-#define CONFIG_SYS_SFP_ADDR  \
-       (CONFIG_SYS_IMMR + CONFIG_SYS_SFP_OFFSET)
+#define CFG_SYS_SFP_ADDR  \
+       (CONFIG_SYS_IMMR + CFG_SYS_SFP_OFFSET)
 
-#define CONFIG_SYS_SEC_MON_ADDR  \
-       (CONFIG_SYS_IMMR + CONFIG_SYS_SEC_MON_OFFSET)
+#define CFG_SYS_SEC_MON_ADDR  \
+       (CONFIG_SYS_IMMR + CFG_SYS_SEC_MON_OFFSET)
 
-#define TSEC_BASE_ADDR         (CONFIG_SYS_IMMR + CONFIG_SYS_TSEC1_OFFSET)
-#define MDIO_BASE_ADDR         (CONFIG_SYS_IMMR + CONFIG_SYS_MDIO1_OFFSET)
+#define TSEC_BASE_ADDR         (CONFIG_SYS_IMMR + CFG_SYS_TSEC1_OFFSET)
+#define MDIO_BASE_ADDR         (CONFIG_SYS_IMMR + CFG_SYS_MDIO1_OFFSET)
 
 #ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
 struct ccsr_cluster_l2 {
@@ -2735,7 +2735,7 @@ struct ccsr_cluster_l2 {
        (CONFIG_SYS_IMMR + CFG_SYS_FSL_CLUSTER_1_L2_OFFSET)
 #endif /* CONFIG_SYS_FSL_QORIQ_CHASSIS2 */
 
-#define        CONFIG_SYS_DCSR_DCFG_OFFSET     0X20000
+#define        CFG_SYS_DCSR_DCFG_OFFSET        0X20000
 struct dcsr_dcfg_regs {
        u8  res_0[0x520];
        u32 ecccr1;
index d4a6057527c2e0e848d7912e21af0a42c2f24caa..b638ea7be6117f8c7800dc19dccdb747824da6cb 100644 (file)
@@ -23,7 +23,7 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image)
        image_entry_arg_t image_entry =
                (image_entry_arg_t)spl_image->entry_point;
 
-       image_entry(spl_image->arg, 0, 0, EPAPR_MAGIC, CONFIG_SYS_BOOTMAPSZ,
+       image_entry(spl_image->arg, 0, 0, EPAPR_MAGIC, CFG_SYS_BOOTMAPSZ,
                    0, 0);
 }
 #endif /* CONFIG_SPL_OS_BOOT */
index 99d8797a549f18e6ac8af46415ce8db5bf115111..03c196fec3b137b8e3cc778719356c1423212116 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/processor.h>
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       (TMU_BASE + 0xc)        /* TCNT0 */
-#define CONFIG_SYS_TIMER_RATE          (get_board_sys_clk() / 4)
+#define CFG_SYS_TIMER_COUNTER  (TMU_BASE + 0xc)        /* TCNT0 */
+#define CFG_SYS_TIMER_RATE             (get_board_sys_clk() / 4)
 
 #endif
index c11101b44ece25611b8c23c8aa401fc911bcaa07..1eb97ac5bb17b664763983853d4f7de49d6bad4e 100644 (file)
@@ -144,7 +144,7 @@ static void x86_phys_memset_page(phys_addr_t map_addr, uintptr_t offset, int c,
 
        /* Make sure the window is below U-Boot. */
        assert(window + LARGE_PAGE_SIZE <
-              gd->relocaddr - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_STACK_SIZE);
+              gd->relocaddr - CONFIG_SYS_MALLOC_LEN - CFG_SYS_STACK_SIZE);
        /* Map the page into the window and then memset the appropriate part. */
        x86_phys_map_page(window, map_addr, 1);
        memset((void *)(window + offset), c, size);
index 3b27f9308a061bfd3d249597311b080aa4074bbe..920b5fd26b20cef8ff693c6ac9cd37e9ba666013 100644 (file)
@@ -22,8 +22,8 @@
  * The actual location of memory and IO is the board property.
  */
 
-#define IOADDR(x)              (CONFIG_SYS_IO_BASE + (x))
-#define MEMADDR(x)             (CONFIG_SYS_MEMORY_BASE + (x))
+#define IOADDR(x)              (CFG_SYS_IO_BASE + (x))
+#define MEMADDR(x)             (CFG_SYS_MEMORY_BASE + (x))
 #define PHYSADDR(x)            ((x) - XCHAL_VECBASE_RESET_VADDR + \
                                 XCHAL_VECBASE_RESET_PADDR)
 
index f9a37e7215c960039b30471f483c925d75690cf0..ea49c7a99c0bcdc60a1d45427fa08ddff0aa1884 100644 (file)
@@ -26,7 +26,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int checkboard (void)
 {
        puts("Board: EB+CPU5282 (BuS Elektronik GmbH & Co. KG)\n");
-#if (CONFIG_TEXT_BASE ==  CONFIG_SYS_INT_FLASH_BASE)
+#if (CONFIG_TEXT_BASE ==  CFG_SYS_INT_FLASH_BASE)
        puts("       Boot from Internal FLASH\n");
 #endif
        return 0;
@@ -38,7 +38,7 @@ int dram_init(void)
 
        size = 0;
        MCFSDRAMC_DCR = MCFSDRAMC_DCR_RTIM_6 |
-                       MCFSDRAMC_DCR_RC((15 * CONFIG_SYS_CLK / 1000000) >> 4);
+                       MCFSDRAMC_DCR_RC((15 * CFG_SYS_CLK / 1000000) >> 4);
        asm (" nop");
 #ifdef CFG_SYS_SDRAM_BASE0
        MCFSDRAMC_DACR0 = MCFSDRAMC_DACR_BASE(CFG_SYS_SDRAM_BASE0)|
@@ -94,7 +94,7 @@ int dram_init(void)
        return 0;
 }
 
-#if defined(CONFIG_SYS_DRAM_TEST)
+#if defined(CFG_SYS_DRAM_TEST)
 int testdram(void)
 {
        uint *pstart = (uint *) CONFIG_SYS_MEMTEST_START;
index 695d6f6ed470d93f047e9e4050c71143d56469bc..917091340009ef4054e34bd382e66542daa3512e 100644 (file)
@@ -88,7 +88,7 @@ int board_init(void)
 
 #if defined(CONFIG_MISC_INIT_R)
 
-#if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_G762_ADDR)
+#if defined(CONFIG_CMD_I2C) && defined(CFG_SYS_I2C_G762_ADDR)
 /*
  * Start I2C fan (GMT G762 controller)
  */
@@ -100,11 +100,11 @@ static void init_fan(void)
 
        /* Enable open-loop and PWM modes */
        data = 0x20;
-       if (i2c_write(CONFIG_SYS_I2C_G762_ADDR,
+       if (i2c_write(CFG_SYS_I2C_G762_ADDR,
                      G762_REG_FAN_CMD1, 1, &data, 1) != 0)
                goto err;
        data = 0;
-       if (i2c_write(CONFIG_SYS_I2C_G762_ADDR,
+       if (i2c_write(CFG_SYS_I2C_G762_ADDR,
                      G762_REG_SET_CNT, 1, &data, 1) != 0)
                goto err;
        /*
@@ -124,18 +124,18 @@ static void init_fan(void)
         * Start fan at low speed (2800 RPM):
         */
        data = 0x08;
-       if (i2c_write(CONFIG_SYS_I2C_G762_ADDR,
+       if (i2c_write(CFG_SYS_I2C_G762_ADDR,
                      G762_REG_SET_OUT, 1, &data, 1) != 0)
                goto err;
 
        return;
 err:
        printf("Error: failed to start I2C fan @%02x\n",
-              CONFIG_SYS_I2C_G762_ADDR);
+              CFG_SYS_I2C_G762_ADDR);
 }
 #else
 static void init_fan(void) {}
-#endif /* CONFIG_CMD_I2C && CONFIG_SYS_I2C_G762_ADDR */
+#endif /* CONFIG_CMD_I2C && CFG_SYS_I2C_G762_ADDR */
 
 #if defined(CONFIG_NET2BIG_V2) && defined(CONFIG_KIRKWOOD_GPIO)
 /*
index 06f964f53a3bb2fdf1e02612488688934de70374..a0bace7b46c2b37debd1564a83215517d95a864c 100644 (file)
@@ -56,8 +56,8 @@ void setup_board_tags(struct tag **in_params)
        t = (struct tag_mv_uboot *)&params->u;
 
        t->uboot_version = VER_NUM | syno_board_id();
-       t->tclk = CONFIG_SYS_TCLK;
-       t->sysclk = CONFIG_SYS_TCLK * 2;
+       t->tclk = CFG_SYS_TCLK;
+       t->sysclk = CFG_SYS_TCLK * 2;
        t->isusbhost = usb_port_modes();
 
        for (i = 0; i < ETHADDR_MAX; i++) {
index d220b877d66181812a601a09937de4cb109e862e..9db5135a8ffab1fb0397bb77c85d73847ce438b3 100644 (file)
@@ -41,10 +41,10 @@ static unsigned long long div_clock = DIV_CLOCK_INIT;
 static unsigned long long div_timer = 1; /* Divisor to convert timer reading
                                          * change to U-Boot ticks
                                          */
-/* CONFIG_SYS_HZ = CONFIG_SYS_HZ_CLOCK/(div_clock * div_timer) */
+/* CONFIG_SYS_HZ = CFG_SYS_HZ_CLOCK/(div_clock * div_timer) */
 static ulong timestamp;                /* U-Boot ticks since startup */
 
-#define READ_TIMER (*(volatile ulong *)(CONFIG_SYS_TIMERBASE+4))
+#define READ_TIMER (*(volatile ulong *)(CFG_SYS_TIMERBASE+4))
 
 /* all function return values in U-Boot ticks i.e. (1/CONFIG_SYS_HZ) sec
  *  - unless otherwise stated
@@ -55,7 +55,7 @@ static ulong timestamp;               /* U-Boot ticks since startup */
 int timer_init (void)
 {
        /* Load timer with initial value */
-       *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 0) = TIMER_LOAD_VAL;
+       *(volatile ulong *)(CFG_SYS_TIMERBASE + 0) = TIMER_LOAD_VAL;
 #ifdef CONFIG_ARCH_CINTEGRATOR
        /* Set timer to be
         *      enabled          1
@@ -66,7 +66,7 @@ int timer_init (void)
         *      32 bit           1
         *      wrapping         0
         */
-       *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 8) = 0x000000C2;
+       *(volatile ulong *)(CFG_SYS_TIMERBASE + 8) = 0x000000C2;
 #else
        /* Set timer to be
         *      enabled          1
@@ -75,7 +75,7 @@ int timer_init (void)
         *      divider 256     10
         *      XX              00
         */
-       *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 8) = 0x00000088;
+       *(volatile ulong *)(CFG_SYS_TIMERBASE + 8) = 0x00000088;
 #endif
 
        /* init the timestamp */
@@ -85,7 +85,7 @@ int timer_init (void)
        /* start "advancing" time stamp from 0 */
        timestamp = 0L;
 
-       div_timer = CONFIG_SYS_HZ_CLOCK;
+       div_timer = CFG_SYS_HZ_CLOCK;
        do_div(div_timer, CONFIG_SYS_HZ);
        do_div(div_timer, div_clock);
 
@@ -156,7 +156,7 @@ unsigned long long get_ticks(void)
  */
 ulong get_tbclk(void)
 {
-       unsigned long long tmp = CONFIG_SYS_HZ_CLOCK;
+       unsigned long long tmp = CFG_SYS_HZ_CLOCK;
 
        do_div(tmp, div_clock);
 
index af326dc6f45317f793bed11d396cba0d38306602..4ca544f1017da13bc449c6e758f84a495b279fe6 100644 (file)
@@ -108,7 +108,7 @@ unsigned long __section(".data") prior_stage_fdt_address[2];
 #define JUNO_FLASH_SEC_SIZE    (256 * 1024)
 static phys_addr_t find_dtb_in_nor_flash(const char *partname)
 {
-       phys_addr_t sector = CONFIG_SYS_FLASH_BASE;
+       phys_addr_t sector = CFG_SYS_FLASH_BASE;
        int i;
 
        for (i = 0;
@@ -140,7 +140,7 @@ static phys_addr_t find_dtb_in_nor_flash(const char *partname)
                        imginfo = sector + JUNO_FLASH_SEC_SIZE - 0x30 - reg;
                        reg = readl(imginfo + 0x54);
 
-                       return CONFIG_SYS_FLASH_BASE +
+                       return CFG_SYS_FLASH_BASE +
                               reg * JUNO_FLASH_SEC_SIZE;
                }
        }
index ade7f9d120aeaf3cd8b9fc89f3cd3b8192a81106..f38f5564a06ceadee9c2fab9bbeaabc4cc316d3b 100644 (file)
@@ -58,8 +58,8 @@ unsigned long get_board_sys_clk(void)
         * else non-zero (hang).
         */
 
-#ifdef CONFIG_SYS_FPGAREG_FREQ
-       return (*(volatile unsigned long *)CONFIG_SYS_FPGAREG_FREQ);
+#ifdef CFG_SYS_FPGAREG_FREQ
+       return (*(volatile unsigned long *)CFG_SYS_FPGAREG_FREQ);
 #else
        /* early Tensilica bitstreams lack this reg, but most run at 50 MHz */
        return 50000000;
@@ -90,7 +90,7 @@ int misc_init_r(void)
        if (s == 0) {
                unsigned int x;
                char s[] = __stringify(CONFIG_ETHBASE);
-               x = (*(volatile u32 *)CONFIG_SYS_FPGAREG_DIPSW)
+               x = (*(volatile u32 *)CFG_SYS_FPGAREG_DIPSW)
                        & FPGAREG_MAC_MASK;
                sprintf(&s[15], "%02x", x);
                env_set("ethaddr", s);
@@ -106,9 +106,9 @@ U_BOOT_DRVINFO(sysreset) = {
 
 static struct ethoc_eth_pdata ethoc_pdata = {
        .eth_pdata = {
-               .iobase = CONFIG_SYS_ETHOC_BASE,
+               .iobase = CFG_SYS_ETHOC_BASE,
        },
-       .packet_base = CONFIG_SYS_ETHOC_BUFFER_ADDR,
+       .packet_base = CFG_SYS_ETHOC_BUFFER_ADDR,
 };
 
 U_BOOT_DRVINFO(ethoc) = {
index 1a039c53c142f685b8633bd08865c94095365102..37340fe97003aa221d5bb54f839c6a083cf5b38d 100644 (file)
@@ -187,7 +187,7 @@ static void atf_print_part_table(void)
        int ret;
        char *ptype;
 
-       struct storage_partition *part = (void *)CONFIG_SYS_LOWMEM_BASE;
+       struct storage_partition *part = (void *)CFG_SYS_LOWMEM_BASE;
 
        pcount = atf_get_pcount();
 
index a8f8c78558449dbd143dbdaa5bac7f37819f01ae..ab20825ed36fe5c44f1a83be40cfdaa40c5fed8e 100644 (file)
@@ -20,7 +20,7 @@
 #include <dm/platform_data/serial_pl01x.h>
 
 static const struct pl01x_serial_plat serial0 = {
-       .base = CONFIG_SYS_SERIAL0,
+       .base = CFG_SYS_SERIAL0,
        .type = TYPE_PL011,
        .clock = 0,
        .skip_init = true,
@@ -32,7 +32,7 @@ U_BOOT_DRVINFO(thunderx_serial0) = {
 };
 
 static const struct pl01x_serial_plat serial1 = {
-       .base = CONFIG_SYS_SERIAL1,
+       .base = CFG_SYS_SERIAL1,
        .type = TYPE_PL011,
        .clock = 0,
        .skip_init = true,
index 5d15ed4e691dad5a51c618dfdeb773e82c7e7b90..8416af163ad1c194732e3e0d7c6ed75e8e2e2f6b 100644 (file)
@@ -12,7 +12,7 @@
 #include <uuid.h>
 #include <linux/delay.h>
 
-#define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
+#define PHYS_FLASH_1 CFG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000
 
 flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
@@ -102,8 +102,8 @@ unsigned long flash_init(void)
        }
 
        flash_protect(FLAG_PROTECT_SET,
-                     CONFIG_SYS_FLASH_BASE,
-                     CONFIG_SYS_FLASH_BASE + 0x3ffff, &flash_info[0]);
+                     CFG_SYS_FLASH_BASE,
+                     CFG_SYS_FLASH_BASE + 0x3ffff, &flash_info[0]);
 
        return size;
 }
@@ -117,8 +117,8 @@ unsigned long flash_init(void)
 #define CMD_PROGRAM            0x00A0
 #define CMD_UNLOCK_BYPASS      0x0020
 
-#define MEM_FLASH_ADDR1                (*(volatile u16 *)(CONFIG_SYS_FLASH_BASE + (0x00000555<<1)))
-#define MEM_FLASH_ADDR2                (*(volatile u16 *)(CONFIG_SYS_FLASH_BASE + (0x000002AA<<1)))
+#define MEM_FLASH_ADDR1                (*(volatile u16 *)(CFG_SYS_FLASH_BASE + (0x00000555<<1)))
+#define MEM_FLASH_ADDR2                (*(volatile u16 *)(CFG_SYS_FLASH_BASE + (0x000002AA<<1)))
 
 #define BIT_ERASE_DONE         0x0080
 #define BIT_RDY_MASK           0x0080
index cbf8134346d5c4ba8013b02157fc8ce96f2d548e..8d8842ebedfa835b56141e292c28b66d63cd5d1f 100644 (file)
@@ -27,7 +27,7 @@ skip_smp_setup:
 
 #if defined(CONFIG_SOC_CA8277B)
        /* Enable CPU Timer */
-       ldr x0, =CONFIG_SYS_TIMER_BASE
+       ldr x0, =CFG_SYS_TIMER_BASE
        mov x1, #1
        str w1, [x0]
 #endif
index f344622b024380024c0b24a2d5dcd616652b0a34..aae0a5dac066f159fdbae56cfacdf2e130beee07 100644 (file)
@@ -84,7 +84,7 @@ int board_init(void)
        unsigned int reg_data, jtag_id;
 
        /* Enable timer */
-       writel(1, CONFIG_SYS_TIMER_BASE);
+       writel(1, CFG_SYS_TIMER_BASE);
 
        /* Enable snoop in CCI400 slave port#4 */
        writel(3, 0xF5595000);
index 2436aab71ccf3774e0fc3143b5660ec83e2d6c0e..e3a0f266a4c58d4841cdfb4bdc756ceb6b029eb8 100644 (file)
@@ -371,20 +371,20 @@ int rmii_hw_init(void)
        /* Set polarity to non-inverted */
        buf[0] = 0x0;
        buf[1] = 0x0;
-       ret = i2c_write(CONFIG_SYS_I2C_EXPANDER_ADDR, 4, 1, buf, 2);
+       ret = i2c_write(CFG_SYS_I2C_EXPANDER_ADDR, 4, 1, buf, 2);
        if (ret) {
                printf("\nExpander @ 0x%02x write FAILED!!!\n",
-                               CONFIG_SYS_I2C_EXPANDER_ADDR);
+                               CFG_SYS_I2C_EXPANDER_ADDR);
                return ret;
        }
 
        /* Configure P07-P05 as outputs */
        buf[0] = 0x1f;
        buf[1] = 0xff;
-       ret = i2c_write(CONFIG_SYS_I2C_EXPANDER_ADDR, 6, 1, buf, 2);
+       ret = i2c_write(CFG_SYS_I2C_EXPANDER_ADDR, 6, 1, buf, 2);
        if (ret) {
                printf("\nExpander @ 0x%02x write FAILED!!!\n",
-                               CONFIG_SYS_I2C_EXPANDER_ADDR);
+                               CFG_SYS_I2C_EXPANDER_ADDR);
        }
 
        /* For Ethernet RMII selection
@@ -392,16 +392,16 @@ int rmii_hw_init(void)
         * P06(SelB)=1
         * P05(SelC)=1
         */
-       if (i2c_read(CONFIG_SYS_I2C_EXPANDER_ADDR, 2, 1, buf, 1)) {
+       if (i2c_read(CFG_SYS_I2C_EXPANDER_ADDR, 2, 1, buf, 1)) {
                printf("\nExpander @ 0x%02x read FAILED!!!\n",
-                               CONFIG_SYS_I2C_EXPANDER_ADDR);
+                               CFG_SYS_I2C_EXPANDER_ADDR);
        }
 
        buf[0] &= 0x1f;
        buf[0] |= (0 << 7) | (1 << 6) | (1 << 5);
-       if (i2c_write(CONFIG_SYS_I2C_EXPANDER_ADDR, 2, 1, buf, 1)) {
+       if (i2c_write(CFG_SYS_I2C_EXPANDER_ADDR, 2, 1, buf, 1)) {
                printf("\nExpander @ 0x%02x write FAILED!!!\n",
-                               CONFIG_SYS_I2C_EXPANDER_ADDR);
+                               CFG_SYS_I2C_EXPANDER_ADDR);
        }
 
        /* Set the output as high */
index 913c2ea16640626e835e375d0959dbf1a004a772..ceb0d2cf0aa3b794dccc3c085790a9e2fcf0de33 100644 (file)
@@ -193,6 +193,6 @@ int board_mmc_init(struct bd_info *bd)
 
 int board_mmc_getcd(struct mmc *mmc)
 {
-       return !at91_get_pio_value(CONFIG_SYS_MMC_CD_PIN);
+       return !at91_get_pio_value(CFG_SYS_MMC_CD_PIN);
 }
 #endif
index a4254250bbf3d6da354ec9e90c280650ebe3d88f..a39bcb4fa0c7f7d8323234ca1e9461b82cf77be3 100644 (file)
@@ -41,7 +41,7 @@ static void *get_fdt_virt(void)
        if (gd->flags & GD_FLG_RELOC)
                return (void *)gd->fdt_blob;
        else
-               return (void *)CONFIG_SYS_TMPVIRT;
+               return (void *)CFG_SYS_TMPVIRT;
 }
 
 static uint64_t get_fdt_phys(void)
@@ -163,7 +163,7 @@ int misc_init_r(void)
         * U-Boot is relocated to RAM already, let's delete the temporary FDT
         * virtual-physical mapping that was used in the pre-relocation phase.
         */
-       disable_tlb(find_tlb_idx((void *)CONFIG_SYS_TMPVIRT, 1));
+       disable_tlb(find_tlb_idx((void *)CFG_SYS_TMPVIRT, 1));
 
        /*
         * Detect the presence of the platform bus node, and
@@ -248,7 +248,7 @@ void init_tlbs(void)
        init_used_tlb_cams();
 
        /* Create a dynamic AS=0 CCSRBAR mapping */
-       assert(!tlb_map_range(CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       assert(!tlb_map_range(CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                              1024 * 1024, TLB_MAP_IO));
 
        /* Create a RAM map that spans all accessible RAM */
index 2304e9e8ec3dcc895454de6118dcff2ab4a9e8b0..21f4ba98b5315ad854a047bb17325b9462729770 100644 (file)
@@ -240,7 +240,7 @@ int misc_init_r(void)
        if (str && (strcmp(str, "4") == 0)) {
                writel((readl(&pmc->mckr) & ~AT91_PMC_MDIV) |
                        AT91SAM9_PMC_MDIV_4, &pmc->mckr);
-               at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
+               at91_clock_init(CFG_SYS_AT91_MAIN_CLOCK);
                serial_setbrg();
                /* Notify the user that the clock is not default */
                printf("Setting master clock to %s MHz\n",
index d31ad026568b36b48776423732f7d04f550f4066..9ca350ed468958af3f5d6d1a793179552ee3b6d9 100644 (file)
@@ -43,7 +43,7 @@
 int fsl_check_boot_mode_secure(void)
 {
        uint32_t val;
-       struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
+       struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
        struct ccsr_gur __iomem *gur = (void *)(CONFIG_DCFG_ADDR);
 
        val = sfp_in32(&sfp_regs->ospr) & ITS_MASK;
index 3424d49208fe2f1c6c3ddc386ebab0bff070aced..285ed9afcc9adc23511d09b59f72bad4b517afbe 100644 (file)
@@ -85,7 +85,7 @@ int get_csf_base_addr(u32 *csf_addr, u32 *flash_base_addr)
 {
        struct ccsr_gur __iomem *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
        u32 csf_hdr_addr = in_be32(&gur->scratchrw[0]);
-       u32 csf_flash_offset = csf_hdr_addr & ~(CONFIG_SYS_PBI_FLASH_BASE);
+       u32 csf_flash_offset = csf_hdr_addr & ~(CFG_SYS_PBI_FLASH_BASE);
        u32 flash_addr, addr;
        int found = 0;
        int i = 0;
@@ -160,7 +160,7 @@ static int get_ie_info_addr(uintptr_t *ie_addr)
         */
 #if defined(CONFIG_FSL_TRUST_ARCH_v1) && defined(CONFIG_FSL_CORENET)
        sg_tbl = (struct fsl_secboot_sg_table *)
-                (((u32)hdr->psgtable & ~(CONFIG_SYS_PBI_FLASH_BASE)) +
+                (((u32)hdr->psgtable & ~(CFG_SYS_PBI_FLASH_BASE)) +
                  flash_base_addr);
 #else
        sg_tbl = (struct fsl_secboot_sg_table *)(uintptr_t)(csf_addr +
@@ -170,7 +170,7 @@ static int get_ie_info_addr(uintptr_t *ie_addr)
        /* IE Key Table is the first entry in the SG Table */
 #if defined(CONFIG_MPC85xx)
        *ie_addr = (uintptr_t)((sg_tbl->src_addr &
-                       ~(CONFIG_SYS_PBI_FLASH_BASE)) +
+                       ~(CFG_SYS_PBI_FLASH_BASE)) +
                        flash_base_addr);
 #else
        *ie_addr = (uintptr_t)sg_tbl->src_addr;
@@ -203,7 +203,7 @@ static u32 check_srk(struct fsl_secboot_img_priv *img)
 /* This function returns ospr's key_revoc values.*/
 static u32 get_key_revoc(void)
 {
-       struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
+       struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
        return (sfp_in32(&sfp_regs->ospr) & OSPR_KEY_REVOC_MASK) >>
                OSPR_KEY_REVOC_SHIFT;
 }
@@ -342,7 +342,7 @@ static inline u32 get_key_len(struct fsl_secboot_img_priv *img)
  */
 static void fsl_secboot_header_verification_failure(void)
 {
-       struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
+       struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
 
        /* 29th bit of OSPR is ITS */
        u32 its = sfp_in32(&sfp_regs->ospr) >> 2;
@@ -367,7 +367,7 @@ static void fsl_secboot_header_verification_failure(void)
  */
 static void fsl_secboot_image_verification_failure(void)
 {
-       struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
+       struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
 
        u32 its = (sfp_in32(&sfp_regs->ospr) & ITS_MASK) >> ITS_BIT;
 
@@ -871,7 +871,7 @@ static int secboot_init(struct fsl_secboot_img_priv **img_ptr)
 int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str,
                        uintptr_t *img_addr_ptr)
 {
-       struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
+       struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
        ulong hash[SHA256_BYTES/sizeof(ulong)];
        char hash_str[NUM_HEX_CHARS + 1];
        struct fsl_secboot_img_priv *img;
index 8951fae32d3bedbae959ae0623dc38ddaa061c6b..1a1e9343d23b843f3ca74170894a2cd2a935ae91 100644 (file)
 #include <asm/mmu.h>
 
 struct law_entry law_table[] = {
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_BMAN_MEM_PHYS, LAW_SIZE_2M, LAW_TRGT_IF_BMAN),
+       SET_LAW(CFG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_BMAN_MEM_PHYS, LAW_SIZE_2M, LAW_TRGT_IF_BMAN),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_QMAN_MEM_PHYS, LAW_SIZE_2M, LAW_TRGT_IF_QMAN),
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_QMAN_MEM_PHYS, LAW_SIZE_2M, LAW_TRGT_IF_QMAN),
 #endif
 #ifdef PIXIS_BASE_PHYS
        SET_LAW(PIXIS_BASE_PHYS, LAW_SIZE_4K, LAW_TRGT_IF_LBC),
@@ -24,9 +24,9 @@ struct law_entry law_table[] = {
 #ifdef CPLD_BASE_PHYS
        SET_LAW(CPLD_BASE_PHYS, LAW_SIZE_4K, LAW_TRGT_IF_LBC),
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
+#ifdef CFG_SYS_DCSRBAR_PHYS
        /* Limit DCSR to 32M to access NPC Trace Buffer */
-       SET_LAW(CONFIG_SYS_DCSRBAR_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_DCSR),
+       SET_LAW(CFG_SYS_DCSRBAR_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_DCSR),
 #endif
 #ifdef CFG_SYS_NAND_BASE_PHYS
        SET_LAW(CFG_SYS_NAND_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
index 7302b76066289c792443ad2d23aa6acc05ec7f78..1a2d9cbfc0ce02674f29454f7078a102bd300489 100644 (file)
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS,
                      MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
                      MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
                      MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
                      MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
 #ifdef CPLD_BASE
@@ -41,25 +41,25 @@ struct fsl_e_tlb_entry tlb_table[] = {
 
        /* TLB 1 */
        /* *I*** - Covers boot page */
-#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CFG_SYS_INIT_L3_ADDR)
 
 #if !defined(CONFIG_NXP_ESBC)
        /*
         * *I*G - L3SRAM. When L3 is used as 1M SRAM, the address of the
         * SRAM is at 0xfff00000, it covered the 0xfffff000.
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_ADDR, CONFIG_SYS_INIT_L3_ADDR,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L3_ADDR, CFG_SYS_INIT_L3_ADDR,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 0, BOOKE_PAGESZ_1M, 1),
 #else
        /*
         * *I*G - L3SRAM. When L3 is used as 1M SRAM, in case of Secure Boot
-        * the physical address of the SRAM is at CONFIG_SYS_INIT_L3_ADDR,
+        * the physical address of the SRAM is at CFG_SYS_INIT_L3_ADDR,
         * and virtual address is CONFIG_SYS_MONITOR_BASE
         */
 
        SET_TLB_ENTRY(1, CONFIG_SYS_MONITOR_BASE & 0xfff00000,
-                       CONFIG_SYS_INIT_L3_ADDR & 0xfff00000,
+                       CFG_SYS_INIT_L3_ADDR & 0xfff00000,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 0, BOOKE_PAGESZ_1M, 1),
 #endif
@@ -80,13 +80,13 @@ struct fsl_e_tlb_entry tlb_table[] = {
 #endif
 
        /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                      MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 1, BOOKE_PAGESZ_16M, 1),
 
        /* *I*G* - Flash, localbus */
        /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                      MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
                      0, 2, BOOKE_PAGESZ_256M, 1),
 
@@ -112,26 +112,26 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 6, BOOKE_PAGESZ_256K, 1),
 
        /* Bman/Qman */
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE, CONFIG_SYS_BMAN_MEM_PHYS,
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE, CFG_SYS_BMAN_MEM_PHYS,
                      MAS3_SW|MAS3_SR, 0,
                      0, 9, BOOKE_PAGESZ_1M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE + 0x00100000,
-                     CONFIG_SYS_BMAN_MEM_PHYS + 0x00100000,
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE + 0x00100000,
+                     CFG_SYS_BMAN_MEM_PHYS + 0x00100000,
                      MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 10, BOOKE_PAGESZ_1M, 1),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE, CONFIG_SYS_QMAN_MEM_PHYS,
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE, CFG_SYS_QMAN_MEM_PHYS,
                      MAS3_SW|MAS3_SR, 0,
                      0, 11, BOOKE_PAGESZ_1M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE + 0x00100000,
-                     CONFIG_SYS_QMAN_MEM_PHYS + 0x00100000,
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE + 0x00100000,
+                     CFG_SYS_QMAN_MEM_PHYS + 0x00100000,
                      MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 12, BOOKE_PAGESZ_1M, 1),
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_DCSRBAR, CONFIG_SYS_DCSRBAR_PHYS,
+#ifdef CFG_SYS_DCSRBAR_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_DCSRBAR, CFG_SYS_DCSRBAR_PHYS,
                      MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 13, BOOKE_PAGESZ_4M, 1),
 #endif
index 2bb838cea6c46bc9557dada154198b14e1c720b8..da2c1de078b74cad9c9211f15c26c14a47a1a313 100644 (file)
 #define QIXIS_RCFG_CTL_RECONFIG_START 0x21
 #endif
 
-#ifdef CONFIG_SYS_I2C_FPGA_ADDR
+#ifdef CFG_SYS_I2C_FPGA_ADDR
 u8 qixis_read_i2c(unsigned int reg)
 {
 #if !CONFIG_IS_ENABLED(DM_I2C)
-       return i2c_reg_read(CONFIG_SYS_I2C_FPGA_ADDR, reg);
+       return i2c_reg_read(CFG_SYS_I2C_FPGA_ADDR, reg);
 #else
        struct udevice *dev;
 
-       if (i2c_get_chip_for_busnum(0, CONFIG_SYS_I2C_FPGA_ADDR, 1, &dev))
+       if (i2c_get_chip_for_busnum(0, CFG_SYS_I2C_FPGA_ADDR, 1, &dev))
                return 0xff;
 
        return dm_i2c_reg_read(dev, reg);
@@ -48,11 +48,11 @@ void qixis_write_i2c(unsigned int reg, u8 value)
 {
        u8 val = value;
 #if !CONFIG_IS_ENABLED(DM_I2C)
-       i2c_reg_write(CONFIG_SYS_I2C_FPGA_ADDR, reg, val);
+       i2c_reg_write(CFG_SYS_I2C_FPGA_ADDR, reg, val);
 #else
        struct udevice *dev;
 
-       if (!i2c_get_chip_for_busnum(0, CONFIG_SYS_I2C_FPGA_ADDR, 1, &dev))
+       if (!i2c_get_chip_for_busnum(0, CFG_SYS_I2C_FPGA_ADDR, 1, &dev))
                dm_i2c_reg_write(dev, reg, val);
 #endif
 
index af76327e4d2f6806ed3dcc119406d756de94dcee..784046ac4e07dc9f12183ab520da43ab0d27a514 100644 (file)
@@ -100,12 +100,12 @@ u16 qixis_read_minor(void);
 char *qixis_read_time(char *result);
 char *qixis_read_tag(char *buf);
 const char *byte_to_binary_mask(u8 val, u8 mask, char *buf);
-#ifdef CONFIG_SYS_I2C_FPGA_ADDR
+#ifdef CFG_SYS_I2C_FPGA_ADDR
 u8 qixis_read_i2c(unsigned int reg);
 void qixis_write_i2c(unsigned int reg, u8 value);
 #endif
 
-#if defined(CONFIG_QIXIS_I2C_ACCESS) && defined(CONFIG_SYS_I2C_FPGA_ADDR)
+#if defined(CONFIG_QIXIS_I2C_ACCESS) && defined(CFG_SYS_I2C_FPGA_ADDR)
 #define QIXIS_READ(reg) qixis_read_i2c(offsetof(struct qixis, reg))
 #define QIXIS_WRITE(reg, value) \
        qixis_write_i2c(offsetof(struct qixis, reg), value)
@@ -114,7 +114,7 @@ void qixis_write_i2c(unsigned int reg, u8 value);
 #define QIXIS_WRITE(reg, value) qixis_write(offsetof(struct qixis, reg), value)
 #endif
 
-#ifdef CONFIG_SYS_I2C_FPGA_ADDR
+#ifdef CFG_SYS_I2C_FPGA_ADDR
 #define QIXIS_READ_I2C(reg) qixis_read_i2c(offsetof(struct qixis, reg))
 #define QIXIS_WRITE_I2C(reg, value) \
                        qixis_write_i2c(offsetof(struct qixis, reg), value)
index f17a6c186d3bb1a3047f10990a1ee4dc830b5790..194b5d27295b3692370c5a5db02a3d54474161e8 100644 (file)
@@ -117,7 +117,7 @@ int misc_init_r(void)
        struct udevice *dev;
        int ret;
 
-       ret = i2c_get_chip_for_busnum(bus_num, CONFIG_SYS_I2C_FPGA_ADDR,
+       ret = i2c_get_chip_for_busnum(bus_num, CFG_SYS_I2C_FPGA_ADDR,
                                      1, &dev);
        if (ret) {
                printf("%s: Cannot find udev for a bus %d\n", __func__,
@@ -128,7 +128,7 @@ int misc_init_r(void)
 #else
        i2c_set_bus_num(bus_num);
 
-       i2c_write(CONFIG_SYS_I2C_FPGA_ADDR, 0x5a, 1, &mux_sdhc_cd, 1);
+       i2c_write(CFG_SYS_I2C_FPGA_ADDR, 0x5a, 1, &mux_sdhc_cd, 1);
 #endif
 
        return 0;
index d0674d014ac5aabdeb77d13498241fe77be9c9dd..d5cb7312095ac67375c37b7caec5f57539346bc6 100644 (file)
@@ -196,7 +196,7 @@ void board_init_f(ulong dummy)
        porsr1 = in_be32(&gur->porsr1);
        pinctl = ((porsr1 & ~(DCFG_CCSR_PORSR1_RCW_MASK)) |
                 DCFG_CCSR_PORSR1_RCW_SRC_I2C);
-       out_be32((unsigned int *)(CONFIG_SYS_DCSR_DCFG_ADDR + DCFG_DCSR_PORCR1),
+       out_be32((unsigned int *)(CFG_SYS_DCSR_DCFG_ADDR + DCFG_DCSR_PORCR1),
                 pinctl);
 #endif
 
index 8b74d458237df038d20db54de250b3493faa680e..4f5834347db484bbd1f668016f2d8e10b51a22a4 100644 (file)
@@ -98,7 +98,7 @@ struct cpld_data {
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
 static void cpld_show(void)
 {
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
 
        printf("CPLD:  V%x.%x\nPCBA:  V%x.0\nVBank: %d\n",
               in_8(&cpld_data->cpld_ver) & VERSION_MASK,
@@ -248,7 +248,7 @@ int board_eth_init(struct bd_info *bis)
 static void convert_serdes_mux(int type, int need_reset)
 {
        char current_serdes;
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
 
        current_serdes = cpld_data->serdes_mux;
 
@@ -322,7 +322,7 @@ int config_serdes_mux(void)
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
 int config_board_mux(void)
 {
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
        int conflict_flag;
 
        conflict_flag = 0;
@@ -610,7 +610,7 @@ u16 flash_read16(void *addr)
        && !defined(CONFIG_SPL_BUILD)
 static void convert_flash_bank(char bank)
 {
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
 
        printf("Now switch to boot from flash bank %d.\n", bank);
        cpld_data->soft_mux_on = CPLD_SET_BOOT_BANK;
@@ -644,7 +644,7 @@ U_BOOT_CMD(
 static int cpld_reset_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
                          char *const argv[])
 {
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
 
        if (argc > 2)
                return CMD_RET_USAGE;
@@ -671,7 +671,7 @@ U_BOOT_CMD(
 static void print_serdes_mux(void)
 {
        char current_serdes;
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
 
        current_serdes = cpld_data->serdes_mux;
 
index 5fe40c4bdb251fd0087732c2d753b1bf9c52adfa..841d8b59bb4c27d87ae710ad59d3d86c45ca1063 100644 (file)
@@ -57,8 +57,8 @@ enum {
 struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        {
                "nor0",
-               CONFIG_SYS_NOR0_CSPR,
-               CONFIG_SYS_NOR0_CSPR_EXT,
+               CFG_SYS_NOR0_CSPR,
+               CFG_SYS_NOR0_CSPR_EXT,
                CFG_SYS_NOR_AMASK,
                CFG_SYS_NOR_CSOR,
                {
@@ -71,8 +71,8 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "nor1",
-               CONFIG_SYS_NOR1_CSPR,
-               CONFIG_SYS_NOR1_CSPR_EXT,
+               CFG_SYS_NOR1_CSPR,
+               CFG_SYS_NOR1_CSPR_EXT,
                CFG_SYS_NOR_AMASK,
                CFG_SYS_NOR_CSOR,
                {
@@ -97,15 +97,15 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "fpga",
-               CONFIG_SYS_FPGA_CSPR,
-               CONFIG_SYS_FPGA_CSPR_EXT,
-               CONFIG_SYS_FPGA_AMASK,
-               CONFIG_SYS_FPGA_CSOR,
+               CFG_SYS_FPGA_CSPR,
+               CFG_SYS_FPGA_CSPR_EXT,
+               CFG_SYS_FPGA_AMASK,
+               CFG_SYS_FPGA_CSOR,
                {
-                       CONFIG_SYS_FPGA_FTIM0,
-                       CONFIG_SYS_FPGA_FTIM1,
-                       CONFIG_SYS_FPGA_FTIM2,
-                       CONFIG_SYS_FPGA_FTIM3
+                       CFG_SYS_FPGA_FTIM0,
+                       CFG_SYS_FPGA_FTIM1,
+                       CFG_SYS_FPGA_FTIM2,
+                       CFG_SYS_FPGA_FTIM3
                },
        }
 };
@@ -126,8 +126,8 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "nor0",
-               CONFIG_SYS_NOR0_CSPR,
-               CONFIG_SYS_NOR0_CSPR_EXT,
+               CFG_SYS_NOR0_CSPR,
+               CFG_SYS_NOR0_CSPR_EXT,
                CFG_SYS_NOR_AMASK,
                CFG_SYS_NOR_CSOR,
                {
@@ -139,8 +139,8 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "nor1",
-               CONFIG_SYS_NOR1_CSPR,
-               CONFIG_SYS_NOR1_CSPR_EXT,
+               CFG_SYS_NOR1_CSPR,
+               CFG_SYS_NOR1_CSPR_EXT,
                CFG_SYS_NOR_AMASK,
                CFG_SYS_NOR_CSOR,
                {
@@ -152,15 +152,15 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "fpga",
-               CONFIG_SYS_FPGA_CSPR,
-               CONFIG_SYS_FPGA_CSPR_EXT,
-               CONFIG_SYS_FPGA_AMASK,
-               CONFIG_SYS_FPGA_CSOR,
+               CFG_SYS_FPGA_CSPR,
+               CFG_SYS_FPGA_CSPR_EXT,
+               CFG_SYS_FPGA_AMASK,
+               CFG_SYS_FPGA_CSOR,
                {
-                       CONFIG_SYS_FPGA_FTIM0,
-                       CONFIG_SYS_FPGA_FTIM1,
-                       CONFIG_SYS_FPGA_FTIM2,
-                       CONFIG_SYS_FPGA_FTIM3
+                       CFG_SYS_FPGA_FTIM0,
+                       CFG_SYS_FPGA_FTIM1,
+                       CFG_SYS_FPGA_FTIM2,
+                       CFG_SYS_FPGA_FTIM3
                },
        }
 };
index 232035638b389e5cccdea52fbdff03b419d23a9f..9db3aa58605972e2d930d26fd9acd65e5fb82453 100644 (file)
 
 u8 cpld_read(unsigned int reg)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        return in_8(p + reg);
 }
 
 void cpld_write(unsigned int reg, u8 value)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        out_8(p + reg, value);
 }
index a8a7263a6538c6dfb499401e1df8e53750b09e71..741a4d64ea9e10a8ab1d1c162ac2875ea3c2c50d 100644 (file)
@@ -60,15 +60,15 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "cpld",
-               CONFIG_SYS_CPLD_CSPR,
-               CONFIG_SYS_CPLD_CSPR_EXT,
-               CONFIG_SYS_CPLD_AMASK,
-               CONFIG_SYS_CPLD_CSOR,
+               CFG_SYS_CPLD_CSPR,
+               CFG_SYS_CPLD_CSPR_EXT,
+               CFG_SYS_CPLD_AMASK,
+               CFG_SYS_CPLD_CSOR,
                {
-                       CONFIG_SYS_CPLD_FTIM0,
-                       CONFIG_SYS_CPLD_FTIM1,
-                       CONFIG_SYS_CPLD_FTIM2,
-                       CONFIG_SYS_CPLD_FTIM3
+                       CFG_SYS_CPLD_FTIM0,
+                       CFG_SYS_CPLD_FTIM1,
+                       CFG_SYS_CPLD_FTIM2,
+                       CFG_SYS_CPLD_FTIM3
                },
        }
 };
@@ -102,15 +102,15 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "cpld",
-               CONFIG_SYS_CPLD_CSPR,
-               CONFIG_SYS_CPLD_CSPR_EXT,
-               CONFIG_SYS_CPLD_AMASK,
-               CONFIG_SYS_CPLD_CSOR,
+               CFG_SYS_CPLD_CSPR,
+               CFG_SYS_CPLD_CSPR_EXT,
+               CFG_SYS_CPLD_AMASK,
+               CFG_SYS_CPLD_CSOR,
                {
-                       CONFIG_SYS_CPLD_FTIM0,
-                       CONFIG_SYS_CPLD_FTIM1,
-                       CONFIG_SYS_CPLD_FTIM2,
-                       CONFIG_SYS_CPLD_FTIM3
+                       CFG_SYS_CPLD_FTIM0,
+                       CFG_SYS_CPLD_FTIM1,
+                       CFG_SYS_CPLD_FTIM2,
+                       CFG_SYS_CPLD_FTIM3
                },
        }
 };
index 97d71dbf2adb6fd44afef171116145dd556883b9..3d0881643cd96cb26a270a96fa5d15e35da9cb80 100644 (file)
@@ -41,8 +41,8 @@ DECLARE_GLOBAL_DATA_PTR;
 struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        {
                "nor0",
-               CONFIG_SYS_NOR0_CSPR,
-               CONFIG_SYS_NOR0_CSPR_EXT,
+               CFG_SYS_NOR0_CSPR,
+               CFG_SYS_NOR0_CSPR_EXT,
                CFG_SYS_NOR_AMASK,
                CFG_SYS_NOR_CSOR,
                {
@@ -55,8 +55,8 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "nor1",
-               CONFIG_SYS_NOR1_CSPR,
-               CONFIG_SYS_NOR1_CSPR_EXT,
+               CFG_SYS_NOR1_CSPR,
+               CFG_SYS_NOR1_CSPR_EXT,
                CFG_SYS_NOR_AMASK,
                CFG_SYS_NOR_CSOR,
                {
@@ -81,15 +81,15 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "fpga",
-               CONFIG_SYS_FPGA_CSPR,
-               CONFIG_SYS_FPGA_CSPR_EXT,
-               CONFIG_SYS_FPGA_AMASK,
-               CONFIG_SYS_FPGA_CSOR,
+               CFG_SYS_FPGA_CSPR,
+               CFG_SYS_FPGA_CSPR_EXT,
+               CFG_SYS_FPGA_AMASK,
+               CFG_SYS_FPGA_CSOR,
                {
-                       CONFIG_SYS_FPGA_FTIM0,
-                       CONFIG_SYS_FPGA_FTIM1,
-                       CONFIG_SYS_FPGA_FTIM2,
-                       CONFIG_SYS_FPGA_FTIM3
+                       CFG_SYS_FPGA_FTIM0,
+                       CFG_SYS_FPGA_FTIM1,
+                       CFG_SYS_FPGA_FTIM2,
+                       CFG_SYS_FPGA_FTIM3
                },
        }
 };
@@ -110,8 +110,8 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "nor0",
-               CONFIG_SYS_NOR0_CSPR,
-               CONFIG_SYS_NOR0_CSPR_EXT,
+               CFG_SYS_NOR0_CSPR,
+               CFG_SYS_NOR0_CSPR_EXT,
                CFG_SYS_NOR_AMASK,
                CFG_SYS_NOR_CSOR,
                {
@@ -123,8 +123,8 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "nor1",
-               CONFIG_SYS_NOR1_CSPR,
-               CONFIG_SYS_NOR1_CSPR_EXT,
+               CFG_SYS_NOR1_CSPR,
+               CFG_SYS_NOR1_CSPR_EXT,
                CFG_SYS_NOR_AMASK,
                CFG_SYS_NOR_CSOR,
                {
@@ -136,15 +136,15 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "fpga",
-               CONFIG_SYS_FPGA_CSPR,
-               CONFIG_SYS_FPGA_CSPR_EXT,
-               CONFIG_SYS_FPGA_AMASK,
-               CONFIG_SYS_FPGA_CSOR,
+               CFG_SYS_FPGA_CSPR,
+               CFG_SYS_FPGA_CSPR_EXT,
+               CFG_SYS_FPGA_AMASK,
+               CFG_SYS_FPGA_CSOR,
                {
-                       CONFIG_SYS_FPGA_FTIM0,
-                       CONFIG_SYS_FPGA_FTIM1,
-                       CONFIG_SYS_FPGA_FTIM2,
-                       CONFIG_SYS_FPGA_FTIM3
+                       CFG_SYS_FPGA_FTIM0,
+                       CFG_SYS_FPGA_FTIM1,
+                       CFG_SYS_FPGA_FTIM2,
+                       CFG_SYS_FPGA_FTIM3
                },
        }
 };
index 548601a5ae16b84d57d8504726e60df4bc78b307..ee19d4ff8aab14b224212991a14389f4690648df 100644 (file)
 
 u8 cpld_read(unsigned int reg)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        return in_8(p + reg);
 }
 
 void cpld_write(unsigned int reg, u8 value)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        out_8(p + reg, value);
 }
index ff3abc830229fee185d20f6bbab5bd6f5b1c93ea..0d3f22ce2bb331eda2e006440f89ae3c5804d2cf 100644 (file)
@@ -41,8 +41,8 @@ DECLARE_GLOBAL_DATA_PTR;
 struct ifc_regs ifc_cfg_ifc_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        {
                "nor0",
-               CONFIG_SYS_NOR0_CSPR_EARLY,
-               CONFIG_SYS_NOR0_CSPR_EXT,
+               CFG_SYS_NOR0_CSPR_EARLY,
+               CFG_SYS_NOR0_CSPR_EXT,
                CFG_SYS_NOR_AMASK,
                CFG_SYS_NOR_CSOR,
                {
@@ -52,13 +52,13 @@ struct ifc_regs ifc_cfg_ifc_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                        CFG_SYS_NOR_FTIM3
                },
                0,
-               CONFIG_SYS_NOR0_CSPR,
+               CFG_SYS_NOR0_CSPR,
                0,
        },
        {
                "nor1",
-               CONFIG_SYS_NOR1_CSPR_EARLY,
-               CONFIG_SYS_NOR0_CSPR_EXT,
+               CFG_SYS_NOR1_CSPR_EARLY,
+               CFG_SYS_NOR0_CSPR_EXT,
                CFG_SYS_NOR_AMASK_EARLY,
                CFG_SYS_NOR_CSOR,
                {
@@ -68,7 +68,7 @@ struct ifc_regs ifc_cfg_ifc_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                        CFG_SYS_NOR_FTIM3
                },
                0,
-               CONFIG_SYS_NOR1_CSPR,
+               CFG_SYS_NOR1_CSPR,
                CFG_SYS_NOR_AMASK,
        },
        {
@@ -86,10 +86,10 @@ struct ifc_regs ifc_cfg_ifc_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "fpga",
-               CONFIG_SYS_FPGA_CSPR,
-               CONFIG_SYS_FPGA_CSPR_EXT,
+               CFG_SYS_FPGA_CSPR,
+               CFG_SYS_FPGA_CSPR_EXT,
                SYS_FPGA_AMASK,
-               CONFIG_SYS_FPGA_CSOR,
+               CFG_SYS_FPGA_CSOR,
                {
                        SYS_FPGA_CS_FTIM0,
                        SYS_FPGA_CS_FTIM1,
@@ -121,10 +121,10 @@ struct ifc_regs ifc_cfg_qspi_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "fpga",
-               CONFIG_SYS_FPGA_CSPR,
-               CONFIG_SYS_FPGA_CSPR_EXT,
+               CFG_SYS_FPGA_CSPR,
+               CFG_SYS_FPGA_CSPR_EXT,
                SYS_FPGA_AMASK,
-               CONFIG_SYS_FPGA_CSOR,
+               CFG_SYS_FPGA_CSOR,
                {
                        SYS_FPGA_CS_FTIM0,
                        SYS_FPGA_CS_FTIM1,
@@ -746,12 +746,12 @@ int set_serdes_volt(int svdd)
 
        /* Read the BRDCFG54 via CLPD */
 #if !CONFIG_IS_ENABLED(DM_I2C)
-       ret = i2c_read(CONFIG_SYS_I2C_FPGA_ADDR,
+       ret = i2c_read(CFG_SYS_I2C_FPGA_ADDR,
                       QIXIS_BRDCFG4_OFFSET, 1, (void *)&brdcfg4, 1);
 #else
        struct udevice *dev;
 
-       ret = i2c_get_chip_for_busnum(0, CONFIG_SYS_I2C_FPGA_ADDR, 1, &dev);
+       ret = i2c_get_chip_for_busnum(0, CFG_SYS_I2C_FPGA_ADDR, 1, &dev);
        if (!ret)
                ret = dm_i2c_read(dev, QIXIS_BRDCFG4_OFFSET,
                                  (void *)&brdcfg4, 1);
@@ -766,7 +766,7 @@ int set_serdes_volt(int svdd)
 
        /* Write to the BRDCFG4 */
 #if !CONFIG_IS_ENABLED(DM_I2C)
-       ret = i2c_write(CONFIG_SYS_I2C_FPGA_ADDR,
+       ret = i2c_write(CFG_SYS_I2C_FPGA_ADDR,
                        QIXIS_BRDCFG4_OFFSET, 1, (void *)&brdcfg4, 1);
 #else
        ret = dm_i2c_write(dev, QIXIS_BRDCFG4_OFFSET,
index 971633c9c8b2dac4b0de954b61a77f316ee80c7f..a4cb1a6cac4e21fb878a0e01a108006790602c88 100644 (file)
@@ -118,10 +118,10 @@ Kernel.itb                        0x01000000      0x08000
 Environment Variables
 ---------------------
 - mcboottimeout: MC boot timeout in milliseconds. If this variable is not defined
-  the value CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS will be assumed.
+  the value CFG_SYS_LS_MC_BOOT_TIMEOUT_MS will be assumed.
 
 - mcmemsize: MC DRAM block size. If this variable is not defined
-  the value CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE will be assumed.
+  the value CFG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE will be assumed.
 
 Booting Linux flavors which do not support 48-bit VA (< Linux 3.18)
 -------------------------------------------------------------------
index 5df85722d1df2efd1da5d8ef400f8040deab6e81..91db618227d01a5bc2a80c1eb3ed7506544d87c5 100644 (file)
@@ -217,7 +217,7 @@ int board_init(void)
 
 #ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT
 #if CONFIG_IS_ENABLED(DM_I2C)
-       rtc_enable_32khz_output(0, CONFIG_SYS_I2C_RTC_ADDR);
+       rtc_enable_32khz_output(0, CFG_SYS_I2C_RTC_ADDR);
 #else
        rtc_enable_32khz_output();
 #endif
index 437675517ebde56c655ca85b49f407ccf1a0211d..cf5b1ee46e007354bd6ae73fcca85927b54e8427 100644 (file)
@@ -57,9 +57,9 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static struct pl01x_serial_plat serial0 = {
 #if CONFIG_CONS_INDEX == 0
-       .base = CONFIG_SYS_SERIAL0,
+       .base = CFG_SYS_SERIAL0,
 #elif CONFIG_CONS_INDEX == 1
-       .base = CONFIG_SYS_SERIAL1,
+       .base = CFG_SYS_SERIAL1,
 #else
 #error "Unsupported console index value."
 #endif
@@ -72,7 +72,7 @@ U_BOOT_DRVINFO(nxp_serial0) = {
 };
 
 static struct pl01x_serial_plat serial1 = {
-       .base = CONFIG_SYS_SERIAL1,
+       .base = CFG_SYS_SERIAL1,
        .type = TYPE_PL011,
 };
 
index efff0551409603233046567531107d157cb03a3f..d67db24d588320f88a8183261359eb38e4fd21ce 100644 (file)
@@ -26,7 +26,7 @@ int checkboard (void) {
        /*
         * Set LED on
         */
-       val = mbar2_readLong(MCFSIM_GPIO1_OUT) & ~CONFIG_SYS_GPIO1_LED;
+       val = mbar2_readLong(MCFSIM_GPIO1_OUT) & ~CFG_SYS_GPIO1_LED;
        mbar2_writeLong(MCFSIM_GPIO1_OUT, val);   /* Set LED on */
 
        return 0;
@@ -42,13 +42,13 @@ int dram_init(void)
         *      RC = ([(RefreshTime/#rows) / (1/BusClk)] / 16) - 1
         */
 
-#ifdef CONFIG_SYS_FAST_CLK
+#ifdef CFG_SYS_FAST_CLK
        /*
         * Busclk=70MHz, RefreshTime=64ms, #rows=4096 (4K)
         * SO=1, NAM=0, COC=0, RTIM=01 (6clk refresh), RC=39
         */
        mbar_writeShort(MCFSIM_DCR, 0x8239);
-#elif CONFIG_SYS_PLL_BYPASS
+#elif CFG_SYS_PLL_BYPASS
        /*
         * Busclk=5.6448MHz, RefreshTime=64ms, #rows=8192 (8K)
         * SO=1, NAM=0, COC=0, RTIM=01 (6clk refresh), RC=02
index bff1ac5fb113f4662b427620098e818cff161bb7..fbd4835416085b791fa0abaa911c73c0f87b8b95 100644 (file)
@@ -42,7 +42,7 @@ ulong flash_init(void)
        ulong size = 0;
        ulong fbase = 0;
 
-       fbase = (ulong) CONFIG_SYS_FLASH_BASE;
+       fbase = (ulong) CFG_SYS_FLASH_BASE;
        flash_get_size((FPWV *) fbase, &flash_info[0]);
        flash_get_offsets((ulong) fbase, &flash_info[0]);
        fbase += flash_info[0].size;
@@ -64,9 +64,9 @@ int flash_get_offsets(ulong base, flash_info_t * info)
 
                info->start[0] = base;
                info->protect[0] = 0;
-               for (i = 1; i < CONFIG_SYS_SST_SECT; i++) {
+               for (i = 1; i < CFG_SYS_SST_SECT; i++) {
                        info->start[i] = info->start[i - 1]
-                                               + CONFIG_SYS_SST_SECTSZ;
+                                               + CFG_SYS_SST_SECTSZ;
                        info->protect[i] = 0;
                }
        }
@@ -162,8 +162,8 @@ ulong flash_get_size(FPWV * addr, flash_info_t * info)
 
        info->sector_count = 0;
        info->size = 0;
-       info->sector_count = CONFIG_SYS_SST_SECT;
-       info->size = CONFIG_SYS_SST_SECT * CONFIG_SYS_SST_SECTSZ;
+       info->sector_count = CFG_SYS_SST_SECT;
+       info->size = CFG_SYS_SST_SECT * CFG_SYS_SST_SECTSZ;
 
        /* reset ID mode */
        *addr = (FPWV) 0x00F000F0;
@@ -222,7 +222,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
 
        start = get_timer(0);
 
-       if ((s_last - s_first) == (CONFIG_SYS_SST_SECT - 1)) {
+       if ((s_last - s_first) == (CFG_SYS_SST_SECT - 1)) {
                if (prot == 0) {
                        addr = (FPWV *) info->start[0];
 
@@ -259,7 +259,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
                                enable_interrupts();
 
                        return 0;
-               } else if (prot == CONFIG_SYS_SST_SECT) {
+               } else if (prot == CFG_SYS_SST_SECT) {
                        return 1;
                }
        }
@@ -282,7 +282,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
 
                                        flag = disable_interrupts();
 
-                                       base = (FPWV *) (CONFIG_SYS_FLASH_BASE);        /* First sector */
+                                       base = (FPWV *) (CFG_SYS_FLASH_BASE);   /* First sector */
 
                                        base[FLASH_CYCLE1] = 0x00AA;    /* unlock */
                                        base[FLASH_CYCLE2] = 0x0055;    /* unlock */
@@ -411,7 +411,7 @@ int write_word(flash_info_t * info, FPWV * dest, u16 data)
                return (2);
        }
 
-       base = (FPWV *) (CONFIG_SYS_FLASH_BASE);
+       base = (FPWV *) (CFG_SYS_FLASH_BASE);
 
        /* Disable interrupts which might cause a timeout here */
        flag = disable_interrupts();
index 179a2a242a8d3df486bd376d2d9f91119a865312..c1cff52fb3db1bc8c35f9cc357e73237859edebf 100644 (file)
@@ -36,7 +36,7 @@ int dram_init(void)
        if (!(mbar_readLong(MCFSIM_DCR) & 0x8000)) {
                u32 RC, temp;
 
-               RC = (CONFIG_SYS_CLK / 1000000) >> 1;
+               RC = (CFG_SYS_CLK / 1000000) >> 1;
                RC = (RC * 15) >> 4;
 
                /* Initialize DRAM Control Register: DCR */
@@ -113,7 +113,7 @@ void ide_set_reset(int idereset)
                mbar2_writeLong(CIM_MISCCR, CIM_MISCCR_CPUEND);
 
 #define CALC_TIMING(t) (t + period - 1) / period
-               period = 1000000000 / (CONFIG_SYS_CLK / 2);     /* period in ns */
+               period = 1000000000 / (CFG_SYS_CLK / 2);        /* period in ns */
 
                /*ata->ton = CALC_TIMING (180); */
                out_8(&ata->t1, CALC_TIMING(piotms[2][0]));
index 0de36a7f747bae436dcf40559301b00d76c38734..34f05f3fdc7239a572f56a0d22cbec0bfa358af2 100644 (file)
@@ -68,7 +68,7 @@ CONFIG_M53015                 -- define for MCF53015 CPUs
 CONFIG_M53017EVB               -- define for M53017EVB board
 
 CONFIG_MCFUART                 -- define to use common CF Uart driver
-CONFIG_SYS_UART_PORT           -- define UART port number, start with 0, 1 and 2
+CFG_SYS_UART_PORT              -- define UART port number, start with 0, 1 and 2
 CONFIG_BAUDRATE                        -- define UART baudrate
 
 CONFIG_MCFRTC                  -- define to use common CF RTC driver
@@ -96,11 +96,11 @@ CONFIG_SYS_I2C_SLAVE                -- define for I2C slave address
 CONFIG_SYS_I2C_OFFSET          -- define for I2C base address offset
 CONFIG_SYS_IMMR                        -- define for MBAR offset
 
-CONFIG_SYS_MBAR                        -- define MBAR offset
+CFG_SYS_MBAR                   -- define MBAR offset
 
 CONFIG_MONITOR_IS_IN_RAM       -- Not support
 
-CONFIG_SYS_INIT_RAM_ADDR       -- defines the base address of the MCF5301x internal SRAM
+CFG_SYS_INIT_RAM_ADDR  -- defines the base address of the MCF5301x internal SRAM
 
 CONFIG_SYS_CSn_BASE            -- defines the Chip Select Base register
 CONFIG_SYS_CSn_MASK            -- defines the Chip Select Mask register
index a10c365ec3788fd2ab9caaa46d3af73f6ef68868..d921eef8b6759f9591b76d34f48f707903755f70 100644 (file)
@@ -23,7 +23,7 @@
 static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl)
 {
        struct nand_chip *this = mtd_to_nand(mtdinfo);
-       volatile u16 *nCE = (u16 *) CONFIG_SYS_LATCH_ADDR;
+       volatile u16 *nCE = (u16 *) CFG_SYS_LATCH_ADDR;
 
        if (ctrl & NAND_CTRL_CHANGE) {
                ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
index bfbcd5dc81dbf95160e984b4312d1e4771e76e59..7240648796b5e48d80b1e1cbec906ee80f7a77c0 100644 (file)
@@ -67,7 +67,7 @@ CONFIG_M5373          -- define for all Freescale MCF5373 CPUs
 CONFIG_M5373EVB                -- define for M5373EVB board
 
 CONFIG_MCFUART         -- define to use common CF Uart driver
-CONFIG_SYS_UART_PORT           -- define UART port number, start with 0, 1 and 2
+CFG_SYS_UART_PORT              -- define UART port number, start with 0, 1 and 2
 CONFIG_BAUDRATE                -- define UART baudrate
 
 CONFIG_MCFRTC          -- define to use common CF RTC driver
@@ -95,11 +95,11 @@ CONFIG_SYS_I2C_SLAVE                -- define for I2C slave address
 CONFIG_SYS_I2C_OFFSET          -- define for I2C base address offset
 CONFIG_SYS_IMMR                -- define for MBAR offset
 
-CONFIG_SYS_MBAR                -- define MBAR offset
+CFG_SYS_MBAR           -- define MBAR offset
 
 CONFIG_MONITOR_IS_IN_RAM -- Not support
 
-CONFIG_SYS_INIT_RAM_ADDR       -- defines the base address of the MCF5373 internal SRAM
+CFG_SYS_INIT_RAM_ADDR  -- defines the base address of the MCF5373 internal SRAM
 
 CONFIG_SYS_CSn_BASE    -- defines the Chip Select Base register
 CONFIG_SYS_CSn_MASK    -- defines the Chip Select Mask register
index fdf3e0ac1b1bdb23f0f67bf495d6ec9a9c7ac405..6d825a66e33f3a4650eaf8e6351e04dce0927a46 100644 (file)
@@ -23,7 +23,7 @@
 static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl)
 {
        struct nand_chip *this = mtd_to_nand(mtdinfo);
-       volatile u16 *nCE = (u16 *) CONFIG_SYS_LATCH_ADDR;
+       volatile u16 *nCE = (u16 *) CFG_SYS_LATCH_ADDR;
 
        if (ctrl & NAND_CTRL_CHANGE) {
                ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
index 85d43cccd1a09b8167efc318c7d6aa01101faf8a..4a1455402650d2f93c71add5b9cea487b5a9b542 100644 (file)
@@ -22,7 +22,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_SYS_DRAM_TEST)
+#if defined(CFG_SYS_DRAM_TEST)
 int
 testdram(void)
 {
@@ -103,25 +103,25 @@ int fixed_sdram(void)
        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;
+       im->sysconf.ddrcdr = CFG_SYS_DDRCDR_VALUE;
        udelay(50000);
 
-       im->ddr.sdram_clk_cntl = CONFIG_SYS_DDR_SDRAM_CLK_CNTL;
+       im->ddr.sdram_clk_cntl = CFG_SYS_DDR_SDRAM_CLK_CNTL;
        udelay(1000);
 
-       im->ddr.csbnds[0].csbnds = CONFIG_SYS_DDR_CS0_BNDS;
-       im->ddr.cs_config[0] = CONFIG_SYS_DDR_CS0_CONFIG;
+       im->ddr.csbnds[0].csbnds = CFG_SYS_DDR_CS0_BNDS;
+       im->ddr.cs_config[0] = CFG_SYS_DDR_CS0_CONFIG;
        udelay(1000);
 
-       im->ddr.timing_cfg_0 = CONFIG_SYS_DDR_TIMING_0;
-       im->ddr.timing_cfg_1 = CONFIG_SYS_DDR_TIMING_1;
-       im->ddr.timing_cfg_2 = CONFIG_SYS_DDR_TIMING_2;
-       im->ddr.timing_cfg_3 = CONFIG_SYS_DDR_TIMING_3;
-       im->ddr.sdram_cfg = CONFIG_SYS_DDR_SDRAM_CFG;
-       im->ddr.sdram_cfg2 = CONFIG_SYS_DDR_SDRAM_CFG2;
-       im->ddr.sdram_mode = CONFIG_SYS_DDR_MODE;
-       im->ddr.sdram_mode2 = CONFIG_SYS_DDR_MODE2;
-       im->ddr.sdram_interval = CONFIG_SYS_DDR_INTERVAL;
+       im->ddr.timing_cfg_0 = CFG_SYS_DDR_TIMING_0;
+       im->ddr.timing_cfg_1 = CFG_SYS_DDR_TIMING_1;
+       im->ddr.timing_cfg_2 = CFG_SYS_DDR_TIMING_2;
+       im->ddr.timing_cfg_3 = CFG_SYS_DDR_TIMING_3;
+       im->ddr.sdram_cfg = CFG_SYS_DDR_SDRAM_CFG;
+       im->ddr.sdram_cfg2 = CFG_SYS_DDR_SDRAM_CFG2;
+       im->ddr.sdram_mode = CFG_SYS_DDR_MODE;
+       im->ddr.sdram_mode2 = CFG_SYS_DDR_MODE2;
+       im->ddr.sdram_interval = CFG_SYS_DDR_INTERVAL;
        sync();
        udelay(1000);
 
index d1943889915297f815c19794e72817a6692d49c8..7b6ef5b11c920ce94d2ff3c8556abe381e9bc214 100644 (file)
@@ -12,7 +12,7 @@
 
 struct law_entry law_table[] = {
        /* LBC window - maps 256M */
-       SET_LAW(CONFIG_SYS_LBC_SDRAM_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
+       SET_LAW(CFG_SYS_LBC_SDRAM_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
 };
 
 int num_law_entries = ARRAY_SIZE(law_table);
index e4c951feb5acd97c3e5b9c8c6bc0a3b979859cab..73e024eaa0118c069b84f19eac66c5ac2a3c2468 100644 (file)
@@ -103,11 +103,11 @@ void lbc_sdram_init(void)
 
        uint idx;
        volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
-       uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;
+       uint *sdram_addr = (uint *)CFG_SYS_LBC_SDRAM_BASE;
        uint lsdmr_common;
 
        puts("LBC SDRAM: ");
-       print_size(CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024,
+       print_size(CFG_SYS_LBC_SDRAM_SIZE * 1024 * 1024,
                   "\n");
 
        /*
@@ -115,17 +115,17 @@ void lbc_sdram_init(void)
         */
        set_lbc_or(2, CONFIG_SYS_OR2_PRELIM);
        set_lbc_br(2, CONFIG_SYS_BR2_PRELIM);
-       lbc->lbcr = CONFIG_SYS_LBC_LBCR;
+       lbc->lbcr = CFG_SYS_LBC_LBCR;
        asm("msync");
 
-       lbc->lsrt = CONFIG_SYS_LBC_LSRT;
-       lbc->mrtpr = CONFIG_SYS_LBC_MRTPR;
+       lbc->lsrt = CFG_SYS_LBC_LSRT;
+       lbc->mrtpr = CFG_SYS_LBC_MRTPR;
        asm("msync");
 
        /*
         * MPC8548 uses "new" 15-16 style addressing.
         */
-       lsdmr_common = CONFIG_SYS_LBC_LSDMR_COMMON;
+       lsdmr_common = CFG_SYS_LBC_LSDMR_COMMON;
        lsdmr_common |= LSDMR_BSMA1516;
 
        /*
index 9c8e9486008974a7941fe110be260859d898cec5..994a32dd92ad04267c9dca1c3c8b813b2f13a989 100644 (file)
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR, CONFIG_SYS_INIT_RAM_ADDR,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR, CFG_SYS_INIT_RAM_ADDR,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024 , CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024 , CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024 , CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
 
@@ -29,7 +29,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
         * Entry 0:
         * FLASH(cover boot page)       16M     Non-cacheable, guarded
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 0, BOOKE_PAGESZ_16M, 1),
 
@@ -37,7 +37,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
         * Entry 1:
         * CCSRBAR      1M      Non-cacheable, guarded
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 1, BOOKE_PAGESZ_1M, 1),
 
@@ -45,8 +45,8 @@ struct fsl_e_tlb_entry tlb_table[] = {
         * Entry 2:
         * LBC SDRAM    64M     Cacheable, non-guarded
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE,
-                     CONFIG_SYS_LBC_SDRAM_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_LBC_SDRAM_BASE,
+                     CFG_SYS_LBC_SDRAM_BASE_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                      0, 2, BOOKE_PAGESZ_64M, 1),
 
index 4f27d3e8ecce39d423b25ba2df828fcb9240a253..d447ad840adb8d3a51b6d1097097c99079978d57 100644 (file)
@@ -42,7 +42,7 @@ u32 get_board_rev(void)
 
        int rev = readl(&fuse->gp[6]);
 
-       if (!i2c_probe(CONFIG_SYS_DIALOG_PMIC_I2C_ADDR))
+       if (!i2c_probe(CFG_SYS_DIALOG_PMIC_I2C_ADDR))
                rev = 0;
 
        return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8;
@@ -81,7 +81,7 @@ static int power_init(void)
        int ret;
        struct pmic *p;
 
-       if (!i2c_probe(CONFIG_SYS_DIALOG_PMIC_I2C_ADDR)) {
+       if (!i2c_probe(CFG_SYS_DIALOG_PMIC_I2C_ADDR)) {
                ret = pmic_dialog_init(I2C_PMIC);
                if (ret)
                        return ret;
index 2dcee79b3aee4e81f307155a2c2c6b4fe9b5d832..13fc2fa2e38cde5b03c21a32f3c948278ffe63db 100644 (file)
@@ -8,8 +8,8 @@
 #include <asm/mmu.h>
 
 struct law_entry law_table[] = {
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_IFC),
-       SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_128K, LAW_TRGT_IF_IFC),
+       SET_LAW(CFG_SYS_FLASH_BASE_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_IFC),
+       SET_LAW(CFG_SYS_CPLD_BASE_PHYS, LAW_SIZE_128K, LAW_TRGT_IF_IFC),
        SET_LAW(CFG_SYS_NAND_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_IFC),
 };
 
index ab3b2e3e69b515090ce96c3c186f827254e42171..0f014823c935fbf6a586091918323617642c4081 100644 (file)
@@ -83,7 +83,7 @@ struct cpld_data {
 int board_early_init_f(void)
 {
        ccsr_gpio_t *pgpio = (void *)(CFG_SYS_MPC85xx_GPIO_ADDR);
-       struct fsl_ifc ifc = {(void *)CONFIG_SYS_IFC_ADDR, (void *)NULL};
+       struct fsl_ifc ifc = {(void *)CFG_SYS_IFC_ADDR, (void *)NULL};
        /* Clock configuration to access CPLD using IFC(GPCM) */
        setbits_be32(&ifc.gregs->ifc_gcr, 1 << IFC_GCR_TBCTL_TRN_TIME_SHIFT);
        /*
@@ -97,7 +97,7 @@ int board_early_init_f(void)
 
 int board_early_init_r(void)
 {
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+       const unsigned int flashbase = CFG_SYS_FLASH_BASE;
        int flash_esel = find_tlb_idx((void *)flashbase, 1);
 
        /*
@@ -118,12 +118,12 @@ int board_early_init_r(void)
                disable_tlb(flash_esel);
        }
 
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
+       set_tlb(1, flashbase, CFG_SYS_FLASH_BASE_PHYS,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, flash_esel, BOOKE_PAGESZ_16M, 1);
 
        set_tlb(1, flashbase + 0x1000000,
-                       CONFIG_SYS_FLASH_BASE_PHYS + 0x1000000,
+                       CFG_SYS_FLASH_BASE_PHYS + 0x1000000,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, flash_esel+1, BOOKE_PAGESZ_16M, 1);
        return 0;
@@ -138,7 +138,7 @@ int config_board_mux(int ctrl_type)
        struct udevice *dev;
        int ret;
 #if defined(CONFIG_TARGET_P1010RDB_PA)
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
 
        ret = i2c_get_chip_for_busnum(I2C_PCA9557_BUS_NUM,
                                      I2C_PCA9557_ADDR1, 1, &dev);
@@ -254,7 +254,7 @@ int config_board_mux(int ctrl_type)
 #endif
 #else
 #if defined(CONFIG_TARGET_P1010RDB_PA)
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
 
        switch (ctrl_type) {
        case MUX_TYPE_IFC:
@@ -404,7 +404,7 @@ int i2c_pca9557_read(int type)
 int checkboard(void)
 {
        struct cpu_type *cpu;
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
        u8 val;
 
        cpu = gd->arch.cpu;
index 9bf948cb5c9654c47e93a3f50b678b357d4126d7..e450f626e0adc4d5106d2b2649dcbdfc9c95e144 100644 (file)
@@ -29,7 +29,7 @@ void board_init_f(ulong bootflag)
 {
        u32 plat_ratio;
        ccsr_gur_t *gur = (void *)CFG_SYS_MPC85xx_GUTS_ADDR;
-       struct fsl_ifc ifc = {(void *)CONFIG_SYS_IFC_ADDR, (void *)NULL};
+       struct fsl_ifc ifc = {(void *)CFG_SYS_IFC_ADDR, (void *)NULL};
 
        console_init_f();
 
index 5e1fa70bca559a092db68c172bbd828ab8042a38..265cde81a3c2b49ac6ed33949a521e992d4ac0f3 100644 (file)
@@ -8,19 +8,19 @@
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR, CONFIG_SYS_INIT_RAM_ADDR,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR, CFG_SYS_INIT_RAM_ADDR,
                        MAS3_SX|MAS3_SW|MAS3_SR, 0,
                        0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 ,
-                       CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024 ,
+                       CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
                        MAS3_SX|MAS3_SW|MAS3_SR, 0,
                        0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024 ,
-                       CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024 ,
+                       CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
                        MAS3_SX|MAS3_SW|MAS3_SR, 0,
                        0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024 ,
-                       CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024 ,
+                       CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
                        MAS3_SX|MAS3_SW|MAS3_SR, 0,
                        0, 0, BOOKE_PAGESZ_4K, 0),
 
@@ -36,17 +36,17 @@ struct fsl_e_tlb_entry tlb_table[] = {
 #endif
 
        /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                        MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 1, BOOKE_PAGESZ_1M, 1),
 
 #ifndef CONFIG_SPL_BUILD
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                        MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
                        0, 2, BOOKE_PAGESZ_16M, 1),
 
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE + 0x1000000,
-                       CONFIG_SYS_FLASH_BASE_PHYS + 0x1000000,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE + 0x1000000,
+                       CFG_SYS_FLASH_BASE_PHYS + 0x1000000,
                        MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
                        0, 3, BOOKE_PAGESZ_16M, 1),
 
@@ -64,7 +64,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
 #endif
 
        /* *I*G - Board CPLD  */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CPLD_BASE, CONFIG_SYS_CPLD_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CPLD_BASE, CFG_SYS_CPLD_BASE_PHYS,
                        MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 6, BOOKE_PAGESZ_256K, 1),
 
@@ -73,14 +73,14 @@ struct fsl_e_tlb_entry tlb_table[] = {
                        0, 7, BOOKE_PAGESZ_1M, 1),
 
 #if defined(CONFIG_SYS_RAMBOOT) || !CONFIG_IS_ENABLED(COMMON_INIT_DDR)
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                        0, 8, BOOKE_PAGESZ_1G, 1),
 #endif
 
-#ifdef CONFIG_SYS_INIT_L2_ADDR
+#ifdef CFG_SYS_INIT_L2_ADDR
        /* *I*G - L2SRAM */
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR, CONFIG_SYS_INIT_L2_ADDR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L2_ADDR, CFG_SYS_INIT_L2_ADDR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_G,
                      0, 11, BOOKE_PAGESZ_256K, 1)
 #endif
index f896fd7ccce52f03583848fe8753357746373fd0..5f16779abaadc1c000d4211660e1d8a587868d04 100644 (file)
@@ -201,7 +201,7 @@ int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
 }
 #endif /* CONFIG_SYS_DDR_RAW_TIMING */
 
-#ifdef CONFIG_SYS_DDR_CS0_BNDS
+#ifdef CFG_SYS_DDR_CS0_BNDS
 /* Fixed sdram init -- doesn't use serial presence detect. */
 phys_size_t fixed_sdram(void)
 {
@@ -209,35 +209,35 @@ phys_size_t fixed_sdram(void)
        char buf[32];
        size_t ddr_size;
        fsl_ddr_cfg_regs_t ddr_cfg_regs = {
-               .cs[0].bnds = CONFIG_SYS_DDR_CS0_BNDS,
-               .cs[0].config = CONFIG_SYS_DDR_CS0_CONFIG,
-               .cs[0].config_2 = CONFIG_SYS_DDR_CS0_CONFIG_2,
+               .cs[0].bnds = CFG_SYS_DDR_CS0_BNDS,
+               .cs[0].config = CFG_SYS_DDR_CS0_CONFIG,
+               .cs[0].config_2 = CFG_SYS_DDR_CS0_CONFIG_2,
 #if CONFIG_CHIP_SELECTS_PER_CTRL > 1
-               .cs[1].bnds = CONFIG_SYS_DDR_CS1_BNDS,
-               .cs[1].config = CONFIG_SYS_DDR_CS1_CONFIG,
-               .cs[1].config_2 = CONFIG_SYS_DDR_CS1_CONFIG_2,
+               .cs[1].bnds = CFG_SYS_DDR_CS1_BNDS,
+               .cs[1].config = CFG_SYS_DDR_CS1_CONFIG,
+               .cs[1].config_2 = CFG_SYS_DDR_CS1_CONFIG_2,
 #endif
-               .timing_cfg_3 = CONFIG_SYS_DDR_TIMING_3,
-               .timing_cfg_0 = CONFIG_SYS_DDR_TIMING_0,
-               .timing_cfg_1 = CONFIG_SYS_DDR_TIMING_1,
-               .timing_cfg_2 = CONFIG_SYS_DDR_TIMING_2,
-               .ddr_sdram_cfg = CONFIG_SYS_DDR_CONTROL,
-               .ddr_sdram_cfg_2 = CONFIG_SYS_DDR_CONTROL_2,
-               .ddr_sdram_mode = CONFIG_SYS_DDR_MODE_1,
-               .ddr_sdram_mode_2 = CONFIG_SYS_DDR_MODE_2,
-               .ddr_sdram_md_cntl = CONFIG_SYS_DDR_MODE_CONTROL,
-               .ddr_sdram_interval = CONFIG_SYS_DDR_INTERVAL,
+               .timing_cfg_3 = CFG_SYS_DDR_TIMING_3,
+               .timing_cfg_0 = CFG_SYS_DDR_TIMING_0,
+               .timing_cfg_1 = CFG_SYS_DDR_TIMING_1,
+               .timing_cfg_2 = CFG_SYS_DDR_TIMING_2,
+               .ddr_sdram_cfg = CFG_SYS_DDR_CONTROL,
+               .ddr_sdram_cfg_2 = CFG_SYS_DDR_CONTROL_2,
+               .ddr_sdram_mode = CFG_SYS_DDR_MODE_1,
+               .ddr_sdram_mode_2 = CFG_SYS_DDR_MODE_2,
+               .ddr_sdram_md_cntl = CFG_SYS_DDR_MODE_CONTROL,
+               .ddr_sdram_interval = CFG_SYS_DDR_INTERVAL,
                .ddr_data_init = 0xdeadbeef, /* Poison value */
-               .ddr_sdram_clk_cntl = CONFIG_SYS_DDR_CLK_CTRL,
-               .ddr_init_addr = CONFIG_SYS_DDR_INIT_ADDR,
-               .ddr_init_ext_addr = CONFIG_SYS_DDR_INIT_EXT_ADDR,
-               .timing_cfg_4 = CONFIG_SYS_DDR_TIMING_4,
-               .timing_cfg_5 = CONFIG_SYS_DDR_TIMING_5,
-               .ddr_zq_cntl = CONFIG_SYS_DDR_ZQ_CONTROL,
-               .ddr_wrlvl_cntl = CONFIG_SYS_DDR_WRLVL_CONTROL,
-               .ddr_sr_cntr = CONFIG_SYS_DDR_SR_CNTR,
-               .ddr_sdram_rcw_1 = CONFIG_SYS_DDR_RCW_1,
-               .ddr_sdram_rcw_2 = CONFIG_SYS_DDR_RCW_2
+               .ddr_sdram_clk_cntl = CFG_SYS_DDR_CLK_CTRL,
+               .ddr_init_addr = CFG_SYS_DDR_INIT_ADDR,
+               .ddr_init_ext_addr = CFG_SYS_DDR_INIT_EXT_ADDR,
+               .timing_cfg_4 = CFG_SYS_DDR_TIMING_4,
+               .timing_cfg_5 = CFG_SYS_DDR_TIMING_5,
+               .ddr_zq_cntl = CFG_SYS_DDR_ZQ_CONTROL,
+               .ddr_wrlvl_cntl = CFG_SYS_DDR_WRLVL_CONTROL,
+               .ddr_sr_cntr = CFG_SYS_DDR_SR_CNTR,
+               .ddr_sdram_rcw_1 = CFG_SYS_DDR_RCW_1,
+               .ddr_sdram_rcw_2 = CFG_SYS_DDR_RCW_2
        };
 
        get_sys_info(&sysinfo);
@@ -248,7 +248,7 @@ phys_size_t fixed_sdram(void)
 
        fsl_ddr_set_memctl_regs(&ddr_cfg_regs, 0, 0);
 
-       if (set_ddr_laws(CONFIG_SYS_DDR_SDRAM_BASE,
+       if (set_ddr_laws(CFG_SYS_DDR_SDRAM_BASE,
                                ddr_size, LAW_TRGT_IF_DDR_1) < 0) {
                printf("ERROR setting Local Access Windows for DDR\n");
                return 0;
index 8f3f4840e604fde7a2c88322f6a8df2df9c2aede..6085984eab43481325855fe41ff84318e3c3e771 100644 (file)
@@ -8,11 +8,11 @@
 #include <asm/mmu.h>
 
 struct law_entry law_table[] = {
-       SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
+       SET_LAW(CFG_SYS_CPLD_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
 #ifdef CONFIG_VSC7385_ENET
-       SET_LAW(CONFIG_SYS_VSC7385_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
+       SET_LAW(CFG_SYS_VSC7385_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
 #endif
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
+       SET_LAW(CFG_SYS_FLASH_BASE_PHYS, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
 #ifdef CFG_SYS_NAND_BASE_PHYS
        SET_LAW(CFG_SYS_NAND_BASE_PHYS, LAW_SIZE_32K, LAW_TRGT_IF_LBC),
 #endif
index 2999c85d0aed2e2583f95afa5261a828e105d18b..ab7972442970e8f5c78d563474479ec50a62ee3a 100644 (file)
@@ -90,20 +90,20 @@ void board_reset_prepare(void)
         * This ensures that external watchdog does not trigger
         * another reset or possible infinite reset loop.
         */
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
        out_8(&cpld_data->wd_cfg, CPLD_WD_CFG);
        in_8(&cpld_data->wd_cfg); /* Read back to sync write */
 }
 
 void board_reset_last(void)
 {
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
        out_8(&cpld_data->system_rst, 1);
 }
 
 void board_cpld_init(void)
 {
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
        u8 prev_wd_cfg = in_8(&cpld_data->wd_cfg);
 
        out_8(&cpld_data->wd_cfg, CPLD_WD_CFG);
@@ -226,7 +226,7 @@ int board_early_init_f(void)
 
 int checkboard(void)
 {
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);
        ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
        u8 in, out, invert, io_config, val;
        int bus_num = CONFIG_SYS_SPD_BUS_NUM;
@@ -246,7 +246,7 @@ int checkboard(void)
        struct udevice *dev;
        int ret;
 
-       ret = i2c_get_chip_for_busnum(bus_num, CONFIG_SYS_I2C_PCA9557_ADDR,
+       ret = i2c_get_chip_for_busnum(bus_num, CFG_SYS_I2C_PCA9557_ADDR,
                                      1, &dev);
        if (ret) {
                printf("%s: Cannot find udev for a bus %d\n", __func__,
@@ -264,10 +264,10 @@ int checkboard(void)
        #else /* Non DM I2C support - will be removed */
        i2c_set_bus_num(bus_num);
 
-       if (i2c_read(CONFIG_SYS_I2C_PCA9557_ADDR, 0, 1, &in, 1) < 0 ||
-           i2c_read(CONFIG_SYS_I2C_PCA9557_ADDR, 1, 1, &out, 1) < 0 ||
-           i2c_read(CONFIG_SYS_I2C_PCA9557_ADDR, 2, 1, &invert, 1) < 0 ||
-           i2c_read(CONFIG_SYS_I2C_PCA9557_ADDR, 3, 1, &io_config, 1) < 0) {
+       if (i2c_read(CFG_SYS_I2C_PCA9557_ADDR, 0, 1, &in, 1) < 0 ||
+           i2c_read(CFG_SYS_I2C_PCA9557_ADDR, 1, 1, &out, 1) < 0 ||
+           i2c_read(CFG_SYS_I2C_PCA9557_ADDR, 2, 1, &invert, 1) < 0 ||
+           i2c_read(CFG_SYS_I2C_PCA9557_ADDR, 3, 1, &io_config, 1) < 0) {
                printf("Error reading i2c boot information!\n");
                return 0; /* Don't want to hang() on this error */
        }
@@ -319,7 +319,7 @@ int checkboard(void)
 
 int board_early_init_r(void)
 {
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+       const unsigned int flashbase = CFG_SYS_FLASH_BASE;
        int flash_esel = find_tlb_idx((void *)flashbase, 1);
 #ifdef CONFIG_VSC7385_ENET
        unsigned int vscfw_addr;
@@ -344,7 +344,7 @@ int board_early_init_r(void)
                disable_tlb(flash_esel);
        }
 
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS, /* tlb, epn, rpn */
+       set_tlb(1, flashbase, CFG_SYS_FLASH_BASE_PHYS, /* tlb, epn, rpn */
                MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,/* perms, wimge */
                0, flash_esel, BOOKE_PAGESZ_64M, 1);/* ts, esel, tsize, iprot */
 
index 4cc5e01f5789aea0f234cf7c9dac66a65450e4bf..94773969e9d8989c5e6bc1e425cedeb37b0ba6c6 100644 (file)
@@ -8,20 +8,20 @@
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR,
+                       CFG_SYS_INIT_RAM_ADDR_PHYS,
                        MAS3_SX|MAS3_SW|MAS3_SR, 0,
                        0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 ,
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024 ,
+                       CFG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
                        MAS3_SX|MAS3_SW|MAS3_SR, 0,
                        0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024 ,
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024 ,
+                       CFG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
                        MAS3_SX|MAS3_SW|MAS3_SR, 0,
                        0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024 ,
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024 ,
+                       CFG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
                        MAS3_SX|MAS3_SW|MAS3_SR, 0,
                        0, 0, BOOKE_PAGESZ_4K, 0),
 
@@ -32,14 +32,14 @@ struct fsl_e_tlb_entry tlb_table[] = {
                        0, 0, BOOKE_PAGESZ_4K, 1),
 
        /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 1, BOOKE_PAGESZ_1M, 1),
 
 #ifndef CONFIG_SPL_BUILD
        /* W**G* - Flash/promjet, localbus */
        /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                        MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
                        0, 2, BOOKE_PAGESZ_64M, 1),
 
@@ -57,13 +57,13 @@ struct fsl_e_tlb_entry tlb_table[] = {
 
 #ifdef CONFIG_VSC7385_ENET
        /* *I*G - VSC7385 Switch */
-       SET_TLB_ENTRY(1, CONFIG_SYS_VSC7385_BASE, CONFIG_SYS_VSC7385_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_VSC7385_BASE, CFG_SYS_VSC7385_BASE_PHYS,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 5, BOOKE_PAGESZ_1M, 1),
 #endif
 #endif /* not SPL */
 
-       SET_TLB_ENTRY(1, CONFIG_SYS_CPLD_BASE, CONFIG_SYS_CPLD_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CPLD_BASE, CFG_SYS_CPLD_BASE_PHYS,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 6, BOOKE_PAGESZ_1M, 1),
 
@@ -76,27 +76,27 @@ struct fsl_e_tlb_entry tlb_table[] = {
 
 #if defined(CONFIG_SYS_RAMBOOT) || !CONFIG_IS_ENABLED(COMMON_INIT_DDR)
        /* **M** - 1G DDR for eSDHC/eSPI/NAND boot */
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                        0, 8, BOOKE_PAGESZ_1G, 1),
 
 #if defined(CONFIG_TARGET_P1020RDB_PD)
        /* **M** - 2G DDR on P1020MBG, map the second 1G */
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
-                       CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE + 0x40000000,
+                       CFG_SYS_DDR_SDRAM_BASE + 0x40000000,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                        0, 9, BOOKE_PAGESZ_1G, 1),
 #endif
 #endif /* RAMBOOT/SPL */
 
-#ifdef CONFIG_SYS_INIT_L2_ADDR
+#ifdef CFG_SYS_INIT_L2_ADDR
        /* ***G - L2SRAM */
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR, CONFIG_SYS_INIT_L2_ADDR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L2_ADDR, CFG_SYS_INIT_L2_ADDR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_G,
                      0, 11, BOOKE_PAGESZ_256K, 1),
 #if CONFIG_SYS_L2_SIZE >= (256 << 10)
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR + 0x40000,
-                     CONFIG_SYS_INIT_L2_ADDR_PHYS + 0x40000,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L2_ADDR + 0x40000,
+                     CFG_SYS_INIT_L2_ADDR_PHYS + 0x40000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_G,
                      0, 12, BOOKE_PAGESZ_256K, 1)
 #endif
index 23ec32b7f975ae7ad234cd420e28e38f8c381746..3e12c816abc4a4d573d42f06d5482c52308e6b59 100644 (file)
@@ -35,10 +35,10 @@ static u8 lane_to_slot[] = {
 };
 
 static int riser_phy_addr[] = {
-       CONFIG_SYS_FM1_DTSEC1_RISER_PHY_ADDR,
-       CONFIG_SYS_FM1_DTSEC2_RISER_PHY_ADDR,
-       CONFIG_SYS_FM1_DTSEC3_RISER_PHY_ADDR,
-       CONFIG_SYS_FM1_DTSEC4_RISER_PHY_ADDR,
+       CFG_SYS_FM1_DTSEC1_RISER_PHY_ADDR,
+       CFG_SYS_FM1_DTSEC2_RISER_PHY_ADDR,
+       CFG_SYS_FM1_DTSEC3_RISER_PHY_ADDR,
+       CFG_SYS_FM1_DTSEC4_RISER_PHY_ADDR,
 };
 
 /*
@@ -101,12 +101,12 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
                slot = lane_to_slot[lane];
                if (slot) {
                        sprintf(phy, "phy_sgmii_%x",
-                                       CONFIG_SYS_FM1_DTSEC1_RISER_PHY_ADDR
+                                       CFG_SYS_FM1_DTSEC1_RISER_PHY_ADDR
                                        + (port - FM1_DTSEC1));
                        fdt_set_phy_handle(fdt, compat, addr, phy);
                } else {
                        sprintf(phy, "phy_sgmii_%x",
-                                       CONFIG_SYS_FM1_DTSEC1_PHY_ADDR
+                                       CFG_SYS_FM1_DTSEC1_PHY_ADDR
                                        + (port - FM1_DTSEC1));
                        fdt_set_phy_handle(fdt, compat, addr, phy);
                }
@@ -158,9 +158,9 @@ int board_eth_init(struct bd_info *bis)
         * is RGMII, we'll also override its PHY address later. We assume that
         * DTSEC4 and DTSEC5 are used for RGMII.
         */
-       fm_info_set_phy_address(FM1_DTSEC1, CONFIG_SYS_FM1_DTSEC1_PHY_ADDR);
-       fm_info_set_phy_address(FM1_DTSEC2, CONFIG_SYS_FM1_DTSEC2_PHY_ADDR);
-       fm_info_set_phy_address(FM1_DTSEC3, CONFIG_SYS_FM1_DTSEC3_PHY_ADDR);
+       fm_info_set_phy_address(FM1_DTSEC1, CFG_SYS_FM1_DTSEC1_PHY_ADDR);
+       fm_info_set_phy_address(FM1_DTSEC2, CFG_SYS_FM1_DTSEC2_PHY_ADDR);
+       fm_info_set_phy_address(FM1_DTSEC3, CFG_SYS_FM1_DTSEC3_PHY_ADDR);
 
        for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
                int idx = i - FM1_DTSEC1;
@@ -180,8 +180,8 @@ int board_eth_init(struct bd_info *bis)
                case PHY_INTERFACE_MODE_RGMII_ID:
                        /* Only DTSEC4 and DTSEC5 can be routed to RGMII */
                        fm_info_set_phy_address(i, i == FM1_DTSEC5 ?
-                                       CONFIG_SYS_FM1_DTSEC5_PHY_ADDR :
-                                       CONFIG_SYS_FM1_DTSEC4_PHY_ADDR);
+                                       CFG_SYS_FM1_DTSEC5_PHY_ADDR :
+                                       CFG_SYS_FM1_DTSEC4_PHY_ADDR);
                        break;
                default:
                        printf("Fman1: DTSEC%u set to unknown interface %i\n",
@@ -198,7 +198,7 @@ int board_eth_init(struct bd_info *bis)
                slot = lane_to_slot[lane];
                if (slot)
                        fm_info_set_phy_address(FM1_10GEC1,
-                                       CONFIG_SYS_FM1_10GEC1_PHY_ADDR);
+                                       CFG_SYS_FM1_10GEC1_PHY_ADDR);
        }
 
        fm_info_set_mdio(FM1_10GEC1,
index 1b1263091e50e550f07169e1d262205a08687032..575259b19c03c22f86e86b296f44e169616d85b6 100644 (file)
@@ -119,7 +119,7 @@ void board_config_lanes_mux(void)
 
 int board_early_init_r(void)
 {
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+       const unsigned int flashbase = CFG_SYS_FLASH_BASE;
        int flash_esel = find_tlb_idx((void *)flashbase, 1);
 
        /*
@@ -140,7 +140,7 @@ int board_early_init_r(void)
                disable_tlb(flash_esel);
        }
 
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
+       set_tlb(1, flashbase, CFG_SYS_FLASH_BASE_PHYS,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, flash_esel, BOOKE_PAGESZ_256M, 1);
 
index 47c3b1627e34ba30faba1703df15825e81db05c2..17a6226cafc7e56d4cd83310c8e64b5f3e30fceb 100644 (file)
 
 u8 cpld_read(unsigned int reg)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        return in_8(p + reg);
 }
 
 void cpld_write(unsigned int reg, u8 value)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        out_8(p + reg, value);
 }
index 818c20cf1b5e1e600fb43c7b2769ed6988a60d1c..1b4173989925eeca1308aee0674879b87eccd141 100644 (file)
@@ -222,7 +222,7 @@ int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
 #if defined(CONFIG_DEEP_SLEEP)
 void board_mem_sleep_setup(void)
 {
-       void __iomem *cpld_base = (void *)CONFIG_SYS_CPLD_BASE;
+       void __iomem *cpld_base = (void *)CFG_SYS_CPLD_BASE;
 
        /* does not provide HW signals for power management */
        clrbits_8(cpld_base + 0x17, 0x40);
index 850ece0110efedc489fa990830e0c099b49245cc..d636bef325f05cb34483eeee6274ca019225b394 100644 (file)
@@ -9,19 +9,19 @@
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_MTD_NOR_FLASH
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
+       SET_LAW(CFG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
 #endif
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
 #endif
-#ifdef CONFIG_SYS_CPLD_BASE_PHYS
-       SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_4K, LAW_TRGT_IF_IFC),
+#ifdef CFG_SYS_CPLD_BASE_PHYS
+       SET_LAW(CFG_SYS_CPLD_BASE_PHYS, LAW_SIZE_4K, LAW_TRGT_IF_IFC),
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-       SET_LAW(CONFIG_SYS_DCSRBAR_PHYS, LAW_SIZE_4M, LAW_TRGT_IF_DCSR),
+#ifdef CFG_SYS_DCSRBAR_PHYS
+       SET_LAW(CFG_SYS_DCSRBAR_PHYS, LAW_SIZE_4M, LAW_TRGT_IF_DCSR),
 #endif
 #ifdef CFG_SYS_NAND_BASE_PHYS
        SET_LAW(CFG_SYS_NAND_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_IFC),
index f777f5a2fe7f12398c8f6220d61831a21f4157db..baa59615b3ee8209825136d1a41cd4f7e2b9d54d 100644 (file)
@@ -130,8 +130,8 @@ int board_early_init_f(void)
 
 int board_early_init_r(void)
 {
-#ifdef CONFIG_SYS_FLASH_BASE
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+#ifdef CFG_SYS_FLASH_BASE
+       const unsigned int flashbase = CFG_SYS_FLASH_BASE;
        int flash_esel = find_tlb_idx((void *)flashbase, 1);
        /*
         * Remap Boot flash region to caching-inhibited
@@ -150,7 +150,7 @@ int board_early_init_r(void)
                disable_tlb(flash_esel);
        }
 
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
+       set_tlb(1, flashbase, CFG_SYS_FLASH_BASE_PHYS,
                MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                0, flash_esel, BOOKE_PAGESZ_256M, 1);
 #endif
index 74744c8ab0ad284670c15a8d72c2ca1644b8f66b..2519a9e4dbee7206139cd279ce16ee22d199cde5 100644 (file)
@@ -8,31 +8,31 @@
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
 
        /* TLB 1 */
        /* *I*** - Covers boot page */
-#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CFG_SYS_INIT_L3_ADDR)
        /*
         * *I*G - L3SRAM. When L3 is used as 256K SRAM, the address of the
         * SRAM is at 0xfffc0000, it covered the 0xfffff000.
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_ADDR, CONFIG_SYS_INIT_L3_ADDR,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L3_ADDR, CFG_SYS_INIT_L3_ADDR,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 0, BOOKE_PAGESZ_256K, 1),
 #else
@@ -42,13 +42,13 @@ struct fsl_e_tlb_entry tlb_table[] = {
 #endif
 
        /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 1, BOOKE_PAGESZ_16M, 1),
 
        /* *I*G* - Flash, localbus */
        /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                      MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
                      0, 2, BOOKE_PAGESZ_256M, 1),
 
@@ -64,27 +64,27 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 4, BOOKE_PAGESZ_256K, 1),
 
        /* Bman/Qman */
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE, CONFIG_SYS_BMAN_MEM_PHYS,
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE, CFG_SYS_BMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 5, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_BMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_BMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 6, BOOKE_PAGESZ_16M, 1),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE, CONFIG_SYS_QMAN_MEM_PHYS,
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE, CFG_SYS_QMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 7, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_QMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_QMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 8, BOOKE_PAGESZ_16M, 1),
 #endif
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_DCSRBAR, CONFIG_SYS_DCSRBAR_PHYS,
+#ifdef CFG_SYS_DCSRBAR_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_DCSRBAR, CFG_SYS_DCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 9, BOOKE_PAGESZ_4M, 1),
 #endif
@@ -93,18 +93,18 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 10, BOOKE_PAGESZ_64K, 1),
 #endif
-#ifdef CONFIG_SYS_CPLD_BASE
-       SET_TLB_ENTRY(1, CONFIG_SYS_CPLD_BASE, CONFIG_SYS_CPLD_BASE_PHYS,
+#ifdef CFG_SYS_CPLD_BASE
+       SET_TLB_ENTRY(1, CFG_SYS_CPLD_BASE, CFG_SYS_CPLD_BASE_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 11, BOOKE_PAGESZ_256K, 1),
 #endif
 
 #if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                      0, 12, BOOKE_PAGESZ_1G, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
-                     CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE + 0x40000000,
+                     CFG_SYS_DDR_SDRAM_BASE + 0x40000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                      0, 13, BOOKE_PAGESZ_1G, 1)
 #endif
index ac34095f3b669215968c7a1dcc1e3e3b225b3a25..9ac57bbd8300aa51d10568a8c79a8800ebe16f45 100644 (file)
@@ -7,7 +7,7 @@
  *
  * The following macros need to be defined:
  *
- * CONFIG_SYS_CPLD_BASE-The virtual address of the base of the CPLD register map
+ * CFG_SYS_CPLD_BASE-The virtual address of the base of the CPLD register map
  */
 
 #include <common.h>
 
 u8 cpld_read(unsigned int reg)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        return in_8(p + reg);
 }
 
 void cpld_write(unsigned int reg, u8 value)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        out_8(p + reg, value);
 }
index 539a36d2a9ba19431f35190c145d468037690d20..02ddb6614158c5d962c36b8d035389fdaea94b43 100644 (file)
@@ -115,7 +115,7 @@ found:
 #if defined(CONFIG_DEEP_SLEEP)
 void board_mem_sleep_setup(void)
 {
-       void __iomem *cpld_base = (void *)CONFIG_SYS_CPLD_BASE;
+       void __iomem *cpld_base = (void *)CFG_SYS_CPLD_BASE;
 
        /* does not provide HW signals for power management */
        clrbits_8(cpld_base + 0x17, 0x40);
index 5ce24b40964fe9e83de0ce2322e8f57e86d4ecfe..fe51d68c7bb6142e84d51252ba871af043d13074 100644 (file)
@@ -49,7 +49,7 @@ int board_eth_init(struct bd_info *bis)
                         * DTSEC3
                         */
                        fm_info_set_phy_address(FM1_DTSEC3,
-                                               CONFIG_SYS_SGMII1_PHY_ADDR);
+                                               CFG_SYS_SGMII1_PHY_ADDR);
                        break;
 #endif
 #ifdef CONFIG_TARGET_T1042RDB
@@ -59,7 +59,7 @@ int board_eth_init(struct bd_info *bis)
                                fm_info_set_phy_address(i, 0);
                        /* T1042RDB only supports SGMII on DTSEC3 */
                        fm_info_set_phy_address(FM1_DTSEC3,
-                                               CONFIG_SYS_SGMII1_PHY_ADDR);
+                                               CFG_SYS_SGMII1_PHY_ADDR);
                        break;
 #endif
 #ifdef CONFIG_TARGET_T1042D4RDB
@@ -68,11 +68,11 @@ int board_eth_init(struct bd_info *bis)
                         *  & DTSEC3
                         */
                        if (FM1_DTSEC1 == i)
-                               phy_addr = CONFIG_SYS_SGMII1_PHY_ADDR;
+                               phy_addr = CFG_SYS_SGMII1_PHY_ADDR;
                        if (FM1_DTSEC2 == i)
-                               phy_addr = CONFIG_SYS_SGMII2_PHY_ADDR;
+                               phy_addr = CFG_SYS_SGMII2_PHY_ADDR;
                        if (FM1_DTSEC3 == i)
-                               phy_addr = CONFIG_SYS_SGMII3_PHY_ADDR;
+                               phy_addr = CFG_SYS_SGMII3_PHY_ADDR;
                        fm_info_set_phy_address(i, phy_addr);
                        break;
 #endif
@@ -81,9 +81,9 @@ int board_eth_init(struct bd_info *bis)
                case PHY_INTERFACE_MODE_RGMII_RXID:
                case PHY_INTERFACE_MODE_RGMII_ID:
                        if (FM1_DTSEC4 == i)
-                               phy_addr = CONFIG_SYS_RGMII1_PHY_ADDR;
+                               phy_addr = CFG_SYS_RGMII1_PHY_ADDR;
                        if (FM1_DTSEC5 == i)
-                               phy_addr = CONFIG_SYS_RGMII2_PHY_ADDR;
+                               phy_addr = CFG_SYS_RGMII2_PHY_ADDR;
                        fm_info_set_phy_address(i, phy_addr);
                        break;
                case PHY_INTERFACE_MODE_QSGMII:
@@ -112,7 +112,7 @@ int board_eth_init(struct bd_info *bis)
        if (serdes_get_first_lane(FSL_SRDS_1, QSGMII_SW1_A) >= 0) {
                for (i = 0; i < 4; i++) {
                        bus = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
-                       phy_addr = CONFIG_SYS_FM1_QSGMII11_PHY_ADDR + i;
+                       phy_addr = CFG_SYS_FM1_QSGMII11_PHY_ADDR + i;
                        phy_int = PHY_INTERFACE_MODE_QSGMII;
 
                        vsc9953_port_info_set_mdio(i, bus);
@@ -124,7 +124,7 @@ int board_eth_init(struct bd_info *bis)
        if (serdes_get_first_lane(FSL_SRDS_1, QSGMII_SW1_B) >= 0) {
                for (i = 4; i < 8; i++) {
                        bus = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
-                       phy_addr = CONFIG_SYS_FM1_QSGMII21_PHY_ADDR + i - 4;
+                       phy_addr = CFG_SYS_FM1_QSGMII21_PHY_ADDR + i - 4;
                        phy_int = PHY_INTERFACE_MODE_QSGMII;
 
                        vsc9953_port_info_set_mdio(i, bus);
index 2f00d80106989fa00f7204d3b3c56f0c381ca74c..a0d6eb5b2707e026a1e1ca209ab72c7b1d4adf77 100644 (file)
@@ -9,19 +9,19 @@
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_MTD_NOR_FLASH
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
+       SET_LAW(CFG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
 #endif
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
 #endif
-#ifdef CONFIG_SYS_CPLD_BASE_PHYS
-       SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_128K, LAW_TRGT_IF_IFC),
+#ifdef CFG_SYS_CPLD_BASE_PHYS
+       SET_LAW(CFG_SYS_CPLD_BASE_PHYS, LAW_SIZE_128K, LAW_TRGT_IF_IFC),
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-       SET_LAW(CONFIG_SYS_DCSRBAR_PHYS, LAW_SIZE_4M, LAW_TRGT_IF_DCSR),
+#ifdef CFG_SYS_DCSRBAR_PHYS
+       SET_LAW(CFG_SYS_DCSRBAR_PHYS, LAW_SIZE_4M, LAW_TRGT_IF_DCSR),
 #endif
 #ifdef CFG_SYS_NAND_BASE_PHYS
        SET_LAW(CFG_SYS_NAND_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_IFC),
index 66a142b3ad0341d4e15e106f2a1464335286c817..dd8283f3c60aac1f5273446a3c85f3cccccefd4c 100644 (file)
@@ -46,7 +46,7 @@ void board_init_f(ulong bootflag)
                porsr1 = in_be32(&gur->porsr1);
                pinctl = ((porsr1 & ~(FSL_CORENET_CCSR_PORSR1_RCW_MASK))
                          | 0x24800000);
-               out_be32((unsigned int *)(CONFIG_SYS_DCSRBAR + 0x20000),
+               out_be32((unsigned int *)(CFG_SYS_DCSRBAR + 0x20000),
                         pinctl);
        }
 #endif
index 7d3fd291a0191f985950e05957a5e405d8a804f4..45ebdd30004c51321b39b019bf1c129a191c6259 100644 (file)
@@ -62,8 +62,8 @@ int board_early_init_f(void)
 
 int board_early_init_r(void)
 {
-#ifdef CONFIG_SYS_FLASH_BASE
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+#ifdef CFG_SYS_FLASH_BASE
+       const unsigned int flashbase = CFG_SYS_FLASH_BASE;
        int flash_esel = find_tlb_idx((void *)flashbase, 1);
 
        /*
@@ -84,7 +84,7 @@ int board_early_init_r(void)
                disable_tlb(flash_esel);
        }
 
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
+       set_tlb(1, flashbase, CFG_SYS_FLASH_BASE_PHYS,
                MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                0, flash_esel, BOOKE_PAGESZ_256M, 1);
 #endif
index 905e4771c91e1fc26a1e14f17a40559795c0623a..10be580b81363ae1e74352a7e6048357bd6ff1ba 100644 (file)
@@ -8,32 +8,32 @@
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
 
        /* TLB 1 */
        /* *I*** - Covers boot page */
-#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR) && \
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CFG_SYS_INIT_L3_ADDR) && \
        !defined(CONFIG_NXP_ESBC)
        /*
         * *I*G - L3SRAM. When L3 is used as 256K SRAM, the address of the
         * SRAM is at 0xfffc0000, it covered the 0xfffff000.
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_ADDR, CONFIG_SYS_INIT_L3_ADDR,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L3_ADDR, CFG_SYS_INIT_L3_ADDR,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 0, BOOKE_PAGESZ_256K, 1),
 
@@ -44,8 +44,8 @@ struct fsl_e_tlb_entry tlb_table[] = {
         * and virtual address is 0xfffc0000
         */
 
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_VADDR,
-                     CONFIG_SYS_INIT_L3_ADDR,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L3_VADDR,
+                     CFG_SYS_INIT_L3_ADDR,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 0, BOOKE_PAGESZ_256K, 1),
 #else
@@ -55,13 +55,13 @@ struct fsl_e_tlb_entry tlb_table[] = {
 #endif
 
        /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 1, BOOKE_PAGESZ_16M, 1),
 
        /* *I*G* - Flash, localbus */
        /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                      MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
                      0, 2, BOOKE_PAGESZ_256M, 1),
 
@@ -77,27 +77,27 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 4, BOOKE_PAGESZ_256K, 1),
 
        /* Bman/Qman */
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE, CONFIG_SYS_BMAN_MEM_PHYS,
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE, CFG_SYS_BMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 5, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_BMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_BMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 6, BOOKE_PAGESZ_16M, 1),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE, CONFIG_SYS_QMAN_MEM_PHYS,
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE, CFG_SYS_QMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 7, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_QMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_QMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 8, BOOKE_PAGESZ_16M, 1),
 #endif
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_DCSRBAR, CONFIG_SYS_DCSRBAR_PHYS,
+#ifdef CFG_SYS_DCSRBAR_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_DCSRBAR, CFG_SYS_DCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 9, BOOKE_PAGESZ_4M, 1),
 #endif
@@ -111,18 +111,18 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 10, BOOKE_PAGESZ_64K, 1),
 #endif
-#ifdef CONFIG_SYS_CPLD_BASE
-       SET_TLB_ENTRY(1, CONFIG_SYS_CPLD_BASE, CONFIG_SYS_CPLD_BASE_PHYS,
+#ifdef CFG_SYS_CPLD_BASE
+       SET_TLB_ENTRY(1, CFG_SYS_CPLD_BASE, CFG_SYS_CPLD_BASE_PHYS,
                      MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 11, BOOKE_PAGESZ_256K, 1),
 #endif
 
 #if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                      0, 12, BOOKE_PAGESZ_1G, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
-                     CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE + 0x40000000,
+                     CFG_SYS_DDR_SDRAM_BASE + 0x40000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                      0, 13, BOOKE_PAGESZ_1G, 1)
 #endif
index f97467e84455108bb1c34a302170d081c4652cf6..3cdd4937684e54b8e830f4d192f5122b12988164 100644 (file)
 #include <asm/mmu.h>
 
 struct law_entry law_table[] = {
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
+       SET_LAW(CFG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
 #endif
 #ifdef QIXIS_BASE_PHYS
        SET_LAW(QIXIS_BASE_PHYS, LAW_SIZE_4K, LAW_TRGT_IF_IFC),
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
+#ifdef CFG_SYS_DCSRBAR_PHYS
        /* Limit DCSR to 32M to access NPC Trace Buffer */
-       SET_LAW(CONFIG_SYS_DCSRBAR_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_DCSR),
+       SET_LAW(CFG_SYS_DCSRBAR_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_DCSR),
 #endif
 #ifdef CFG_SYS_NAND_BASE_PHYS
        SET_LAW(CFG_SYS_NAND_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_IFC),
index 82710cf897b21b0dfc5165a5ecf9faed9edfed1f..8be55e52e5f6555b657ea83a6d0adfe46efedcf5 100644 (file)
@@ -282,7 +282,7 @@ static void esdhc_adapter_card_ident(void)
 
 int board_early_init_r(void)
 {
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+       const unsigned int flashbase = CFG_SYS_FLASH_BASE;
        int flash_esel = find_tlb_idx((void *)flashbase, 1);
 
        /*
@@ -303,7 +303,7 @@ int board_early_init_r(void)
                disable_tlb(flash_esel);
        }
 
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
+       set_tlb(1, flashbase, CFG_SYS_FLASH_BASE_PHYS,
                MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                0, flash_esel, BOOKE_PAGESZ_256M, 1);
 
index f2448e86c0d2899ef1da160e4aff97975a86a082..3d220afc16e6cd03ac7eed1c2d0df99a14ced84d 100644 (file)
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
 
        /* TLB 1 */
        /* *I*** - Covers boot page */
-#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CFG_SYS_INIT_L3_ADDR)
        /*
         * *I*G - L3SRAM. When L3 is used as 1M SRAM, the address of the
         * SRAM is at 0xfff00000, it covered the 0xfffff000.
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_ADDR, CONFIG_SYS_INIT_L3_ADDR,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L3_ADDR, CFG_SYS_INIT_L3_ADDR,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 0, BOOKE_PAGESZ_1M, 1),
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -54,13 +54,13 @@ struct fsl_e_tlb_entry tlb_table[] = {
 #endif
 
        /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 1, BOOKE_PAGESZ_16M, 1),
 
        /* *I*G* - Flash, localbus */
        /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                      MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
                      0, 2, BOOKE_PAGESZ_256M, 1),
 
@@ -92,27 +92,27 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 7, BOOKE_PAGESZ_256K, 1),
 
        /* Bman/Qman */
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE, CONFIG_SYS_BMAN_MEM_PHYS,
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE, CFG_SYS_BMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 9, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_BMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_BMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 10, BOOKE_PAGESZ_16M, 1),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE, CONFIG_SYS_QMAN_MEM_PHYS,
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE, CFG_SYS_QMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 11, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_QMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_QMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 12, BOOKE_PAGESZ_16M, 1),
 #endif
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_DCSRBAR, CONFIG_SYS_DCSRBAR_PHYS,
+#ifdef CFG_SYS_DCSRBAR_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_DCSRBAR, CFG_SYS_DCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 13, BOOKE_PAGESZ_32M, 1),
 #endif
@@ -143,7 +143,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
 #endif
 
 #if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                      0, 19, BOOKE_PAGESZ_2G, 1)
 #endif
index b9ba62adffcddd59517415b3e0256dc3da127a3d..933fa0decc31540e9c7870e0dc8ed0a4fb89415c 100644 (file)
 
 u8 cpld_read(unsigned int reg)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        return in_8(p + reg);
 }
 
 void cpld_write(unsigned int reg, u8 value)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        out_8(p + reg, value);
 }
index 3ff4c773d599d4378a059b701d8a960e810eb55f..53a13694506fd70cea96ac7a1f47aecda280243a 100644 (file)
 #include <asm/mmu.h>
 
 struct law_entry law_table[] = {
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
+       SET_LAW(CFG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
 #endif
-#ifdef CONFIG_SYS_CPLD_BASE_PHYS
-       SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_4K, LAW_TRGT_IF_IFC),
+#ifdef CFG_SYS_CPLD_BASE_PHYS
+       SET_LAW(CFG_SYS_CPLD_BASE_PHYS, LAW_SIZE_4K, LAW_TRGT_IF_IFC),
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
+#ifdef CFG_SYS_DCSRBAR_PHYS
        /* Limit DCSR to 32M to access NPC Trace Buffer */
-       SET_LAW(CONFIG_SYS_DCSRBAR_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_DCSR),
+       SET_LAW(CFG_SYS_DCSRBAR_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_DCSR),
 #endif
 #ifdef CFG_SYS_NAND_BASE_PHYS
        SET_LAW(CFG_SYS_NAND_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_IFC),
index 1c8017b593aa5d88fcde580c6447955940347dec..04cb313e8c4cc44d62f34eba63bfdd0e90142f67 100644 (file)
@@ -77,7 +77,7 @@ int checkboard(void)
 
 int board_early_init_r(void)
 {
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+       const unsigned int flashbase = CFG_SYS_FLASH_BASE;
        int flash_esel = find_tlb_idx((void *)flashbase, 1);
        /*
         * Remap Boot flash + PROMJET region to caching-inhibited
@@ -96,7 +96,7 @@ int board_early_init_r(void)
                disable_tlb(flash_esel);
        }
 
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
+       set_tlb(1, flashbase, CFG_SYS_FLASH_BASE_PHYS,
                MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                0, flash_esel, BOOKE_PAGESZ_256M, 1);
 
index 45c27c0812055f71f52a614f84b92bb9e92dc738..688a208c621f939c56d6ee99c67dc6c9bafef0a2 100644 (file)
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
 
        /* TLB 1 */
        /* *I*** - Covers boot page */
-#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CFG_SYS_INIT_L3_ADDR)
        /*
         * *I*G - L3SRAM. When L3 is used as 1M SRAM, the address of the
         * SRAM is at 0xfff00000, it covered the 0xfffff000.
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_ADDR, CONFIG_SYS_INIT_L3_ADDR,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L3_ADDR, CFG_SYS_INIT_L3_ADDR,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 0, BOOKE_PAGESZ_1M, 1),
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -54,13 +54,13 @@ struct fsl_e_tlb_entry tlb_table[] = {
 #endif
 
        /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 1, BOOKE_PAGESZ_16M, 1),
 
        /* *I*G* - Flash, localbus */
        /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                      MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
                      0, 2, BOOKE_PAGESZ_256M, 1),
 
@@ -92,27 +92,27 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 7, BOOKE_PAGESZ_256K, 1),
 
        /* Bman/Qman */
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE, CONFIG_SYS_BMAN_MEM_PHYS,
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE, CFG_SYS_BMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 9, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_BMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_BMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 10, BOOKE_PAGESZ_16M, 1),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE, CONFIG_SYS_QMAN_MEM_PHYS,
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE, CFG_SYS_QMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 11, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_QMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_QMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 12, BOOKE_PAGESZ_16M, 1),
 #endif
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_DCSRBAR, CONFIG_SYS_DCSRBAR_PHYS,
+#ifdef CFG_SYS_DCSRBAR_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_DCSRBAR, CFG_SYS_DCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 13, BOOKE_PAGESZ_32M, 1),
 #endif
@@ -126,8 +126,8 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 16, BOOKE_PAGESZ_64K, 1),
 #endif
-#ifdef CONFIG_SYS_CPLD_BASE
-       SET_TLB_ENTRY(1, CONFIG_SYS_CPLD_BASE, CONFIG_SYS_CPLD_BASE_PHYS,
+#ifdef CFG_SYS_CPLD_BASE
+       SET_TLB_ENTRY(1, CFG_SYS_CPLD_BASE, CFG_SYS_CPLD_BASE_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 17, BOOKE_PAGESZ_4K, 1),
 #endif
@@ -142,7 +142,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 18, BOOKE_PAGESZ_1M, 1),
 #endif
 #if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                      0, 19, BOOKE_PAGESZ_2G, 1)
 #endif
index d484509bc20a0b2f022fda4062ab08ef237e5be5..8b1012086ec7a245045517277fc18c430bf859ec 100644 (file)
@@ -9,7 +9,7 @@
  *
  * The following macros need to be defined:
  *
- * CONFIG_SYS_CPLD_BASE - The virtual address of the base of the
+ * CFG_SYS_CPLD_BASE - The virtual address of the base of the
  * CPLD register map
  *
  */
 
 u8 cpld_read(unsigned int reg)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        return in_8(p + reg);
 }
 
 void cpld_write(unsigned int reg, u8 value)
 {
-       void *p = (void *)CONFIG_SYS_CPLD_BASE;
+       void *p = (void *)CFG_SYS_CPLD_BASE;
 
        out_8(p + reg, value);
 }
index 438589604f1978105c35d85862c8e7fe98ba1e98..43eeb884e2ff71554d1b9a2f0cb111ca6f813851 100644 (file)
@@ -8,19 +8,19 @@
 #include <asm/mmu.h>
 
 struct law_entry law_table[] = {
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
+       SET_LAW(CFG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_LAW(CONFIG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_LAW(CFG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
 #endif
-#ifdef CONFIG_SYS_CPLD_BASE_PHYS
-       SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_4K, LAW_TRGT_IF_IFC),
+#ifdef CFG_SYS_CPLD_BASE_PHYS
+       SET_LAW(CFG_SYS_CPLD_BASE_PHYS, LAW_SIZE_4K, LAW_TRGT_IF_IFC),
 #endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
+#ifdef CFG_SYS_DCSRBAR_PHYS
        /* Limit DCSR to 32M to access NPC Trace Buffer */
-       SET_LAW(CONFIG_SYS_DCSRBAR_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_DCSR),
+       SET_LAW(CFG_SYS_DCSRBAR_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_DCSR),
 #endif
 #ifdef CFG_SYS_NAND_BASE_PHYS
        SET_LAW(CFG_SYS_NAND_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_IFC),
index 20ce7523e57aefeee817bad2d6446280c0e92b8f..0bd0ba939628656a96f89f47494d0342f435cc11 100644 (file)
@@ -54,7 +54,7 @@ int checkboard(void)
 
 int board_early_init_r(void)
 {
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+       const unsigned int flashbase = CFG_SYS_FLASH_BASE;
        int flash_esel = find_tlb_idx((void *)flashbase, 1);
 
        /*
@@ -75,7 +75,7 @@ int board_early_init_r(void)
                disable_tlb(flash_esel);
        }
 
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
+       set_tlb(1, flashbase, CFG_SYS_FLASH_BASE_PHYS,
                MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                0, flash_esel, BOOKE_PAGESZ_256M, 1);
 
index c57af3046f91b704951db6f1de737615dd25af14..f5af893c2d9d4315063211fac93d1bd2d58ec798 100644 (file)
@@ -8,29 +8,29 @@
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
 
        /* TLB 1 */
        /* *I*** - Covers boot page */
-#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CFG_SYS_INIT_L3_ADDR)
        /*
         * *I*G - L3SRAM. When L3 is used as 512K SRAM */
-       SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_ADDR, CONFIG_SYS_INIT_L3_ADDR,
+       SET_TLB_ENTRY(1, CFG_SYS_INIT_L3_ADDR, CFG_SYS_INIT_L3_ADDR,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 0, BOOKE_PAGESZ_512K, 1),
 #else
@@ -40,13 +40,13 @@ struct fsl_e_tlb_entry tlb_table[] = {
 #endif
 
        /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 1, BOOKE_PAGESZ_16M, 1),
 
        /* *I*G* - Flash, localbus */
        /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                      MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
                      0, 2, BOOKE_PAGESZ_256M, 1),
 
@@ -73,28 +73,28 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 6, BOOKE_PAGESZ_256K, 1),
 
        /* Bman/Qman */
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE, CONFIG_SYS_BMAN_MEM_PHYS,
+#ifdef CFG_SYS_BMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE, CFG_SYS_BMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 9, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_BMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_BMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 10, BOOKE_PAGESZ_16M, 1),
 #endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE, CONFIG_SYS_QMAN_MEM_PHYS,
+#ifdef CFG_SYS_QMAN_MEM_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE, CFG_SYS_QMAN_MEM_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 11, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_QMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_QMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 12, BOOKE_PAGESZ_16M, 1),
 #endif
 #endif
 
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-       SET_TLB_ENTRY(1, CONFIG_SYS_DCSRBAR, CONFIG_SYS_DCSRBAR_PHYS,
+#ifdef CFG_SYS_DCSRBAR_PHYS
+       SET_TLB_ENTRY(1, CFG_SYS_DCSRBAR, CFG_SYS_DCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 13, BOOKE_PAGESZ_32M, 1),
 #endif
@@ -108,13 +108,13 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 16, BOOKE_PAGESZ_64K, 1),
 #endif
-#ifdef CONFIG_SYS_CPLD_BASE
-       SET_TLB_ENTRY(1, CONFIG_SYS_CPLD_BASE, CONFIG_SYS_CPLD_BASE_PHYS,
+#ifdef CFG_SYS_CPLD_BASE
+       SET_TLB_ENTRY(1, CFG_SYS_CPLD_BASE, CFG_SYS_CPLD_BASE_PHYS,
                      MAS3_SW|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 17, BOOKE_PAGESZ_4K, 1),
 #endif
 #if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
                      0, 18, BOOKE_PAGESZ_2G, 1)
 #endif
index 4889a6a4f3b960021ba20ec758f1cf499783a549..4fac146353da0cef5144b0febbf72a15b8599c7c 100644 (file)
@@ -40,26 +40,26 @@ static long fixed_sdram(void)
        out_be32(&im->sysconf.ddrlaw[0].bar,
                 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);
+       out_be32(&im->sysconf.ddrcdr, CFG_SYS_DDRCDR_VALUE);
 
        out_be32(&im->ddr.csbnds[0].csbnds, (msize - 1) >> 24);
-       out_be32(&im->ddr.cs_config[0], CONFIG_SYS_DDR_CS0_CONFIG);
+       out_be32(&im->ddr.cs_config[0], CFG_SYS_DDR_CS0_CONFIG);
 
        /* Currently we use only one CS, so disable the other bank. */
        out_be32(&im->ddr.cs_config[1], 0);
 
-       out_be32(&im->ddr.sdram_clk_cntl, CONFIG_SYS_DDR_SDRAM_CLK_CNTL);
-       out_be32(&im->ddr.timing_cfg_3, CONFIG_SYS_DDR_TIMING_3);
-       out_be32(&im->ddr.timing_cfg_1, CONFIG_SYS_DDR_TIMING_1);
-       out_be32(&im->ddr.timing_cfg_2, CONFIG_SYS_DDR_TIMING_2);
-       out_be32(&im->ddr.timing_cfg_0, CONFIG_SYS_DDR_TIMING_0);
+       out_be32(&im->ddr.sdram_clk_cntl, CFG_SYS_DDR_SDRAM_CLK_CNTL);
+       out_be32(&im->ddr.timing_cfg_3, CFG_SYS_DDR_TIMING_3);
+       out_be32(&im->ddr.timing_cfg_1, CFG_SYS_DDR_TIMING_1);
+       out_be32(&im->ddr.timing_cfg_2, CFG_SYS_DDR_TIMING_2);
+       out_be32(&im->ddr.timing_cfg_0, CFG_SYS_DDR_TIMING_0);
 
-       out_be32(&im->ddr.sdram_cfg, CONFIG_SYS_DDR_SDRAM_CFG);
-       out_be32(&im->ddr.sdram_cfg2, CONFIG_SYS_DDR_SDRAM_CFG2);
-       out_be32(&im->ddr.sdram_mode, CONFIG_SYS_DDR_MODE);
-       out_be32(&im->ddr.sdram_mode2, CONFIG_SYS_DDR_MODE2);
+       out_be32(&im->ddr.sdram_cfg, CFG_SYS_DDR_SDRAM_CFG);
+       out_be32(&im->ddr.sdram_cfg2, CFG_SYS_DDR_SDRAM_CFG2);
+       out_be32(&im->ddr.sdram_mode, CFG_SYS_DDR_MODE);
+       out_be32(&im->ddr.sdram_mode2, CFG_SYS_DDR_MODE2);
 
-       out_be32(&im->ddr.sdram_interval, CONFIG_SYS_DDR_INTERVAL);
+       out_be32(&im->ddr.sdram_interval, CFG_SYS_DDR_INTERVAL);
        sync();
 
        /* enable DDR controller */
index 6c5e6fbbcb0de73e3659d625ecb88f35ea1ffbb8..f1599306e618ef9187f9162742d00bd733bdc308 100644 (file)
@@ -82,7 +82,7 @@ int onenand_board_init(struct mtd_info *mtd)
 {
        if (gpmc_cs0_flash == MTD_DEV_TYPE_ONENAND) {
                struct onenand_chip *this = mtd->priv;
-               this->base = (void *)CONFIG_SYS_ONENAND_BASE;
+               this->base = (void *)CFG_SYS_ONENAND_BASE;
                return 0;
        }
        return 1;
index 5401bddf06a965721099f760777418311bdd324f..b433f69675abad4fd1ab9f0e4347f0897f17576a 100644 (file)
@@ -20,7 +20,7 @@
 
 void show_qrio(void)
 {
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
        u16 id_rev = in_be16(qrio_base + ID_REV_OFF);
 
        printf("QRIO: id = %u, revision = %u\n",
@@ -33,7 +33,7 @@ bool qrio_get_selftest_pin(void)
 {
        u8 slftest;
 
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        slftest = in_8(qrio_base + SLFTEST_OFF);
 
@@ -46,7 +46,7 @@ bool qrio_get_pgy_pres_pin(void)
 {
        u8 pgy_pres;
 
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        pgy_pres = in_8(qrio_base + BPRTH_OFF);
 
@@ -57,7 +57,7 @@ int qrio_get_gpio(u8 port_off, u8 gpio_nr)
 {
        u32 gprt;
 
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        gprt = in_be32(qrio_base + port_off + GPRT_OFF);
 
@@ -68,7 +68,7 @@ void qrio_set_gpio(u8 port_off, u8 gpio_nr, bool value)
 {
        u32 gprt, mask;
 
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        mask = 1U << gpio_nr;
 
@@ -85,7 +85,7 @@ void qrio_gpio_direction_output(u8 port_off, u8 gpio_nr, bool value)
 {
        u32 direct, mask;
 
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        mask = 1U << gpio_nr;
 
@@ -100,7 +100,7 @@ void qrio_gpio_direction_input(u8 port_off, u8 gpio_nr)
 {
        u32 direct, mask;
 
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        mask = 1U << gpio_nr;
 
@@ -113,7 +113,7 @@ void qrio_set_opendrain_gpio(u8 port_off, u8 gpio_nr, u8 val)
 {
        u32 direct, mask;
 
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        mask = 1U << gpio_nr;
 
@@ -133,7 +133,7 @@ void qrio_set_opendrain_gpio(u8 port_off, u8 gpio_nr, u8 val)
 void qrio_wdmask(u8 bit, bool wden)
 {
        u16 wdmask;
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        wdmask = in_be16(qrio_base + WDMASK_OFF);
 
@@ -150,7 +150,7 @@ void qrio_wdmask(u8 bit, bool wden)
 void qrio_prst(u8 bit, bool en, bool wden)
 {
        u16 prst;
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        qrio_wdmask(bit, wden);
 
@@ -170,7 +170,7 @@ void qrio_prstcfg(u8 bit, u8 mode)
 {
        unsigned long prstcfg;
        u8 i;
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        prstcfg = in_be32(qrio_base + PRSTCFG_OFF);
 
@@ -191,7 +191,7 @@ void qrio_prstcfg(u8 bit, u8 mode)
 void qrio_set_leds(void)
 {
        u8 ctrlh;
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        /* set UNIT LED to RED and BOOT LED to ON */
        ctrlh = in_8(qrio_base + CTRLH_OFF);
@@ -205,7 +205,7 @@ void qrio_set_leds(void)
 void qrio_enable_app_buffer(void)
 {
        u8 ctrll;
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        /* enable application buffer */
        ctrll = in_8(qrio_base + CTRLL_OFF);
@@ -219,7 +219,7 @@ void qrio_enable_app_buffer(void)
 void qrio_cpuwd_flag(bool flag)
 {
        u8 reason1;
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        reason1 = in_8(qrio_base + REASON1_OFF);
        if (flag)
@@ -246,7 +246,7 @@ void qrio_cpuwd_flag(bool flag)
 bool qrio_reason_unitrst(void)
 {
        u16 reason;
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        reason = in_be16(qrio_base + REASON1_OFF);
 
@@ -258,7 +258,7 @@ bool qrio_reason_unitrst(void)
 void qrio_uprstreq(u8 mode)
 {
        u32 rstcfg;
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
 
        rstcfg = in_8(qrio_base + RSTCFG_OFF);
 
@@ -277,7 +277,7 @@ void qrio_uprstreq(u8 mode)
 
 ulong early_bootcount_load(void)
 {
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
        u16 id_rev = in_be16(qrio_base + ID_REV_OFF);
        u8 id = (id_rev >> 8) & 0xff;
        u8 rev = id_rev & 0xff;
@@ -295,7 +295,7 @@ ulong early_bootcount_load(void)
 
 void early_bootcount_store(ulong ebootcount)
 {
-       void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+       void __iomem *qrio_base = (void *)CFG_SYS_QRIO_BASE;
        u16 id_rev = in_be16(qrio_base + ID_REV_OFF);
        u8 id = (id_rev >> 8) & 0xff;
        u8 rev = id_rev & 0xff;
index ddd8f7a13e1a24d2f855de4b8224e1a4a56adcb2..88afc76bbbf6a70d9ae9432e87485242451fb445 100644 (file)
@@ -40,7 +40,7 @@ static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
 static int piggy_present(void)
 {
        struct km_bec_fpga __iomem *base =
-               (struct km_bec_fpga __iomem *)CONFIG_SYS_KMBEC_FPGA_BASE;
+               (struct km_bec_fpga __iomem *)CFG_SYS_KMBEC_FPGA_BASE;
 
        return in_8(&base->bprth) & PIGGY_PRESENT;
 }
@@ -53,7 +53,7 @@ int ethernet_present(void)
 int board_early_init_r(void)
 {
        struct km_bec_fpga *base =
-               (struct km_bec_fpga *)CONFIG_SYS_KMBEC_FPGA_BASE;
+               (struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE;
 
 #if defined(CONFIG_ARCH_MPC8360)
        unsigned short  svid;
@@ -126,18 +126,18 @@ static int fixed_sdram(void)
        u32 ddr_size_log2;
 
        out_be32(&im->sysconf.ddrlaw[0].ar, (LAWAR_EN | 0x1e));
-       out_be32(&im->ddr.csbnds[0].csbnds, (CONFIG_SYS_DDR_CS0_BNDS) | 0x7f);
-       out_be32(&im->ddr.cs_config[0], CONFIG_SYS_DDR_CS0_CONFIG);
-       out_be32(&im->ddr.timing_cfg_0, CONFIG_SYS_DDR_TIMING_0);
-       out_be32(&im->ddr.timing_cfg_1, CONFIG_SYS_DDR_TIMING_1);
-       out_be32(&im->ddr.timing_cfg_2, CONFIG_SYS_DDR_TIMING_2);
-       out_be32(&im->ddr.timing_cfg_3, CONFIG_SYS_DDR_TIMING_3);
-       out_be32(&im->ddr.sdram_cfg, CONFIG_SYS_DDR_SDRAM_CFG);
-       out_be32(&im->ddr.sdram_cfg2, CONFIG_SYS_DDR_SDRAM_CFG2);
-       out_be32(&im->ddr.sdram_mode, CONFIG_SYS_DDR_MODE);
-       out_be32(&im->ddr.sdram_mode2, CONFIG_SYS_DDR_MODE2);
-       out_be32(&im->ddr.sdram_interval, CONFIG_SYS_DDR_INTERVAL);
-       out_be32(&im->ddr.sdram_clk_cntl, CONFIG_SYS_DDR_CLK_CNTL);
+       out_be32(&im->ddr.csbnds[0].csbnds, (CFG_SYS_DDR_CS0_BNDS) | 0x7f);
+       out_be32(&im->ddr.cs_config[0], CFG_SYS_DDR_CS0_CONFIG);
+       out_be32(&im->ddr.timing_cfg_0, CFG_SYS_DDR_TIMING_0);
+       out_be32(&im->ddr.timing_cfg_1, CFG_SYS_DDR_TIMING_1);
+       out_be32(&im->ddr.timing_cfg_2, CFG_SYS_DDR_TIMING_2);
+       out_be32(&im->ddr.timing_cfg_3, CFG_SYS_DDR_TIMING_3);
+       out_be32(&im->ddr.sdram_cfg, CFG_SYS_DDR_SDRAM_CFG);
+       out_be32(&im->ddr.sdram_cfg2, CFG_SYS_DDR_SDRAM_CFG2);
+       out_be32(&im->ddr.sdram_mode, CFG_SYS_DDR_MODE);
+       out_be32(&im->ddr.sdram_mode2, CFG_SYS_DDR_MODE2);
+       out_be32(&im->ddr.sdram_interval, CFG_SYS_DDR_INTERVAL);
+       out_be32(&im->ddr.sdram_clk_cntl, CFG_SYS_DDR_CLK_CNTL);
        udelay(200);
        setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN);
 
@@ -215,7 +215,7 @@ int post_hotkeys_pressed(void)
 {
        int testpin = 0;
        struct km_bec_fpga *base =
-               (struct km_bec_fpga *)CONFIG_SYS_KMBEC_FPGA_BASE;
+               (struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE;
        int testpin_reg = in_8(&base->CONFIG_TESTPIN_REG);
        testpin = (testpin_reg & CONFIG_TESTPIN_MASK) != 0;
        debug("post_hotkeys_pressed: %d\n", !testpin);
index 6a1711092b62568d4ebd0027112828f7ece0e2fa..9f68c215f38c44b0d2c8bbbbd2cbfc52e1bd487c 100644 (file)
@@ -44,7 +44,7 @@ int checkboard(void)
 
 int board_early_init_f(void)
 {
-       struct fsl_ifc ifc = {(void *)CONFIG_SYS_IFC_ADDR, (void *)NULL};
+       struct fsl_ifc ifc = {(void *)CFG_SYS_IFC_ADDR, (void *)NULL};
        ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
        bool cpuwd_flag = false;
 
@@ -141,7 +141,7 @@ int board_early_init_r(void)
 {
        int ret = 0;
 
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+       const unsigned int flashbase = CFG_SYS_FLASH_BASE;
        int flash_esel = find_tlb_idx((void *)flashbase, 1);
 
        /*
@@ -162,7 +162,7 @@ int board_early_init_r(void)
                disable_tlb(flash_esel);
        }
 
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
+       set_tlb(1, flashbase, CFG_SYS_FLASH_BASE_PHYS,
                MAS3_SX | MAS3_SW | MAS3_SR, MAS2_I | MAS2_G,
                0, flash_esel, BOOKE_PAGESZ_256M, 1);
 
index b04a8e20dce91f5bb78512423bf0d574d53d0bc0..ec3bb8fe8061ba3972c14d3e413d174eb0fa1c38 100644 (file)
 #include <asm/fsl_law.h>
 
 struct law_entry law_table[] = {
-       SET_LAW(CONFIG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
-       SET_LAW(CONFIG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
-       SET_LAW(CONFIG_SYS_DCSRBAR_PHYS, LAW_SIZE_4M, LAW_TRGT_IF_DCSR),
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_64M, LAW_TRGT_IF_IFC),
+       SET_LAW(CFG_SYS_BMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_BMAN),
+       SET_LAW(CFG_SYS_QMAN_MEM_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_QMAN),
+       SET_LAW(CFG_SYS_DCSRBAR_PHYS, LAW_SIZE_4M, LAW_TRGT_IF_DCSR),
+       SET_LAW(CFG_SYS_FLASH_BASE_PHYS, LAW_SIZE_64M, LAW_TRGT_IF_IFC),
        SET_LAW(CFG_SYS_NAND_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_IFC),
-       SET_LAW(CONFIG_SYS_QRIO_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_IFC),
+       SET_LAW(CFG_SYS_QRIO_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_IFC),
        SET_LAW(SYS_LAWAPP_BASE_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_IFC),
 /* other application LAW are not used in u-boot */
 };
index 0f6dc6063ab1f600d8a1b17cc8a936bd92628c97..41b24e39433d55bd14a32e6afce32b989cc6796b 100644 (file)
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS,
                      MAS3_SX | MAS3_SW | MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
                      MAS3_SX | MAS3_SW | MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
                      MAS3_SX | MAS3_SW | MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
-                     CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
+                     CFG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
                      MAS3_SX | MAS3_SW | MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
 
@@ -35,13 +35,13 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 0, BOOKE_PAGESZ_4K, 1),
 
        /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                      MAS3_SX | MAS3_SW | MAS3_SR, MAS2_I | MAS2_G,
                      0, 1, BOOKE_PAGESZ_16M, 1),
 
        /* *I*G* - Flash, localbus */
        /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS,
                      MAS3_SX | MAS3_SR, MAS2_W | MAS2_G,
                      0, 2, BOOKE_PAGESZ_128M, 1),
 
@@ -56,22 +56,22 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 4, BOOKE_PAGESZ_256K, 1),
 
        /* Bman/Qman */
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE, CONFIG_SYS_BMAN_MEM_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE, CFG_SYS_BMAN_MEM_PHYS,
                      MAS3_SX | MAS3_SW | MAS3_SR, 0,
                      0, 5, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_BMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_BMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_BMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_BMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX | MAS3_SW | MAS3_SR, MAS2_I | MAS2_G,
                      0, 6, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE, CONFIG_SYS_QMAN_MEM_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE, CFG_SYS_QMAN_MEM_PHYS,
                      MAS3_SX | MAS3_SW | MAS3_SR, 0,
                      0, 7, BOOKE_PAGESZ_16M, 1),
-       SET_TLB_ENTRY(1, CONFIG_SYS_QMAN_MEM_BASE + 0x01000000,
-                     CONFIG_SYS_QMAN_MEM_PHYS + 0x01000000,
+       SET_TLB_ENTRY(1, CFG_SYS_QMAN_MEM_BASE + 0x01000000,
+                     CFG_SYS_QMAN_MEM_PHYS + 0x01000000,
                      MAS3_SX | MAS3_SW | MAS3_SR, MAS2_I | MAS2_G,
                      0, 8, BOOKE_PAGESZ_16M, 1),
 
-       SET_TLB_ENTRY(1, CONFIG_SYS_DCSRBAR, CONFIG_SYS_DCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_DCSRBAR, CFG_SYS_DCSRBAR_PHYS,
                      MAS3_SX | MAS3_SW | MAS3_SR, MAS2_I | MAS2_G,
                      0, 9, BOOKE_PAGESZ_4M, 1),
 
@@ -80,11 +80,11 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      MAS3_SX | MAS3_SW | MAS3_SR, MAS2_I | MAS2_G,
                      0, 10, BOOKE_PAGESZ_64K, 1),
        /* QRIO */
-       SET_TLB_ENTRY(1, CONFIG_SYS_QRIO_BASE, CONFIG_SYS_QRIO_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_QRIO_BASE, CFG_SYS_QRIO_BASE_PHYS,
                      MAS3_SW | MAS3_SR, MAS2_I | MAS2_G,
                      0, 11, BOOKE_PAGESZ_64K, 1),
        /* MRAM */
-       SET_TLB_ENTRY(1, CONFIG_SYS_MRAM_BASE, SYS_MRAM_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_MRAM_BASE, SYS_MRAM_BASE_PHYS,
                      MAS3_SW | MAS3_SR, MAS2_I | MAS2_G,
                      0, 12, BOOKE_PAGESZ_128M, 1),
        /* BFTIC */
@@ -96,7 +96,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
         * in cpu_init_f, so do not use them here!!.
         */
        /* PAXE */
-       SET_TLB_ENTRY(1, CONFIG_SYS_PAXE_BASE, SYS_PAXE_BASE_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_PAXE_BASE, SYS_PAXE_BASE_PHYS,
                      MAS3_SW | MAS3_SR, MAS2_I | MAS2_G,
                      0, 16, BOOKE_PAGESZ_128M, 1)
 };
index 1a7fa3fc1e4891d3281c327b80343a50ea0a4294..e005ece469bb821ea961accbf63d54384082958d 100644 (file)
@@ -52,7 +52,7 @@ int board_early_init_f(void)
 {
        struct ccsr_scfg *scfg = (struct ccsr_scfg *)CFG_SYS_FSL_SCFG_ADDR;
        struct ccsr_gur __iomem *gur = (void *)CFG_SYS_FSL_GUTS_ADDR;
-       struct fsl_ifc ifc = {(void *)CONFIG_SYS_IFC_ADDR, (void *)NULL};
+       struct fsl_ifc ifc = {(void *)CFG_SYS_IFC_ADDR, (void *)NULL};
 
        /* Disable unused MCK1 */
        setbits_be32(&gur->ddrclkdr, 2);
index fa95886fa3b63cc67e36b92feebe62d578b2b4ef..238b9637badd03aea3ddd1055715f6f91d3564d3 100644 (file)
@@ -232,7 +232,7 @@ int board_init(void)
        gpmc_init();
 #if defined(CONFIG_CMD_ONENAND)
        enable_gpmc_cs_config(gpmc_regs_onenandrx51, &gpmc_cfg->cs[0],
-                             CONFIG_SYS_ONENAND_BASE, GPMC_SIZE_256M);
+                             CFG_SYS_ONENAND_BASE, GPMC_SIZE_256M);
 #endif
        /* Enable the clks & power */
        per_clocks_enable();
index 9f21795437a674dae27ea13213afb4953c10e104..c67c107b16c28a253854088e64bde32d23d9961f 100644 (file)
@@ -14,7 +14,7 @@ int onenand_board_init(struct mtd_info *mtd)
 {
        struct onenand_chip *this = mtd->priv;
 
-       this->base = (void *)CONFIG_SYS_ONENAND_BASE;
+       this->base = (void *)CFG_SYS_ONENAND_BASE;
        this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK;
        this->chip_probe = s5pc110_chip_probe;
 
index 37e911c430a9aaf255a9b2adba01992aa3b4b04e..265a2cde4b484813809ce26978f9bb13bbe73b1b 100644 (file)
@@ -13,7 +13,7 @@ int onenand_board_init(struct mtd_info *mtd)
 {
        struct onenand_chip *this = mtd->priv;
 
-       this->base = (void *)CONFIG_SYS_ONENAND_BASE;
+       this->base = (void *)CFG_SYS_ONENAND_BASE;
        this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK;
        this->chip_probe = s5pc210_chip_probe;
 
index 3d0f7341a37103e208c2718a6dd041519159ddee..15044c7d0edf5e89796c93969cc86a21b0ffed45 100644 (file)
@@ -246,7 +246,7 @@ void mem_init(void)
 
        setting.cr = SDRAM_BASE_CONF;
        setting.mdr = AT91_SDRAMC_MD_SDRAM;
-       setting.tr = (CONFIG_SYS_MASTER_CLOCK * 7) / 1000000;
+       setting.tr = (CFG_SYS_MASTER_CLOCK * 7) / 1000000;
 
        /*
         * I write here directly in this register, because this
index 1eee972d49e12a65fdb1a213e599b926d8c4879d..ad44a7c0d28b01a14c771a7a79ebc07dc4ab8def 100644 (file)
@@ -168,7 +168,7 @@ void sdramc_configure(unsigned int mask)
        at91_sdram_hw_init();
        setting.cr = SDRAM_BASE_CONF | mask;
        setting.mdr = AT91_SDRAMC_MD_SDRAM;
-       setting.tr = (CONFIG_SYS_MASTER_CLOCK * 7) / 1000000;
+       setting.tr = (CFG_SYS_MASTER_CLOCK * 7) / 1000000;
 
        writel(readl(&ma->ebicsa) | AT91_MATRIX_CS1A_SDRAMC |
                AT91_MATRIX_VDDIOMSEL_3_3V | AT91_MATRIX_EBI_IOSR_SEL,
index 840941b63e504474aef33e28c5ac2b3f74eeadea..e4427ecff1bc682a5761ad2d9b51e0a1f0804e42 100644 (file)
  */
 
 struct law_entry law_table[] = {
-       SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_DDR),
-       SET_LAW(CONFIG_SYS_LBC_FLASH_BASE, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
-#if defined(CONFIG_SYS_FPGA_BASE)
-       SET_LAW(CONFIG_SYS_FPGA_BASE, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
+       SET_LAW(CFG_SYS_DDR_SDRAM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_DDR),
+       SET_LAW(CFG_SYS_LBC_FLASH_BASE, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
+#if defined(CFG_SYS_FPGA_BASE)
+       SET_LAW(CFG_SYS_FPGA_BASE, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
 #endif
-       SET_LAW(CONFIG_SYS_LIME_BASE, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
+       SET_LAW(CFG_SYS_LIME_BASE, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
 };
 
 int num_law_entries = ARRAY_SIZE(law_table);
index ad49999dc28ee5c5f4d3f14ef561caccd204f775..61402a554b784420c6bb1010c2444c2e2e8df6ca 100644 (file)
@@ -34,20 +34,20 @@ phys_size_t fixed_sdram(void)
        ddr->cs0_config = 0;
        ddr->sdram_cfg = 0;
 
-       ddr->cs0_bnds = CONFIG_SYS_DDR_CS0_BNDS;
-       ddr->cs0_config = CONFIG_SYS_DDR_CS0_CONFIG;
-       ddr->timing_cfg_0 = CONFIG_SYS_DDR_TIMING_0;
-       ddr->timing_cfg_1 = CONFIG_SYS_DDR_TIMING_1;
-       ddr->timing_cfg_2 = CONFIG_SYS_DDR_TIMING_2;
-       ddr->sdram_mode = CONFIG_SYS_DDR_MODE;
-       ddr->sdram_interval = CONFIG_SYS_DDR_INTERVAL;
-       ddr->sdram_cfg_2 = CONFIG_SYS_DDR_CONFIG_2;
-       ddr->sdram_clk_cntl = CONFIG_SYS_DDR_CLK_CONTROL;
+       ddr->cs0_bnds = CFG_SYS_DDR_CS0_BNDS;
+       ddr->cs0_config = CFG_SYS_DDR_CS0_CONFIG;
+       ddr->timing_cfg_0 = CFG_SYS_DDR_TIMING_0;
+       ddr->timing_cfg_1 = CFG_SYS_DDR_TIMING_1;
+       ddr->timing_cfg_2 = CFG_SYS_DDR_TIMING_2;
+       ddr->sdram_mode = CFG_SYS_DDR_MODE;
+       ddr->sdram_interval = CFG_SYS_DDR_INTERVAL;
+       ddr->sdram_cfg_2 = CFG_SYS_DDR_CONFIG_2;
+       ddr->sdram_clk_cntl = CFG_SYS_DDR_CLK_CONTROL;
 
        asm ("sync;isync;msync");
        udelay(1000);
 
-       ddr->sdram_cfg = CONFIG_SYS_DDR_CONFIG;
+       ddr->sdram_cfg = CFG_SYS_DDR_CONFIG;
        asm ("sync; isync; msync");
        udelay(1000);
 
@@ -62,7 +62,7 @@ phys_size_t fixed_sdram(void)
 }
 #endif
 
-#if defined(CONFIG_SYS_DRAM_TEST)
+#if defined(CFG_SYS_DRAM_TEST)
 int testdram(void)
 {
        uint *pstart = (uint *) CONFIG_SYS_MEMTEST_START;
index eaba87542e76dda78375fc1ad1cfb6fe21fff555..9c4dd186fca7b85862c281390eb34121eb3468b1 100644 (file)
@@ -83,7 +83,7 @@ int misc_init_r (void)
        /*
         * Check if boot FLASH isn't max size
         */
-       if (gd->bd->bi_flashsize < (0 - CONFIG_SYS_FLASH0)) {
+       if (gd->bd->bi_flashsize < (0 - CFG_SYS_FLASH0)) {
                set_lbc_or(0, gd->bd->bi_flashstart |
                           (CONFIG_SYS_OR0_PRELIM & 0x00007fff));
                set_lbc_br(0, gd->bd->bi_flashstart |
@@ -98,7 +98,7 @@ int misc_init_r (void)
        /*
         * Check if only one FLASH bank is available
         */
-       if (gd->bd->bi_flashsize != CONFIG_SYS_MAX_FLASH_BANKS * (0 - CONFIG_SYS_FLASH0)) {
+       if (gd->bd->bi_flashsize != CONFIG_SYS_MAX_FLASH_BANKS * (0 - CFG_SYS_FLASH0)) {
                set_lbc_or(1, 0);
                set_lbc_br(1, 0);
 
@@ -143,7 +143,7 @@ void local_bus_init (void)
        sys_info_t sysinfo;
        uint clkdiv;
        uint lbc_mhz;
-       uint lcrr = CONFIG_SYS_LBC_LCRR;
+       uint lcrr = CFG_SYS_LBC_LCRR;
 
        get_sys_info (&sysinfo);
        clkdiv = lbc->lcrr & LCRR_CLKDIV;
@@ -204,8 +204,8 @@ int ft_board_setup(void *blob, struct bd_info *bd)
        /* Fixup FPGA mapping */
        val[i++] = 3;                           /* chip select number */
        val[i++] = 0;                           /* always 0 */
-       val[i++] = CONFIG_SYS_FPGA_BASE;
-       val[i++] = CONFIG_SYS_FPGA_SIZE;
+       val[i++] = CFG_SYS_FPGA_BASE;
+       val[i++] = CFG_SYS_FPGA_SIZE;
 
        rc = fdt_find_and_setprop(blob, "/localbus", "ranges",
                                  val, i * sizeof(u32), 1);
index 1ab403d145e610f916aa349efbce31124ef27d94..631f6c3407553b3534a8ffd0cc4108f32979db87 100644 (file)
 
 struct fsl_e_tlb_entry tlb_table[] = {
        /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR, CONFIG_SYS_INIT_RAM_ADDR,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR, CFG_SYS_INIT_RAM_ADDR,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 4 * 1024 , CFG_SYS_INIT_RAM_ADDR + 4 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 8 * 1024 , CFG_SYS_INIT_RAM_ADDR + 8 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
+       SET_TLB_ENTRY(0, CFG_SYS_INIT_RAM_ADDR + 12 * 1024 , CFG_SYS_INIT_RAM_ADDR + 12 * 1024,
                      MAS3_SX|MAS3_SW|MAS3_SR, 0,
                      0, 0, BOOKE_PAGESZ_4K, 0),
 
@@ -33,7 +33,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
         * 0xfc000000   64M     FLASH
         * Out of reset this entry is only 4K.
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 1, BOOKE_PAGESZ_64M, 1),
 
@@ -53,12 +53,12 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 3, BOOKE_PAGESZ_256M, 1),
 
-#if defined(CONFIG_SYS_FPGA_BASE)
+#if defined(CFG_SYS_FPGA_BASE)
        /*
         * TLB 4:       1M      Non-cacheable, guarded
         * 0xc0000000   1M      FPGA and NAND
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FPGA_BASE, CONFIG_SYS_FPGA_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_FPGA_BASE, CFG_SYS_FPGA_BASE,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 4, BOOKE_PAGESZ_1M, 1),
 #endif
@@ -70,7 +70,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
         * (0xcbfc0000  256K    LIME GDC MMIO)
         * MMIO is relocatable and could be at 0xcbfc0000
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_LIME_BASE, CONFIG_SYS_LIME_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_LIME_BASE, CFG_SYS_LIME_BASE,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 5, BOOKE_PAGESZ_64M, 1),
 
@@ -79,7 +79,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
         * 0xe000_0000  1M      CCSRBAR
         * 0xe200_0000  16M     PCI1 IO
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+       SET_TLB_ENTRY(1, CFG_SYS_CCSRBAR, CFG_SYS_CCSRBAR_PHYS,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 6, BOOKE_PAGESZ_64M, 1),
 
@@ -91,11 +91,11 @@ struct fsl_e_tlb_entry tlb_table[] = {
         * Make sure the TLB count at the top of this table is correct.
         * Likely it needs to be increased by two for these entries.
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 7, BOOKE_PAGESZ_256M, 1),
 
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000, CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
+       SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE + 0x10000000, CFG_SYS_DDR_SDRAM_BASE + 0x10000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 8, BOOKE_PAGESZ_256M, 1),
 #endif
index 5426fc4ffd8439509a84000ae0344a31e5f78fd3..429f886771b731f7832cdd59df9f7041a1b8df66 100644 (file)
@@ -77,7 +77,7 @@ int dram_init(void)
         * DCR
         * set proper  RC as per specification
         */
-       RC = (CONFIG_SYS_CPU_CLK / 1000000) >> 1;
+       RC = (CFG_SYS_CPU_CLK / 1000000) >> 1;
        RC = (RC * 15) >> 4;
 
        /* 0x8000 is the faster option */
index 34818736a4f5c9aa6f03408754175a5080147295..1683f780a33b646ca67a466e5ae54273fe2cded6 100644 (file)
@@ -121,7 +121,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
        /* adjust memory start address for LPAE */
        if (lpae) {
                start[0] -= CFG_SYS_SDRAM_BASE;
-               start[0] += CONFIG_SYS_LPAE_SDRAM_BASE;
+               start[0] += CFG_SYS_LPAE_SDRAM_BASE;
        }
 
        if ((size[0] == 0x80000000) && (ddr3a_size != 0)) {
@@ -175,11 +175,11 @@ void ft_board_setup_ex(void *blob, struct bd_info *bd)
                        if (prop1 && prop2) {
                                initrd_start = __be64_to_cpu(*prop1);
                                initrd_start -= CFG_SYS_SDRAM_BASE;
-                               initrd_start += CONFIG_SYS_LPAE_SDRAM_BASE;
+                               initrd_start += CFG_SYS_LPAE_SDRAM_BASE;
                                initrd_start = __cpu_to_be64(initrd_start);
                                initrd_end = __be64_to_cpu(*prop2);
                                initrd_end -= CFG_SYS_SDRAM_BASE;
-                               initrd_end += CONFIG_SYS_LPAE_SDRAM_BASE;
+                               initrd_end += CFG_SYS_LPAE_SDRAM_BASE;
                                initrd_end = __cpu_to_be64(initrd_end);
 
                                err = fdt_delprop(blob, nodeoffset,
@@ -223,7 +223,7 @@ void ft_board_setup_ex(void *blob, struct bd_info *bd)
                        if (size) {
                                *reserve_start -= CFG_SYS_SDRAM_BASE;
                                *reserve_start +=
-                                       CONFIG_SYS_LPAE_SDRAM_BASE;
+                                       CFG_SYS_LPAE_SDRAM_BASE;
                                *reserve_start =
                                        __cpu_to_be64(*reserve_start);
                        } else {
index 929668ebaa87643ada0ff14062c9f46fa1cb42e4..09cbd6bf71987fdc5d3998b73298d31976214838 100644 (file)
@@ -146,7 +146,7 @@ int board_init(void)
        gd->bd->bi_arch_number = MACH_TYPE_OMAP5_SEVM;
        gd->bd->bi_boot_params = (0x80000000 + 0x100); /* boot param addr */
 
-       tca642x_set_inital_state(CONFIG_SYS_I2C_TCA642X_ADDR, tca642x_init);
+       tca642x_set_inital_state(CFG_SYS_I2C_TCA642X_ADDR, tca642x_init);
 
        return 0;
 }
index 9d921032eaffdcee301c78cea8f5caf580242aaf..bc7e5c5764f8c2183a0cb9ef65ae648a9f22be3c 100644 (file)
@@ -13,7 +13,7 @@
  */
 int board_flash_wp_on(void)
 {
-       if (pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) &
+       if (pca953x_get_val(CFG_SYS_I2C_PCA953X_ADDR0) &
                        CONFIG_SYS_PCA953X_NVM_WP)
                return 1;
 
@@ -30,7 +30,7 @@ uint get_board_derivative(void)
 #if defined(CONFIG_MPC85xx)
        volatile ccsr_gur_t *gur = (void *)CFG_SYS_MPC85xx_GUTS_ADDR;
 #elif defined(CONFIG_MPC86xx)
-       volatile immap_t *immap = (immap_t *)CONFIG_SYS_CCSRBAR;
+       volatile immap_t *immap = (immap_t *)CFG_SYS_CCSRBAR;
        volatile ccsr_gur_t *gur = &immap->im_gur;
 #endif
 
index 4a001bcee851f0f657e260daccaddc80a32d1400..668270cc6605598f01f74b60e21e4c423cf547c6 100644 (file)
@@ -654,7 +654,7 @@ config SYS_MONITOR_BASE
        default TEXT_BASE
        help
          The physical start address of boot monitor code (which is the same as
-         CONFIG_TEXT_BASE when linking) and the same as CONFIG_SYS_FLASH_BASE
+         CONFIG_TEXT_BASE when linking) and the same as CFG_SYS_FLASH_BASE
          when booting from flash.
 
 config SPL_SYS_MONITOR_BASE
index 8813be544be111b797c12a2fec4b1989398fe3a5..0fd63291d3fcc5db0ddc81f9157c7613e1c7843e 100644 (file)
@@ -161,8 +161,8 @@ phys_size_t env_get_bootm_mapsize(void)
                return tmp;
        }
 
-#if defined(CONFIG_SYS_BOOTMAPSZ)
-       return CONFIG_SYS_BOOTMAPSZ;
+#if defined(CFG_SYS_BOOTMAPSZ)
+       return CFG_SYS_BOOTMAPSZ;
 #else
        return env_get_bootm_size();
 #endif
index 0e2dfbc4fc28f8a62b8523f2dbb711461aafccdf..58505e6e1d3e94baead9c8562c7ea8b328526e7f 100644 (file)
@@ -51,10 +51,10 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc,
        }
 #elif CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
        old_bus = i2c_get_bus_num();
-       i2c_set_bus_num(CONFIG_SYS_RTC_BUS_NUM);
+       i2c_set_bus_num(CFG_SYS_RTC_BUS_NUM);
 #else
        old_bus = I2C_GET_BUS();
-       I2C_SET_BUS(CONFIG_SYS_RTC_BUS_NUM);
+       I2C_SET_BUS(CFG_SYS_RTC_BUS_NUM);
 #endif
 
        switch (argc) {
index 7b84378f7cd2cf0acc0a7d9194b569ce7970fb12..da8b4c255555529fda7748ff6db0fe9e9bf79eea 100644 (file)
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -97,19 +97,19 @@ static uint i2c_mm_last_alen;
  * When multiple buses are present, the list is an array of bus-address
  * pairs.  The following macros take care of this */
 
-#if defined(CONFIG_SYS_I2C_NOPROBES)
+#if defined(CFG_SYS_I2C_NOPROBES)
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS)
 static struct
 {
        uchar   bus;
        uchar   addr;
-} i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES;
+} i2c_no_probes[] = CFG_SYS_I2C_NOPROBES;
 #define GET_BUS_NUM    i2c_get_bus_num()
 #define COMPARE_BUS(b,i)       (i2c_no_probes[(i)].bus == (b))
 #define COMPARE_ADDR(a,i)      (i2c_no_probes[(i)].addr == (a))
 #define NO_PROBE_ADDR(i)       i2c_no_probes[(i)].addr
 #else          /* single bus */
-static uchar i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES;
+static uchar i2c_no_probes[] = CFG_SYS_I2C_NOPROBES;
 #define GET_BUS_NUM    0
 #define COMPARE_BUS(b,i)       ((b) == 0)      /* Make compiler happy */
 #define COMPARE_ADDR(a,i)      (i2c_no_probes[(i)] == (a))
@@ -912,7 +912,7 @@ static int do_i2c_probe(struct cmd_tbl *cmdtp, int flag, int argc,
        int j;
        int addr = -1;
        int found = 0;
-#if defined(CONFIG_SYS_I2C_NOPROBES)
+#if defined(CFG_SYS_I2C_NOPROBES)
        int k, skip;
        unsigned int bus = GET_BUS_NUM;
 #endif /* NOPROBES */
@@ -932,7 +932,7 @@ static int do_i2c_probe(struct cmd_tbl *cmdtp, int flag, int argc,
                if ((0 <= addr) && (j != addr))
                        continue;
 
-#if defined(CONFIG_SYS_I2C_NOPROBES)
+#if defined(CFG_SYS_I2C_NOPROBES)
                skip = 0;
                for (k = 0; k < ARRAY_SIZE(i2c_no_probes); k++) {
                        if (COMPARE_BUS(bus, k) && COMPARE_ADDR(j, k)) {
@@ -955,7 +955,7 @@ static int do_i2c_probe(struct cmd_tbl *cmdtp, int flag, int argc,
        }
        putc ('\n');
 
-#if defined(CONFIG_SYS_I2C_NOPROBES)
+#if defined(CFG_SYS_I2C_NOPROBES)
        puts ("Excluded chip addresses:");
        for (k = 0; k < ARRAY_SIZE(i2c_no_probes); k++) {
                if (COMPARE_BUS(bus,k))
@@ -1702,7 +1702,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
 #ifndef CONFIG_SYS_I2C_DIRECT_BUS
                        int j;
 
-                       for (j = 0; j < CONFIG_SYS_I2C_MAX_HOPS; j++) {
+                       for (j = 0; j < CFG_SYS_I2C_MAX_HOPS; j++) {
                                if (i2c_bus[i].next_hop[j].chip == 0)
                                        break;
                                printf("->%s@0x%2x:%d",
@@ -1737,7 +1737,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
                printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name);
 #ifndef CONFIG_SYS_I2C_DIRECT_BUS
                        int j;
-                       for (j = 0; j < CONFIG_SYS_I2C_MAX_HOPS; j++) {
+                       for (j = 0; j < CFG_SYS_I2C_MAX_HOPS; j++) {
                                if (i2c_bus[i].next_hop[j].chip == 0)
                                        break;
                                printf("->%s@0x%2x:%d",
index aab1130763e3d15b6b3afe745318be548198e25a..e027248db56d6e36bcdbdca85d43ab1a7393dd59 100644 (file)
@@ -900,9 +900,9 @@ static const init_fnc_t init_sequence_f[] = {
        post_init_f,
 #endif
        INIT_FUNC_WATCHDOG_RESET
-#if defined(CONFIG_SYS_DRAM_TEST)
+#if defined(CFG_SYS_DRAM_TEST)
        testdram,
-#endif /* CONFIG_SYS_DRAM_TEST */
+#endif /* CFG_SYS_DRAM_TEST */
        INIT_FUNC_WATCHDOG_RESET
 
 #ifdef CONFIG_POST
index f7fb7df54a038ef4e9e57dc474e6e6239d8c16b4..347bb7f7c02df5e87799371083ea6b26cac5850f 100644 (file)
@@ -346,7 +346,7 @@ static int initr_flash(void)
         * NOTE: Maybe we should add some schedule()? XXX
         */
        if (env_get_yesno("flashchecksum") == 1) {
-               const uchar *flash_base = (const uchar *)CONFIG_SYS_FLASH_BASE;
+               const uchar *flash_base = (const uchar *)CFG_SYS_FLASH_BASE;
 
                printf("  CRC: %08X", crc32(0,
                                            flash_base,
@@ -356,8 +356,8 @@ static int initr_flash(void)
        putc('\n');
 
        /* update start of FLASH memory    */
-#ifdef CONFIG_SYS_FLASH_BASE
-       bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
+#ifdef CFG_SYS_FLASH_BASE
+       bd->bi_flashstart = CFG_SYS_FLASH_BASE;
 #endif
        /* size of FLASH memory (final value) */
        bd->bi_flashsize = flash_size;
@@ -370,7 +370,7 @@ static int initr_flash(void)
 #if defined(CONFIG_OXC) || defined(CONFIG_RMU)
        /* flash mapped at end of memory map */
        bd->bi_flashoffset = CONFIG_TEXT_BASE + flash_size;
-#elif CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE
+#elif CONFIG_SYS_MONITOR_BASE == CFG_SYS_FLASH_BASE
        bd->bi_flashoffset = monitor_flash_len; /* reserved area for monitor */
 #endif
        return 0;
index 8da85539afd1741c9a6b9602562807cf86f713b6..fc696cf0cee2947f80cac7fe842e551a9eea895c 100644 (file)
@@ -26,7 +26,7 @@ config SPL_SYS_CCSR_DO_NOT_RELOCATE
        bool "Ensures that CCSR is not relocated"
        depends on PPC
        help
-         If this is defined, then CONFIG_SYS_CCSRBAR_PHYS will be forced to a
+         If this is defined, then CFG_SYS_CCSRBAR_PHYS will be forced to a
          value that ensures that CCSR is not relocated.
 
 config TPL_SYS_CCSR_DO_NOT_RELOCATE
@@ -59,7 +59,7 @@ config SPL_RELOC_TEXT_BASE
 config SPL_RELOC_STACK
        hex "Address of the start of the stack SPL will use after relocation."
        help
-         If unspecified, this is equal to CONFIG_SYS_SPL_MALLOC_START.  Starting
+         If unspecified, this is equal to CFG_SYS_SPL_MALLOC_START.  Starting
          address of the malloc pool used in SPL.  When this option is set the full
          malloc is used in SPL and it is set up by spl_init() and before that, the
          simple malloc() can be used if CONFIG_SYS_MALLOC_F is defined.
index 22d2a0621e1ecefcbf40e0d62282a5cea9f3cc3a..1d2e8fda728482a9c7878951034a73795e18c197 100644 (file)
@@ -43,8 +43,8 @@
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_BINMAN_MAGIC_SYM;
 
-#ifndef CONFIG_SYS_UBOOT_START
-#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE
+#ifndef CFG_SYS_UBOOT_START
+#define CFG_SYS_UBOOT_START    CONFIG_TEXT_BASE
 #endif
 
 u32 *boot_params_ptr = NULL;
@@ -250,7 +250,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
                spl_image->entry_point = u_boot_pos;
                spl_image->load_addr = u_boot_pos;
        } else {
-               spl_image->entry_point = CONFIG_SYS_UBOOT_START;
+               spl_image->entry_point = CFG_SYS_UBOOT_START;
                spl_image->load_addr = CONFIG_TEXT_BASE;
        }
        spl_image->os = IH_OS_U_BOOT;
index c1ed31e367c764a4c129accb9e64b835b182acdc..08da7fed88ea417de3d46c54391aee0d293de54e 100644 (file)
@@ -828,7 +828,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
        }
 
        /*
-        * If a platform does not provide CONFIG_SYS_UBOOT_START, U-Boot's
+        * If a platform does not provide CFG_SYS_UBOOT_START, U-Boot's
         * Makefile will set it to 0 and it will end up as the entry point
         * here. What it actually means is: use the load address.
         */
index eaa95fb9b590ffed6b816a540e6d933cbc16a9c0..1ef5e4126242353851ca0ef1db295acbc095dd76 100644 (file)
@@ -20,7 +20,7 @@ static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
 
 unsigned long __weak spl_nor_get_uboot_base(void)
 {
-       return CONFIG_SYS_UBOOT_BASE;
+       return CFG_SYS_UBOOT_BASE;
 }
 
 static int spl_nor_load_image(struct spl_image_info *spl_image,
index da6742416ed9f7a8d5ce23b9c569c38946270c0a..2aff025f76ee1cecda4f8354b7cd87e0a93e3a37 100644 (file)
@@ -31,7 +31,7 @@ static int spi_load_image_os(struct spl_image_info *spl_image,
        int err;
 
        /* Read for a header, parse or error out. */
-       spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS, sizeof(*header),
+       spi_flash_read(flash, CFG_SYS_SPI_KERNEL_OFFS, sizeof(*header),
                       (void *)header);
 
        if (image_get_magic(header) != IH_MAGIC)
@@ -41,12 +41,12 @@ static int spi_load_image_os(struct spl_image_info *spl_image,
        if (err)
                return err;
 
-       spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS,
+       spi_flash_read(flash, CFG_SYS_SPI_KERNEL_OFFS,
                       spl_image->size, (void *)spl_image->load_addr);
 
        /* Read device tree. */
-       spi_flash_read(flash, CONFIG_SYS_SPI_ARGS_OFFS,
-                      CONFIG_SYS_SPI_ARGS_SIZE,
+       spi_flash_read(flash, CFG_SYS_SPI_ARGS_OFFS,
+                      CFG_SYS_SPI_ARGS_SIZE,
                       (void *)CONFIG_SYS_SPL_ARGS_ADDR);
 
        return 0;
index fb804f0208921b162e0116758099c19b9b0b75fb..bcac25cd021c276ef0d5b56a13527976208fa894 100644 (file)
@@ -31,7 +31,7 @@ int spl_ubi_load_image(struct spl_image_info *spl_image,
 #ifdef CONFIG_SPL_ONENAND_SUPPORT
        case BOOT_DEVICE_ONENAND:
                info.read = onenand_spl_read_block;
-               info.peb_size = CONFIG_SYS_ONENAND_BLOCK_SIZE;
+               info.peb_size = CFG_SYS_ONENAND_BLOCK_SIZE;
                break;
 #endif
        default:
index 1258d85e63da199e458c59253d34b64ac861c6e3..77c23ba05978b2c301541cad49e03e948aa2ae13 100644 (file)
@@ -25,6 +25,6 @@ static int spl_xip(struct spl_image_info *spl_image,
        }
 #endif
        return(spl_parse_image_header(spl_image, bootdev,
-              (const struct legacy_img_hdr *)CONFIG_SYS_UBOOT_BASE));
+              (const struct legacy_img_hdr *)CFG_SYS_UBOOT_BASE));
 }
 SPL_LOAD_IMAGE_METHOD("XIP", 0, BOOT_DEVICE_XIP, spl_xip);
index 00e64ba0c7d5f1b20ceb74e681036598113848c6..0b6d2c53db742c1e443a976c48f84e2af517ac09 100644 (file)
@@ -60,7 +60,7 @@ int board_mmc_init(struct bd_info *bd)
 /* this is a weak define that we are overriding */
 int board_mmc_getcd(struct mmc *mmc)
 {
-       return !at91_get_gpio_value(CONFIG_SYS_MMC_CD_PIN);
+       return !at91_get_gpio_value(CFG_SYS_MMC_CD_PIN);
 }
 
 #endif
@@ -70,5 +70,5 @@ and the board definition files needs:
 /* SD/MMC card */
 #define CONFIG_GENERIC_ATMEL_MCI       1
 #define CONFIG_ATMEL_MCI_PORTB         1       /* Atmel XE-EK uses port B */
-#define CONFIG_SYS_MMC_CD_PIN          AT91_PIN_PC9
+#define CFG_SYS_MMC_CD_PIN             AT91_PIN_PC9
 #define CONFIG_CMD_MMC                 1
index ad52850818ff90b54c9fdbfa8ebc6399ef192e6a..3818574702860c0b22a94a39f2e8396928f3cfd6 100644 (file)
@@ -35,12 +35,12 @@ In addition, the t3corp board defines the routine thusly:
 void flash_cmd_reset(flash_info_t *info)
 {
        /*
-        * FLASH at address CONFIG_SYS_FLASH_BASE is a Spansion chip and
+        * FLASH at address CFG_SYS_FLASH_BASE is a Spansion chip and
         * needs the Spansion type reset commands. The other flash chip
         * is located behind a FPGA (Xilinx DS617) and needs the Intel type
         * reset command.
         */
-       if (info->start[0] == CONFIG_SYS_FLASH_BASE)
+       if (info->start[0] == CFG_SYS_FLASH_BASE)
                flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
        else
                flash_write_cmd(info, 0, 0, FLASH_CMD_RESET);
index 607531af2a8acb7533e9d75df52379fd1f5e3b12..326efa0a2d6d86c1a7e803ae9b4f1e8a182ac75d 100644 (file)
@@ -75,7 +75,7 @@ http://www.ti.com/tool/TMDXLCDK138
 Davinci special defines
 =======================
 
-CONFIG_SYS_DV_NOR_BOOT_CFG:    AM18xx based boards, booting in NOR Boot mode
+CFG_SYS_DV_NOR_BOOT_CFG:       AM18xx based boards, booting in NOR Boot mode
                                need a "NOR Boot Configuration Word" stored
                                in the NOR Flash. This define adds this.
                                More Info about this, see:
index 82fea6201d60ae76d15339f14336954edb1c44d8..767614cbc6d352c9ca8bf13aa41fba0135ee46af 100644 (file)
@@ -11,7 +11,7 @@ Configuration options
 
        CONFIG_USB_OHCI_NEW: enable the new OHCI driver
 
-       CONFIG_SYS_USB_OHCI_REGS_BASE: defines the base address of the OHCI
+       CFG_SYS_USB_OHCI_REGS_BASE: defines the base address of the OHCI
                                registers
 
        CONFIG_SYS_USB_OHCI_SLOT_NAME: slot name
index 3c6ebbdb0e6ea149e8c9879bd6898c6f572d6642..bafffe6dc51ff54d4a110014cb857791ff96a444 100644 (file)
@@ -59,13 +59,13 @@ A) defined(CONFIG_SYS_RAMBOOT) i.e. SD, SPI, NAND RAMBOOT & NAND_SPL boot
    3) TLB entry for the stack during AS1
        Location          : Lable "create_init_ram_area"
        TLB Entry  : 14
-       EPN -->RPN : CONFIG_SYS_INIT_RAM_ADDR --> CONFIG_SYS_INIT_RAM_ADDR
+       EPN -->RPN : CFG_SYS_INIT_RAM_ADDR --> CFG_SYS_INIT_RAM_ADDR
        Properties : 16K, AS1, IPROT
 
    4) TLB entry for CCSRBAR during AS1 execution
        Location          : cpu_init_early_f
        TLB Entry  : 13
-       EPN -->RPN : CONFIG_SYS_CCSRBAR --> CONFIG_SYS_CCSRBAR
+       EPN -->RPN : CFG_SYS_CCSRBAR --> CFG_SYS_CCSRBAR
        Properties : 1M, AS1, I, G
 
    5) Invalidate unproctected TLB Entries
@@ -84,7 +84,7 @@ A) defined(CONFIG_SYS_RAMBOOT) i.e. SD, SPI, NAND RAMBOOT & NAND_SPL boot
    8) Update Flash's TLB entry
        Location          : Board_init_r
        TLB entry  : Search from TLB entries
-       EPN -->RPN : CONFIG_SYS_FLASH_BASE --> CONFIG_SYS_FLASH_BASE_PHYS
+       EPN -->RPN : CFG_SYS_FLASH_BASE --> CFG_SYS_FLASH_BASE_PHYS
        Properties : Board specific size, AS0, I, G, IPROT
 
 
@@ -94,7 +94,7 @@ B) !defined(CONFIG_SYS_RAMBOOT) i.e. NOR boot
        Location          : Label "_start"
        TLB Entry  : CONFIG_SYS_PPC_E500_DEBUG_TLB
 #if defined(CONFIG_NXP_ESBC)
-       EPN -->RPN : CONFIG_SYS_MONITOR_BASE --> CONFIG_SYS_PBI_FLASH_WINDOW
+       EPN -->RPN : CONFIG_SYS_MONITOR_BASE --> CFG_SYS_PBI_FLASH_WINDOW
        Properties : 1M, AS1, I, G, IPROT
 #else
        EPN -->RPN : CONFIG_SYS_MONITOR_BASE & 0xffc00000 --> 0xffc00000
@@ -105,7 +105,7 @@ B) !defined(CONFIG_SYS_RAMBOOT) i.e. NOR boot
        Location          : Label "create_init_ram_area"
        TLB Entry  : 15
 #if defined(CONFIG_NXP_ESBC)
-       EPN -->RPN : CONFIG_SYS_MONITOR_BASE --> CONFIG_SYS_PBI_FLASH_WINDOW
+       EPN -->RPN : CONFIG_SYS_MONITOR_BASE --> CFG_SYS_PBI_FLASH_WINDOW
        Properties : 1M, AS1, I, G, IPROT
 #else
        EPN -->RPN : CONFIG_SYS_MONITOR_BASE & 0xffc00000 --> 0xffc00000
@@ -115,13 +115,13 @@ B) !defined(CONFIG_SYS_RAMBOOT) i.e. NOR boot
    3) TLB entry for the stack during AS1
        Location          : Lable "create_init_ram_area"
        TLB Entry  : 14
-       EPN -->RPN : CONFIG_SYS_INIT_RAM_ADDR --> CONFIG_SYS_INIT_RAM_ADDR
+       EPN -->RPN : CFG_SYS_INIT_RAM_ADDR --> CFG_SYS_INIT_RAM_ADDR
        Properties : 16K, AS1, IPROT
 
    4) TLB entry for CCSRBAR during AS1 execution
        Location          : cpu_init_early_f
        TLB Entry  : 13
-       EPN -->RPN : CONFIG_SYS_CCSRBAR --> CONFIG_SYS_CCSRBAR
+       EPN -->RPN : CFG_SYS_CCSRBAR --> CFG_SYS_CCSRBAR
        Properties : 1M, AS1, I, G
 
    5) TLB entry for Errata workaround CONFIG_SYS_FSL_ERRATUM_IFC_A003399
@@ -162,5 +162,5 @@ B) !defined(CONFIG_SYS_RAMBOOT) i.e. NOR boot
    12) Update Flash's TLB entry
        Location          : Board_init_r
        TLB entry  : Search from TLB entries
-       EPN -->RPN : CONFIG_SYS_FLASH_BASE --> CONFIG_SYS_FLASH_BASE_PHYS
+       EPN -->RPN : CFG_SYS_FLASH_BASE --> CFG_SYS_FLASH_BASE_PHYS
        Properties : Board specific size, AS0, I, G, IPROT
index a3c3ab4b9501cc506c4c1b2a8ae92af0acf6dcf8..37657512533df6a36d3105e672b96d37424ef351 100644 (file)
@@ -134,7 +134,7 @@ Configuration Options:
        chip.IO_ADDR_R = ...;
        chip.IO_ADDR_W = ...;
 
-       if (nand_scan_ident(mtd, CONFIG_SYS_MAX_NAND_CHIPS, NULL))
+       if (nand_scan_ident(mtd, CFG_SYS_MAX_NAND_CHIPS, NULL))
                error out
 
        /*
index c9049fd01d667af497967af665b6fc8f54da790e..0446fe95937aeb72fa85060f89bc4a66e15a018b 100644 (file)
@@ -35,7 +35,7 @@ just after switching the console:
        setenv sout serial_scc; setenv baudrate 38400
 
 After that press 'enter' at the SCC console. Note that baudrates <38400
-are not allowed on LWMON with watchdog enabled (see CONFIG_SYS_BAUDRATE_TABLE in
+are not allowed on LWMON with watchdog enabled (see CFG_SYS_BAUDRATE_TABLE in
 include/configs/lwmon.h).
 
 
index 584503eb12e46882c9c6e027788a4bf62b75a898..770327fea21ac23ad7bd88e66601c555827b0449 100644 (file)
@@ -112,16 +112,16 @@ CONFIG_M5272:
 Other options, generally set inside include/configs/<boardname>.h, they may
 apply to one or more cpu for the ColdFire family:
 
-CONFIG_SYS_MBAR:
+CFG_SYS_MBAR:
   defines the base address of the MCF5272 configuration registers
-CONFIG_SYS_SCR:
+CFG_SYS_SCR:
   defines the contents of the System Configuration Register
-CONFIG_SYS_SPR:
+CFG_SYS_SPR:
   defines the contents of the System Protection Register
-CONFIG_SYS_MFD:
+CFG_SYS_MFD:
   defines the PLL Multiplication Factor Divider
   (see table 9-4 of MCF user manual)
-CONFIG_SYS_RFD:
+CFG_SYS_RFD:
   defines the PLL Reduce Frequency Devider
   (see table 9-4 of MCF user manual)
 CONFIG_SYS_CSx_BASE:
@@ -136,9 +136,9 @@ CONFIG_SYS_CSx_RO:
   if set to 0 chip select x is read/write else chip select is read only
 CONFIG_SYS_CSx_WS:
   defines the number of wait states  of chip select x
-CONFIG_SYS_CACHE_ICACR:
+CFG_SYS_CACHE_ICACR:
   cache-related registers config
-CONFIG_SYS_CACHE_DCACR:
+CFG_SYS_CACHE_DCACR:
   cache-related registers config
 CONFIG_SYS_CACHE_ACRX:
   cache-related registers config
@@ -162,7 +162,7 @@ CFG_SYS_SDRAM_EMOD:
   these options are used.
 CONFIG_MCFUART:
   defines enabling of ColdFire UART driver
-CONFIG_SYS_UART_PORT:
+CFG_SYS_UART_PORT:
   defines the UART port to be used (only a single UART can be actually enabled)
-CONFIG_SYS_SBFHDR_SIZE:
+CFG_SYS_SBFHDR_SIZE:
   size of the prepended SBF header, if any
index 43665de64f5b049c9d6110d16ed49bff34c1c00c..fe1ae210def04144f04f84dcc98400fb8b458e1c 100644 (file)
@@ -99,7 +99,7 @@ The I2C subsystem has supported the driver model since early 2015.
 Maintainers should submit patches switching over to using CONFIG_DM_I2C and
 other base driver model options in time for inclusion in the 2021.10 release.
 
-CONFIG_SYS_TIMER_RATE and CONFIG_SYS_TIMER_COUNTER
+CFG_SYS_TIMER_RATE and CFG_SYS_TIMER_COUNTER
 --------------------------------------------------
 Deadline: 2023.01
 
index 464a85302ecf459f6c883e037693975250d053d2..273d8fc796888d2c722ede56eff797561a9bb3e7 100644 (file)
@@ -30,9 +30,9 @@ Optional properties:
                8(WHITE_GRAY_BALCKBAR_64),9(MOBILE_WHITEBAR_32),
                10(MOBILE_WHITEBAR_64)
        samsung,h-sync-polarity: Horizontal Sync polarity
-                       CONFIG_SYS_LOW if defined, else CONFIG_SYS_HIGH
+                       CFG_SYS_LOW if defined, else CONFIG_SYS_HIGH
        samsung,v-sync-polarity: Vertical Sync polarity
-                       CONFIG_SYS_LOW if defined, else CONFIG_SYS_HIGH
+                       CFG_SYS_LOW if defined, else CONFIG_SYS_HIGH
        samsung,interlaced: Progressive if 0, else Interlaced
        samsung,color-space: input video data format
                COLOR_RGB = 0, COLOR_YCBCR422 = 1, COLOR_YCBCR444 = 2
index b022f6163f1a8c99e4fc132d3cdbef8b49d55c40..bff0cecfcfbc0fe23cf1181ba7caacc05e2eee76 100644 (file)
@@ -23,15 +23,15 @@ Board(panel specific):
        samsung,vl-height: Height of display area in mm
 
        samsung,vl-clkp: Clock polarity
-               CONFIG_SYS_LOW if defined, else CONFIG_SYS_HIGH
+               CFG_SYS_LOW if defined, else CONFIG_SYS_HIGH
        samsung,vl-oep: Output Enable polarity
-               CONFIG_SYS_LOW if defined, else CONFIG_SYS_HIGH
+               CFG_SYS_LOW if defined, else CONFIG_SYS_HIGH
        samsung,vl-hsp: Horizontal Sync polarity
-               CONFIG_SYS_LOW if defined, else CONFIG_SYS_HIGH
+               CFG_SYS_LOW if defined, else CONFIG_SYS_HIGH
        samsung,vl-vsp: Vertical Sync polarity
-               CONFIG_SYS_LOW if defined, else CONFIG_SYS_HIGH
+               CFG_SYS_LOW if defined, else CONFIG_SYS_HIGH
        samsung,vl-dp: Data polarity
-               CONFIG_SYS_LOW if defined, else CONFIG_SYS_HIGH
+               CFG_SYS_LOW if defined, else CONFIG_SYS_HIGH
 
        samsung,vl-cmd-allow-len: Wait end of frame
        samsung,winid: Window number on which data is to be displayed
index ea0e144cedcf2074a4752e8d1f03a7b9681ae78b..6c8c2e594fb7eb2847479ca755d5b18efe95e06d 100644 (file)
@@ -16,7 +16,7 @@ i.MX5x SoCs.
     of frequency deviation), avoiding system failure, or at least decreasing
     the likelihood of system failure.
 
-1.2 CONFIG_SYS_MAIN_PWR_ON: Trigger MAIN_PWR_ON upon startup.
+1.2 CFG_SYS_MAIN_PWR_ON: Trigger MAIN_PWR_ON upon startup.
     This option should be enabled for boards having a SYS_ON_OFF_CTL signal
     connected to GPIO1[23] and triggering the MAIN_PWR_ON signal like in the
     reference designs.
index 15897f63dd9a49fa9be390d9eb29a46459b41b9a..83f210d2d058efe79cdb783d0940be83838cbe8f 100644 (file)
@@ -162,7 +162,7 @@ bootm_low
     for use by the bootm command. See also "bootm_size"
     environment variable. Address defined by "bootm_low" is
     also the base of the initial memory mapping for the Linux
-    kernel -- see the description of CONFIG_SYS_BOOTMAPSZ and
+    kernel -- see the description of CFG_SYS_BOOTMAPSZ and
     bootm_mapsize.
 
 bootm_mapsize
@@ -170,7 +170,7 @@ bootm_mapsize
     This variable is given as a hexadecimal number and it
     defines the size of the memory region starting at base
     address bootm_low that is accessible by the Linux kernel
-    during early boot.  If unset, CONFIG_SYS_BOOTMAPSZ is used
+    during early boot.  If unset, CFG_SYS_BOOTMAPSZ is used
     as the default value if it is defined, and bootm_size is
     used otherwise.
 
@@ -228,7 +228,7 @@ initrd_high
     is usually what you want since it allows for
     maximum initrd size. If for some reason you want to
     make sure that the initrd image is loaded below the
-    CONFIG_SYS_BOOTMAPSZ limit, you can set this environment
+    CFG_SYS_BOOTMAPSZ limit, you can set this environment
     variable to a value of "no" or "off" or "0".
     Alternatively, you can set it to a maximum upper
     address to use (U-Boot will still check that it
index 8d6424c9da109c4bb695dfc13b79ecac53b4720b..570252d186a4afeda4e6a139d258bf8d8f453d04 100644 (file)
@@ -83,7 +83,7 @@ config BOOTCOUNT_I2C
        bool "Boot counter on I2C device"
        help
          Enable support for the bootcounter on an i2c (like RTC) device.
-         CONFIG_SYS_I2C_RTC_ADDR = i2c chip address
+         CFG_SYS_I2C_RTC_ADDR = i2c chip address
          CONFIG_SYS_BOOTCOUNT_ADDR = i2c addr which is used for
                                      the bootcounter.
 
index 496741d63f783a2928031451af36442cb377047e..b3ac67ea35dda5e491c5c1118e1719dde07cadf4 100644 (file)
@@ -17,7 +17,7 @@ void bootcount_store(ulong a)
 
        buf[0] = BC_MAGIC;
        buf[1] = (a & 0xff);
-       ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR, CONFIG_SYS_BOOTCOUNT_ADDR,
+       ret = i2c_write(CFG_SYS_I2C_RTC_ADDR, CONFIG_SYS_BOOTCOUNT_ADDR,
                  CONFIG_BOOTCOUNT_ALEN, buf, 2);
        if (ret != 0)
                puts("Error writing bootcount\n");
@@ -28,7 +28,7 @@ ulong bootcount_load(void)
        unsigned char buf[3];
        int ret;
 
-       ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, CONFIG_SYS_BOOTCOUNT_ADDR,
+       ret = i2c_read(CFG_SYS_I2C_RTC_ADDR, CONFIG_SYS_BOOTCOUNT_ADDR,
                       CONFIG_BOOTCOUNT_ALEN, buf, 2);
        if (ret != 0) {
                puts("Error loading bootcount\n");
index b2bfb529cc8062327c37993daced4433cc3f42db..2fdc2fbd5547c9350b96ebf0075a7370e8c6c48d 100644 (file)
@@ -150,7 +150,7 @@ static int at91_slow_clk_enable(struct clk *clk)
 
 static ulong at91_slow_clk_get_rate(struct clk *clk)
 {
-       return CONFIG_SYS_AT91_SLOW_CLOCK;
+       return CFG_SYS_AT91_SLOW_CLOCK;
 }
 
 static struct clk_ops at91_slow_clk_ops = {
index b79e99b63de8fb7361499a1bdb4f72aa83117c58..8fde77c23ee03e2306a01322ffa32b1855036372 100644 (file)
@@ -14,7 +14,7 @@ config SPL_DM
        help
          Enable driver model in SPL. You will need to provide a
          suitable malloc() implementation. If you are not using the
-         full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
+         full malloc() enabled by CFG_SYS_SPL_MALLOC_START,
          consider using CONFIG_SPL_SYS_MALLOC_SIMPLE. In that case you
          must provide CONFIG_SPL_SYS_MALLOC_F_LEN to set the size.
          In most cases driver model will only allocate a few uclasses
@@ -27,7 +27,7 @@ config TPL_DM
        help
          Enable driver model in TPL. You will need to provide a
          suitable malloc() implementation. If you are not using the
-         full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
+         full malloc() enabled by CFG_SYS_SPL_MALLOC_START,
          consider using CONFIG_TPL_SYS_MALLOC_SIMPLE. In that case you
          must provide CONFIG_SPL_SYS_MALLOC_F_LEN to set the size.
          In most cases driver model will only allocate a few uclasses
@@ -42,7 +42,7 @@ config VPL_DM
        help
          Enable driver model in VPL. You will need to provide a
          suitable malloc() implementation. If you are not using the
-         full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
+         full malloc() enabled by CFG_SYS_SPL_MALLOC_START,
          consider using CONFIG_SPL_SYS_MALLOC_SIMPLE.
 
 config DM_WARN
index 4975dbb821e11cc1433aff8ecbdd1d1a341ab145..cd332718b640469af9e2494edb02daa97902136a 100644 (file)
@@ -22,7 +22,7 @@
 
 /*
  * CFG_SYS_FSL_DDR_SDRAM_BASE_PHY is the physical address from the view
- * of DDR controllers. It is the same as CONFIG_SYS_DDR_SDRAM_BASE for
+ * of DDR controllers. It is the same as CFG_SYS_DDR_SDRAM_BASE for
  * all Power SoCs. But it could be different for ARM SoCs. For example,
  * fsl_lsch3 has a mapping mechanism to map DDR memory to ranges (in order) of
  * 0x00_8000_0000 ~ 0x00_ffff_ffff
@@ -32,7 +32,7 @@
 #ifdef CONFIG_MPC83xx
 #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
+#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY CFG_SYS_DDR_SDRAM_BASE
 #endif
 #endif
 
index a1ff47035be389efd8ed338ed27a694d28a6b492..ca49ee40a71dae0ea0250896508a965b0a4e006b 100644 (file)
@@ -24,8 +24,8 @@
 #define CONFIG_FPGA_DELAY()
 #endif
 
-#ifndef CONFIG_SYS_FPGA_WAIT
-#define CONFIG_SYS_FPGA_WAIT CONFIG_SYS_HZ/10          /* 100 ms */
+#ifndef CFG_SYS_FPGA_WAIT
+#define CFG_SYS_FPGA_WAIT CONFIG_SYS_HZ/10             /* 100 ms */
 #endif
 
 static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize);
@@ -138,7 +138,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
                ts = get_timer (0);             /* get current time */
                do {
                        CONFIG_FPGA_DELAY ();
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for STATUS to go high.\n");
                                (*fn->abort) (cookie);
                                return FPGA_FAIL;
index f264ff8c0ecd564de6b7065b9c8e443d17eefa0f..3eed461e1e5c287e4a861d2c5bd4396fc101f86f 100644 (file)
@@ -22,8 +22,8 @@
 #define CONFIG_FPGA_DELAY()
 #endif
 
-#ifndef CONFIG_SYS_FPGA_WAIT
-#define CONFIG_SYS_FPGA_WAIT CONFIG_SYS_HZ / 10                /* 100 ms */
+#ifndef CFG_SYS_FPGA_WAIT
+#define CFG_SYS_FPGA_WAIT CONFIG_SYS_HZ / 10           /* 100 ms */
 #endif
 
 static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize);
@@ -130,7 +130,7 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
                ts = get_timer(0);              /* get current time */
                do {
                        CONFIG_FPGA_DELAY();
-                       if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {
+                       if (get_timer(ts) > CFG_SYS_FPGA_WAIT) {
                                /* check the time */
                                puts("** Timeout waiting for STATUS to go high.\n");
                                (*fn->abort) (cookie);
index f72dfdec94ead6cadedb8c592d4f684037d089c1..57a4532f736e56230dfaaf36b9384b87d2789ba4 100644 (file)
@@ -21,8 +21,8 @@
 #define CONFIG_FPGA_DELAY()
 #endif
 
-#ifndef CONFIG_SYS_FPGA_WAIT
-#define CONFIG_SYS_FPGA_WAIT CONFIG_SYS_HZ/100 /* 10 ms */
+#ifndef CFG_SYS_FPGA_WAIT
+#define CFG_SYS_FPGA_WAIT CONFIG_SYS_HZ/100    /* 10 ms */
 #endif
 
 static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize);
@@ -149,7 +149,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
                /* Now wait for INIT and BUSY to go high */
                do {
                        CONFIG_FPGA_DELAY ();
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for INIT to clear.\n");
                                (*fn->abort) (cookie);  /* abort the burn */
                                return FPGA_FAIL;
@@ -182,7 +182,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
                                CONFIG_FPGA_DELAY ();
                                (*fn->clk) (true, true, cookie);        /* Assert the clock pin */
 
-                               if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                               if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                        puts ("** Timeout waiting for BUSY to clear.\n");
                                        (*fn->abort) (cookie);  /* abort the burn */
                                        return FPGA_FAIL;
@@ -214,7 +214,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
                        CONFIG_FPGA_DELAY ();
                        (*fn->clk) (true, true, cookie);        /* Assert the clock pin */
 
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for DONE to clear.\n");
                                (*fn->abort) (cookie);  /* abort the burn */
                                ret_val = FPGA_FAIL;
@@ -333,7 +333,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
                ts = get_timer (0);             /* get current time */
                do {
                        CONFIG_FPGA_DELAY ();
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for INIT to start.\n");
                                return FPGA_FAIL;
                        }
@@ -347,7 +347,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
                /* Now wait for INIT to go high */
                do {
                        CONFIG_FPGA_DELAY ();
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for INIT to clear.\n");
                                return FPGA_FAIL;
                        }
@@ -404,7 +404,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 
                        putc ('*');
 
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for DONE to clear.\n");
                                ret_val = FPGA_FAIL;
                                break;
index b7a063a95fc83477f4d468692005e1312667c33e..fdec89bb815f8f2b29e6071db88229b36ef9bd7c 100644 (file)
@@ -26,8 +26,8 @@
 #define CONFIG_FPGA_DELAY()
 #endif
 
-#ifndef CONFIG_SYS_FPGA_WAIT
-#define CONFIG_SYS_FPGA_WAIT CONFIG_SYS_HZ/100 /* 10 ms */
+#ifndef CFG_SYS_FPGA_WAIT
+#define CFG_SYS_FPGA_WAIT CONFIG_SYS_HZ/100    /* 10 ms */
 #endif
 
 static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize);
@@ -154,7 +154,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
                /* Now wait for INIT and BUSY to go high */
                do {
                        CONFIG_FPGA_DELAY ();
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for INIT to clear.\n");
                                (*fn->abort) (cookie);  /* abort the burn */
                                return FPGA_FAIL;
@@ -187,7 +187,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
                                CONFIG_FPGA_DELAY ();
                                (*fn->clk) (true, true, cookie);        /* Assert the clock pin */
 
-                               if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                               if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                        puts ("** Timeout waiting for BUSY to clear.\n");
                                        (*fn->abort) (cookie);  /* abort the burn */
                                        return FPGA_FAIL;
@@ -221,7 +221,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
                        CONFIG_FPGA_DELAY ();
                        (*fn->clk) (true, true, cookie);        /* Assert the clock pin */
 
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for DONE to clear.\n");
                                (*fn->abort) (cookie);  /* abort the burn */
                                ret_val = FPGA_FAIL;
@@ -340,7 +340,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
                ts = get_timer (0);             /* get current time */
                do {
                        CONFIG_FPGA_DELAY ();
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for INIT to start.\n");
                                if (*fn->abort)
                                        (*fn->abort) (cookie);
@@ -356,7 +356,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
                /* Now wait for INIT to go high */
                do {
                        CONFIG_FPGA_DELAY ();
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for INIT to clear.\n");
                                if (*fn->abort)
                                        (*fn->abort) (cookie);
@@ -423,7 +423,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 
                        putc ('*');
 
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
+                       if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {       /* check the time */
                                puts ("** Timeout waiting for DONE to clear.\n");
                                ret_val = FPGA_FAIL;
                                break;
index 0d536f0d0446039d90c8cba748822f053bdf382f..8871deaea6f6031c4366e6313859b2537730cce3 100644 (file)
@@ -49,8 +49,8 @@
  * which yields 11.44 mS.  So let's make it bigger in order to handle
  * an XC2V1000, if anyone can ever get ahold of one.
  */
-#ifndef CONFIG_SYS_FPGA_WAIT_INIT
-#define CONFIG_SYS_FPGA_WAIT_INIT      CONFIG_SYS_HZ / 2       /* 500 ms */
+#ifndef CFG_SYS_FPGA_WAIT_INIT
+#define CFG_SYS_FPGA_WAIT_INIT CONFIG_SYS_HZ / 2       /* 500 ms */
 #endif
 
 /*
  * This is normally not necessary since for most reasonable configuration
  * clock frequencies (i.e. 66 MHz or less), BUSY monitoring is unnecessary.
  */
-#ifndef CONFIG_SYS_FPGA_WAIT_BUSY
-#define CONFIG_SYS_FPGA_WAIT_BUSY      CONFIG_SYS_HZ / 200     /* 5 ms*/
+#ifndef CFG_SYS_FPGA_WAIT_BUSY
+#define CFG_SYS_FPGA_WAIT_BUSY CONFIG_SYS_HZ / 200     /* 5 ms*/
 #endif
 
 /* Default timeout for waiting for FPGA to enter operational mode after
  * configuration data has been written.
  */
-#ifndef        CONFIG_SYS_FPGA_WAIT_CONFIG
-#define CONFIG_SYS_FPGA_WAIT_CONFIG    CONFIG_SYS_HZ / 5       /* 200 ms */
+#ifndef        CFG_SYS_FPGA_WAIT_CONFIG
+#define CFG_SYS_FPGA_WAIT_CONFIG       CONFIG_SYS_HZ / 5       /* 200 ms */
 #endif
 
 static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize);
@@ -190,9 +190,9 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)
        udelay(10);
        ts = get_timer(0);
        do {
-               if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_INIT) {
+               if (get_timer(ts) > CFG_SYS_FPGA_WAIT_INIT) {
                        printf("%s:%d: ** Timeout after %d ticks waiting for INIT to assert.\n",
-                              __func__, __LINE__, CONFIG_SYS_FPGA_WAIT_INIT);
+                              __func__, __LINE__, CFG_SYS_FPGA_WAIT_INIT);
                        (*fn->abort)(cookie);
                        return FPGA_FAIL;
                }
@@ -209,9 +209,9 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)
        ts = get_timer(0);
        do {
                CONFIG_FPGA_DELAY();
-               if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_INIT) {
+               if (get_timer(ts) > CFG_SYS_FPGA_WAIT_INIT) {
                        printf("%s:%d: ** Timeout after %d ticks waiting for INIT to deassert.\n",
-                              __func__, __LINE__, CONFIG_SYS_FPGA_WAIT_INIT);
+                              __func__, __LINE__, CFG_SYS_FPGA_WAIT_INIT);
                        (*fn->abort)(cookie);
                        return FPGA_FAIL;
                }
@@ -260,9 +260,9 @@ static int virtex2_slave_post(xilinx_virtex2_slave_fns *fn,
                                break;
                }
 
-               if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_CONFIG) {
+               if (get_timer(ts) > CFG_SYS_FPGA_WAIT_CONFIG) {
                        printf("%s:%d: ** Timeout after %d ticks waiting for DONE to assert and INIT to deassert\n",
-                              __func__, __LINE__, CONFIG_SYS_FPGA_WAIT_CONFIG);
+                              __func__, __LINE__, CFG_SYS_FPGA_WAIT_CONFIG);
                        (*fn->abort)(cookie);
                        ret_val = FPGA_FAIL;
                        break;
@@ -350,10 +350,10 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #ifdef CONFIG_SYS_FPGA_CHECK_BUSY
                ts = get_timer(0);
                while ((*fn->busy)(cookie)) {
-                       if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_BUSY) {
+                       if (get_timer(ts) > CFG_SYS_FPGA_WAIT_BUSY) {
                                printf("%s:%d: ** Timeout after %d ticks waiting for BUSY to deassert\n",
                                       __func__, __LINE__,
-                                      CONFIG_SYS_FPGA_WAIT_BUSY);
+                                      CFG_SYS_FPGA_WAIT_BUSY);
                                (*fn->abort)(cookie);
                                return FPGA_FAIL;
                        }
index 0c83df46da4149c541efb8e98b44b30d7f196ded..53dd780a6ca2273702ba97c6f856fc7243582e2a 100644 (file)
@@ -36,8 +36,8 @@
 #define DEVCFG_MCTRL_RFIFO_FLUSH       0x00000002
 #define DEVCFG_MCTRL_WFIFO_FLUSH       0x00000001
 
-#ifndef CONFIG_SYS_FPGA_WAIT
-#define CONFIG_SYS_FPGA_WAIT CONFIG_SYS_HZ/100 /* 10 ms */
+#ifndef CFG_SYS_FPGA_WAIT
+#define CFG_SYS_FPGA_WAIT CONFIG_SYS_HZ/100    /* 10 ms */
 #endif
 
 #ifndef CONFIG_SYS_FPGA_PROG_TIME
@@ -232,7 +232,7 @@ static int zynq_dma_xfer_init(bitstream_type bstype)
                /* Polling the PCAP_INIT status for Reset */
                ts = get_timer(0);
                while (readl(&devcfg_base->status) & DEVCFG_STATUS_PCFG_INIT) {
-                       if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {
+                       if (get_timer(ts) > CFG_SYS_FPGA_WAIT) {
                                printf("%s: Timeout wait for INIT to clear\n",
                                       __func__);
                                return FPGA_FAIL;
@@ -246,7 +246,7 @@ static int zynq_dma_xfer_init(bitstream_type bstype)
                ts = get_timer(0);
                while (!(readl(&devcfg_base->status) &
                        DEVCFG_STATUS_PCFG_INIT)) {
-                       if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {
+                       if (get_timer(ts) > CFG_SYS_FPGA_WAIT) {
                                printf("%s: Timeout wait for INIT to set\n",
                                       __func__);
                                return FPGA_FAIL;
@@ -400,7 +400,7 @@ static int zynq_load(xilinx_desc *desc, const void *buf, size_t bsize,
        /* Check FPGA configuration completion */
        ts = get_timer(0);
        while (!(isr_status & DEVCFG_ISR_PCFG_DONE)) {
-               if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {
+               if (get_timer(ts) > CFG_SYS_FPGA_WAIT) {
                        printf("%s: Timeout wait for FPGA to config\n",
                               __func__);
                        return FPGA_FAIL;
@@ -484,7 +484,7 @@ static int zynq_loadfs(xilinx_desc *desc, const void *buf, size_t bsize,
        /* Check FPGA configuration completion */
        ts = get_timer(0);
        while (!(isr_status & DEVCFG_ISR_PCFG_DONE)) {
-               if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {
+               if (get_timer(ts) > CFG_SYS_FPGA_WAIT) {
                        printf("%s: Timeout wait for FPGA to config\n",
                               __func__);
                        return FPGA_FAIL;
@@ -561,7 +561,7 @@ int zynq_decrypt_load(u32 srcaddr, u32 srclen, u32 dstaddr, u32 dstlen,
                /* Check FPGA configuration completion */
                ts = get_timer(0);
                while (!(isr_status & DEVCFG_ISR_PCFG_DONE)) {
-                       if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {
+                       if (get_timer(ts) > CFG_SYS_FPGA_WAIT) {
                                printf("%s: Timeout wait for FPGA to config\n",
                                       __func__);
                                return FPGA_FAIL;
index 2fd2996798ceb7dccc699d4c72ad2552046b81c9..b5ed35256ee761cb70615ffd45995fa76ee33caf 100644 (file)
@@ -14,8 +14,8 @@
 #include <pca953x.h>
 
 /* Default to an address that hopefully won't corrupt other i2c devices */
-#ifndef CONFIG_SYS_I2C_PCA953X_ADDR
-#define CONFIG_SYS_I2C_PCA953X_ADDR    (~0)
+#ifndef CFG_SYS_I2C_PCA953X_ADDR
+#define CFG_SYS_I2C_PCA953X_ADDR       (~0)
 #endif
 
 enum {
@@ -26,14 +26,14 @@ enum {
        PCA953X_CMD_INVERT,
 };
 
-#ifdef CONFIG_SYS_I2C_PCA953X_WIDTH
+#ifdef CFG_SYS_I2C_PCA953X_WIDTH
 struct pca953x_chip_ngpio {
        uint8_t chip;
        uint8_t ngpio;
 };
 
 static struct pca953x_chip_ngpio pca953x_chip_ngpios[] =
-    CONFIG_SYS_I2C_PCA953X_WIDTH;
+    CFG_SYS_I2C_PCA953X_WIDTH;
 
 /*
  * Determine the number of GPIO pins supported. If we don't know we assume
@@ -204,7 +204,7 @@ static struct cmd_tbl cmd_pca953x[] = {
 static int do_pca953x(struct cmd_tbl *cmdtp, int flag, int argc,
                      char *const argv[])
 {
-       static uint8_t chip = CONFIG_SYS_I2C_PCA953X_ADDR;
+       static uint8_t chip = CFG_SYS_I2C_PCA953X_ADDR;
        int ret = CMD_RET_USAGE, val;
        ulong ul_arg2 = 0;
        ulong ul_arg3 = 0;
index 7f67f96b0ec06e68e5d8bded18574c37e3509f6f..b07496e6e49c3ce9fc83d7fda2089c460e4bf032 100644 (file)
@@ -52,7 +52,7 @@ static int tca642x_reg_write(uchar chip, uint8_t addr,
        int ret;
 
        org_bus_num = i2c_get_bus_num();
-       i2c_set_bus_num(CONFIG_SYS_I2C_TCA642X_BUS_NUM);
+       i2c_set_bus_num(CFG_SYS_I2C_TCA642X_BUS_NUM);
 
        if (i2c_read(chip, addr, 1, (uint8_t *)&valw, 1)) {
                printf("Could not read before writing\n");
@@ -76,7 +76,7 @@ static int tca642x_reg_read(uchar chip, uint8_t addr, uint8_t *data)
        int ret = 0;
 
        org_bus_num = i2c_get_bus_num();
-       i2c_set_bus_num(CONFIG_SYS_I2C_TCA642X_BUS_NUM);
+       i2c_set_bus_num(CFG_SYS_I2C_TCA642X_BUS_NUM);
        if (i2c_read(chip, addr, 1, (u8 *)&valw, 1)) {
                ret = -1;
                goto error;
@@ -242,7 +242,7 @@ static struct cmd_tbl cmd_tca642x[] = {
 static int do_tca642x(struct cmd_tbl *cmdtp, int flag, int argc,
                      char *const argv[])
 {
-       static uchar chip = CONFIG_SYS_I2C_TCA642X_ADDR;
+       static uchar chip = CFG_SYS_I2C_TCA642X_ADDR;
        int ret = CMD_RET_USAGE, val;
        int gpio_bank = 0;
        uint8_t bank_shift;
index ae177227dea34adc17db0c3492483904f93a768f..25ef937dc0b3ba918916b59fb9d5a05cccc278b4 100644 (file)
@@ -91,7 +91,7 @@ static uint _davinci_i2c_setspeed(struct i2c_regs *i2c_base,
 
        psc = 2;
        /* SCLL + SCLH */
-       div = (CONFIG_SYS_HZ_CLOCK / ((psc + 1) * speed)) - 10;
+       div = (CFG_SYS_HZ_CLOCK / ((psc + 1) * speed)) - 10;
        REG(&(i2c_base->i2c_psc)) = psc; /* 27MHz / (2 + 1) = 9MHz */
        REG(&(i2c_base->i2c_scll)) = (div * 50) / 100; /* 50% Duty */
        REG(&(i2c_base->i2c_sclh)) = div - REG(&(i2c_base->i2c_scll));
index edbcd83b64695b22de0cef11f8ba74247c7ceef6..187db92b75f6dbc8130a79b5620c1d37dfb4bc28 100644 (file)
@@ -41,7 +41,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_M68K
-#define CONFIG_SYS_IMMR                CONFIG_SYS_MBAR
+#define CONFIG_SYS_IMMR                CFG_SYS_MBAR
 #endif
 
 #if !CONFIG_IS_ENABLED(DM_I2C)
index c3f6a1251f15958459156dd9d8d0f00a9b99c7be..7f65db23205a143987de6e6d49d9a02a3bd20651 100644 (file)
@@ -35,7 +35,7 @@ struct i2c_adapter *i2c_get_adapter(int index)
 
 #if !defined(CONFIG_SYS_I2C_DIRECT_BUS)
 struct i2c_bus_hose i2c_bus[CFG_SYS_NUM_I2C_BUSES] =
-                       CONFIG_SYS_I2C_BUSES;
+                       CFG_SYS_I2C_BUSES;
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -114,7 +114,7 @@ static int i2c_mux_set_all(void)
        /* Connect requested bus if behind muxes */
        if (i2c_bus_tmp->next_hop[0].chip != 0) {
                /* Set all muxes along the path to that bus */
-               for (i = 0; i < CONFIG_SYS_I2C_MAX_HOPS; i++) {
+               for (i = 0; i < CFG_SYS_I2C_MAX_HOPS; i++) {
                        int     ret;
 
                        if (i2c_bus_tmp->next_hop[i].chip == 0)
@@ -143,7 +143,7 @@ static int i2c_mux_disconnect_all(void)
        /* Disconnect current bus (turn off muxes if any) */
        if ((i2c_bus_tmp->next_hop[0].chip != 0) &&
            (I2C_ADAP->init_done != 0)) {
-               i = CONFIG_SYS_I2C_MAX_HOPS;
+               i = CFG_SYS_I2C_MAX_HOPS;
                do {
                        uint8_t chip;
                        int ret;
index 4edcba29110e31fb63b53e13897a8535ec119b42..b9b0ff1c39e2d3f964dac609f69edab70c206e90 100644 (file)
@@ -129,7 +129,7 @@ struct bcm_kona_i2c_dev {
 #define DEF_DEVICE(num) \
 {(void *)CONFIG_SYS_I2C_BASE##num, DEF_SPD, &std_cfg_table[DEF_SPD_ENUM]}
 
-static struct bcm_kona_i2c_dev g_i2c_devs[CONFIG_SYS_MAX_I2C_BUS] = {
+static struct bcm_kona_i2c_dev g_i2c_devs[CFG_SYS_MAX_I2C_BUS] = {
 #ifdef CONFIG_SYS_I2C_BASE0
        DEF_DEVICE(0),
 #endif
index f48a4f25aae6e0675aec10b024afe484d04664d9..a9c7d6e1bc260a3d3b4d4aa5256051a7e71f0b99 100644 (file)
@@ -42,7 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #endif /* CONFIG_DM_I2C */
 
 /*
- * On SUNXI, we get CONFIG_SYS_TCLK from this include, so we want to
+ * On SUNXI, we get CFG_SYS_TCLK from this include, so we want to
  * always have it.
  */
 #if CONFIG_IS_ENABLED(DM_I2C) && defined(CONFIG_ARCH_SUNXI)
@@ -427,9 +427,9 @@ static int twsi_stop(struct mvtwsi_registers *twsi, uint tick)
 static uint twsi_calc_freq(const int n, const int m)
 {
 #ifdef CONFIG_ARCH_SUNXI
-       return CONFIG_SYS_TCLK / (10 * (m + 1) * (1 << n));
+       return CFG_SYS_TCLK / (10 * (m + 1) * (1 << n));
 #else
-       return CONFIG_SYS_TCLK / (10 * (m + 1) * (2 << n));
+       return CFG_SYS_TCLK / (10 * (m + 1) * (2 << n));
 #endif
 }
 
index f80ff5383bc3063a425c7e9099c5fe6350953744..9a1599dcd91e4ccf2626b8ed38a139e7d194a133 100644 (file)
@@ -39,8 +39,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define VF610_I2C_REGSHIFT     0
 
 #define I2C_EARLY_INIT_INDEX           0
-#ifdef CONFIG_SYS_I2C_IFDR_DIV
-#define I2C_IFDR_DIV_CONSERVATIVE      CONFIG_SYS_I2C_IFDR_DIV
+#ifdef CFG_SYS_I2C_IFDR_DIV
+#define I2C_IFDR_DIV_CONSERVATIVE      CFG_SYS_I2C_IFDR_DIV
 #else
 #define I2C_IFDR_DIV_CONSERVATIVE      0x7e
 #endif
index 8fdaacd5e04c05a65e857403b1351410d94b62e5..58b00587363d3574a1a40aff8365e708b15d5989 100644 (file)
 struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        {
                "cs0",
-#if defined(CONFIG_SYS_CSPR0) && defined(CONFIG_SYS_CSOR0)
-               CONFIG_SYS_CSPR0,
-#ifdef CONFIG_SYS_CSPR0_EXT
-               CONFIG_SYS_CSPR0_EXT,
+#if defined(CFG_SYS_CSPR0) && defined(CFG_SYS_CSOR0)
+               CFG_SYS_CSPR0,
+#ifdef CFG_SYS_CSPR0_EXT
+               CFG_SYS_CSPR0_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK0
-               CONFIG_SYS_AMASK0,
+#ifdef CFG_SYS_AMASK0
+               CFG_SYS_AMASK0,
 #else
                0,
 #endif
-               CONFIG_SYS_CSOR0,
+               CFG_SYS_CSOR0,
                {
-                       CONFIG_SYS_CS0_FTIM0,
-                       CONFIG_SYS_CS0_FTIM1,
-                       CONFIG_SYS_CS0_FTIM2,
-                       CONFIG_SYS_CS0_FTIM3,
+                       CFG_SYS_CS0_FTIM0,
+                       CFG_SYS_CS0_FTIM1,
+                       CFG_SYS_CS0_FTIM2,
+                       CFG_SYS_CS0_FTIM3,
                },
-#ifdef CONFIG_SYS_CSOR0_EXT
-               CONFIG_SYS_CSOR0_EXT,
+#ifdef CFG_SYS_CSOR0_EXT
+               CFG_SYS_CSOR0_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_CSPR0_FINAL
-               CONFIG_SYS_CSPR0_FINAL,
+#ifdef CFG_SYS_CSPR0_FINAL
+               CFG_SYS_CSPR0_FINAL,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK0_FINAL
-               CONFIG_SYS_AMASK0_FINAL,
+#ifdef CFG_SYS_AMASK0_FINAL
+               CFG_SYS_AMASK0_FINAL,
 #else
                0,
 #endif
@@ -52,37 +52,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 2
        {
                "cs1",
-#if defined(CONFIG_SYS_CSPR1) && defined(CONFIG_SYS_CSOR1)
-               CONFIG_SYS_CSPR1,
-#ifdef CONFIG_SYS_CSPR1_EXT
-               CONFIG_SYS_CSPR1_EXT,
+#if defined(CFG_SYS_CSPR1) && defined(CFG_SYS_CSOR1)
+               CFG_SYS_CSPR1,
+#ifdef CFG_SYS_CSPR1_EXT
+               CFG_SYS_CSPR1_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK1
-               CONFIG_SYS_AMASK1,
+#ifdef CFG_SYS_AMASK1
+               CFG_SYS_AMASK1,
 #else
                0,
 #endif
-               CONFIG_SYS_CSOR1,
+               CFG_SYS_CSOR1,
                {
-                       CONFIG_SYS_CS1_FTIM0,
-                       CONFIG_SYS_CS1_FTIM1,
-                       CONFIG_SYS_CS1_FTIM2,
-                       CONFIG_SYS_CS1_FTIM3,
+                       CFG_SYS_CS1_FTIM0,
+                       CFG_SYS_CS1_FTIM1,
+                       CFG_SYS_CS1_FTIM2,
+                       CFG_SYS_CS1_FTIM3,
                },
-#ifdef CONFIG_SYS_CSOR1_EXT
-               CONFIG_SYS_CSOR1_EXT,
+#ifdef CFG_SYS_CSOR1_EXT
+               CFG_SYS_CSOR1_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_CSPR1_FINAL
-               CONFIG_SYS_CSPR1_FINAL,
+#ifdef CFG_SYS_CSPR1_FINAL
+               CFG_SYS_CSPR1_FINAL,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK1_FINAL
-               CONFIG_SYS_AMASK1_FINAL,
+#ifdef CFG_SYS_AMASK1_FINAL
+               CFG_SYS_AMASK1_FINAL,
 #else
                0,
 #endif
@@ -93,37 +93,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 3
        {
                "cs2",
-#if defined(CONFIG_SYS_CSPR2) && defined(CONFIG_SYS_CSOR2)
-               CONFIG_SYS_CSPR2,
-#ifdef CONFIG_SYS_CSPR2_EXT
-               CONFIG_SYS_CSPR2_EXT,
+#if defined(CFG_SYS_CSPR2) && defined(CFG_SYS_CSOR2)
+               CFG_SYS_CSPR2,
+#ifdef CFG_SYS_CSPR2_EXT
+               CFG_SYS_CSPR2_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK2
-               CONFIG_SYS_AMASK2,
+#ifdef CFG_SYS_AMASK2
+               CFG_SYS_AMASK2,
 #else
                0,
 #endif
-               CONFIG_SYS_CSOR2,
+               CFG_SYS_CSOR2,
                {
-                       CONFIG_SYS_CS2_FTIM0,
-                       CONFIG_SYS_CS2_FTIM1,
-                       CONFIG_SYS_CS2_FTIM2,
-                       CONFIG_SYS_CS2_FTIM3,
+                       CFG_SYS_CS2_FTIM0,
+                       CFG_SYS_CS2_FTIM1,
+                       CFG_SYS_CS2_FTIM2,
+                       CFG_SYS_CS2_FTIM3,
                },
-#ifdef CONFIG_SYS_CSOR2_EXT
-               CONFIG_SYS_CSOR2_EXT,
+#ifdef CFG_SYS_CSOR2_EXT
+               CFG_SYS_CSOR2_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_CSPR2_FINAL
-               CONFIG_SYS_CSPR2_FINAL,
+#ifdef CFG_SYS_CSPR2_FINAL
+               CFG_SYS_CSPR2_FINAL,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK2_FINAL
-               CONFIG_SYS_AMASK2_FINAL,
+#ifdef CFG_SYS_AMASK2_FINAL
+               CFG_SYS_AMASK2_FINAL,
 #else
                0,
 #endif
@@ -134,37 +134,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 4
        {
                "cs3",
-#if defined(CONFIG_SYS_CSPR3) && defined(CONFIG_SYS_CSOR3)
-               CONFIG_SYS_CSPR3,
-#ifdef CONFIG_SYS_CSPR3_EXT
-               CONFIG_SYS_CSPR3_EXT,
+#if defined(CFG_SYS_CSPR3) && defined(CFG_SYS_CSOR3)
+               CFG_SYS_CSPR3,
+#ifdef CFG_SYS_CSPR3_EXT
+               CFG_SYS_CSPR3_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK3
-               CONFIG_SYS_AMASK3,
+#ifdef CFG_SYS_AMASK3
+               CFG_SYS_AMASK3,
 #else
                0,
 #endif
-               CONFIG_SYS_CSOR3,
+               CFG_SYS_CSOR3,
                {
-                       CONFIG_SYS_CS3_FTIM0,
-                       CONFIG_SYS_CS3_FTIM1,
-                       CONFIG_SYS_CS3_FTIM2,
-                       CONFIG_SYS_CS3_FTIM3,
+                       CFG_SYS_CS3_FTIM0,
+                       CFG_SYS_CS3_FTIM1,
+                       CFG_SYS_CS3_FTIM2,
+                       CFG_SYS_CS3_FTIM3,
                },
-#ifdef CONFIG_SYS_CSOR3_EXT
-               CONFIG_SYS_CSOR3_EXT,
+#ifdef CFG_SYS_CSOR3_EXT
+               CFG_SYS_CSOR3_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_CSPR3_FINAL
-               CONFIG_SYS_CSPR3_FINAL,
+#ifdef CFG_SYS_CSPR3_FINAL
+               CFG_SYS_CSPR3_FINAL,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK3_FINAL
-               CONFIG_SYS_AMASK3_FINAL,
+#ifdef CFG_SYS_AMASK3_FINAL
+               CFG_SYS_AMASK3_FINAL,
 #else
                0,
 #endif
@@ -175,37 +175,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 5
        {
                "cs4",
-#if defined(CONFIG_SYS_CSPR4) && defined(CONFIG_SYS_CSOR4)
-               CONFIG_SYS_CSPR4,
-#ifdef CONFIG_SYS_CSPR4_EXT
-               CONFIG_SYS_CSPR4_EXT,
+#if defined(CFG_SYS_CSPR4) && defined(CFG_SYS_CSOR4)
+               CFG_SYS_CSPR4,
+#ifdef CFG_SYS_CSPR4_EXT
+               CFG_SYS_CSPR4_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK4
-               CONFIG_SYS_AMASK4,
+#ifdef CFG_SYS_AMASK4
+               CFG_SYS_AMASK4,
 #else
                0,
 #endif
-               CONFIG_SYS_CSOR4,
+               CFG_SYS_CSOR4,
                {
-                       CONFIG_SYS_CS4_FTIM0,
-                       CONFIG_SYS_CS4_FTIM1,
-                       CONFIG_SYS_CS4_FTIM2,
-                       CONFIG_SYS_CS4_FTIM3,
+                       CFG_SYS_CS4_FTIM0,
+                       CFG_SYS_CS4_FTIM1,
+                       CFG_SYS_CS4_FTIM2,
+                       CFG_SYS_CS4_FTIM3,
                },
-#ifdef CONFIG_SYS_CSOR4_EXT
-               CONFIG_SYS_CSOR4_EXT,
+#ifdef CFG_SYS_CSOR4_EXT
+               CFG_SYS_CSOR4_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_CSPR4_FINAL
-               CONFIG_SYS_CSPR4_FINAL,
+#ifdef CFG_SYS_CSPR4_FINAL
+               CFG_SYS_CSPR4_FINAL,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK4_FINAL
-               CONFIG_SYS_AMASK4_FINAL,
+#ifdef CFG_SYS_AMASK4_FINAL
+               CFG_SYS_AMASK4_FINAL,
 #else
                0,
 #endif
@@ -257,37 +257,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 7
        {
                "cs6",
-#if defined(CONFIG_SYS_CSPR6) && defined(CONFIG_SYS_CSOR6)
-               CONFIG_SYS_CSPR6,
-#ifdef CONFIG_SYS_CSPR6_EXT
-               CONFIG_SYS_CSPR6_EXT,
+#if defined(CFG_SYS_CSPR6) && defined(CFG_SYS_CSOR6)
+               CFG_SYS_CSPR6,
+#ifdef CFG_SYS_CSPR6_EXT
+               CFG_SYS_CSPR6_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK6
-               CONFIG_SYS_AMASK6,
+#ifdef CFG_SYS_AMASK6
+               CFG_SYS_AMASK6,
 #else
                0,
 #endif
-               CONFIG_SYS_CSOR6,
+               CFG_SYS_CSOR6,
                {
-                       CONFIG_SYS_CS6_FTIM0,
-                       CONFIG_SYS_CS6_FTIM1,
-                       CONFIG_SYS_CS6_FTIM2,
-                       CONFIG_SYS_CS6_FTIM3,
+                       CFG_SYS_CS6_FTIM0,
+                       CFG_SYS_CS6_FTIM1,
+                       CFG_SYS_CS6_FTIM2,
+                       CFG_SYS_CS6_FTIM3,
                },
-#ifdef CONFIG_SYS_CSOR6_EXT
-               CONFIG_SYS_CSOR6_EXT,
+#ifdef CFG_SYS_CSOR6_EXT
+               CFG_SYS_CSOR6_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_CSPR6_FINAL
-               CONFIG_SYS_CSPR6_FINAL,
+#ifdef CFG_SYS_CSPR6_FINAL
+               CFG_SYS_CSPR6_FINAL,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK6_FINAL
-               CONFIG_SYS_AMASK6_FINAL,
+#ifdef CFG_SYS_AMASK6_FINAL
+               CFG_SYS_AMASK6_FINAL,
 #else
                0,
 #endif
@@ -298,37 +298,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 8
        {
                "cs7",
-#if defined(CONFIG_SYS_CSPR7) && defined(CONFIG_SYS_CSOR7)
-               CONFIG_SYS_CSPR7,
-#ifdef CONFIG_SYS_CSPR7_EXT
-               CONFIG_SYS_CSPR7_EXT,
+#if defined(CFG_SYS_CSPR7) && defined(CFG_SYS_CSOR7)
+               CFG_SYS_CSPR7,
+#ifdef CFG_SYS_CSPR7_EXT
+               CFG_SYS_CSPR7_EXT,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK7
-               CONFIG_SYS_AMASK7,
+#ifdef CFG_SYS_AMASK7
+               CFG_SYS_AMASK7,
 #else
                0,
 #endif
-               CONFIG_SYS_CSOR7,
-#ifdef CONFIG_SYS_CSOR7_EXT
-               CONFIG_SYS_CSOR7_EXT,
+               CFG_SYS_CSOR7,
+#ifdef CFG_SYS_CSOR7_EXT
+               CFG_SYS_CSOR7_EXT,
 #else
                0,
 #endif
                {
-                       CONFIG_SYS_CS7_FTIM0,
-                       CONFIG_SYS_CS7_FTIM1,
-                       CONFIG_SYS_CS7_FTIM2,
-                       CONFIG_SYS_CS7_FTIM3,
+                       CFG_SYS_CS7_FTIM0,
+                       CFG_SYS_CS7_FTIM1,
+                       CFG_SYS_CS7_FTIM2,
+                       CFG_SYS_CS7_FTIM3,
                },
-#ifdef CONFIG_SYS_CSPR7_FINAL
-               CONFIG_SYS_CSPR7_FINAL,
+#ifdef CFG_SYS_CSPR7_FINAL
+               CFG_SYS_CSPR7_FINAL,
 #else
                0,
 #endif
-#ifdef CONFIG_SYS_AMASK7_FINAL
-               CONFIG_SYS_AMASK7_FINAL,
+#ifdef CFG_SYS_AMASK7_FINAL
+               CFG_SYS_AMASK7_FINAL,
 #else
                0,
 #endif
@@ -412,91 +412,91 @@ void init_final_memctl_regs(void)
 #else
 void init_early_memctl_regs(void)
 {
-#if defined(CONFIG_SYS_CSPR0) && defined(CONFIG_SYS_CSOR0)
-       set_ifc_ftim(IFC_CS0, IFC_FTIM0, CONFIG_SYS_CS0_FTIM0);
-       set_ifc_ftim(IFC_CS0, IFC_FTIM1, CONFIG_SYS_CS0_FTIM1);
-       set_ifc_ftim(IFC_CS0, IFC_FTIM2, CONFIG_SYS_CS0_FTIM2);
-       set_ifc_ftim(IFC_CS0, IFC_FTIM3, CONFIG_SYS_CS0_FTIM3);
+#if defined(CFG_SYS_CSPR0) && defined(CFG_SYS_CSOR0)
+       set_ifc_ftim(IFC_CS0, IFC_FTIM0, CFG_SYS_CS0_FTIM0);
+       set_ifc_ftim(IFC_CS0, IFC_FTIM1, CFG_SYS_CS0_FTIM1);
+       set_ifc_ftim(IFC_CS0, IFC_FTIM2, CFG_SYS_CS0_FTIM2);
+       set_ifc_ftim(IFC_CS0, IFC_FTIM3, CFG_SYS_CS0_FTIM3);
 
 #ifndef CONFIG_A003399_NOR_WORKAROUND
-#ifdef CONFIG_SYS_CSPR0_EXT
-       set_ifc_cspr_ext(IFC_CS0, CONFIG_SYS_CSPR0_EXT);
+#ifdef CFG_SYS_CSPR0_EXT
+       set_ifc_cspr_ext(IFC_CS0, CFG_SYS_CSPR0_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR0_EXT
-       set_ifc_csor_ext(IFC_CS0, CONFIG_SYS_CSOR0_EXT);
+#ifdef CFG_SYS_CSOR0_EXT
+       set_ifc_csor_ext(IFC_CS0, CFG_SYS_CSOR0_EXT);
 #endif
-       set_ifc_cspr(IFC_CS0, CONFIG_SYS_CSPR0);
-       set_ifc_amask(IFC_CS0, CONFIG_SYS_AMASK0);
-       set_ifc_csor(IFC_CS0, CONFIG_SYS_CSOR0);
+       set_ifc_cspr(IFC_CS0, CFG_SYS_CSPR0);
+       set_ifc_amask(IFC_CS0, CFG_SYS_AMASK0);
+       set_ifc_csor(IFC_CS0, CFG_SYS_CSOR0);
 #endif
 #endif
 
-#ifdef CONFIG_SYS_CSPR1_EXT
-       set_ifc_cspr_ext(IFC_CS1, CONFIG_SYS_CSPR1_EXT);
+#ifdef CFG_SYS_CSPR1_EXT
+       set_ifc_cspr_ext(IFC_CS1, CFG_SYS_CSPR1_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR1_EXT
-       set_ifc_csor_ext(IFC_CS1, CONFIG_SYS_CSOR1_EXT);
+#ifdef CFG_SYS_CSOR1_EXT
+       set_ifc_csor_ext(IFC_CS1, CFG_SYS_CSOR1_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR1) && defined(CONFIG_SYS_CSOR1)
-       set_ifc_ftim(IFC_CS1, IFC_FTIM0, CONFIG_SYS_CS1_FTIM0);
-       set_ifc_ftim(IFC_CS1, IFC_FTIM1, CONFIG_SYS_CS1_FTIM1);
-       set_ifc_ftim(IFC_CS1, IFC_FTIM2, CONFIG_SYS_CS1_FTIM2);
-       set_ifc_ftim(IFC_CS1, IFC_FTIM3, CONFIG_SYS_CS1_FTIM3);
+#if defined(CFG_SYS_CSPR1) && defined(CFG_SYS_CSOR1)
+       set_ifc_ftim(IFC_CS1, IFC_FTIM0, CFG_SYS_CS1_FTIM0);
+       set_ifc_ftim(IFC_CS1, IFC_FTIM1, CFG_SYS_CS1_FTIM1);
+       set_ifc_ftim(IFC_CS1, IFC_FTIM2, CFG_SYS_CS1_FTIM2);
+       set_ifc_ftim(IFC_CS1, IFC_FTIM3, CFG_SYS_CS1_FTIM3);
 
-       set_ifc_csor(IFC_CS1, CONFIG_SYS_CSOR1);
-       set_ifc_amask(IFC_CS1, CONFIG_SYS_AMASK1);
-       set_ifc_cspr(IFC_CS1, CONFIG_SYS_CSPR1);
+       set_ifc_csor(IFC_CS1, CFG_SYS_CSOR1);
+       set_ifc_amask(IFC_CS1, CFG_SYS_AMASK1);
+       set_ifc_cspr(IFC_CS1, CFG_SYS_CSPR1);
 #endif
 
-#ifdef CONFIG_SYS_CSPR2_EXT
-       set_ifc_cspr_ext(IFC_CS2, CONFIG_SYS_CSPR2_EXT);
+#ifdef CFG_SYS_CSPR2_EXT
+       set_ifc_cspr_ext(IFC_CS2, CFG_SYS_CSPR2_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR2_EXT
-       set_ifc_csor_ext(IFC_CS2, CONFIG_SYS_CSOR2_EXT);
+#ifdef CFG_SYS_CSOR2_EXT
+       set_ifc_csor_ext(IFC_CS2, CFG_SYS_CSOR2_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR2) && defined(CONFIG_SYS_CSOR2)
-       set_ifc_ftim(IFC_CS2, IFC_FTIM0, CONFIG_SYS_CS2_FTIM0);
-       set_ifc_ftim(IFC_CS2, IFC_FTIM1, CONFIG_SYS_CS2_FTIM1);
-       set_ifc_ftim(IFC_CS2, IFC_FTIM2, CONFIG_SYS_CS2_FTIM2);
-       set_ifc_ftim(IFC_CS2, IFC_FTIM3, CONFIG_SYS_CS2_FTIM3);
+#if defined(CFG_SYS_CSPR2) && defined(CFG_SYS_CSOR2)
+       set_ifc_ftim(IFC_CS2, IFC_FTIM0, CFG_SYS_CS2_FTIM0);
+       set_ifc_ftim(IFC_CS2, IFC_FTIM1, CFG_SYS_CS2_FTIM1);
+       set_ifc_ftim(IFC_CS2, IFC_FTIM2, CFG_SYS_CS2_FTIM2);
+       set_ifc_ftim(IFC_CS2, IFC_FTIM3, CFG_SYS_CS2_FTIM3);
 
-       set_ifc_csor(IFC_CS2, CONFIG_SYS_CSOR2);
-       set_ifc_amask(IFC_CS2, CONFIG_SYS_AMASK2);
-       set_ifc_cspr(IFC_CS2, CONFIG_SYS_CSPR2);
+       set_ifc_csor(IFC_CS2, CFG_SYS_CSOR2);
+       set_ifc_amask(IFC_CS2, CFG_SYS_AMASK2);
+       set_ifc_cspr(IFC_CS2, CFG_SYS_CSPR2);
 #endif
 
-#ifdef CONFIG_SYS_CSPR3_EXT
-       set_ifc_cspr_ext(IFC_CS3, CONFIG_SYS_CSPR3_EXT);
+#ifdef CFG_SYS_CSPR3_EXT
+       set_ifc_cspr_ext(IFC_CS3, CFG_SYS_CSPR3_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR3_EXT
-       set_ifc_csor_ext(IFC_CS3, CONFIG_SYS_CSOR3_EXT);
+#ifdef CFG_SYS_CSOR3_EXT
+       set_ifc_csor_ext(IFC_CS3, CFG_SYS_CSOR3_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR3) && defined(CONFIG_SYS_CSOR3)
-       set_ifc_ftim(IFC_CS3, IFC_FTIM0, CONFIG_SYS_CS3_FTIM0);
-       set_ifc_ftim(IFC_CS3, IFC_FTIM1, CONFIG_SYS_CS3_FTIM1);
-       set_ifc_ftim(IFC_CS3, IFC_FTIM2, CONFIG_SYS_CS3_FTIM2);
-       set_ifc_ftim(IFC_CS3, IFC_FTIM3, CONFIG_SYS_CS3_FTIM3);
+#if defined(CFG_SYS_CSPR3) && defined(CFG_SYS_CSOR3)
+       set_ifc_ftim(IFC_CS3, IFC_FTIM0, CFG_SYS_CS3_FTIM0);
+       set_ifc_ftim(IFC_CS3, IFC_FTIM1, CFG_SYS_CS3_FTIM1);
+       set_ifc_ftim(IFC_CS3, IFC_FTIM2, CFG_SYS_CS3_FTIM2);
+       set_ifc_ftim(IFC_CS3, IFC_FTIM3, CFG_SYS_CS3_FTIM3);
 
-       set_ifc_cspr(IFC_CS3, CONFIG_SYS_CSPR3);
-       set_ifc_amask(IFC_CS3, CONFIG_SYS_AMASK3);
-       set_ifc_csor(IFC_CS3, CONFIG_SYS_CSOR3);
+       set_ifc_cspr(IFC_CS3, CFG_SYS_CSPR3);
+       set_ifc_amask(IFC_CS3, CFG_SYS_AMASK3);
+       set_ifc_csor(IFC_CS3, CFG_SYS_CSOR3);
 #endif
 
-#ifdef CONFIG_SYS_CSPR4_EXT
-       set_ifc_cspr_ext(IFC_CS4, CONFIG_SYS_CSPR4_EXT);
+#ifdef CFG_SYS_CSPR4_EXT
+       set_ifc_cspr_ext(IFC_CS4, CFG_SYS_CSPR4_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR4_EXT
-       set_ifc_csor_ext(IFC_CS4, CONFIG_SYS_CSOR4_EXT);
+#ifdef CFG_SYS_CSOR4_EXT
+       set_ifc_csor_ext(IFC_CS4, CFG_SYS_CSOR4_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR4) && defined(CONFIG_SYS_CSOR4)
-       set_ifc_ftim(IFC_CS4, IFC_FTIM0, CONFIG_SYS_CS4_FTIM0);
-       set_ifc_ftim(IFC_CS4, IFC_FTIM1, CONFIG_SYS_CS4_FTIM1);
-       set_ifc_ftim(IFC_CS4, IFC_FTIM2, CONFIG_SYS_CS4_FTIM2);
-       set_ifc_ftim(IFC_CS4, IFC_FTIM3, CONFIG_SYS_CS4_FTIM3);
+#if defined(CFG_SYS_CSPR4) && defined(CFG_SYS_CSOR4)
+       set_ifc_ftim(IFC_CS4, IFC_FTIM0, CFG_SYS_CS4_FTIM0);
+       set_ifc_ftim(IFC_CS4, IFC_FTIM1, CFG_SYS_CS4_FTIM1);
+       set_ifc_ftim(IFC_CS4, IFC_FTIM2, CFG_SYS_CS4_FTIM2);
+       set_ifc_ftim(IFC_CS4, IFC_FTIM3, CFG_SYS_CS4_FTIM3);
 
-       set_ifc_cspr(IFC_CS4, CONFIG_SYS_CSPR4);
-       set_ifc_amask(IFC_CS4, CONFIG_SYS_AMASK4);
-       set_ifc_csor(IFC_CS4, CONFIG_SYS_CSOR4);
+       set_ifc_cspr(IFC_CS4, CFG_SYS_CSPR4);
+       set_ifc_amask(IFC_CS4, CFG_SYS_AMASK4);
+       set_ifc_csor(IFC_CS4, CFG_SYS_CSOR4);
 #endif
 
 #ifdef CONFIG_SYS_CSPR5_EXT
@@ -516,66 +516,66 @@ void init_early_memctl_regs(void)
        set_ifc_csor(IFC_CS5, CONFIG_SYS_CSOR5);
 #endif
 
-#ifdef CONFIG_SYS_CSPR6_EXT
-       set_ifc_cspr_ext(IFC_CS6, CONFIG_SYS_CSPR6_EXT);
+#ifdef CFG_SYS_CSPR6_EXT
+       set_ifc_cspr_ext(IFC_CS6, CFG_SYS_CSPR6_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR6_EXT
-       set_ifc_csor_ext(IFC_CS6, CONFIG_SYS_CSOR6_EXT);
+#ifdef CFG_SYS_CSOR6_EXT
+       set_ifc_csor_ext(IFC_CS6, CFG_SYS_CSOR6_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR6) && defined(CONFIG_SYS_CSOR6)
-       set_ifc_ftim(IFC_CS6, IFC_FTIM0, CONFIG_SYS_CS6_FTIM0);
-       set_ifc_ftim(IFC_CS6, IFC_FTIM1, CONFIG_SYS_CS6_FTIM1);
-       set_ifc_ftim(IFC_CS6, IFC_FTIM2, CONFIG_SYS_CS6_FTIM2);
-       set_ifc_ftim(IFC_CS6, IFC_FTIM3, CONFIG_SYS_CS6_FTIM3);
+#if defined(CFG_SYS_CSPR6) && defined(CFG_SYS_CSOR6)
+       set_ifc_ftim(IFC_CS6, IFC_FTIM0, CFG_SYS_CS6_FTIM0);
+       set_ifc_ftim(IFC_CS6, IFC_FTIM1, CFG_SYS_CS6_FTIM1);
+       set_ifc_ftim(IFC_CS6, IFC_FTIM2, CFG_SYS_CS6_FTIM2);
+       set_ifc_ftim(IFC_CS6, IFC_FTIM3, CFG_SYS_CS6_FTIM3);
 
-       set_ifc_cspr(IFC_CS6, CONFIG_SYS_CSPR6);
-       set_ifc_amask(IFC_CS6, CONFIG_SYS_AMASK6);
-       set_ifc_csor(IFC_CS6, CONFIG_SYS_CSOR6);
+       set_ifc_cspr(IFC_CS6, CFG_SYS_CSPR6);
+       set_ifc_amask(IFC_CS6, CFG_SYS_AMASK6);
+       set_ifc_csor(IFC_CS6, CFG_SYS_CSOR6);
 #endif
 
-#ifdef CONFIG_SYS_CSPR7_EXT
-       set_ifc_cspr_ext(IFC_CS7, CONFIG_SYS_CSPR7_EXT);
+#ifdef CFG_SYS_CSPR7_EXT
+       set_ifc_cspr_ext(IFC_CS7, CFG_SYS_CSPR7_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR7_EXT
-       set_ifc_csor_ext(IFC_CS7, CONFIG_SYS_CSOR7_EXT);
+#ifdef CFG_SYS_CSOR7_EXT
+       set_ifc_csor_ext(IFC_CS7, CFG_SYS_CSOR7_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR7) && defined(CONFIG_SYS_CSOR7)
-       set_ifc_ftim(IFC_CS7, IFC_FTIM0, CONFIG_SYS_CS7_FTIM0);
-       set_ifc_ftim(IFC_CS7, IFC_FTIM1, CONFIG_SYS_CS7_FTIM1);
-       set_ifc_ftim(IFC_CS7, IFC_FTIM2, CONFIG_SYS_CS7_FTIM2);
-       set_ifc_ftim(IFC_CS7, IFC_FTIM3, CONFIG_SYS_CS7_FTIM3);
+#if defined(CFG_SYS_CSPR7) && defined(CFG_SYS_CSOR7)
+       set_ifc_ftim(IFC_CS7, IFC_FTIM0, CFG_SYS_CS7_FTIM0);
+       set_ifc_ftim(IFC_CS7, IFC_FTIM1, CFG_SYS_CS7_FTIM1);
+       set_ifc_ftim(IFC_CS7, IFC_FTIM2, CFG_SYS_CS7_FTIM2);
+       set_ifc_ftim(IFC_CS7, IFC_FTIM3, CFG_SYS_CS7_FTIM3);
 
-       set_ifc_cspr(IFC_CS7, CONFIG_SYS_CSPR7);
-       set_ifc_amask(IFC_CS7, CONFIG_SYS_AMASK7);
-       set_ifc_csor(IFC_CS7, CONFIG_SYS_CSOR7);
+       set_ifc_cspr(IFC_CS7, CFG_SYS_CSPR7);
+       set_ifc_amask(IFC_CS7, CFG_SYS_AMASK7);
+       set_ifc_csor(IFC_CS7, CFG_SYS_CSOR7);
 #endif
 }
 
 void init_final_memctl_regs(void)
 {
-#ifdef CONFIG_SYS_CSPR0_FINAL
-       set_ifc_cspr(IFC_CS0, CONFIG_SYS_CSPR0_FINAL);
+#ifdef CFG_SYS_CSPR0_FINAL
+       set_ifc_cspr(IFC_CS0, CFG_SYS_CSPR0_FINAL);
 #endif
-#ifdef CONFIG_SYS_AMASK0_FINAL
-       set_ifc_amask(IFC_CS0, CONFIG_SYS_AMASK0);
+#ifdef CFG_SYS_AMASK0_FINAL
+       set_ifc_amask(IFC_CS0, CFG_SYS_AMASK0);
 #endif
-#ifdef CONFIG_SYS_CSPR1_FINAL
-       set_ifc_cspr(IFC_CS1, CONFIG_SYS_CSPR1_FINAL);
+#ifdef CFG_SYS_CSPR1_FINAL
+       set_ifc_cspr(IFC_CS1, CFG_SYS_CSPR1_FINAL);
 #endif
-#ifdef CONFIG_SYS_AMASK1_FINAL
-       set_ifc_amask(IFC_CS1, CONFIG_SYS_AMASK1_FINAL);
+#ifdef CFG_SYS_AMASK1_FINAL
+       set_ifc_amask(IFC_CS1, CFG_SYS_AMASK1_FINAL);
 #endif
-#ifdef CONFIG_SYS_CSPR2_FINAL
-       set_ifc_cspr(IFC_CS2, CONFIG_SYS_CSPR2_FINAL);
+#ifdef CFG_SYS_CSPR2_FINAL
+       set_ifc_cspr(IFC_CS2, CFG_SYS_CSPR2_FINAL);
 #endif
-#ifdef CONFIG_SYS_AMASK2_FINAL
-       set_ifc_amask(IFC_CS2, CONFIG_SYS_AMASK2);
+#ifdef CFG_SYS_AMASK2_FINAL
+       set_ifc_amask(IFC_CS2, CFG_SYS_AMASK2);
 #endif
-#ifdef CONFIG_SYS_CSPR3_FINAL
-       set_ifc_cspr(IFC_CS3, CONFIG_SYS_CSPR3_FINAL);
+#ifdef CFG_SYS_CSPR3_FINAL
+       set_ifc_cspr(IFC_CS3, CFG_SYS_CSPR3_FINAL);
 #endif
-#ifdef CONFIG_SYS_AMASK3_FINAL
-       set_ifc_amask(IFC_CS3, CONFIG_SYS_AMASK3);
+#ifdef CFG_SYS_AMASK3_FINAL
+       set_ifc_amask(IFC_CS3, CFG_SYS_AMASK3);
 #endif
 }
 #endif
index 9c4b4d7e46ddda31d3aa8830665d6c4d9c1ca5b7..6b831281e96ff188d095f587045f3caf5738788f 100644 (file)
 #endif
 #include <fsl_qbman.h>
 
-#define MAX_BPORTALS (CONFIG_SYS_BMAN_CINH_SIZE / CONFIG_SYS_BMAN_SP_CINH_SIZE)
-#define MAX_QPORTALS (CONFIG_SYS_QMAN_CINH_SIZE / CONFIG_SYS_QMAN_SP_CINH_SIZE)
+#define MAX_BPORTALS (CFG_SYS_BMAN_CINH_SIZE / CFG_SYS_BMAN_SP_CINH_SIZE)
+#define MAX_QPORTALS (CFG_SYS_QMAN_CINH_SIZE / CFG_SYS_QMAN_SP_CINH_SIZE)
 void setup_qbman_portals(void)
 {
-       void __iomem *bpaddr = (void *)CONFIG_SYS_BMAN_CINH_BASE +
-                               CONFIG_SYS_BMAN_SWP_ISDR_REG;
-       void __iomem *qpaddr = (void *)CONFIG_SYS_QMAN_CINH_BASE +
-                               CONFIG_SYS_QMAN_SWP_ISDR_REG;
+       void __iomem *bpaddr = (void *)CFG_SYS_BMAN_CINH_BASE +
+                               CFG_SYS_BMAN_SWP_ISDR_REG;
+       void __iomem *qpaddr = (void *)CFG_SYS_QMAN_CINH_BASE +
+                               CFG_SYS_QMAN_SWP_ISDR_REG;
        struct ccsr_qman *qman = (void *)CFG_SYS_FSL_QMAN_ADDR;
 
        /* Set the Qman initiator BAR to match the LAW (for DQRR stashing) */
 #ifdef CONFIG_PHYS_64BIT
-       out_be32(&qman->qcsp_bare, (u32)(CONFIG_SYS_QMAN_MEM_PHYS >> 32));
+       out_be32(&qman->qcsp_bare, (u32)(CFG_SYS_QMAN_MEM_PHYS >> 32));
 #endif
-       out_be32(&qman->qcsp_bar, (u32)CONFIG_SYS_QMAN_MEM_PHYS);
+       out_be32(&qman->qcsp_bar, (u32)CFG_SYS_QMAN_MEM_PHYS);
 #ifdef CONFIG_FSL_CORENET
        int i;
 
-       for (i = 0; i < CONFIG_SYS_QMAN_NUM_PORTALS; i++) {
+       for (i = 0; i < CFG_SYS_QMAN_NUM_PORTALS; i++) {
                u8 sdest = qp_info[i].sdest;
                u16 fliodn = qp_info[i].fliodn;
                u16 dliodn = qp_info[i].dliodn;
@@ -53,7 +53,7 @@ void setup_qbman_portals(void)
 #if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A)
        int i;
 
-       for (i = 0; i < CONFIG_SYS_QMAN_NUM_PORTALS; i++) {
+       for (i = 0; i < CFG_SYS_QMAN_NUM_PORTALS; i++) {
                u8 sdest = qp_info[i].sdest;
                u16 ficid = qp_info[i].ficid;
                u16 dicid = qp_info[i].dicid;
@@ -68,10 +68,10 @@ void setup_qbman_portals(void)
 #endif
 
        /* Change default state of BMan ISDR portals to all 1s */
-       inhibit_portals(bpaddr, CONFIG_SYS_BMAN_NUM_PORTALS, MAX_BPORTALS,
-                       CONFIG_SYS_BMAN_SP_CINH_SIZE);
-       inhibit_portals(qpaddr, CONFIG_SYS_QMAN_NUM_PORTALS, MAX_QPORTALS,
-                       CONFIG_SYS_QMAN_SP_CINH_SIZE);
+       inhibit_portals(bpaddr, CFG_SYS_BMAN_NUM_PORTALS, MAX_BPORTALS,
+                       CFG_SYS_BMAN_SP_CINH_SIZE);
+       inhibit_portals(qpaddr, CFG_SYS_QMAN_NUM_PORTALS, MAX_QPORTALS,
+                       CFG_SYS_QMAN_SP_CINH_SIZE);
 }
 
 void inhibit_portals(void __iomem *addr, int max_portals,
index 321bd27fd325e22eab904807d93aab7ef738e366..3597ee22242cc6b9a435f9ab9d5f4877607a4de5 100644 (file)
@@ -10,7 +10,7 @@
 static u32 get_sec_mon_state(void)
 {
        struct ccsr_sec_mon_regs *sec_mon_regs = (void *)
-                                               (CONFIG_SYS_SEC_MON_ADDR);
+                                               (CFG_SYS_SEC_MON_ADDR);
        return sec_mon_in32(&sec_mon_regs->hp_stat) & HPSR_SSM_ST_MASK;
 }
 
@@ -19,7 +19,7 @@ static int set_sec_mon_state_non_sec(void)
        u32 sts;
        int timeout = 10;
        struct ccsr_sec_mon_regs *sec_mon_regs = (void *)
-                                               (CONFIG_SYS_SEC_MON_ADDR);
+                                               (CFG_SYS_SEC_MON_ADDR);
 
        sts = get_sec_mon_state();
 
@@ -120,7 +120,7 @@ static int set_sec_mon_state_soft_fail(void)
        u32 sts;
        int timeout = 10;
        struct ccsr_sec_mon_regs *sec_mon_regs = (void *)
-                                               (CONFIG_SYS_SEC_MON_ADDR);
+                                               (CFG_SYS_SEC_MON_ADDR);
 
        printf("SEC_MON state transitioning to Soft Fail.\n");
        sec_mon_setbits32(&sec_mon_regs->hp_com, HPCOMR_SW_FSV);
index aa00d7e2014debd68af8cc0ebe9e3a20b77a4329..6d7c0cff22a5fd6794ceafc1ea6fd775e788cf7e 100644 (file)
@@ -9,7 +9,7 @@
 #include <mmc.h>
 #include <malloc.h>
 
-#ifndef CONFIG_SYS_MMC_U_BOOT_OFFS
+#ifndef CFG_SYS_MMC_U_BOOT_OFFS
 extern uchar mmc_u_boot_offs[];
 #endif
 
@@ -97,7 +97,7 @@ void __noreturn mmc_boot(void)
        }
 
 #ifdef CONFIG_FSL_CORENET
-       offset = CONFIG_SYS_MMC_U_BOOT_OFFS;
+       offset = CFG_SYS_MMC_U_BOOT_OFFS;
 #else
        sector = 0;
 again:
@@ -153,16 +153,16 @@ again:
                val = *(tmp_buf + blk_off + ESDHC_BOOT_IMAGE_ADDR + i);
                offset = (offset << 8) + val;
        }
-#ifndef CONFIG_SYS_MMC_U_BOOT_OFFS
+#ifndef CFG_SYS_MMC_U_BOOT_OFFS
        offset += (ulong)&mmc_u_boot_offs - CONFIG_SPL_TEXT_BASE;
 #else
-       offset += CONFIG_SYS_MMC_U_BOOT_OFFS;
+       offset += CFG_SYS_MMC_U_BOOT_OFFS;
 #endif
 #endif
        /*
        * Load U-Boot image from mmc into RAM
        */
-       code_len = CONFIG_SYS_MMC_U_BOOT_SIZE;
+       code_len = CFG_SYS_MMC_U_BOOT_SIZE;
        blk_start = offset / mmc->read_bl_len;
        blk_off = offset % mmc->read_bl_len;
        blk_cnt = ALIGN(code_len, mmc->read_bl_len) / mmc->read_bl_len + 1;
@@ -176,7 +176,7 @@ again:
                blk_start++;
        }
        err = mmc->block_dev.block_read(&mmc->block_dev, blk_start, blk_cnt,
-                                       (uchar *)CONFIG_SYS_MMC_U_BOOT_DST +
+                                       (uchar *)CFG_SYS_MMC_U_BOOT_DST +
                                        (blk_off ? (mmc->read_bl_len - blk_off) : 0));
        if (err != blk_cnt) {
                puts("spl: mmc read failed!!\n");
@@ -189,18 +189,18 @@ again:
         * after SDHC DMA transfer.
         */
        if (blk_off)
-               memcpy((uchar *)CONFIG_SYS_MMC_U_BOOT_DST,
+               memcpy((uchar *)CFG_SYS_MMC_U_BOOT_DST,
                       tmp_buf + blk_off, mmc->read_bl_len - blk_off);
 
        /*
        * Clean d-cache and invalidate i-cache, to
        * make sure that no stale data is executed.
        */
-       flush_cache(CONFIG_SYS_MMC_U_BOOT_DST, CONFIG_SYS_MMC_U_BOOT_SIZE);
+       flush_cache(CFG_SYS_MMC_U_BOOT_DST, CFG_SYS_MMC_U_BOOT_SIZE);
 
        /*
        * Jump to U-Boot image
        */
-       uboot = (void *)CONFIG_SYS_MMC_U_BOOT_START;
+       uboot = (void *)CFG_SYS_MMC_U_BOOT_START;
        (*uboot)();
 }
index 607a22368cba37df67d4bbae0a2246ab5a955132..d91819acfd7fba8126b89910fae11899d948ee03 100644 (file)
@@ -24,8 +24,8 @@
 #include <asm/arch/hardware.h>
 #include "atmel_mci.h"
 
-#ifndef CONFIG_SYS_MMC_CLK_OD
-# define CONFIG_SYS_MMC_CLK_OD 150000
+#ifndef CFG_SYS_MMC_CLK_OD
+# define CFG_SYS_MMC_CLK_OD    150000
 #endif
 
 #define MMC_DEFAULT_BLKLEN     512
@@ -448,9 +448,9 @@ static int mci_init(struct mmc *mmc)
 
        /* Set default clocks and blocklen */
 #ifdef CONFIG_DM_MMC
-       mci_set_mode(dev, CONFIG_SYS_MMC_CLK_OD, MMC_DEFAULT_BLKLEN);
+       mci_set_mode(dev, CFG_SYS_MMC_CLK_OD, MMC_DEFAULT_BLKLEN);
 #else
-       mci_set_mode(mmc, CONFIG_SYS_MMC_CLK_OD, MMC_DEFAULT_BLKLEN);
+       mci_set_mode(mmc, CFG_SYS_MMC_CLK_OD, MMC_DEFAULT_BLKLEN);
 #endif
 
        return 0;
index b2d0fac963685fedbdaf41151e4727cde69f2302..3ce7cbf71f8002a3540cc97659b1ba79b16095b4 100644 (file)
@@ -761,7 +761,7 @@ int sh_sdhi_init(unsigned long addr, int ch, unsigned long quirks)
        struct mmc *mmc;
        struct sh_sdhi_host *host = NULL;
 
-       if (ch >= CONFIG_SYS_SH_SDHI_NR_CHANNEL)
+       if (ch >= CFG_SYS_SH_SDHI_NR_CHANNEL)
                return -ENODEV;
 
        host = malloc(sizeof(struct sh_sdhi_host));
index d34d8ee976716d711813897f708f6ffde8787b8a..c1cdd2cbc3e26a85e946e9163db10ef91e87c105 100644 (file)
@@ -53,7 +53,7 @@
  * AMD/Spansion Application Note: Migration from Single-byte to Three-byte
  *   Device IDs, Publication Number 25538 Revision A, November 8, 2001
  *
- * Define CONFIG_SYS_WRITE_SWAPPED_DATA, if you have to swap the Bytes between
+ * Define CFG_SYS_WRITE_SWAPPED_DATA, if you have to swap the Bytes between
  * reading and writing ... (yes there is such a Hardware).
  */
 
@@ -119,14 +119,14 @@ phys_addr_t cfi_flash_bank_addr(int i)
 #else
 __weak phys_addr_t cfi_flash_bank_addr(int i)
 {
-       return ((phys_addr_t [])CONFIG_SYS_FLASH_BANKS_LIST)[i];
+       return ((phys_addr_t [])CFG_SYS_FLASH_BANKS_LIST)[i];
 }
 #endif
 
 __weak unsigned long cfi_flash_bank_size(int i)
 {
-#ifdef CONFIG_SYS_FLASH_BANKS_SIZES
-       return ((unsigned long [])CONFIG_SYS_FLASH_BANKS_SIZES)[i];
+#ifdef CFG_SYS_FLASH_BANKS_SIZES
+       return ((unsigned long [])CFG_SYS_FLASH_BANKS_SIZES)[i];
 #else
        return 0;
 #endif
@@ -178,7 +178,7 @@ __maybe_weak u64 flash_read64(void *addr)
  */
 #if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || \
        (defined(CONFIG_SYS_MONITOR_BASE) && \
-       (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE))
+       (CONFIG_SYS_MONITOR_BASE >= CFG_SYS_FLASH_BASE))
 static flash_info_t *flash_get_info(ulong base)
 {
        int i;
@@ -227,7 +227,7 @@ static void flash_make_cmd(flash_info_t *info, u32 cmd, void *cmdbuf)
        int i;
        int cword_offset;
        int cp_offset;
-#if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
+#if defined(__LITTLE_ENDIAN) || defined(CFG_SYS_WRITE_SWAPPED_DATA)
        u32 cmd_le = cpu_to_le32(cmd);
 #endif
        uchar val;
@@ -235,7 +235,7 @@ static void flash_make_cmd(flash_info_t *info, u32 cmd, void *cmdbuf)
 
        for (i = info->portwidth; i > 0; i--) {
                cword_offset = (info->portwidth - i) % info->chipwidth;
-#if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
+#if defined(__LITTLE_ENDIAN) || defined(CFG_SYS_WRITE_SWAPPED_DATA)
                cp_offset = info->portwidth - i;
                val = *((uchar *)&cmd_le + cword_offset);
 #else
@@ -292,7 +292,7 @@ static inline uchar flash_read_uchar(flash_info_t *info, uint offset)
        uchar retval;
 
        cp = flash_map(info, 0, offset);
-#if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
+#if defined(__LITTLE_ENDIAN) || defined(CFG_SYS_WRITE_SWAPPED_DATA)
        retval = flash_read8(cp);
 #else
        retval = flash_read8(cp + info->portwidth - 1);
@@ -335,7 +335,7 @@ static ulong flash_read_long (flash_info_t *info, flash_sect_t sect,
        for (x = 0; x < 4 * info->portwidth; x++)
                debug("addr[%x] = 0x%x\n", x, flash_read8(addr + x));
 #endif
-#if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
+#if defined(__LITTLE_ENDIAN) || defined(CFG_SYS_WRITE_SWAPPED_DATA)
        retval = ((flash_read8(addr) << 16) |
                  (flash_read8(addr + info->portwidth) << 24) |
                  (flash_read8(addr + 2 * info->portwidth)) |
@@ -580,7 +580,7 @@ static int flash_status_check(flash_info_t *info, flash_sect_t sector,
 #endif
 
        /* Wait for command completion */
-#ifdef CONFIG_SYS_LOW_RES_TIMER
+#ifdef CFG_SYS_LOW_RES_TIMER
        reset_timer();
 #endif
        start = get_timer(0);
@@ -673,7 +673,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
 #endif
 
        /* Wait for command completion */
-#ifdef CONFIG_SYS_LOW_RES_TIMER
+#ifdef CFG_SYS_LOW_RES_TIMER
        reset_timer();
 #endif
        start = get_timer(0);
@@ -713,7 +713,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
  */
 static void flash_add_byte(flash_info_t *info, cfiword_t *cword, uchar c)
 {
-#if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
+#if defined(__LITTLE_ENDIAN) && !defined(CFG_SYS_WRITE_SWAPPED_DATA)
        unsigned short  w;
        unsigned int    l;
        unsigned long long ll;
@@ -724,7 +724,7 @@ static void flash_add_byte(flash_info_t *info, cfiword_t *cword, uchar c)
                cword->w8 = c;
                break;
        case FLASH_CFI_16BIT:
-#if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
+#if defined(__LITTLE_ENDIAN) && !defined(CFG_SYS_WRITE_SWAPPED_DATA)
                w = c;
                w <<= 8;
                cword->w16 = (cword->w16 >> 8) | w;
@@ -733,7 +733,7 @@ static void flash_add_byte(flash_info_t *info, cfiword_t *cword, uchar c)
 #endif
                break;
        case FLASH_CFI_32BIT:
-#if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
+#if defined(__LITTLE_ENDIAN) && !defined(CFG_SYS_WRITE_SWAPPED_DATA)
                l = c;
                l <<= 24;
                cword->w32 = (cword->w32 >> 8) | l;
@@ -742,7 +742,7 @@ static void flash_add_byte(flash_info_t *info, cfiword_t *cword, uchar c)
 #endif
                break;
        case FLASH_CFI_64BIT:
-#if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
+#if defined(__LITTLE_ENDIAN) && !defined(CFG_SYS_WRITE_SWAPPED_DATA)
                ll = c;
                ll <<= 56;
                cword->w64 = (cword->w64 >> 8) | ll;
@@ -2359,7 +2359,7 @@ static void flash_protect_default(void)
 
        /* Monitor protection ON by default */
 #if defined(CONFIG_SYS_MONITOR_BASE) && \
-       (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) && \
+       (CONFIG_SYS_MONITOR_BASE >= CFG_SYS_FLASH_BASE) && \
        (!defined(CONFIG_MONITOR_IS_IN_RAM))
        flash_protect(FLAG_PROTECT_SET,
                      CONFIG_SYS_MONITOR_BASE,
index 59de3256405b3d81f038706e5d45cf2f05958e25..18abd7544184973c7335de3a89b3202b7bc6e6c2 100644 (file)
@@ -780,10 +780,10 @@ static void fsl_ifc_ctrl_init(void)
        ver = ifc_in32(&ifc_ctrl->regs.gregs->ifc_rev);
        if (ver >= FSL_IFC_V2_0_0)
                ifc_ctrl->regs.rregs =
-                       (void *)CONFIG_SYS_IFC_ADDR + IFC_RREGS_64KOFFSET;
+                       (void *)CFG_SYS_IFC_ADDR + IFC_RREGS_64KOFFSET;
        else
                ifc_ctrl->regs.rregs =
-                       (void *)CONFIG_SYS_IFC_ADDR + IFC_RREGS_4KOFFSET;
+                       (void *)CFG_SYS_IFC_ADDR + IFC_RREGS_4KOFFSET;
 
        /* clear event registers */
        ifc_out32(&ifc_ctrl->regs.rregs->ifc_nand.nand_evter_stat, ~0U);
index 7d4b77dd11d42c7d9de498ae856fc72bcdd45ca6..3b464ce10ce95acca5a3ef9a39b8cfd89dd7eb3a 100644 (file)
@@ -54,14 +54,14 @@ static inline int check_read_ecc(uchar *buf, u32 *eccstat,
 
 static inline struct fsl_ifc_runtime *runtime_regs_address(void)
 {
-       struct fsl_ifc regs = {(void *)CONFIG_SYS_IFC_ADDR, NULL};
+       struct fsl_ifc regs = {(void *)CFG_SYS_IFC_ADDR, NULL};
        int ver = 0;
 
        ver = ifc_in32(&regs.gregs->ifc_rev);
        if (ver >= FSL_IFC_V2_0_0)
-               regs.rregs = (void *)CONFIG_SYS_IFC_ADDR + IFC_RREGS_64KOFFSET;
+               regs.rregs = (void *)CFG_SYS_IFC_ADDR + IFC_RREGS_64KOFFSET;
        else
-               regs.rregs = (void *)CONFIG_SYS_IFC_ADDR + IFC_RREGS_4KOFFSET;
+               regs.rregs = (void *)CFG_SYS_IFC_ADDR + IFC_RREGS_4KOFFSET;
 
        return regs.rregs;
 }
@@ -108,7 +108,7 @@ static inline int bad_block(uchar *marker, int port_size)
 
 int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst)
 {
-       struct fsl_ifc_fcm *gregs = (void *)CONFIG_SYS_IFC_ADDR;
+       struct fsl_ifc_fcm *gregs = (void *)CFG_SYS_IFC_ADDR;
        struct fsl_ifc_runtime *ifc = NULL;
        uchar *buf = (uchar *)CFG_SYS_NAND_BASE;
        int page_size;
index 5bc5301d63497d387166f92162a0b660bbe440b7..a884c65d18b8a4f9e191c6e6fb0195f4072e626d 100644 (file)
@@ -84,8 +84,8 @@ struct lpc32xx_nand_mlc_registers {
 static struct lpc32xx_nand_mlc_registers __iomem *lpc32xx_nand_mlc_registers
        = (struct lpc32xx_nand_mlc_registers __iomem *)MLC_NAND_BASE;
 
-#if !defined(CONFIG_SYS_MAX_NAND_CHIPS)
-#define CONFIG_SYS_MAX_NAND_CHIPS      1
+#if !defined(CFG_SYS_MAX_NAND_CHIPS)
+#define CFG_SYS_MAX_NAND_CHIPS 1
 #endif
 
 #define clkdiv(v, w, o) (((1+(clk/v)) & w) << o)
@@ -586,7 +586,7 @@ void board_nand_init(void)
        lpc32xx_nand_init();
 
        /* identify chip */
-       ret = nand_scan_ident(mtd, CONFIG_SYS_MAX_NAND_CHIPS, NULL);
+       ret = nand_scan_ident(mtd, CFG_SYS_MAX_NAND_CHIPS, NULL);
        if (ret) {
                pr_err("nand_scan_ident returned %i", ret);
                return;
index ab6f1a8be3ee0485cd13d1beb5add3cbf96ebda6..2699958a5de245ded105e1aa69a59c1911cbfa70 100644 (file)
@@ -49,12 +49,12 @@ static inline int onenand_bufferram_address(int block)
 
 static inline uint16_t onenand_readw(uint32_t addr)
 {
-       return readw(CONFIG_SYS_ONENAND_BASE + addr);
+       return readw(CFG_SYS_ONENAND_BASE + addr);
 }
 
 static inline void onenand_writew(uint16_t value, uint32_t addr)
 {
-       writew(value, CONFIG_SYS_ONENAND_BASE + addr);
+       writew(value, CFG_SYS_ONENAND_BASE + addr);
 }
 
 static enum onenand_spl_pagesize onenand_spl_get_geometry(void)
@@ -82,7 +82,7 @@ static enum onenand_spl_pagesize onenand_spl_get_geometry(void)
 static int onenand_spl_read_page(uint32_t block, uint32_t page, uint32_t *buf,
                                        enum onenand_spl_pagesize pagesize)
 {
-       const uint32_t addr = CONFIG_SYS_ONENAND_BASE + ONENAND_DATARAM;
+       const uint32_t addr = CFG_SYS_ONENAND_BASE + ONENAND_DATARAM;
        uint32_t offset;
 
        onenand_writew(onenand_block_address(block),
index 3a8c7b867ebabbc20f8cc0534ef65dc15dde80f1..04791df69bb0e76980b3e767c43c55e40e2d7045 100644 (file)
@@ -35,7 +35,7 @@ void onenand_init(void)
        /* It's used for some board init required */
        err = onenand_board_init(&onenand_mtd);
 #else
-       onenand_chip.base = (void *) CONFIG_SYS_ONENAND_BASE;
+       onenand_chip.base = (void *) CFG_SYS_ONENAND_BASE;
 #endif
 
        if (!err && !(onenand_scan(&onenand_mtd, 1))) {
index 5c41d7558c2449bd271aae0a1faea99c461a8146..dfc35d6eabf01c22382cac048e50ea69df3dcb46 100644 (file)
@@ -49,8 +49,8 @@ void fsl_spi_boot(void)
        }
 
 #ifdef CONFIG_FSL_CORENET
-       offset = CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS;
-       code_len = CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE;
+       offset = CFG_SYS_SPI_FLASH_U_BOOT_OFFS;
+       code_len = CFG_SYS_SPI_FLASH_U_BOOT_SIZE;
 #else
        /*
        * Load U-Boot image from SPI flash into RAM
@@ -66,7 +66,7 @@ void fsl_spi_boot(void)
                       flash->page_size, (void *)buf);
        offset = *(u32 *)(buf + ESPI_BOOT_IMAGE_ADDR);
        /* Skip spl code */
-       offset += CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS;
+       offset += CFG_SYS_SPI_FLASH_U_BOOT_OFFS;
        /* Get the code size from offset 0x48 */
        code_len = *(u32 *)(buf + ESPI_BOOT_IMAGE_SIZE);
        /* Skip spl code */
@@ -76,7 +76,7 @@ void fsl_spi_boot(void)
        printf("Loading second stage boot loader ");
        while (copy_len <= code_len) {
                spi_flash_read(flash, offset + copy_len, 0x2000,
-                              (void *)(CONFIG_SYS_SPI_FLASH_U_BOOT_DST
+                              (void *)(CFG_SYS_SPI_FLASH_U_BOOT_DST
                               + copy_len));
                copy_len = copy_len + 0x2000;
                putc('.');
@@ -85,7 +85,7 @@ void fsl_spi_boot(void)
        /*
        * Jump to U-Boot image
        */
-       flush_cache(CONFIG_SYS_SPI_FLASH_U_BOOT_DST, code_len);
-       uboot = (void *)CONFIG_SYS_SPI_FLASH_U_BOOT_START;
+       flush_cache(CFG_SYS_SPI_FLASH_U_BOOT_DST, code_len);
+       uboot = (void *)CFG_SYS_SPI_FLASH_U_BOOT_START;
        (*uboot)();
 }
index 95afa2d6bc722b3863f289454d9e02d9a5119183..4523344ba6b02ac29fe215ad70a897a013d90e9a 100644 (file)
@@ -39,7 +39,7 @@ unsigned long flash_init(void)
        for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
                flash_info[i].flash_id = FLASH_STM32;
                flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT;
-               flash_info[i].start[0] = CONFIG_SYS_FLASH_BASE + (i << 20);
+               flash_info[i].start[0] = CFG_SYS_FLASH_BASE + (i << 20);
                flash_info[i].size = sect_sz_kb[0];
                for (j = 1; j < CONFIG_SYS_MAX_FLASH_SECT; j++) {
                        flash_info[i].start[j] = flash_info[i].start[j - 1]
index c23e0c07702fd7a4f1ed16c8ae26a18e462b1d98..c8381cc7133cad212f62d7bd06868b6799e87b1f 100644 (file)
@@ -128,7 +128,7 @@ static void dtsec_init_phy(struct fm_eth *fm_eth)
        struct dtsec *regs = (struct dtsec *)CFG_SYS_FSL_FM1_DTSEC1_ADDR;
 
        /* Assign a Physical address to the TBI */
-       out_be32(&regs->tbipa, CONFIG_SYS_TBIPA_VALUE);
+       out_be32(&regs->tbipa, CFG_SYS_TBIPA_VALUE);
 #endif
 
        if (fm_eth->enet_if == PHY_INTERFACE_MODE_SGMII ||
index 1d3b7aa058366aa81b09de1a652fb07248b20c39..c476cb31200aaa29976cb5ce53dfdeec3570001c 100644 (file)
@@ -67,9 +67,9 @@ static void fm_init_muram(int fm_idx, void *reg)
        void *base = reg;
 
        muram[fm_idx].base = base;
-       muram[fm_idx].size = CONFIG_SYS_FM_MURAM_SIZE;
+       muram[fm_idx].size = CFG_SYS_FM_MURAM_SIZE;
        muram[fm_idx].alloc = base + FM_MURAM_RES_SIZE;
-       muram[fm_idx].top = base + CONFIG_SYS_FM_MURAM_SIZE;
+       muram[fm_idx].top = base + CFG_SYS_FM_MURAM_SIZE;
 }
 
 /*
index 8443cbb6b65fc6eae808f2184889f938fdb5d22d..618c1bccbe3f628059701aaeed9943a6bf8ba367 100644 (file)
@@ -244,9 +244,9 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
 {
        int off;
        uint32_t ph;
-       phys_addr_t paddr = CONFIG_SYS_CCSRBAR_PHYS + info->compat_offset;
+       phys_addr_t paddr = CFG_SYS_CCSRBAR_PHYS + info->compat_offset;
 #ifndef CONFIG_SYS_FMAN_V3
-       u64 dtsec1_addr = (u64)CONFIG_SYS_CCSRBAR_PHYS +
+       u64 dtsec1_addr = (u64)CFG_SYS_CCSRBAR_PHYS +
                                CFG_SYS_FSL_FM1_DTSEC1_OFFSET;
 #endif
 
index 8be38e11a843657799683d72933d0f87fb96f85b..ff998d49dc4c32e012cdec3ef3196204a40d0f6b 100644 (file)
@@ -256,12 +256,12 @@ static inline int qbman_swp_sys_init(struct qbman_swp_sys *s,
 
        s->addr_cena = d->cena_bar;
        s->addr_cinh = d->cinh_bar;
-       s->cena = (void *)valloc(CONFIG_SYS_PAGE_SIZE);
+       s->cena = (void *)valloc(CFG_SYS_PAGE_SIZE);
        if (!s->cena) {
                printf("Could not allocate page for cena shadow\n");
                return -1;
        }
-       memset((void *)s->cena, 0x00, CONFIG_SYS_PAGE_SIZE);
+       memset((void *)s->cena, 0x00, CFG_SYS_PAGE_SIZE);
 
 #ifdef QBMAN_CHECKING
        /* We should never be asked to initialise for a portal that isn't in
index 68833f9ddd928641b7d5a315120c42217262bf27..69da465eaabcac3f0d6e89de0371ab6e1ebacac5 100644 (file)
@@ -54,7 +54,7 @@ static int mc_memset_resv_ram;
 static struct mc_version mc_ver_info;
 static int mc_boot_status = -1;
 static int mc_dpl_applied = -1;
-#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+#ifdef CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
 static int mc_aiop_applied = -1;
 #endif
 struct fsl_mc_io *root_mc_io = NULL;
@@ -500,13 +500,13 @@ static int load_mc_dpc(u64 mc_ram_addr, size_t mc_ram_size, u64 mc_dpc_addr)
        int dpc_size;
 #endif
 
-#ifdef CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET
-       BUILD_BUG_ON((CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET & 0x3) != 0 ||
-                    CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET > 0xffffffff);
+#ifdef CFG_SYS_LS_MC_DRAM_DPC_OFFSET
+       BUILD_BUG_ON((CFG_SYS_LS_MC_DRAM_DPC_OFFSET & 0x3) != 0 ||
+                    CFG_SYS_LS_MC_DRAM_DPC_OFFSET > 0xffffffff);
 
-       mc_dpc_offset = CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET;
+       mc_dpc_offset = CFG_SYS_LS_MC_DRAM_DPC_OFFSET;
 #else
-#error "CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET not defined"
+#error "CFG_SYS_LS_MC_DRAM_DPC_OFFSET not defined"
 #endif
 
        /*
@@ -531,7 +531,7 @@ static int load_mc_dpc(u64 mc_ram_addr, size_t mc_ram_size, u64 mc_dpc_addr)
        }
 
        dpc_size = fdt_totalsize(dpc_fdt_hdr);
-       if (dpc_size > CONFIG_SYS_LS_MC_DPC_MAX_LENGTH) {
+       if (dpc_size > CFG_SYS_LS_MC_DPC_MAX_LENGTH) {
                printf("\nfsl-mc: ERROR: Bad DPC image (too large: %d)\n",
                       dpc_size);
                return -EINVAL;
@@ -576,13 +576,13 @@ static int load_mc_dpl(u64 mc_ram_addr, size_t mc_ram_size, u64 mc_dpl_addr)
        int dpl_size;
 #endif
 
-#ifdef CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET
-       BUILD_BUG_ON((CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET & 0x3) != 0 ||
-                    CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET > 0xffffffff);
+#ifdef CFG_SYS_LS_MC_DRAM_DPL_OFFSET
+       BUILD_BUG_ON((CFG_SYS_LS_MC_DRAM_DPL_OFFSET & 0x3) != 0 ||
+                    CFG_SYS_LS_MC_DRAM_DPL_OFFSET > 0xffffffff);
 
-       mc_dpl_offset = CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET;
+       mc_dpl_offset = CFG_SYS_LS_MC_DRAM_DPL_OFFSET;
 #else
-#error "CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET not defined"
+#error "CFG_SYS_LS_MC_DRAM_DPL_OFFSET not defined"
 #endif
 
        /*
@@ -603,7 +603,7 @@ static int load_mc_dpl(u64 mc_ram_addr, size_t mc_ram_size, u64 mc_dpl_addr)
        }
 
        dpl_size = fdt_totalsize(dpl_fdt_hdr);
-       if (dpl_size > CONFIG_SYS_LS_MC_DPL_MAX_LENGTH) {
+       if (dpl_size > CFG_SYS_LS_MC_DPL_MAX_LENGTH) {
                printf("\nfsl-mc: ERROR: Bad DPL image (too large: %d)\n",
                       dpl_size);
                return -EINVAL;
@@ -624,7 +624,7 @@ static int load_mc_dpl(u64 mc_ram_addr, size_t mc_ram_size, u64 mc_dpl_addr)
  */
 static unsigned long get_mc_boot_timeout_ms(void)
 {
-       unsigned long timeout_ms = CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS;
+       unsigned long timeout_ms = CFG_SYS_LS_MC_BOOT_TIMEOUT_MS;
 
        char *timeout_ms_env_var = env_get(MC_BOOT_TIMEOUT_ENV_VAR);
 
@@ -636,14 +636,14 @@ static unsigned long get_mc_boot_timeout_ms(void)
                               "\' environment variable: %lu\n",
                               timeout_ms);
 
-                       timeout_ms = CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS;
+                       timeout_ms = CFG_SYS_LS_MC_BOOT_TIMEOUT_MS;
                }
        }
 
        return timeout_ms;
 }
 
-#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+#ifdef CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
 
 __weak bool soc_has_aiop(void)
 {
@@ -666,12 +666,12 @@ static int load_mc_aiop_img(u64 aiop_fw_addr)
 
 #ifdef CONFIG_SYS_LS_MC_DPC_IN_DDR
        printf("MC AIOP is preloaded to %#llx\n", mc_ram_addr +
-              CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET);
+              CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET);
 #else
        aiop_img = (void *)aiop_fw_addr;
        mc_copy_image("MC AIOP image",
-                     (u64)aiop_img, CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH,
-                     mc_ram_addr + CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET);
+                     (u64)aiop_img, CFG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH,
+                     mc_ram_addr + CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET);
 #endif
        mc_aiop_applied = 0;
 
@@ -896,7 +896,7 @@ int get_mc_boot_status(void)
        return mc_boot_status;
 }
 
-#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+#ifdef CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
 int get_aiop_apply_status(void)
 {
        return mc_aiop_applied;
@@ -938,14 +938,14 @@ u64 mc_get_dram_addr(void)
  */
 unsigned long mc_get_dram_block_size(void)
 {
-       unsigned long dram_block_size = CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE;
+       unsigned long dram_block_size = CFG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE;
 
        char *dram_block_size_env_var = env_get(MC_MEM_SIZE_ENV_VAR);
 
        if (dram_block_size_env_var) {
                dram_block_size = hextoul(dram_block_size_env_var, NULL);
 
-               if (dram_block_size < CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE) {
+               if (dram_block_size < CFG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE) {
                        printf("fsl-mc: WARNING: Invalid value for \'"
                               MC_MEM_SIZE_ENV_VAR
                               "\' environment variable: %lu\n",
@@ -1838,7 +1838,7 @@ static int do_fsl_mc(struct cmd_tbl *cmdtp, int flag, int argc,
        case 's': {
                        char sub_cmd;
                        u64 mc_fw_addr, mc_dpc_addr;
-#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+#ifdef CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
                        u64 aiop_fw_addr;
 #endif
                        if (argc < 3)
@@ -1864,7 +1864,7 @@ static int do_fsl_mc(struct cmd_tbl *cmdtp, int flag, int argc,
                                        err = mc_init_object();
                                break;
 
-#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+#ifdef CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
                        case 'a':
                                if (argc < 4)
                                        goto usage;
index 6825f9e27c06b830a3c139ed5a50ddbd1506aee2..cc61a107403856947d410455676ec021d1a0d6e3 100644 (file)
@@ -43,11 +43,11 @@ DECLARE_GLOBAL_DATA_PTR;
 static void init_eth_info(struct fec_info_dma *info)
 {
        /* setup Receive and Transmit buffer descriptor */
-#ifdef CONFIG_SYS_FEC_BUF_USE_SRAM
+#ifdef CFG_SYS_FEC_BUF_USE_SRAM
        static u32 tmp;
 
        if (info->index == 0)
-               tmp = CONFIG_SYS_INIT_RAM_ADDR + 0x1000;
+               tmp = CFG_SYS_INIT_RAM_ADDR + 0x1000;
        else
                info->rxbd = (cbd_t *)DBUF_LENGTH;
 
@@ -59,7 +59,7 @@ static void init_eth_info(struct fec_info_dma *info)
        tmp = (u32)info->txbd;
        info->txbuf =
            (char *)((u32)info->txbuf + tmp +
-           (CONFIG_SYS_TX_ETH_BUFFER * sizeof(cbd_t)));
+           (CFG_SYS_TX_ETH_BUFFER * sizeof(cbd_t)));
        tmp = (u32)info->txbuf;
 #else
        info->rxbd =
@@ -67,7 +67,7 @@ static void init_eth_info(struct fec_info_dma *info)
                               (PKTBUFSRX * sizeof(cbd_t)));
        info->txbd =
            (cbd_t *)memalign(CONFIG_SYS_CACHELINE_SIZE,
-                              (CONFIG_SYS_TX_ETH_BUFFER * sizeof(cbd_t)));
+                              (CFG_SYS_TX_ETH_BUFFER * sizeof(cbd_t)));
        info->txbuf =
            (char *)memalign(CONFIG_SYS_CACHELINE_SIZE, DBUF_LENGTH);
 #endif
@@ -283,15 +283,15 @@ static int fec_init(struct udevice *dev)
 
        /* Setup Ethernet Transmitter Buffer Descriptors (13.14.24.19)
         * Settings:    Last, Tx CRC */
-       for (i = 0; i < CONFIG_SYS_TX_ETH_BUFFER; i++) {
+       for (i = 0; i < CFG_SYS_TX_ETH_BUFFER; i++) {
                info->txbd[i].cbd_sc = 0;
                info->txbd[i].cbd_datlen = 0;
                info->txbd[i].cbd_bufaddr = (uint) (&info->txbuf[0]);
        }
-       info->txbd[CONFIG_SYS_TX_ETH_BUFFER - 1].cbd_sc |= BD_ENET_TX_WRAP;
+       info->txbd[CFG_SYS_TX_ETH_BUFFER - 1].cbd_sc |= BD_ENET_TX_WRAP;
 
        info->used_tbd_idx = 0;
-       info->clean_tbd_num = CONFIG_SYS_TX_ETH_BUFFER;
+       info->clean_tbd_num = CFG_SYS_TX_ETH_BUFFER;
 
        /* Set Rx FIFO alarm and granularity value */
        fecp->rfcr = 0x0c000000;
@@ -352,7 +352,7 @@ static int mcdmafec_send(struct udevice *dev, void *packet, int length)
        miiphy_read(dev->name, info->phy_addr, MII_BMSR, &phy_status);
 
        /* process all the consumed TBDs */
-       while (info->clean_tbd_num < CONFIG_SYS_TX_ETH_BUFFER) {
+       while (info->clean_tbd_num < CFG_SYS_TX_ETH_BUFFER) {
                p_used_tbd = &info->txbd[info->used_tbd_idx];
                if (p_used_tbd->cbd_sc & BD_ENET_TX_READY) {
 #ifdef ET_DEBUG
@@ -363,7 +363,7 @@ static int mcdmafec_send(struct udevice *dev, void *packet, int length)
                }
 
                /* clean this buffer descriptor */
-               if (info->used_tbd_idx == (CONFIG_SYS_TX_ETH_BUFFER - 1))
+               if (info->used_tbd_idx == (CFG_SYS_TX_ETH_BUFFER - 1))
                        p_used_tbd->cbd_sc = BD_ENET_TX_WRAP;
                else
                        p_used_tbd->cbd_sc = 0;
@@ -371,7 +371,7 @@ static int mcdmafec_send(struct udevice *dev, void *packet, int length)
                /* update some indeces for a correct handling of TBD ring */
                info->clean_tbd_num++;
                info->used_tbd_idx = (info->used_tbd_idx + 1)
-                       % CONFIG_SYS_TX_ETH_BUFFER;
+                       % CFG_SYS_TX_ETH_BUFFER;
        }
 
        /* Check for valid length of data. */
@@ -389,7 +389,7 @@ static int mcdmafec_send(struct udevice *dev, void *packet, int length)
        p_tbd->cbd_datlen = length;
        p_tbd->cbd_bufaddr = (u32)packet;
        p_tbd->cbd_sc |= BD_ENET_TX_LAST | BD_ENET_TX_TC | BD_ENET_TX_READY;
-       info->tx_idx = (info->tx_idx + 1) % CONFIG_SYS_TX_ETH_BUFFER;
+       info->tx_idx = (info->tx_idx + 1) % CFG_SYS_TX_ETH_BUFFER;
 
        /* Enable DMA transmit task */
        MCD_continDma(info->tx_task);
@@ -524,8 +524,8 @@ static int mcdmafec_probe(struct udevice *dev)
        if (val)
                info->tx_init = fdt32_to_cpu(*val);
 
-#ifdef CONFIG_SYS_FEC_BUF_USE_SRAM
-       u32 tmp = CONFIG_SYS_INIT_RAM_ADDR + 0x1000;
+#ifdef CFG_SYS_FEC_BUF_USE_SRAM
+       u32 tmp = CFG_SYS_INIT_RAM_ADDR + 0x1000;
 #endif
        init_eth_info(info);
 
index 4dd848932b961ce61cc4fda742d96febffc70556..ec1fae9688bdf04f6ddd6f2eea965a40a01314a3 100644 (file)
@@ -39,11 +39,11 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static void init_eth_info(struct fec_info_s *info)
 {
-#ifdef CONFIG_SYS_FEC_BUF_USE_SRAM
+#ifdef CFG_SYS_FEC_BUF_USE_SRAM
        static u32 tmp;
 
        if (info->index == 0)
-               tmp = CONFIG_SYS_INIT_RAM_ADDR + 0x1000;
+               tmp = CFG_SYS_INIT_RAM_ADDR + 0x1000;
        else
                info->rxbd = (cbd_t *)DBUF_LENGTH;
 
@@ -56,7 +56,7 @@ static void init_eth_info(struct fec_info_s *info)
        tmp = (u32)info->txbd;
        info->txbuf =
            (char *)((u32)info->txbuf + tmp +
-           (CONFIG_SYS_TX_ETH_BUFFER * sizeof(cbd_t)));
+           (CFG_SYS_TX_ETH_BUFFER * sizeof(cbd_t)));
        tmp = (u32)info->txbuf;
 #else
        info->rxbd =
@@ -387,7 +387,7 @@ static int mcffec_send(struct udevice *dev, void *packet, int length)
        /* Activate transmit Buffer Descriptor polling */
        fecp->tdar = 0x01000000;        /* Descriptor polling active    */
 
-#ifndef CONFIG_SYS_FEC_BUF_USE_SRAM
+#ifndef CFG_SYS_FEC_BUF_USE_SRAM
        /*
         * FEC unable to initial transmit data packet.
         * A nop will ensure the descriptor polling active completed.
index 32b7d3e561306c5adc2bede12063ff4b95f1a42f..551d7061ccc3e1ce284ac8b61232809c8838b4a5 100644 (file)
@@ -605,10 +605,10 @@ enum uec_num_of_threads {
 #define STD_UEC_INFO(num) \
 {                      \
        .uf_info                = {     \
-               .ucc_num        = CONFIG_SYS_UEC##num##_UCC_NUM,\
-               .rx_clock       = CONFIG_SYS_UEC##num##_RX_CLK, \
-               .tx_clock       = CONFIG_SYS_UEC##num##_TX_CLK, \
-               .eth_type       = CONFIG_SYS_UEC##num##_ETH_TYPE,\
+               .ucc_num        = CFG_SYS_UEC##num##_UCC_NUM,\
+               .rx_clock       = CFG_SYS_UEC##num##_RX_CLK,    \
+               .tx_clock       = CFG_SYS_UEC##num##_TX_CLK,    \
+               .eth_type       = CFG_SYS_UEC##num##_ETH_TYPE,\
        },      \
        .num_threads_tx         = UEC_NUM_OF_THREADS_1, \
        .num_threads_rx         = UEC_NUM_OF_THREADS_1, \
@@ -616,9 +616,9 @@ enum uec_num_of_threads {
        .risc_rx                = QE_RISC_ALLOCATION_RISC1_AND_RISC2, \
        .tx_bd_ring_len         = 16,   \
        .rx_bd_ring_len         = 16,   \
-       .phy_address            = CONFIG_SYS_UEC##num##_PHY_ADDR, \
-       .enet_interface_type    = CONFIG_SYS_UEC##num##_INTERFACE_TYPE, \
-       .speed                  = CONFIG_SYS_UEC##num##_INTERFACE_SPEED, \
+       .phy_address            = CFG_SYS_UEC##num##_PHY_ADDR, \
+       .enet_interface_type    = CFG_SYS_UEC##num##_INTERFACE_TYPE, \
+       .speed                  = CFG_SYS_UEC##num##_INTERFACE_SPEED, \
 }
 
 struct uec_inf {
index d69a9ff477367cb51d7094e87df41f1c858617d1..8b6f034ea1653a9f077fa2f7e65b30b5b9cde103 100644 (file)
@@ -764,7 +764,7 @@ static int tsec_initialize(struct bd_info *bis,
        priv->phyregs_sgmii = tsec_info->miiregs_sgmii;
 
        priv->phyaddr = tsec_info->phyaddr;
-       priv->tbiaddr = CONFIG_SYS_TBIPA_VALUE;
+       priv->tbiaddr = CFG_SYS_TBIPA_VALUE;
        priv->flags = tsec_info->flags;
 
        strcpy(dev->name, tsec_info->devname);
@@ -832,7 +832,7 @@ int tsec_probe(struct udevice *dev)
        struct eth_pdata *pdata = dev_get_plat(dev);
        struct tsec_private *priv = dev_get_priv(dev);
        struct ofnode_phandle_args phandle_args;
-       u32 tbiaddr = CONFIG_SYS_TBIPA_VALUE;
+       u32 tbiaddr = CFG_SYS_TBIPA_VALUE;
        struct tsec_data *data;
        ofnode parent, child;
        fdt_addr_t reg;
index af8d99cefbef46ff061f41f557665e8c616aac38..09883f06be28986b523a5a00754c99cbbca7769e 100644 (file)
@@ -39,13 +39,13 @@ int vsc7385_upload_firmware(void *firmware, unsigned int size)
        u8 *fw = firmware;
        unsigned int i;
 
-       u32 *gloreset = (u32 *) (CONFIG_SYS_VSC7385_BASE + 0x1c050);
-       u32 *icpu_ctrl = (u32 *) (CONFIG_SYS_VSC7385_BASE + 0x1c040);
-       u32 *icpu_addr = (u32 *) (CONFIG_SYS_VSC7385_BASE + 0x1c044);
-       u32 *icpu_data = (u32 *) (CONFIG_SYS_VSC7385_BASE + 0x1c048);
-       u32 *icpu_rom_map = (u32 *) (CONFIG_SYS_VSC7385_BASE + 0x1c070);
+       u32 *gloreset = (u32 *) (CFG_SYS_VSC7385_BASE + 0x1c050);
+       u32 *icpu_ctrl = (u32 *) (CFG_SYS_VSC7385_BASE + 0x1c040);
+       u32 *icpu_addr = (u32 *) (CFG_SYS_VSC7385_BASE + 0x1c044);
+       u32 *icpu_data = (u32 *) (CFG_SYS_VSC7385_BASE + 0x1c048);
+       u32 *icpu_rom_map = (u32 *) (CFG_SYS_VSC7385_BASE + 0x1c070);
 #ifdef DEBUG
-       u32 *chipid = (u32 *) (CONFIG_SYS_VSC7385_BASE + 0x1c060);
+       u32 *chipid = (u32 *) (CFG_SYS_VSC7385_BASE + 0x1c060);
 #endif
 
        out_be32(gloreset, 3);
index e286dd108f31af2cbdd8aacd9d337b8a69cd7ffb..ad7aaf35a9a0279965a2196e88970d35e5372853 100644 (file)
@@ -24,7 +24,7 @@ int pmic_dialog_init(unsigned char bus)
        p->number_of_regs = DIALOG_NUM_OF_REGS;
 
        p->interface = PMIC_I2C;
-       p->hw.i2c.addr = CONFIG_SYS_DIALOG_PMIC_I2C_ADDR;
+       p->hw.i2c.addr = CFG_SYS_DIALOG_PMIC_I2C_ADDR;
        p->hw.i2c.tx_num = 1;
        p->bus = bus;
 
index 83461c024c7754742824cc696886e5be79ffc4da..63371e71bf744e9eac39b7a7edeef3ec4065b5cd 100644 (file)
@@ -605,10 +605,10 @@ enum uec_num_of_threads {
 #define STD_UEC_INFO(num) \
 {                      \
        .uf_info                = {     \
-               .ucc_num        = CONFIG_SYS_UEC##num##_UCC_NUM,\
-               .rx_clock       = CONFIG_SYS_UEC##num##_RX_CLK, \
-               .tx_clock       = CONFIG_SYS_UEC##num##_TX_CLK, \
-               .eth_type       = CONFIG_SYS_UEC##num##_ETH_TYPE,\
+               .ucc_num        = CFG_SYS_UEC##num##_UCC_NUM,\
+               .rx_clock       = CFG_SYS_UEC##num##_RX_CLK,    \
+               .tx_clock       = CFG_SYS_UEC##num##_TX_CLK,    \
+               .eth_type       = CFG_SYS_UEC##num##_ETH_TYPE,\
        },      \
        .num_threads_tx         = UEC_NUM_OF_THREADS_1, \
        .num_threads_rx         = UEC_NUM_OF_THREADS_1, \
@@ -616,9 +616,9 @@ enum uec_num_of_threads {
        .risc_rx                = QE_RISC_ALLOCATION_RISC1_AND_RISC2, \
        .tx_bd_ring_len         = 16,   \
        .rx_bd_ring_len         = 16,   \
-       .phy_address            = CONFIG_SYS_UEC##num##_PHY_ADDR, \
-       .enet_interface_type    = CONFIG_SYS_UEC##num##_INTERFACE_TYPE, \
-       .speed                  = CONFIG_SYS_UEC##num##_INTERFACE_SPEED, \
+       .phy_address            = CFG_SYS_UEC##num##_PHY_ADDR, \
+       .enet_interface_type    = CFG_SYS_UEC##num##_INTERFACE_TYPE, \
+       .speed                  = CFG_SYS_UEC##num##_INTERFACE_SPEED, \
 }
 
 struct uec_inf {
index 9d429c832f49b7493f8b6e3c6f6f96676dcff1a4..fcf06d1032838a1a7b9d31e235cb8d72e0a2d9cf 100644 (file)
@@ -52,7 +52,7 @@
  *
  * Some boards do not have a PHY for each ethernet port. These ports are known
  * as Fixed PHY (or PHY-less) ports. For such ports, set the appropriate
- * CONFIG_SYS_UECx_PHY_ADDR equal to CONFIG_FIXED_PHY_ADDR (an unused address)
+ * CFG_SYS_UECx_PHY_ADDR equal to CONFIG_FIXED_PHY_ADDR (an unused address)
  * When the drver tries to identify the PHYs, CONFIG_FIXED_PHY will be returned
  * and the driver will search CONFIG_SYS_FIXED_PHY_PORTS to find what network
  * speed and duplex should be for the port.
  *     #define CONFIG_FIXED_PHY   0xFFFFFFFF
  *     #define CONFIG_SYS_FIXED_PHY_ADDR 0x1E (pick an unused phy address)
  *
- *     #define CONFIG_SYS_UEC1_PHY_ADDR CONFIG_SYS_FIXED_PHY_ADDR
- *     #define CONFIG_SYS_UEC2_PHY_ADDR 0x02
- *     #define CONFIG_SYS_UEC3_PHY_ADDR CONFIG_SYS_FIXED_PHY_ADDR
- *     #define CONFIG_SYS_UEC4_PHY_ADDR 0x04
+ *     #define CFG_SYS_UEC1_PHY_ADDR CONFIG_SYS_FIXED_PHY_ADDR
+ *     #define CFG_SYS_UEC2_PHY_ADDR 0x02
+ *     #define CFG_SYS_UEC3_PHY_ADDR CONFIG_SYS_FIXED_PHY_ADDR
+ *     #define CFG_SYS_UEC4_PHY_ADDR 0x04
  *
  *     #define CONFIG_SYS_FIXED_PHY_PORT(name,speed,duplex) \
  *                 {name, speed, duplex},
index 40ca66bdceeecb6c637897c623e044184ce5f66d..0e9d3d24dd89721998a9fa7355499b4cc7c26b16 100644 (file)
@@ -80,8 +80,8 @@ enum ds_type {
 #endif
 /*---------------------------------------------------------------------*/
 
-#ifndef CONFIG_SYS_I2C_RTC_ADDR
-# define CONFIG_SYS_I2C_RTC_ADDR       0x68
+#ifndef CFG_SYS_I2C_RTC_ADDR
+# define CFG_SYS_I2C_RTC_ADDR  0x68
 #endif
 
 #if defined(CONFIG_RTC_DS1307) && (CONFIG_SYS_I2C_SPEED > 100000)
@@ -212,13 +212,13 @@ void rtc_reset (void)
 static
 uchar rtc_read (uchar reg)
 {
-       return (i2c_reg_read (CONFIG_SYS_I2C_RTC_ADDR, reg));
+       return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg));
 }
 
 
 static void rtc_write (uchar reg, uchar val)
 {
-       i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+       i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val);
 }
 
 #endif /* !CONFIG_DM_RTC */
index 486c01f9ba20d8d5d1e609520a7f598540bc4fe4..2c780ab8edfadaaac853cb35de0ecb76a83b40be 100644 (file)
@@ -184,13 +184,13 @@ void rtc_reset (void)
 static
 uchar rtc_read (uchar reg)
 {
-       return (i2c_reg_read (CONFIG_SYS_I2C_RTC_ADDR, reg));
+       return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg));
 }
 
 
 static void rtc_write (uchar reg, uchar val)
 {
-       i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+       i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val);
 }
 #else
 static uchar rtc_read(struct udevice *dev, uchar reg)
index 9f2647d707e5f6c94cb1af545ad5f4b79fa63759..89442f9386ba8b5e10d15ae3448d7ea769b62808 100644 (file)
@@ -29,8 +29,8 @@
 #endif
 /*---------------------------------------------------------------------*/
 
-#ifndef CONFIG_SYS_I2C_RTC_ADDR
-# define CONFIG_SYS_I2C_RTC_ADDR       0x68
+#ifndef CFG_SYS_I2C_RTC_ADDR
+# define CFG_SYS_I2C_RTC_ADDR  0x68
 #endif
 
 #if defined(CONFIG_RTC_DS1374) && (CONFIG_SYS_I2C_SPEED > 400000)
@@ -194,21 +194,21 @@ void rtc_reset (void){
  */
 static uchar rtc_read (uchar reg)
 {
-       return (i2c_reg_read (CONFIG_SYS_I2C_RTC_ADDR, reg));
+       return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg));
 }
 
 static void rtc_write(uchar reg, uchar val, bool set)
 {
        if (set == true) {
-               val |= i2c_reg_read (CONFIG_SYS_I2C_RTC_ADDR, reg);
-               i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+               val |= i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg);
+               i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val);
        } else {
-               val = i2c_reg_read (CONFIG_SYS_I2C_RTC_ADDR, reg) & ~val;
-               i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+               val = i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg) & ~val;
+               i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val);
        }
 }
 
 static void rtc_write_raw (uchar reg, uchar val)
 {
-               i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+               i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val);
 }
index 5b72e86768a1560528438d122ba287ba6c7c9e0a..bd32ed2dbf91b5a70b334de2aa18b0e037ce6c1f 100644 (file)
@@ -164,13 +164,13 @@ void rtc_enable_32khz_output(void)
 static
 uchar rtc_read (uchar reg)
 {
-       return (i2c_reg_read (CONFIG_SYS_I2C_RTC_ADDR, reg));
+       return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg));
 }
 
 
 static void rtc_write (uchar reg, uchar val)
 {
-       i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+       i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val);
 }
 #else
 static int ds3231_rtc_get(struct udevice *dev, struct rtc_time *tmp)
index 8be532c3e318bcf2d6ea61dbef75aa8bad07be4a..66a0faa0ecff909c6a202043802433c768278249 100644 (file)
@@ -319,7 +319,7 @@ int rtc_get(struct rtc_time *tm)
 {
        u8 buf[M41T62_DATETIME_REG_SIZE];
 
-       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE);
+       i2c_read(CFG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE);
        m41t62_update_rtc_time(tm, buf);
 
        return 0;
@@ -329,10 +329,10 @@ int rtc_set(struct rtc_time *tm)
 {
        u8 buf[M41T62_DATETIME_REG_SIZE];
 
-       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE);
+       i2c_read(CFG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE);
        m41t62_set_rtc_buf(tm, buf);
 
-       if (i2c_write(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf,
+       if (i2c_write(CFG_SYS_I2C_RTC_ADDR, 0, 1, buf,
                      M41T62_DATETIME_REG_SIZE)) {
                printf("I2C write failed in %s()\n", __func__);
                return -1;
@@ -349,8 +349,8 @@ void rtc_reset(void)
         * M41T82: Make sure HT (Halt Update) bit is cleared.
         * This bit is 0 in M41T62 so its save to clear it always.
         */
-       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, M41T62_REG_ALARM_HOUR, 1, &val, 1);
+       i2c_read(CFG_SYS_I2C_RTC_ADDR, M41T62_REG_ALARM_HOUR, 1, &val, 1);
        val &= ~M41T80_ALHOUR_HT;
-       i2c_write(CONFIG_SYS_I2C_RTC_ADDR, M41T62_REG_ALARM_HOUR, 1, &val, 1);
+       i2c_write(CFG_SYS_I2C_RTC_ADDR, M41T62_REG_ALARM_HOUR, 1, &val, 1);
 }
 #endif /* CONFIG_DM_RTC */
index 11928839dcfc958e2f6da430792bb0e3467a3912..e03a87f94da9d401ca3e96b3c2beabc6ee8befa6 100644 (file)
 #include <i2c.h>
 #include <linux/delay.h>
 
-#ifndef        CONFIG_SYS_I2C_RTC_ADDR
-#define        CONFIG_SYS_I2C_RTC_ADDR 0x50
+#ifndef        CFG_SYS_I2C_RTC_ADDR
+#define        CFG_SYS_I2C_RTC_ADDR    0x50
 #endif
 
 /* ------------------------------------------------------------------------- */
 
 static uchar rtc_read (uchar reg)
 {
-       return (i2c_reg_read (CONFIG_SYS_I2C_RTC_ADDR, reg));
+       return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg));
 }
 
 static void rtc_write (uchar reg, uchar val)
 {
-       i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+       i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val);
        udelay(2500);
 }
 
index 19faefba7c8ff112cc41044fedeedcd74bd4a959..91a412440b85124c14f1e3de0b3e3ee92dee8fe8 100644 (file)
@@ -111,12 +111,12 @@ void rtc_reset (void)
 
 static uchar rtc_read (uchar reg)
 {
-       return (i2c_reg_read (CONFIG_SYS_I2C_RTC_ADDR, reg));
+       return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg));
 }
 
 static void rtc_write (uchar reg, uchar val)
 {
-       i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+       i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val);
 }
 #else
 static int pcf8563_rtc_get(struct udevice *dev, struct rtc_time *tmp)
index c987494b669dfee5f63a4684437ebb29e4ece69a..e0a7bd3662fbda8316e3631b5f56920f8f6c2990 100644 (file)
 /****** Helper functions ****************************************/
 static u8 rtc_read(u8 reg)
 {
-       return i2c_reg_read(CONFIG_SYS_I2C_RTC_ADDR, reg);
+       return i2c_reg_read(CFG_SYS_I2C_RTC_ADDR, reg);
 }
 
 static void rtc_write(u8 reg, u8 val)
 {
-       i2c_reg_write(CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+       i2c_reg_write(CFG_SYS_I2C_RTC_ADDR, reg, val);
 }
 /****************************************************************/
 
index 97ec001aef56f1cecd3540922874e180ea5f1061..6b1c23ca5db6ad2f08ca8ae4b1d08f389ae8effc 100644 (file)
@@ -39,8 +39,8 @@ static unsigned int rtc_debug = DEBUG;
 #define rtc_debug 0    /* gcc will remove all the debug code for us */
 #endif
 
-#ifndef CONFIG_SYS_I2C_RTC_ADDR
-#define CONFIG_SYS_I2C_RTC_ADDR 0x32
+#ifndef CFG_SYS_I2C_RTC_ADDR
+#define CFG_SYS_I2C_RTC_ADDR 0x32
 #endif
 
 #define RS5C372_RAM_SIZE 0x10
@@ -63,7 +63,7 @@ rs5c372_readram(unsigned char *buf, int len)
 {
        int ret;
 
-       ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 0, buf, len);
+       ret = i2c_read(CFG_SYS_I2C_RTC_ADDR, 0, 0, buf, len);
        if (ret != 0) {
                printf("%s: failed to read\n", __FUNCTION__);
                return ret;
@@ -103,7 +103,7 @@ rs5c372_enable(void)
        buf[14] = 0; /* reg. 13 */
        buf[15] = 0; /* reg. 14 */
        buf[16] = USE_24HOUR_MODE; /* reg. 15 */
-       ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR, 0, 0, buf, RS5C372_RAM_SIZE+1);
+       ret = i2c_write(CFG_SYS_I2C_RTC_ADDR, 0, 0, buf, RS5C372_RAM_SIZE+1);
        if (ret != 0) {
                printf("%s: failed\n", __FUNCTION__);
                return;
@@ -204,7 +204,7 @@ int rtc_set (struct rtc_time *tmp)
        memset(buf, 0, sizeof(buf));
 
        /* only read register 15 */
-       ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 0, buf, 1);
+       ret = i2c_read(CFG_SYS_I2C_RTC_ADDR, 0, 0, buf, 1);
 
        if (ret == 0) {
                /* need to save register 15 */
@@ -233,7 +233,7 @@ int rtc_set (struct rtc_time *tmp)
                        printf("WARNING: year should be between 1970 and 2069!\n");
                buf[7] = bin2bcd(tmp->tm_year % 100);
 
-               ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR, 0, 0, buf, 8);
+               ret = i2c_write(CFG_SYS_I2C_RTC_ADDR, 0, 0, buf, 8);
                if (ret != 0) {
                        printf("rs5c372_set_datetime(), i2c_master_send() returned %d\n",ret);
                        return -1;
index d513561b8202547897f6c1955572b0e13531f1e5..bf93b557748b96e3523caebc10245f8a5961cd7e 100644 (file)
@@ -33,8 +33,8 @@
 #endif
 /*---------------------------------------------------------------------*/
 
-#ifndef CONFIG_SYS_I2C_RTC_ADDR
-# define CONFIG_SYS_I2C_RTC_ADDR       0x32
+#ifndef CFG_SYS_I2C_RTC_ADDR
+# define CFG_SYS_I2C_RTC_ADDR  0x32
 #endif
 
 /*
@@ -313,7 +313,7 @@ static int rx8010sj_rtc_reset(DEV_TYPE *dev)
 int rtc_get(struct rtc_time *tm)
 {
        struct ludevice dev = {
-                       .chip = CONFIG_SYS_I2C_RTC_ADDR,
+                       .chip = CFG_SYS_I2C_RTC_ADDR,
        };
 
        return rx8010sj_rtc_get(&dev, tm);
@@ -322,7 +322,7 @@ int rtc_get(struct rtc_time *tm)
 int rtc_set(struct rtc_time *tm)
 {
        struct ludevice dev = {
-                       .chip = CONFIG_SYS_I2C_RTC_ADDR,
+                       .chip = CFG_SYS_I2C_RTC_ADDR,
        };
 
        return rx8010sj_rtc_set(&dev, tm);
@@ -331,7 +331,7 @@ int rtc_set(struct rtc_time *tm)
 void rtc_reset(void)
 {
        struct ludevice dev = {
-                       .chip = CONFIG_SYS_I2C_RTC_ADDR,
+                       .chip = CFG_SYS_I2C_RTC_ADDR,
        };
 
        rx8010sj_rtc_reset(&dev);
@@ -340,7 +340,7 @@ void rtc_reset(void)
 void rtc_init(void)
 {
        struct ludevice dev = {
-                       .chip = CONFIG_SYS_I2C_RTC_ADDR,
+                       .chip = CFG_SYS_I2C_RTC_ADDR,
        };
 
        rx8010sj_rtc_init(&dev);
index ce23427b1744e3261a8f56549090f66324932c18..4a8d1c5903f360abd7cbf0d78079fb2318ae72d1 100644 (file)
@@ -77,7 +77,7 @@
 
 static void rtc_write(int reg, u8 val)
 {
-       i2c_write(CONFIG_SYS_I2C_RTC_ADDR, reg, 2, &val, 1);
+       i2c_write(CFG_SYS_I2C_RTC_ADDR, reg, 2, &val, 1);
 }
 
 /*
@@ -89,7 +89,7 @@ int rtc_get(struct rtc_time *tm)
 {
        u8 buf[8];
 
-       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, X1205_CCR_BASE, 2, buf, 8);
+       i2c_read(CFG_SYS_I2C_RTC_ADDR, X1205_CCR_BASE, 2, buf, 8);
 
        debug("%s: raw read data - sec=%02x, min=%02x, hr=%02x, "
              "mday=%02x, mon=%02x, year=%02x, wday=%02x, y2k=%02x\n",
index 83cda1f204095cbf4473ce8edf7883e7327d8ce1..8a489a2e3f95e3d7e614ee927d2687585321ad82 100644 (file)
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
 /*
  * Table with supported baudrates (defined in config_xyz.h)
  */
-static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
+static const unsigned long baudrate_table[] = CFG_SYS_BAUDRATE_TABLE;
 
 #if CONFIG_IS_ENABLED(SERIAL_PRESENT)
 static int serial_check_stdout(const void *blob, struct udevice **devp)
index 6cdbb89841c1ba238cf88afd31b482420b13f633..4d5496509481345fb6cc181e38cfa1a7b4dfa52b 100644 (file)
@@ -22,7 +22,7 @@ static struct serial_device *serial_current;
 /*
  * Table with supported baudrates (defined in config_xyz.h)
  */
-static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
+static const unsigned long baudrate_table[] = CFG_SYS_BAUDRATE_TABLE;
 
 /**
  * serial_null() - Void registration routine of a serial driver
@@ -459,7 +459,7 @@ void default_serial_puts(const char *s)
 }
 
 #if CONFIG_POST & CONFIG_SYS_POST_UART
-static const int bauds[] = CONFIG_SYS_BAUDRATE_TABLE;
+static const int bauds[] = CFG_SYS_BAUDRATE_TABLE;
 
 /**
  * uart_post_test() - Test the currently selected serial port using POST
index 0ee6171108a8772bbe4060f13c3ef3a09f05031b..9ebc4ed48f0a85bb2d0c2d3552f4a935aaa6923f 100644 (file)
@@ -225,7 +225,7 @@ static int __davinci_spi_claim_bus(struct davinci_spi_slave *ds, int cs)
                SPIPC0_DOFUN_MASK | SPIPC0_DIFUN_MASK), &ds->regs->pc0);
 
        /* setup format */
-       scalar = ((CONFIG_SYS_SPI_CLK / ds->freq) - 1) & 0xFF;
+       scalar = ((CFG_SYS_SPI_CLK / ds->freq) - 1) & 0xFF;
 
        /*
         * Use following format:
@@ -314,7 +314,7 @@ static int davinci_spi_set_speed(struct udevice *bus, uint max_hz)
        struct davinci_spi_slave *ds = dev_get_priv(bus);
 
        debug("%s speed %u\n", __func__, max_hz);
-       if (max_hz > CONFIG_SYS_SPI_CLK / 2)
+       if (max_hz > CFG_SYS_SPI_CLK / 2)
                return -EINVAL;
 
        ds->freq = max_hz;
index bc5da0a1e6e97cc1b329b8feaf4816c2792d103a..2bb7390bbfb74075fc98c82f99f40aef1e51ae01 100644 (file)
@@ -131,7 +131,7 @@ static int mvebu_spi_set_speed(struct udevice *bus, uint hz)
         * follows:
         * SPI actual frequency = core_clk / (SPR * (2 ^ SPPR))
         */
-       divider = DIV_ROUND_UP(CONFIG_SYS_TCLK, hz);
+       divider = DIV_ROUND_UP(CFG_SYS_TCLK, hz);
        if (divider < 16) {
                /* This is the easy case, divider is less than 16 */
                spr = divider;
@@ -205,7 +205,7 @@ static void mvebu_spi_50mhz_ac_timing_erratum(struct udevice *bus, uint mode)
        data = readl(&reg->timing1);
        data &= ~KW_SPI_TMISO_SAMPLE_MASK;
 
-       if (CONFIG_SYS_TCLK == 250000000 &&
+       if (CFG_SYS_TCLK == 250000000 &&
            mode & SPI_CPOL &&
            mode & SPI_CPHA)
                data |= KW_SPI_TMISO_SAMPLE_2;
index ad1781e6c0f89800c83eba3c91f7aa98abb400ae..84fbc79016a0a51adc5b8fd53fe94b192683b670 100644 (file)
@@ -15,8 +15,8 @@ static int xtfpga_reset_request(struct udevice *dev, enum sysreset_t type)
 {
        switch (type) {
        case SYSRESET_COLD:
-               writel(CONFIG_SYS_FPGAREG_RESET_CODE,
-                      CONFIG_SYS_FPGAREG_RESET);
+               writel(CFG_SYS_FPGAREG_RESET_CODE,
+                      CFG_SYS_FPGAREG_RESET);
                break;
        default:
                return -EPROTONOSUPPORT;
index 065f10bb742b91cbb251687fdae7671df51e8bbd..2e50d9fbc5804a4dd63f99c179329aed174accba 100644 (file)
@@ -59,7 +59,7 @@ static int arm_global_timer_probe(struct udevice *dev)
                        return ret;
                uc_priv->clock_rate = ret;
        } else {
-               uc_priv->clock_rate = CONFIG_SYS_HZ_CLOCK;
+               uc_priv->clock_rate = CFG_SYS_HZ_CLOCK;
        }
 
        /* init timer */
index 72be2977547ab53b953b1a821cf16ea20532c058..9c3b64ae5b1b8753f04fb798dfde3de54644027d 100644 (file)
@@ -28,9 +28,9 @@
 #define GPT_CLKSRC_IPG_CLK             (1 << 6)
 #define GPT_CLKSRC_IPG_CLK_24M         (5 << 6)
 
-/* If CONFIG_SYS_HZ_CLOCK not specified et's default to 3Mhz */
-#ifndef CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_HZ_CLOCK            3000000
+/* If CFG_SYS_HZ_CLOCK not specified et's default to 3Mhz */
+#ifndef CFG_SYS_HZ_CLOCK
+#define CFG_SYS_HZ_CLOCK               3000000
 #endif
 
 struct imx_gpt_timer_regs {
@@ -60,7 +60,7 @@ static u64 imx_gpt_timer_get_count(struct udevice *dev)
 
 static int imx_gpt_setup(struct imx_gpt_timer_regs *regs, u32 rate)
 {
-       u32 prescaler = (rate / CONFIG_SYS_HZ_CLOCK) - 1;
+       u32 prescaler = (rate / CFG_SYS_HZ_CLOCK) - 1;
 
        /* Reset the timer */
        setbits_le32(&regs->cr, GPT_CR_SWR);
@@ -138,7 +138,7 @@ static int imx_gpt_timer_probe(struct udevice *dev)
                return ret;
        }
 
-       uc_priv->clock_rate = CONFIG_SYS_HZ_CLOCK;
+       uc_priv->clock_rate = CFG_SYS_HZ_CLOCK;
 
        return 0;
 }
index d0eab3ce781dc6dac06c71c57144aaf57cdf1353..d588f0cbcd1863f20b658f2633dec0de7f27ccff 100644 (file)
@@ -72,7 +72,7 @@ unsigned long notrace timer_early_get_rate(void)
        if (IS_ENABLED(CONFIG_ARCH_MVEBU))
                return MVEBU_TIMER_FIXED_RATE_25MHZ;
        else
-               return CONFIG_SYS_TCLK;
+               return CFG_SYS_TCLK;
 }
 
 /**
@@ -117,7 +117,7 @@ static int orion_timer_probe(struct udevice *dev)
        if (type == INPUT_CLOCK_25MHZ)
                uc_priv->clock_rate = MVEBU_TIMER_FIXED_RATE_25MHZ;
        else
-               uc_priv->clock_rate = CONFIG_SYS_TCLK;
+               uc_priv->clock_rate = CFG_SYS_TCLK;
        orion_timer_init(priv->base, type);
 
        return 0;
index f07251e54c018ecd61d926792c0e4a77fc96a2a3..1213a14ef19708d890e9e1d3fcbaff9ae9ec98d1 100644 (file)
@@ -97,11 +97,11 @@ static int stm32_timer_probe(struct udevice *dev)
        rate = clk_get_rate(&clk);
 
        /* we set timer prescaler to obtain a 1MHz timer counter frequency */
-       psc = (rate / CONFIG_SYS_HZ_CLOCK) - 1;
+       psc = (rate / CFG_SYS_HZ_CLOCK) - 1;
        writel(psc, &regs->psc);
 
        /* Set timer frequency to 1MHz */
-       uc_priv->clock_rate = CONFIG_SYS_HZ_CLOCK;
+       uc_priv->clock_rate = CFG_SYS_HZ_CLOCK;
 
        /* Configure timer for auto-reload */
        setbits_le32(&regs->cr1, CR1_ARPE);
index 9acef5ee4f84813fc5037d94ec20b0a1ac77835d..3f4418198ccd7723597625e3fef23d53cc8fe3f6 100644 (file)
@@ -1993,7 +1993,7 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
        gohci.disabled = 1;
        gohci.sleeping = 0;
        gohci.irq = -1;
-       gohci.regs = (struct ohci_regs *)CONFIG_SYS_USB_OHCI_REGS_BASE;
+       gohci.regs = (struct ohci_regs *)CFG_SYS_USB_OHCI_REGS_BASE;
 
        gohci.flags = 0;
        gohci.slot_name = CONFIG_SYS_USB_OHCI_SLOT_NAME;
index 54d1efc8f5f371a6f3d48c0a3cf063f810997543..b0a99c9cd5d95670c680b3e432f5d01331f27ad6 100644 (file)
@@ -221,13 +221,13 @@ static struct clk ipu_clk = {
        .usecount = 0,
 };
 
-#if !defined CONFIG_SYS_LDB_CLOCK
-#define CONFIG_SYS_LDB_CLOCK 65000000
+#if !defined CFG_SYS_LDB_CLOCK
+#define CFG_SYS_LDB_CLOCK 65000000
 #endif
 
 static struct clk ldb_clk = {
        .name = "ldb_clk",
-       .rate = CONFIG_SYS_LDB_CLOCK,
+       .rate = CFG_SYS_LDB_CLOCK,
        .usecount = 0,
 };
 
index 24111dfaf47baafbcf05ff956199ea5cba741d14..4e506ae262b5444e7c7a91f44486ec8878c1ea67 100644 (file)
@@ -140,7 +140,7 @@ config ENV_IS_IN_FLASH
           type flash chips the second sector can be used: the offset
           for this sector is given here.
 
-          CONFIG_ENV_OFFSET is used relative to CONFIG_SYS_FLASH_BASE.
+          CONFIG_ENV_OFFSET is used relative to CFG_SYS_FLASH_BASE.
 
          CONFIG_ENV_ADDR:
 
index 9f26e6cad9c48c063898a3ecb752bf39e041c600..27fb45bf8c3ea38de01706813562973a6b4b59a5 100644 (file)
@@ -92,6 +92,6 @@ unsigned long env_size __UBOOT_ENV_SECTION__(env_size) = sizeof(env_t);
 /*
  * Add in absolutes.
  */
-GEN_ABS(env_offset, (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE));
+GEN_ABS(env_offset, (CONFIG_ENV_ADDR - CFG_SYS_FLASH_BASE));
 
 #endif /* ENV_IS_EMBEDDED */
index 17c76bcf3dbc53cdf3d82a46dca98a3859946728..d60f494b58b5e9be03d3b379edd54999eb96a143 100644 (file)
@@ -17,8 +17,8 @@
 #endif
 #endif
 
-#ifndef CONFIG_SYS_BAUDRATE_TABLE
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
+#ifndef CFG_SYS_BAUDRATE_TABLE
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
 #endif
 
 #endif /* __CONFIG_FALLBACKS_H */
index 6dfa3dd0f02af7bc51ff8bc85646df84782a6be5..246437a51e2fd709f3a14bd313aa1e552994c82d 100644 (file)
@@ -13,7 +13,7 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 #define CONFIG_WATCHDOG_TIMEOUT                5000
 
 
 #define CONFIG_PRAM            512     /* 512 KB */
 
-#define CONFIG_SYS_CLK         166666666       /* CPU Core Clock */
-#define CONFIG_SYS_PLL_ODR     0x36
-#define CONFIG_SYS_PLL_FDR     0x7D
+#define CFG_SYS_CLK            166666666       /* CPU Core Clock */
+#define CFG_SYS_PLL_ODR        0x36
+#define CFG_SYS_PLL_FDR        0x7D
 
-#define CONFIG_SYS_MBAR                0xFC000000
+#define CFG_SYS_MBAR           0xFC000000
 
 /*
  * Low Level Configuration Settings
@@ -53,9 +53,9 @@
  * You should know what you are doing if you make changes here.
  */
 /* Definitions for initial stack pointer and data area (in DPRAM) */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x80000000
-#define CONFIG_SYS_INIT_RAM_SIZE               0x4000  /* Size of used area in internal SRAM */
-#define CONFIG_SYS_INIT_RAM_CTRL       0x221
+#define CFG_SYS_INIT_RAM_ADDR  0x80000000
+#define CFG_SYS_INIT_RAM_SIZE          0x4000  /* Size of used area in internal SRAM */
+#define CFG_SYS_INIT_RAM_CTRL  0x221
 
 /*
  * Start addresses for the final memory configuration
  * 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           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /* FLASH organization */
 #ifdef CONFIG_SYS_FLASH_CFI
-#      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
+#      define CFG_SYS_FLASH_SIZE               0x800000        /* Max size that the board might have */
 #endif
 
-#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_CS0_BASE
+#define CFG_SYS_FLASH_BASE             CFG_SYS_CS0_BASE
 
 /*
  * Configuration for environment
 
 /* Cache Configuration */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINV | CF_CACR_INVI)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_CENB | CF_CACR_CINV | \
                                         CF_CACR_DISD | CF_CACR_INVI | \
                                         CF_CACR_CEIB | CF_CACR_DCM | \
                                         CF_CACR_EUSP)
  * CS4 - Available
  * CS5 - Available
  */
-#define CONFIG_SYS_CS0_BASE            0
-#define CONFIG_SYS_CS0_MASK            0x007F0001
-#define CONFIG_SYS_CS0_CTRL            0x00001FA0
+#define CFG_SYS_CS0_BASE               0
+#define CFG_SYS_CS0_MASK               0x007F0001
+#define CFG_SYS_CS0_CTRL               0x00001FA0
 
 #endif                         /* _M5208EVBE_H */
index e28662c6e59a32425e617048999d16975be43d37..128ef50b476f07da774c255403adb0d179ab9a3d 100644 (file)
  * (easy to change)
  */
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
 
 /* I2C */
-#define CONFIG_SYS_I2C_PINMUX_REG      (gpio->par_qspi)
-#define CONFIG_SYS_I2C_PINMUX_CLR      ~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
-#define CONFIG_SYS_I2C_PINMUX_SET      (GPIO_PAR_FECI2C_SCL_I2CSCL | GPIO_PAR_FECI2C_SDA_I2CSDA)
+#define CFG_SYS_I2C_PINMUX_REG (gpio->par_qspi)
+#define CFG_SYS_I2C_PINMUX_CLR ~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
+#define CFG_SYS_I2C_PINMUX_SET (GPIO_PAR_FECI2C_SCL_I2CSCL | GPIO_PAR_FECI2C_SDA_I2CSDA)
 
 /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
 #ifdef CONFIG_MCFFEC
 
 #define CONFIG_PRAM            512     /* 512 KB */
 
-#define CONFIG_SYS_CLK                 75000000
-#define CONFIG_SYS_CPU_CLK             CONFIG_SYS_CLK * 2
+#define CFG_SYS_CLK                    75000000
+#define CFG_SYS_CPU_CLK                CFG_SYS_CLK * 2
 
-#define CONFIG_SYS_MBAR                0x40000000
+#define CFG_SYS_MBAR           0x40000000
 
 /*
  * Low Level Configuration Settings
@@ -63,9 +63,9 @@
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x10000 /* Size of used area in internal SRAM */
-#define CONFIG_SYS_INIT_RAM_CTRL       0x21
+#define CFG_SYS_INIT_RAM_ADDR  0x20000000
+#define CFG_SYS_INIT_RAM_SIZE  0x10000 /* Size of used area in internal SRAM */
+#define CFG_SYS_INIT_RAM_CTRL  0x21
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * the maximum mapped by the Linux kernel during initialization ??
  */
 /* Initial Memory map for Linux */
-#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
-#      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
+#      define CFG_SYS_FLASH_SIZE               0x800000        /* Max size that the board might have */
 #endif
 
-#define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CS0_BASE)
+#define CFG_SYS_FLASH_BASE             (CFG_SYS_CS0_BASE)
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINV)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_CENB | CF_CACR_DISD | \
                                         CF_CACR_CEIB | CF_CACR_DCM | \
                                         CF_CACR_EUSP)
 
  * CS7 - Available
  */
 #ifdef CONFIG_NORFLASH_PS32BIT
-#      define CONFIG_SYS_CS0_BASE      0xFFC00000
-#      define CONFIG_SYS_CS0_MASK      0x003f0001
-#      define CONFIG_SYS_CS0_CTRL      0x00001D00
+#      define CFG_SYS_CS0_BASE 0xFFC00000
+#      define CFG_SYS_CS0_MASK 0x003f0001
+#      define CFG_SYS_CS0_CTRL 0x00001D00
 #else
-#      define CONFIG_SYS_CS0_BASE      0xFFE00000
-#      define CONFIG_SYS_CS0_MASK      0x001f0001
-#      define CONFIG_SYS_CS0_CTRL      0x00001D80
+#      define CFG_SYS_CS0_BASE 0xFFE00000
+#      define CFG_SYS_CS0_MASK 0x001f0001
+#      define CFG_SYS_CS0_CTRL 0x00001D80
 #endif
 
 #endif                         /* _M5329EVB_H */
index f1da278d5159d410cf07f311102026663173c4d9..0e38eeb4a36580ce59cbf574c7071725862c7993 100644 (file)
@@ -18,7 +18,7 @@
  * (easy to change)
  */
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 #undef CONFIG_MONITOR_IS_IN_RAM                /* no pre-loader required!!! ;-) */
 
@@ -26,9 +26,9 @@
  * Clock configuration: enable only one of the following options
  */
 
-#undef  CONFIG_SYS_PLL_BYPASS                          /* bypass PLL for test purpose */
-#define CONFIG_SYS_FAST_CLK            1               /* MCF5249 can run at 140MHz   */
-#define        CONFIG_SYS_CLK                  132025600       /* MCF5249 can run at 140MHz   */
+#undef  CFG_SYS_PLL_BYPASS                             /* bypass PLL for test purpose */
+#define CFG_SYS_FAST_CLK               1               /* MCF5249 can run at 140MHz   */
+#define        CFG_SYS_CLK                     132025600       /* MCF5249 can run at 140MHz   */
 
 /*
  * Low Level Configuration Settings
  * You should know what you are doing if you make changes here.
  */
 
-#define CONFIG_SYS_MBAR                0x10000000      /* Register Base Addrs */
-#define        CONFIG_SYS_MBAR2                0x80000000
+#define CFG_SYS_MBAR           0x10000000      /* Register Base Addrs */
+#define        CFG_SYS_MBAR2           0x80000000
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000  /* Size of used area in internal SRAM   */
+#define CFG_SYS_INIT_RAM_ADDR  0x20000000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000  /* Size of used area in internal SRAM   */
 
 #define LDS_BOARD_TEXT \
        . = DEFINED(env_offset) ? env_offset : .; \
@@ -56,7 +56,7 @@
  */
 #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 CFG_SYS_FLASH_BASE             (CFG_SYS_CS0_BASE)
 
 #if 0 /* test-only */
 #define CONFIG_PRAM            512 /* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */
  * 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           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
 
-#      define CONFIG_SYS_FLASH_SIZE            0x1000000       /* Max size that the board might have */
-#      define CONFIG_SYS_FLASH_BANKS_LIST      { CONFIG_SYS_FLASH_BASE }
+#      define CFG_SYS_FLASH_SIZE               0x1000000       /* Max size that the board might have */
+#      define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE }
 #endif
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 4)
-#define CONFIG_SYS_ICACHE_INV          (CF_CACR_DCM)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_FLASH_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_DCM)
+#define CFG_SYS_CACHE_ACR0             (CFG_SYS_FLASH_BASE | \
                                         CF_ADDRMASK(2) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
-#define CONFIG_SYS_CACHE_ACR1          (CFG_SYS_SDRAM_BASE | \
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_CENB | CF_CACR_CEIB | \
                                         CF_CACR_DBWE)
 
 /*-----------------------------------------------------------------------
  */
 
 /* CS0 - AMD Flash, address 0xffc00000 */
-#define        CONFIG_SYS_CS0_BASE             0xffe00000
-#define        CONFIG_SYS_CS0_CTRL             0x00001980      /* WS=0110, AA=1, PS=10         */
+#define        CFG_SYS_CS0_BASE                0xffe00000
+#define        CFG_SYS_CS0_CTRL                0x00001980      /* WS=0110, AA=1, PS=10         */
 /** Note: There is a CSMR0/DRAM vector problem, need to disable C/I ***/
-#define        CONFIG_SYS_CS0_MASK             0x003f0021      /* 4MB, AA=0, WP=0, C/I=1, V=1  */
+#define        CFG_SYS_CS0_MASK                0x003f0021      /* 4MB, AA=0, WP=0, C/I=1, V=1  */
 
 /* CS1 - FPGA, address 0xe0000000 */
-#define        CONFIG_SYS_CS1_BASE             0xe0000000
-#define        CONFIG_SYS_CS1_CTRL             0x00000d80      /* WS=0011, AA=1, PS=10         */
-#define        CONFIG_SYS_CS1_MASK             0x00010001      /* 128kB, AA=0, WP=0, C/I=0, V=1*/
+#define        CFG_SYS_CS1_BASE                0xe0000000
+#define        CFG_SYS_CS1_CTRL                0x00000d80      /* WS=0011, AA=1, PS=10         */
+#define        CFG_SYS_CS1_MASK                0x00010001      /* 128kB, AA=0, WP=0, C/I=0, V=1*/
 
 /*-----------------------------------------------------------------------
  * Port configuration
  */
-#define        CONFIG_SYS_GPIO_FUNC            0x00000008      /* Set gpio pins: none          */
-#define        CONFIG_SYS_GPIO1_FUNC           0x00df00f0      /* 36-39(SWITCH),48-52(FPGAs),54*/
-#define        CONFIG_SYS_GPIO_EN              0x00000008      /* Set gpio output enable       */
-#define        CONFIG_SYS_GPIO1_EN             0x00c70000      /* Set gpio output enable       */
-#define        CONFIG_SYS_GPIO_OUT             0x00000008      /* Set outputs to default state */
-#define        CONFIG_SYS_GPIO1_OUT            0x00c70000      /* Set outputs to default state */
-#define CONFIG_SYS_GPIO1_LED           0x00400000      /* user led                     */
+#define        CFG_SYS_GPIO_FUNC               0x00000008      /* Set gpio pins: none          */
+#define        CFG_SYS_GPIO1_FUNC              0x00df00f0      /* 36-39(SWITCH),48-52(FPGAs),54*/
+#define        CFG_SYS_GPIO_EN         0x00000008      /* Set gpio output enable       */
+#define        CFG_SYS_GPIO1_EN                0x00c70000      /* Set gpio output enable       */
+#define        CFG_SYS_GPIO_OUT                0x00000008      /* Set outputs to default state */
+#define        CFG_SYS_GPIO1_OUT               0x00c70000      /* Set outputs to default state */
+#define CFG_SYS_GPIO1_LED              0x00400000      /* user led                     */
 
 #endif /* M5249 */
index bd3c57d1438c64e0f50445217e065f0a9615e5f5..7e37c6d11997db73be42e3b7dec520e7052363ac 100644 (file)
@@ -8,7 +8,7 @@
 
 #include <linux/stringify.h>
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 
 /* Configuration for environment
@@ -20,7 +20,7 @@
        env/embedded.o(.text*);
 
 #ifdef CONFIG_DRIVER_DM9000
-#      define CONFIG_DM9000_BASE       (CONFIG_SYS_CS1_BASE | 0x300)
+#      define CONFIG_DM9000_BASE       (CFG_SYS_CS1_BASE | 0x300)
 #      define DM9000_IO                CONFIG_DM9000_BASE
 #      define DM9000_DATA              (CONFIG_DM9000_BASE + 4)
 #      undef CONFIG_DM9000_DEBUG
 #define CONFIG_HOSTNAME                "M5253DEMO"
 
 /* I2C */
-#define CONFIG_SYS_I2C_PINMUX_REG      (*(u32 *) (CONFIG_SYS_MBAR+0x19C))
-#define CONFIG_SYS_I2C_PINMUX_CLR      (0xFFFFE7FF)
-#define CONFIG_SYS_I2C_PINMUX_SET      (0)
-
-#undef CONFIG_SYS_PLL_BYPASS           /* bypass PLL for test purpose */
-#define CONFIG_SYS_FAST_CLK
-#ifdef CONFIG_SYS_FAST_CLK
-#      define CONFIG_SYS_PLLCR 0x1243E054
-#      define CONFIG_SYS_CLK           140000000
+#define CFG_SYS_I2C_PINMUX_REG (*(u32 *) (CFG_SYS_MBAR+0x19C))
+#define CFG_SYS_I2C_PINMUX_CLR (0xFFFFE7FF)
+#define CFG_SYS_I2C_PINMUX_SET (0)
+
+#undef CFG_SYS_PLL_BYPASS              /* bypass PLL for test purpose */
+#define CFG_SYS_FAST_CLK
+#ifdef CFG_SYS_FAST_CLK
+#      define CFG_SYS_PLLCR    0x1243E054
+#      define CFG_SYS_CLK              140000000
 #else
-#      define CONFIG_SYS_PLLCR 0x135a4140
-#      define CONFIG_SYS_CLK           70000000
+#      define CFG_SYS_PLLCR    0x135a4140
+#      define CFG_SYS_CLK              70000000
 #endif
 
 /*
  * You should know what you are doing if you make changes here.
  */
 
-#define CONFIG_SYS_MBAR                0x10000000      /* Register Base Addrs */
-#define CONFIG_SYS_MBAR2               0x80000000      /* Module Base Addrs 2 */
+#define CFG_SYS_MBAR           0x10000000      /* Register Base Addrs */
+#define CFG_SYS_MBAR2          0x80000000      /* Module Base Addrs 2 */
 
 /*
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x10000 /* Size of used area in internal SRAM */
+#define CFG_SYS_INIT_RAM_ADDR  0x20000000
+#define CFG_SYS_INIT_RAM_SIZE  0x10000 /* Size of used area in internal SRAM */
 
 /*
  * Start addresses for the final memory configuration
  * 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           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /* FLASH organization */
-#define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CS0_BASE)
+#define CFG_SYS_FLASH_BASE             (CFG_SYS_CS0_BASE)
 
 #define FLASH_SST6401B         0x200
 #define SST_ID_xF6401B         0x236D236D
  * Amd/Atmel use 0x30 for sector erase, SST use 0x50.
  * 0x30 is block erase in SST
  */
-#      define CONFIG_SYS_FLASH_SIZE            0x800000
+#      define CFG_SYS_FLASH_SIZE               0x800000
 #else
-#      define CONFIG_SYS_SST_SECT              2048
-#      define CONFIG_SYS_SST_SECTSZ            0x1000
+#      define CFG_SYS_SST_SECT         2048
+#      define CFG_SYS_SST_SECTSZ               0x1000
 #endif
 
 /* Cache Configuration */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 4)
-#define CONFIG_SYS_ICACHE_INV          (CF_CACR_DCM)
-#define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_FLASH_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_DCM)
+#define CFG_SYS_CACHE_ACR0             (CFG_SYS_FLASH_BASE | \
                                         CF_ADDRMASK(8) | \
                                         CF_ACR_EN | CF_ACR_SM_ALL)
-#define CONFIG_SYS_CACHE_ACR1          (CFG_SYS_SDRAM_BASE | \
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_CENB | CF_CACR_CEIB | \
                                         CF_CACR_DBWE)
 
-#define CONFIG_SYS_CS0_BASE            0xFF800000
-#define CONFIG_SYS_CS0_MASK            0x007F0021
-#define CONFIG_SYS_CS0_CTRL            0x00001D80
+#define CFG_SYS_CS0_BASE               0xFF800000
+#define CFG_SYS_CS0_MASK               0x007F0021
+#define CFG_SYS_CS0_CTRL               0x00001D80
 
-#define CONFIG_SYS_CS1_BASE            0xE0000000
-#define CONFIG_SYS_CS1_MASK            0x00000001
-#define CONFIG_SYS_CS1_CTRL            0x00003DD8
+#define CFG_SYS_CS1_BASE               0xE0000000
+#define CFG_SYS_CS1_MASK               0x00000001
+#define CFG_SYS_CS1_CTRL               0x00003DD8
 
 /*-----------------------------------------------------------------------
  * Port configuration
  */
-#define CONFIG_SYS_GPIO_FUNC           0x00000008      /* Set gpio pins: none */
-#define CONFIG_SYS_GPIO1_FUNC          0x00df00f0      /* 36-39(SWITCH),48-52(FPGAs),54 */
-#define CONFIG_SYS_GPIO_EN             0x00000008      /* Set gpio output enable */
-#define CONFIG_SYS_GPIO1_EN            0x00c70000      /* Set gpio output enable */
-#define CONFIG_SYS_GPIO_OUT            0x00000008      /* Set outputs to default state */
-#define CONFIG_SYS_GPIO1_OUT           0x00c70000      /* Set outputs to default state */
-#define CONFIG_SYS_GPIO1_LED           0x00400000      /* user led */
+#define CFG_SYS_GPIO_FUNC              0x00000008      /* Set gpio pins: none */
+#define CFG_SYS_GPIO1_FUNC             0x00df00f0      /* 36-39(SWITCH),48-52(FPGAs),54 */
+#define CFG_SYS_GPIO_EN                0x00000008      /* Set gpio output enable */
+#define CFG_SYS_GPIO1_EN               0x00c70000      /* Set gpio output enable */
+#define CFG_SYS_GPIO_OUT               0x00000008      /* Set outputs to default state */
+#define CFG_SYS_GPIO1_OUT              0x00c70000      /* Set outputs to default state */
+#define CFG_SYS_GPIO1_LED              0x00400000      /* user led */
 
 #endif                         /* _M5253DEMO_H */
index 7c3bc032bfee4ed5d0e4c94c0897a996a5ce9dbb..847b4c2593d83a86ee08581832033a41fc564c9d 100644 (file)
@@ -17,7 +17,7 @@
  * (easy to change)
  */
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 #define CONFIG_WATCHDOG_TIMEOUT 10000  /* timeout in milliseconds */
 
        "save\0"                                \
        ""
 
-#define CONFIG_SYS_CLK                 66000000
+#define CFG_SYS_CLK                    66000000
 
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
  * You should know what you are doing if you make changes here.
  */
-#define CONFIG_SYS_MBAR                0x10000000      /* Register Base Addrs */
-#define CONFIG_SYS_SCR                 0x0003
-#define CONFIG_SYS_SPR                 0xffff
+#define CFG_SYS_MBAR           0x10000000      /* Register Base Addrs */
+#define CFG_SYS_SCR                    0x0003
+#define CFG_SYS_SPR                    0xffff
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000  /* Size of used area in internal SRAM    */
+#define CFG_SYS_INIT_RAM_ADDR  0x20000000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000  /* Size of used area in internal SRAM    */
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  */
 #define CFG_SYS_SDRAM_BASE             0x00000000
 #define CFG_SYS_SDRAM_SIZE             4       /* SDRAM size in MB */
-#define CONFIG_SYS_FLASH_BASE          0xffe00000
+#define CFG_SYS_FLASH_BASE             0xffe00000
 
 /*
  * 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           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
-#      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
+#      define CFG_SYS_FLASH_SIZE               0x800000        /* Max size that the board might have */
 #endif
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINV | CF_CACR_INVI)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_CENB | CF_CACR_CINV | \
                                         CF_CACR_DISD | CF_CACR_INVI | \
                                         CF_CACR_CEIB | CF_CACR_DCM | \
                                         CF_CACR_EUSP)
 /*-----------------------------------------------------------------------
  * Port configuration
  */
-#define CONFIG_SYS_PACNT               0x00000000
-#define CONFIG_SYS_PADDR               0x0000
-#define CONFIG_SYS_PADAT               0x0000
-#define CONFIG_SYS_PBCNT               0x55554155      /* Ethernet/UART configuration */
-#define CONFIG_SYS_PBDDR               0x0000
-#define CONFIG_SYS_PBDAT               0x0000
-#define CONFIG_SYS_PDCNT               0x00000000
+#define CFG_SYS_PACNT          0x00000000
+#define CFG_SYS_PADDR          0x0000
+#define CFG_SYS_PADAT          0x0000
+#define CFG_SYS_PBCNT          0x55554155      /* Ethernet/UART configuration */
+#define CFG_SYS_PBDDR          0x0000
+#define CFG_SYS_PBDAT          0x0000
+#define CFG_SYS_PDCNT          0x00000000
 #endif                         /* _M5272C3_H */
index 4eb4abea725142a5a82f66738311e7e0f7a429f9..ff9f85358963b16fbf4253c6050a832d050cc1bf 100644 (file)
@@ -21,7 +21,7 @@
  * (easy to change)
  */
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
@@ -34,9 +34,9 @@
 /* Available command configuration */
 
 /* I2C */
-#define CONFIG_SYS_I2C_PINMUX_REG      (gpio_reg->par_feci2c)
-#define CONFIG_SYS_I2C_PINMUX_CLR      (0xFFF0)
-#define CONFIG_SYS_I2C_PINMUX_SET      (0x000F)
+#define CFG_SYS_I2C_PINMUX_REG (gpio_reg->par_feci2c)
+#define CFG_SYS_I2C_PINMUX_CLR (0xFFF0)
+#define CFG_SYS_I2C_PINMUX_SET (0x000F)
 
 #ifdef CONFIG_MCFFEC
 #      define CONFIG_OVERWRITE_ETHADDR_ONCE
@@ -54,7 +54,7 @@
        "save\0"                                \
        ""
 
-#define CONFIG_SYS_CLK                 150000000
+#define CFG_SYS_CLK                    150000000
 
 /*
  * Low Level Configuration Settings
  * You should know what you are doing if you make changes here.
  */
 
-#define CONFIG_SYS_MBAR                0x40000000
+#define CFG_SYS_MBAR           0x40000000
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x10000 /* Size of used area in internal SRAM */
+#define CFG_SYS_INIT_RAM_ADDR  0x20000000
+#define CFG_SYS_INIT_RAM_SIZE  0x10000 /* Size of used area in internal SRAM */
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  */
 #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 CFG_SYS_FLASH_BASE             CFG_SYS_CS0_BASE
 
 /*
  * 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           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 
-#define CONFIG_SYS_FLASH_SIZE          0x200000
+#define CFG_SYS_FLASH_SIZE             0x200000
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINV | CF_CACR_INVI)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_CENB | CF_CACR_CINV | \
                                         CF_CACR_DISD | CF_CACR_INVI | \
                                         CF_CACR_CEIB | CF_CACR_DCM | \
                                         CF_CACR_EUSP)
 /*-----------------------------------------------------------------------
  * Memory bank definitions
  */
-#define CONFIG_SYS_CS0_BASE            0xffe00000
-#define CONFIG_SYS_CS0_CTRL            0x00001980
-#define CONFIG_SYS_CS0_MASK            0x001F0001
+#define CFG_SYS_CS0_BASE               0xffe00000
+#define CFG_SYS_CS0_CTRL               0x00001980
+#define CFG_SYS_CS0_MASK               0x001F0001
 
-#define CONFIG_SYS_CS1_BASE            0x30000000
-#define CONFIG_SYS_CS1_CTRL            0x00001900
-#define CONFIG_SYS_CS1_MASK            0x00070001
+#define CFG_SYS_CS1_BASE               0x30000000
+#define CFG_SYS_CS1_CTRL               0x00001900
+#define CFG_SYS_CS1_MASK               0x00070001
 
 #endif /* _M5275EVB_H */
index eda394467e9376bd73c7873314d3b69317c4d9fb..bde9e770e52aa4002ef475042bea84d6b59265e3 100644 (file)
@@ -17,7 +17,7 @@
  * (easy to change)
  */
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 #undef CONFIG_MONITOR_IS_IN_RAM        /* define if monitor is started from a pre-loader */
 
        "save\0"                                \
        ""
 
-#define        CONFIG_SYS_CLK                  64000000
+#define        CFG_SYS_CLK                     64000000
 
 /* PLL Configuration: Ext Clock * 6 (see table 9-4 of MCF user manual) */
 
-#define CONFIG_SYS_MFD                 0x02    /* PLL Multiplication Factor Devider */
-#define CONFIG_SYS_RFD                 0x00    /* PLL Reduce Frecuency Devider */
+#define CFG_SYS_MFD                    0x02    /* PLL Multiplication Factor Devider */
+#define CFG_SYS_RFD                    0x00    /* PLL Reduce Frecuency Devider */
 
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
  * You should know what you are doing if you make changes here.
  */
-#define        CONFIG_SYS_MBAR         0x40000000
+#define        CFG_SYS_MBAR            0x40000000
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x10000 /* Size of used area in internal SRAM    */
+#define CFG_SYS_INIT_RAM_ADDR  0x20000000
+#define CFG_SYS_INIT_RAM_SIZE  0x10000 /* Size of used area in internal SRAM    */
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  */
 #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
+#define CFG_SYS_FLASH_BASE             CFG_SYS_CS0_BASE
+#define        CFG_SYS_INT_FLASH_BASE  0xf0000000
+#define CFG_SYS_INT_FLASH_ENABLE       0x21
 
 /*
  * 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           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
 
-#      define CONFIG_SYS_FLASH_SIZE            0x1000000       /* Max size that the board might have */
-#      define CONFIG_SYS_FLASH_BANKS_LIST      { CONFIG_SYS_FLASH_BASE }
+#      define CFG_SYS_FLASH_SIZE               0x1000000       /* Max size that the board might have */
+#      define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE }
 #endif
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINV + CF_CACR_DCM)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_CENB | CF_CACR_DISD | \
                                         CF_CACR_CEIB | CF_CACR_DBWE | \
                                         CF_CACR_EUSP)
 
 /*-----------------------------------------------------------------------
  * Memory bank definitions
  */
-#define CONFIG_SYS_CS0_BASE            0xFFE00000
-#define CONFIG_SYS_CS0_CTRL            0x00001980
-#define CONFIG_SYS_CS0_MASK            0x001F0001
+#define CFG_SYS_CS0_BASE               0xFFE00000
+#define CFG_SYS_CS0_CTRL               0x00001980
+#define CFG_SYS_CS0_MASK               0x001F0001
 
 /*-----------------------------------------------------------------------
  * Port configuration
  */
-#define CONFIG_SYS_PACNT               0x0000000       /* Port A D[31:24] */
-#define CONFIG_SYS_PADDR               0x0000000
-#define CONFIG_SYS_PADAT               0x0000000
+#define CFG_SYS_PACNT          0x0000000       /* Port A D[31:24] */
+#define CFG_SYS_PADDR          0x0000000
+#define CFG_SYS_PADAT          0x0000000
 
-#define CONFIG_SYS_PBCNT               0x0000000       /* Port B D[23:16] */
-#define CONFIG_SYS_PBDDR               0x0000000
-#define CONFIG_SYS_PBDAT               0x0000000
+#define CFG_SYS_PBCNT          0x0000000       /* Port B D[23:16] */
+#define CFG_SYS_PBDDR          0x0000000
+#define CFG_SYS_PBDAT          0x0000000
 
-#define CONFIG_SYS_PDCNT               0x0000000       /* Port D D[07:00] */
+#define CFG_SYS_PDCNT          0x0000000       /* Port D D[07:00] */
 
-#define CONFIG_SYS_PEHLPAR             0xC0
-#define CONFIG_SYS_PUAPAR              0x0F    /* UA0..UA3 = Uart 0 +1 */
-#define CONFIG_SYS_DDRUA               0x05
-#define CONFIG_SYS_PJPAR               0xFF
+#define CFG_SYS_PEHLPAR                0xC0
+#define CFG_SYS_PUAPAR         0x0F    /* UA0..UA3 = Uart 0 +1 */
+#define CFG_SYS_DDRUA          0x05
+#define CFG_SYS_PJPAR          0xFF
 
 #endif                         /* _CONFIG_M5282EVB_H */
index 159993a46bc5d729d17fe327c706934c425ddbb0..0e9ba4c3ada893490163e5a7c8004fd10ed390e8 100644 (file)
  * (easy to change)
  */
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 #define CONFIG_WATCHDOG_TIMEOUT                5000
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_SYS_TX_ETH_BUFFER 8
-#      define CONFIG_SYS_FEC_BUF_USE_SRAM
+#      define CFG_SYS_TX_ETH_BUFFER    8
+#      define CFG_SYS_FEC_BUF_USE_SRAM
 #endif
 
-#define CONFIG_SYS_RTC_CNT             (0x8000)
-#define CONFIG_SYS_RTC_SETUP           (RTC_OCEN_OSCBYP | RTC_OCEN_CLKEN)
+#define CFG_SYS_RTC_CNT                (0x8000)
+#define CFG_SYS_RTC_SETUP              (RTC_OCEN_OSCBYP | RTC_OCEN_CLKEN)
 
 /* I2C */
 
 
 #define CONFIG_PRAM            512     /* 512 KB */
 
-#define CONFIG_SYS_CLK         80000000
-#define CONFIG_SYS_CPU_CLK     CONFIG_SYS_CLK * 3
+#define CFG_SYS_CLK            80000000
+#define CFG_SYS_CPU_CLK        CFG_SYS_CLK * 3
 
-#define CONFIG_SYS_MBAR                0xFC000000
+#define CFG_SYS_MBAR           0xFC000000
 
 /*
  * Low Level Configuration Settings
@@ -67,9 +67,9 @@
 /*
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x80000000
-#define CONFIG_SYS_INIT_RAM_SIZE               0x20000 /* Size of used area in internal SRAM */
-#define CONFIG_SYS_INIT_RAM_CTRL       0x221
+#define CFG_SYS_INIT_RAM_ADDR  0x80000000
+#define CFG_SYS_INIT_RAM_SIZE          0x20000 /* Size of used area in internal SRAM */
+#define CFG_SYS_INIT_RAM_CTRL  0x221
 
 /*
  * Start addresses for the final memory configuration
  * 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           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
 #      define CONFIG_FLASH_SPANSION_S29WS_N    1
-#      define CONFIG_SYS_FLASH_SIZE            0x1000000       /* Max size that the board might have */
+#      define CFG_SYS_FLASH_SIZE               0x1000000       /* Max size that the board might have */
 #endif
 
-#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_CS0_BASE
+#define CFG_SYS_FLASH_BASE             CFG_SYS_CS0_BASE
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINVA)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_EC | CF_CACR_CINVA | \
                                         CF_CACR_DCM_P)
 
 /*-----------------------------------------------------------------------
  * CS4 - Available
  * CS5 - Available
  */
-#define CONFIG_SYS_CS0_BASE            0
-#define CONFIG_SYS_CS0_MASK            0x00FF0001
-#define CONFIG_SYS_CS0_CTRL            0x00001FA0
+#define CFG_SYS_CS0_BASE               0
+#define CFG_SYS_CS0_MASK               0x00FF0001
+#define CFG_SYS_CS0_CTRL               0x00001FA0
 
-#define CONFIG_SYS_CS1_BASE            0xC0000000
-#define CONFIG_SYS_CS1_MASK            0x00070001
-#define CONFIG_SYS_CS1_CTRL            0x00001FA0
+#define CFG_SYS_CS1_BASE               0xC0000000
+#define CFG_SYS_CS1_MASK               0x00070001
+#define CFG_SYS_CS1_CTRL               0x00001FA0
 
 #endif                         /* _M53017EVB_H */
index d7ece6393498b1ee9aa9116f27391e6d6e2993d6..8f83810f165e395c08a7d48a1729c62ef14f237c 100644 (file)
@@ -18,7 +18,7 @@
  * (easy to change)
  */
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
 
 
 #define CONFIG_PRAM            512     /* 512 KB */
 
-#define CONFIG_SYS_CLK                 80000000
-#define CONFIG_SYS_CPU_CLK             CONFIG_SYS_CLK * 3
+#define CFG_SYS_CLK                    80000000
+#define CFG_SYS_CPU_CLK                CFG_SYS_CLK * 3
 
-#define CONFIG_SYS_MBAR                0xFC000000
+#define CFG_SYS_MBAR           0xFC000000
 
-#define CONFIG_SYS_LATCH_ADDR          (CONFIG_SYS_CS1_BASE + 0x80000)
+#define CFG_SYS_LATCH_ADDR             (CFG_SYS_CS1_BASE + 0x80000)
 
 /*
  * Low Level Configuration Settings
@@ -61,9 +61,9 @@
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x80000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x8000  /* Size of used area in internal SRAM */
-#define CONFIG_SYS_INIT_RAM_CTRL       0x221
+#define CFG_SYS_INIT_RAM_ADDR  0x80000000
+#define CFG_SYS_INIT_RAM_SIZE  0x8000  /* Size of used area in internal SRAM */
+#define CFG_SYS_INIT_RAM_CTRL  0x221
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * 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           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
-#      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
+#      define CFG_SYS_FLASH_SIZE               0x800000        /* Max size that the board might have */
 #endif
 
 #ifdef CONFIG_CMD_NAND
-#      define CFG_SYS_NAND_BASE                CONFIG_SYS_CS2_BASE
+#      define CFG_SYS_NAND_BASE                CFG_SYS_CS2_BASE
 #      define CFG_SYS_NAND_BASE_LIST   { CFG_SYS_NAND_BASE }
 #      define NAND_ALLOW_ERASE_ALL     1
 #endif
 
-#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_CS0_BASE
+#define CFG_SYS_FLASH_BASE             CFG_SYS_CS0_BASE
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINVA)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_EC | CF_CACR_CINVA | \
                                         CF_CACR_DCM_P)
 
 /*-----------------------------------------------------------------------
  * CS4 - Available
  * CS5 - Available
  */
-#define CONFIG_SYS_CS0_BASE            0
-#define CONFIG_SYS_CS0_MASK            0x007f0001
-#define CONFIG_SYS_CS0_CTRL            0x00001fa0
+#define CFG_SYS_CS0_BASE               0
+#define CFG_SYS_CS0_MASK               0x007f0001
+#define CFG_SYS_CS0_CTRL               0x00001fa0
 
-#define CONFIG_SYS_CS1_BASE            0x10000000
-#define CONFIG_SYS_CS1_MASK            0x001f0001
-#define CONFIG_SYS_CS1_CTRL            0x002A3780
+#define CFG_SYS_CS1_BASE               0x10000000
+#define CFG_SYS_CS1_MASK               0x001f0001
+#define CFG_SYS_CS1_CTRL               0x002A3780
 
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_SYS_CS2_BASE            0x20000000
-#define CONFIG_SYS_CS2_MASK            (16 << 20)
-#define CONFIG_SYS_CS2_CTRL            0x00001f60
+#define CFG_SYS_CS2_BASE               0x20000000
+#define CFG_SYS_CS2_MASK               (16 << 20)
+#define CFG_SYS_CS2_CTRL               0x00001f60
 #endif
 
 #endif                         /* _M5329EVB_H */
index b2fc6923e0d99ab14057166c96ec1fc6914bb35a..43c642edeb1892e01cf660b21160f17275122b68 100644 (file)
@@ -20,7 +20,7 @@
  * (easy to change)
  */
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 #define CONFIG_WATCHDOG_TIMEOUT        3360    /* timeout in ms, max is 3.36 sec */
 
 
 #define CONFIG_PRAM            512     /* 512 KB */
 
-#define CONFIG_SYS_CLK                 80000000
-#define CONFIG_SYS_CPU_CLK             CONFIG_SYS_CLK * 3
+#define CFG_SYS_CLK                    80000000
+#define CFG_SYS_CPU_CLK                CFG_SYS_CLK * 3
 
-#define CONFIG_SYS_MBAR                0xFC000000
+#define CFG_SYS_MBAR           0xFC000000
 
-#define CONFIG_SYS_LATCH_ADDR          (CONFIG_SYS_CS1_BASE + 0x80000)
+#define CFG_SYS_LATCH_ADDR             (CFG_SYS_CS1_BASE + 0x80000)
 
 /*
  * Low Level Configuration Settings
@@ -63,9 +63,9 @@
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x80000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x8000  /* Size of used area in internal SRAM */
-#define CONFIG_SYS_INIT_RAM_CTRL       0x221
+#define CFG_SYS_INIT_RAM_ADDR  0x80000000
+#define CFG_SYS_INIT_RAM_SIZE  0x8000  /* Size of used area in internal SRAM */
+#define CFG_SYS_INIT_RAM_CTRL  0x221
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * 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           (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + (CFG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
-#      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
+#      define CFG_SYS_FLASH_SIZE               0x800000        /* Max size that the board might have */
 #endif
 
-#      define CFG_SYS_NAND_BASE                CONFIG_SYS_CS2_BASE
+#      define CFG_SYS_NAND_BASE                CFG_SYS_CS2_BASE
 #      define CFG_SYS_NAND_BASE_LIST   { CFG_SYS_NAND_BASE }
 #      define NAND_ALLOW_ERASE_ALL     1
 
-#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_CS0_BASE
+#define CFG_SYS_FLASH_BASE             CFG_SYS_CS0_BASE
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINVA)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_EC | CF_CACR_CINVA | \
                                         CF_CACR_DCM_P)
 
 /*-----------------------------------------------------------------------
  * CS4 - Available
  * CS5 - Available
  */
-#define CONFIG_SYS_CS0_BASE            0
-#define CONFIG_SYS_CS0_MASK            0x007f0001
-#define CONFIG_SYS_CS0_CTRL            0x00001fa0
+#define CFG_SYS_CS0_BASE               0
+#define CFG_SYS_CS0_MASK               0x007f0001
+#define CFG_SYS_CS0_CTRL               0x00001fa0
 
-#define CONFIG_SYS_CS1_BASE            0x10000000
-#define CONFIG_SYS_CS1_MASK            0x001f0001
-#define CONFIG_SYS_CS1_CTRL            0x002A3780
+#define CFG_SYS_CS1_BASE               0x10000000
+#define CFG_SYS_CS1_MASK               0x001f0001
+#define CFG_SYS_CS1_CTRL               0x002A3780
 
-#define CONFIG_SYS_CS2_BASE            0x20000000
-#define CONFIG_SYS_CS2_MASK            (16 << 20)
-#define CONFIG_SYS_CS2_CTRL            0x00001f60
+#define CFG_SYS_CS2_BASE               0x20000000
+#define CFG_SYS_CS2_MASK               (16 << 20)
+#define CFG_SYS_CS2_CTRL               0x00001f60
 
 #endif                         /* _M5373EVB_H */
index 2e7140cd86a1319e8f127df633435bf1833697e5..232cf9e99845d76aea7bbc3ad6e40fcf604ec3e0 100644 (file)
 /* Miscellaneous configurable options */
 
 /* Definitions for initial stack pointer and data area (in DPRAM) */
-#define CONFIG_SYS_INIT_RAM_ADDR       (CONFIG_SYS_IMMR + 0x2800)
-#define        CONFIG_SYS_INIT_RAM_SIZE        (0x2e00 - 0x2800)
+#define CFG_SYS_INIT_RAM_ADDR  (CONFIG_SYS_IMMR + 0x2800)
+#define        CFG_SYS_INIT_RAM_SIZE   (0x2e00 - 0x2800)
 
 /* 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
+#define CFG_SYS_FLASH_BASE             CONFIG_TEXT_BASE
 
 /*
  * 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            (8 << 20)
+#define        CFG_SYS_BOOTMAPSZ               (8 << 20)
 
 /* Environment Configuration */
 
index d9627e393d9cd66e2f000b2ef9299baea877a30e..85c080cf27a5dfb6b4a87a681f97fa3dbc259fac 100644 (file)
 */
 
 /* System Clock Configuration Register */
-#define CONFIG_SYS_SCCR_TSEC1CM        1               /* eTSEC1 clock mode (0-3) */
-#define CONFIG_SYS_SCCR_TSEC2CM        1               /* eTSEC2 clock mode (0-3) */
-#define CONFIG_SYS_SCCR_SATACM SCCR_SATACM_2   /* SATA1-4 clock mode (0-3) */
+#define CFG_SYS_SCCR_TSEC1CM   1               /* eTSEC1 clock mode (0-3) */
+#define CFG_SYS_SCCR_TSEC2CM   1               /* eTSEC2 clock mode (0-3) */
+#define CFG_SYS_SCCR_SATACM    SCCR_SATACM_2   /* SATA1-4 clock mode (0-3) */
 
 /*
  * System IO Config
  */
-#define CONFIG_SYS_SICRH               0x08200000
-#define CONFIG_SYS_SICRL               0x00000000
+#define CFG_SYS_SICRH          0x08200000
+#define CFG_SYS_SICRL          0x00000000
 
 /*
  * Output Buffer Impedance
  */
-#define CONFIG_SYS_OBIR                0x30100000
+#define CFG_SYS_OBIR           0x30100000
 
 /*
  * Device configurations
@@ -60,9 +60,9 @@
  * DDR Setup
  */
 #define CFG_SYS_SDRAM_BASE             0x00000000 /* DDR is system memory */
-#define CONFIG_SYS_DDR_SDRAM_CLK_CNTL  0x03000000
+#define CFG_SYS_DDR_SDRAM_CLK_CNTL     0x03000000
 
-#define CONFIG_SYS_DDRCDR_VALUE        (DDRCDR_DHC_EN | DDRCDR_ODT | DDRCDR_Q_DRN)
+#define CFG_SYS_DDRCDR_VALUE   (DDRCDR_DHC_EN | DDRCDR_ODT | DDRCDR_Q_DRN)
 
 #undef CONFIG_NEVER_ASSERT_ODT_TO_CPU  /* Never assert ODT to internal IOs */
 
  * Manually set up DDR parameters
  */
 #define CFG_SYS_SDRAM_SIZE             0x10000000 /* 256 MiB */
-#define CONFIG_SYS_DDR_CS0_BNDS                0x0000000f
-#define CONFIG_SYS_DDR_CS0_CONFIG      (CSCONFIG_EN \
+#define CFG_SYS_DDR_CS0_BNDS           0x0000000f
+#define CFG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN \
                                        | CSCONFIG_ODT_WR_ONLY_CURRENT \
                                        | CSCONFIG_ROW_BIT_13 \
                                        | CSCONFIG_COL_BIT_10)
 
-#define CONFIG_SYS_DDR_TIMING_3        0x00000000
-#define CONFIG_SYS_DDR_TIMING_0        ((0 << TIMING_CFG0_RWT_SHIFT) \
+#define CFG_SYS_DDR_TIMING_3   0x00000000
+#define CFG_SYS_DDR_TIMING_0   ((0 << TIMING_CFG0_RWT_SHIFT) \
                                | (0 << TIMING_CFG0_WRT_SHIFT) \
                                | (0 << TIMING_CFG0_RRT_SHIFT) \
                                | (0 << TIMING_CFG0_WWT_SHIFT) \
@@ -86,7 +86,7 @@
                                | (8 << TIMING_CFG0_ODT_PD_EXIT_SHIFT) \
                                | (2 << TIMING_CFG0_MRS_CYC_SHIFT))
                                /* 0x00260802 */ /* DDR400 */
-#define CONFIG_SYS_DDR_TIMING_1        ((3 << TIMING_CFG1_PRETOACT_SHIFT) \
+#define CFG_SYS_DDR_TIMING_1   ((3 << TIMING_CFG1_PRETOACT_SHIFT) \
                                | (9 << TIMING_CFG1_ACTTOPRE_SHIFT) \
                                | (3 << TIMING_CFG1_ACTTORW_SHIFT) \
                                | (7 << TIMING_CFG1_CASLAT_SHIFT) \
@@ -95,7 +95,7 @@
                                | (2 << TIMING_CFG1_ACTTOACT_SHIFT) \
                                | (2 << TIMING_CFG1_WRTORD_SHIFT))
                                /* 0x3937d322 */
-#define CONFIG_SYS_DDR_TIMING_2        ((0 << TIMING_CFG2_ADD_LAT_SHIFT) \
+#define CFG_SYS_DDR_TIMING_2   ((0 << TIMING_CFG2_ADD_LAT_SHIFT) \
                                | (5 << TIMING_CFG2_CPO_SHIFT) \
                                | (3 << TIMING_CFG2_WR_LAT_DELAY_SHIFT) \
                                | (2 << TIMING_CFG2_RD_TO_PRE_SHIFT) \
                                | (8 << TIMING_CFG2_FOUR_ACT_SHIFT))
                                /* 0x02984cc8 */
 
-#define CONFIG_SYS_DDR_INTERVAL        ((1024 << SDRAM_INTERVAL_REFINT_SHIFT) \
+#define CFG_SYS_DDR_INTERVAL   ((1024 << SDRAM_INTERVAL_REFINT_SHIFT) \
                                | (0 << SDRAM_INTERVAL_BSTOPRE_SHIFT))
                                /* 0x06090100 */
 
-#define CONFIG_SYS_DDR_SDRAM_CFG       (SDRAM_CFG_SREN \
+#define CFG_SYS_DDR_SDRAM_CFG  (SDRAM_CFG_SREN \
                                        | SDRAM_CFG_SDRAM_TYPE_DDR2)
                                        /* 0x43000000 */
-#define CONFIG_SYS_DDR_SDRAM_CFG2      0x00001000 /* 1 posted refresh */
-#define CONFIG_SYS_DDR_MODE            ((0x0406 << SDRAM_MODE_ESD_SHIFT) \
+#define CFG_SYS_DDR_SDRAM_CFG2 0x00001000 /* 1 posted refresh */
+#define CFG_SYS_DDR_MODE               ((0x0406 << SDRAM_MODE_ESD_SHIFT) \
                                        | (0x0442 << SDRAM_MODE_SD_SHIFT))
                                        /* 0x04400442 */ /* DDR400 */
-#define CONFIG_SYS_DDR_MODE2           0x00000000
+#define CFG_SYS_DDR_MODE2              0x00000000
 
 /*
  * Memory test
  */
-#undef CONFIG_SYS_DRAM_TEST            /* memory test, takes time */
+#undef CFG_SYS_DRAM_TEST               /* memory test, takes time */
 
 /*
  * The reserved memory
 /*
  * Initial RAM Base Address Setup
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0xE6000000 /* Initial RAM address */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000 /* Size of used area in RAM */
+#define CFG_SYS_INIT_RAM_ADDR  0xE6000000 /* Initial RAM address */
+#define CFG_SYS_INIT_RAM_SIZE  0x1000 /* Size of used area in RAM */
 
 /*
  * FLASH on the Local Bus
  */
-#define CONFIG_SYS_FLASH_BASE          0xFE000000 /* FLASH base address */
-#define CONFIG_SYS_FLASH_SIZE          8 /* max FLASH size is 32M */
+#define CFG_SYS_FLASH_BASE             0xFE000000 /* FLASH base address */
+#define CFG_SYS_FLASH_SIZE             8 /* max FLASH size is 32M */
 
 /*
  * NAND Flash on the Local Bus
 
 /* Vitesse 7385 */
 
-#define CONFIG_SYS_VSC7385_BASE        0xF0000000
+#define CFG_SYS_VSC7385_BASE   0xF0000000
 
 /*
  * Serial Port
  */
 #define CFG_SYS_NS16550_CLK            get_bus_freq(0)
 
-#define CONFIG_SYS_BAUDRATE_TABLE \
+#define CFG_SYS_BAUDRATE_TABLE \
                {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
 
 #define CFG_SYS_NS16550_COM1   (CONFIG_SYS_IMMR+0x4500)
 #define CONFIG_FSL_SERDES2     0xe3100
 
 /* I2C */
-#define CONFIG_SYS_I2C_NOPROBES                { {0, 0x51} }
+#define CFG_SYS_I2C_NOPROBES           { {0, 0x51} }
 
 /*
  * Config on-board RTC
  */
 #define CONFIG_RTC_DS1374      /* use ds1374 rtc via i2c */
-#define CONFIG_SYS_I2C_RTC_ADDR        0x68 /* at address 0x68 */
+#define CFG_SYS_I2C_RTC_ADDR   0x68 /* at address 0x68 */
 
 /*
  * General PCI
 
 #ifdef CONFIG_TSEC1
 #define CONFIG_TSEC1_NAME              "TSEC0"
-#define CONFIG_SYS_TSEC1_OFFSET                0x24000
+#define CFG_SYS_TSEC1_OFFSET           0x24000
 #define TSEC1_PHY_ADDR                 2
 #define TSEC1_FLAGS                    (TSEC_GIGABIT | TSEC_REDUCED)
 #define TSEC1_PHYIDX                   0
  * have to be in the first 256 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
+#define CFG_SYS_BOOTMAPSZ      (256 << 20) /* Initial Memory map for Linux */
 
 /*
  * Environment Configuration
index 25b4fe0c7d4d3415dc006cdc97d3eb6c988d7ea3..ff02c2cd8472e4a8254ceac80b8bed37abfa5154 100644 (file)
  * Only possible on E500 Version 2 or newer cores.
  */
 
-#define CONFIG_SYS_CCSRBAR             0xe0000000
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
+#define CFG_SYS_CCSRBAR                0xe0000000
+#define CFG_SYS_CCSRBAR_PHYS_LOW       CFG_SYS_CCSRBAR
 
 /* DDR Setup */
 #define CONFIG_SPD_EEPROM              /* Use SPD EEPROM for DDR setup*/
 
 #define CONFIG_MEM_INIT_VALUE  0xDeadBeef
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000      /* DDR is system memory*/
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000      /* DDR is system memory*/
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 /* I2C addresses of SPD EEPROMs */
 #define SPD_EEPROM_ADDRESS     0x51    /* CTLR 0 DIMM 0 */
  * 1111 1111 1000 0000 0110 1110 0110 0101 = ff806e65   ORx
  */
 
-#define CONFIG_SYS_FLASH_BASE          0xff000000      /* start of FLASH 16M */
+#define CFG_SYS_FLASH_BASE             0xff000000      /* start of FLASH 16M */
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_FLASH_BASE_PHYS     0xfff000000ull
+#define CFG_SYS_FLASH_BASE_PHYS        0xfff000000ull
 #else
-#define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE_PHYS        CFG_SYS_FLASH_BASE
 #endif
 
-#define CONFIG_SYS_FLASH_BANKS_LIST \
-       {CONFIG_SYS_FLASH_BASE_PHYS + 0x800000, CONFIG_SYS_FLASH_BASE_PHYS}
+#define CFG_SYS_FLASH_BANKS_LIST \
+       {CFG_SYS_FLASH_BASE_PHYS + 0x800000, CFG_SYS_FLASH_BASE_PHYS}
 
 #define CONFIG_HWCONFIG                        /* enable hwconfig */
 
 /*
  * SDRAM on the Local Bus
  */
-#define CONFIG_SYS_LBC_SDRAM_BASE      0xf0000000      /* Localbus SDRAM */
+#define CFG_SYS_LBC_SDRAM_BASE 0xf0000000      /* Localbus SDRAM */
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_LBC_SDRAM_BASE_PHYS 0xff0000000ull
+#define CFG_SYS_LBC_SDRAM_BASE_PHYS    0xff0000000ull
 #else
-#define CONFIG_SYS_LBC_SDRAM_BASE_PHYS CONFIG_SYS_LBC_SDRAM_BASE
+#define CFG_SYS_LBC_SDRAM_BASE_PHYS    CFG_SYS_LBC_SDRAM_BASE
 #endif
-#define CONFIG_SYS_LBC_SDRAM_SIZE      64              /* LBC SDRAM is 64MB */
+#define CFG_SYS_LBC_SDRAM_SIZE 64              /* LBC SDRAM is 64MB */
 
 /*
  * Base Register 2 and Option Register 2 configure SDRAM.
- * The SDRAM base address, CONFIG_SYS_LBC_SDRAM_BASE, is 0xf0000000.
+ * The SDRAM base address, CFG_SYS_LBC_SDRAM_BASE, is 0xf0000000.
  *
  * For BR2, need:
  *    Base address of 0xf0000000 = BR[0:16] = 1111 0000 0000 0000 0
  * 0   4    8    12   16   20   24   28
  * 1111 0000 0000 0000 0001 1000 0110 0001 = f0001861
  *
- * FIXME: CONFIG_SYS_LBC_SDRAM_BASE should be masked and OR'ed into
+ * FIXME: CFG_SYS_LBC_SDRAM_BASE should be masked and OR'ed into
  * FIXME: the top 17 bits of BR2.
  */
 
 /*
- * The SDRAM size in MB, CONFIG_SYS_LBC_SDRAM_SIZE, is 64.
+ * The SDRAM size in MB, CFG_SYS_LBC_SDRAM_SIZE, is 64.
  *
  * For OR2, need:
  *    64MB mask for AM, OR2[0:7] = 1111 1100
  * 1111 1100 0000 0000 0110 1001 0000 0001 = fc006901
  */
 
-#define CONFIG_SYS_LBC_LCRR            0x00030004      /* LB clock ratio reg */
-#define CONFIG_SYS_LBC_LBCR            0x00000000      /* LB config reg */
-#define CONFIG_SYS_LBC_LSRT            0x20000000      /* LB sdram refresh timer */
-#define CONFIG_SYS_LBC_MRTPR           0x00000000      /* LB refresh timer prescal*/
+#define CFG_SYS_LBC_LCRR               0x00030004      /* LB clock ratio reg */
+#define CFG_SYS_LBC_LBCR               0x00000000      /* LB config reg */
+#define CFG_SYS_LBC_LSRT               0x20000000      /* LB sdram refresh timer */
+#define CFG_SYS_LBC_MRTPR              0x00000000      /* LB refresh timer prescal*/
 
 /*
  * Common settings for all Local Bus SDRAM commands.
  *                 or BSMA1617 (for CPU 1.0) (old)
  * is OR'ed in too.
  */
-#define CONFIG_SYS_LBC_LSDMR_COMMON    ( LSDMR_RFCR16          \
+#define CFG_SYS_LBC_LSDMR_COMMON       ( LSDMR_RFCR16          \
                                | LSDMR_PRETOACT7       \
                                | LSDMR_ACTTORW7        \
                                | LSDMR_BL8             \
 #define CADMUS_BASE_ADDR_PHYS  CADMUS_BASE_ADDR
 #endif
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0xe4010000      /* Initial RAM address */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x4000          /* Size of used area in RAM */
+#define CFG_SYS_INIT_RAM_ADDR  0xe4010000      /* Initial RAM address */
+#define CFG_SYS_INIT_RAM_SIZE  0x4000          /* Size of used area in RAM */
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /* Serial Port */
 #define CFG_SYS_NS16550_CLK            get_bus_freq(0)
 
-#define CONFIG_SYS_BAUDRATE_TABLE \
+#define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
 
-#define CFG_SYS_NS16550_COM1   (CONFIG_SYS_CCSRBAR+0x4500)
-#define CFG_SYS_NS16550_COM2   (CONFIG_SYS_CCSRBAR+0x4600)
+#define CFG_SYS_NS16550_COM1   (CFG_SYS_CCSRBAR+0x4500)
+#define CFG_SYS_NS16550_COM2   (CFG_SYS_CCSRBAR+0x4600)
 
 /*
  * I2C
  */
 #if !CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_SYS_I2C_NOPROBES                { {0, 0x69} }
+#define CFG_SYS_I2C_NOPROBES           { {0, 0x69} }
 #endif
 
 /*
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial Memory map for Linux*/
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial Memory map for Linux*/
 
 /*
  * Environment Configuration
index 21491b9f97ca1fd584022097b71e6dd032c97aaa..a8af0a101c844afeb3a2a8583e21f2c55a9e067e 100644 (file)
 #include <asm/config_mpc85xx.h>
 
 #ifdef CONFIG_SDCARD
-#define CONFIG_SYS_MMC_U_BOOT_SIZE     (512 << 10)
-#define CONFIG_SYS_MMC_U_BOOT_DST      (0x11000000)
-#define CONFIG_SYS_MMC_U_BOOT_START    (0x11000000)
-#define CONFIG_SYS_MMC_U_BOOT_OFFS     (96 << 10)
+#define CFG_SYS_MMC_U_BOOT_SIZE        (512 << 10)
+#define CFG_SYS_MMC_U_BOOT_DST (0x11000000)
+#define CFG_SYS_MMC_U_BOOT_START       (0x11000000)
+#define CFG_SYS_MMC_U_BOOT_OFFS        (96 << 10)
 #endif
 
 #ifdef CONFIG_SPIFLASH
 #define CONFIG_RAMBOOT_SPIFLASH
 #define CONFIG_RESET_VECTOR_ADDRESS    0x110bfffc
 #else
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE       (512 << 10)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x11000000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x11000000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (96 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE  (512 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_DST           (0x11000000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_START (0x11000000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_OFFS  (96 << 10)
 #endif
 #endif
 
 extern unsigned long get_sdram_size(void);
 #endif
 #define CFG_SYS_SDRAM_SIZE             get_sdram_size() /* DDR size */
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
-#define CONFIG_SYS_CCSRBAR                     0xffe00000
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW            CONFIG_SYS_CCSRBAR
+#define CFG_SYS_CCSRBAR                        0xffe00000
+#define CFG_SYS_CCSRBAR_PHYS_LOW               CFG_SYS_CCSRBAR
 
 /*
  * Memory map
@@ -136,15 +136,15 @@ extern unsigned long get_sdram_size(void);
  */
 /* NOR Flash on IFC */
 
-#define CONFIG_SYS_FLASH_BASE          0xee000000
+#define CFG_SYS_FLASH_BASE             0xee000000
 
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | CONFIG_SYS_FLASH_BASE)
+#define CFG_SYS_FLASH_BASE_PHYS        (0xf00000000ull | CFG_SYS_FLASH_BASE)
 #else
-#define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE_PHYS        CFG_SYS_FLASH_BASE
 #endif
 
-#define CFG_SYS_NOR_CSPR       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR_CSPR       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
@@ -161,7 +161,7 @@ extern unsigned long get_sdram_size(void);
                                FTIM2_NOR_TWP(0x1c)
 #define CFG_SYS_NOR_FTIM3      0x0
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS}
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
 /* CFI for NOR Flash */
@@ -237,85 +237,85 @@ extern unsigned long get_sdram_size(void);
 
 /* Set up IFC registers for boot location NOR/NAND */
 #if defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_NAND_SECBOOT)
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1               CFG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1          CFG_SYS_NOR_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0               CFG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0          CFG_SYS_NOR_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NAND_FTIM3
 #endif
 
 /* CPLD on IFC */
-#define CONFIG_SYS_CPLD_BASE           0xffb00000
+#define CFG_SYS_CPLD_BASE              0xffb00000
 
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_CPLD_BASE_PHYS      0xfffb00000ull
+#define CFG_SYS_CPLD_BASE_PHYS 0xfffb00000ull
 #else
-#define CONFIG_SYS_CPLD_BASE_PHYS      CONFIG_SYS_CPLD_BASE
+#define CFG_SYS_CPLD_BASE_PHYS CFG_SYS_CPLD_BASE
 #endif
 
-#define CONFIG_SYS_CSPR3       (CSPR_PHYS_ADDR(CONFIG_SYS_CPLD_BASE_PHYS) \
+#define CFG_SYS_CSPR3  (CSPR_PHYS_ADDR(CFG_SYS_CPLD_BASE_PHYS) \
                                | CSPR_PORT_SIZE_8 \
                                | CSPR_MSEL_GPCM \
                                | CSPR_V)
-#define CONFIG_SYS_AMASK3              IFC_AMASK(64*1024)
-#define CONFIG_SYS_CSOR3               0x0
+#define CFG_SYS_AMASK3         IFC_AMASK(64*1024)
+#define CFG_SYS_CSOR3          0x0
 /* CPLD Timing parameters for IFC CS3 */
-#define CONFIG_SYS_CS3_FTIM0           (FTIM0_GPCM_TACSE(0x0e) | \
+#define CFG_SYS_CS3_FTIM0              (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
                                        FTIM0_GPCM_TEAHC(0x0e))
-#define CONFIG_SYS_CS3_FTIM1           (FTIM1_GPCM_TACO(0x0e) | \
+#define CFG_SYS_CS3_FTIM1              (FTIM1_GPCM_TACO(0x0e) | \
                                        FTIM1_GPCM_TRAD(0x1f))
-#define CONFIG_SYS_CS3_FTIM2           (FTIM2_GPCM_TCS(0x0e) | \
+#define CFG_SYS_CS3_FTIM2              (FTIM2_GPCM_TCS(0x0e) | \
                                        FTIM2_GPCM_TCH(0x8) | \
                                        FTIM2_GPCM_TWP(0x1f))
-#define CONFIG_SYS_CS3_FTIM3           0x0
+#define CFG_SYS_CS3_FTIM3              0x0
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0xffd00000 /* stack in RAM */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x00004000 /* End of used area in RAM */
+#define CFG_SYS_INIT_RAM_ADDR  0xffd00000 /* stack in RAM */
+#define CFG_SYS_INIT_RAM_SIZE  0x00004000 /* End of used area in RAM */
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*
  * Config the L2 Cache as L2 SRAM
  */
 #if defined(CONFIG_SPL_BUILD)
 #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH)
-#define CONFIG_SYS_INIT_L2_ADDR                0xD0000000
-#define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR
-#define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
+#define CFG_SYS_INIT_L2_ADDR           0xD0000000
+#define CFG_SYS_INIT_L2_ADDR_PHYS      CFG_SYS_INIT_L2_ADDR
+#define CFG_SYS_INIT_L2_END    (CFG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
-#define CONFIG_SYS_INIT_L2_ADDR                0xD0000000
-#define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR
-#define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
+#define CFG_SYS_INIT_L2_ADDR           0xD0000000
+#define CFG_SYS_INIT_L2_ADDR_PHYS      CFG_SYS_INIT_L2_ADDR
+#define CFG_SYS_INIT_L2_END    (CFG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
 #else
-#define CONFIG_SYS_INIT_L2_ADDR                0xD0000000
-#define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR
-#define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
+#define CFG_SYS_INIT_L2_ADDR           0xD0000000
+#define CFG_SYS_INIT_L2_ADDR_PHYS      CFG_SYS_INIT_L2_ADDR
+#define CFG_SYS_INIT_L2_END    (CFG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
 #endif
 #endif
 #endif
@@ -324,11 +324,11 @@ extern unsigned long get_sdram_size(void);
 #undef CONFIG_SERIAL_SOFTWARE_FIFO
 #define CFG_SYS_NS16550_CLK            get_bus_freq(0)
 
-#define CONFIG_SYS_BAUDRATE_TABLE      \
+#define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
-#define CFG_SYS_NS16550_COM1   (CONFIG_SYS_CCSRBAR+0x4500)
-#define CFG_SYS_NS16550_COM2   (CONFIG_SYS_CCSRBAR+0x4600)
+#define CFG_SYS_NS16550_COM1   (CFG_SYS_CCSRBAR+0x4500)
+#define CFG_SYS_NS16550_COM2   (CFG_SYS_CCSRBAR+0x4600)
 
 /* I2C */
 #define I2C_PCA9557_ADDR1              0x18
@@ -343,7 +343,7 @@ extern unsigned long get_sdram_size(void);
 
 /* RTC */
 #define CONFIG_RTC_PT7C4338
-#define CONFIG_SYS_I2C_RTC_ADDR        0x68
+#define CFG_SYS_I2C_RTC_ADDR   0x68
 
 /*
  * SPI interface will not be available in case of NAND boot SPI CS0 will be
@@ -393,7 +393,7 @@ extern unsigned long get_sdram_size(void);
  */
 #if defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
-#define SPL_ENV_ADDR           (CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
+#define SPL_ENV_ADDR           (CFG_SYS_INIT_L2_ADDR + (160 << 10))
 #endif
 #endif
 
@@ -410,7 +410,7 @@ extern unsigned long get_sdram_size(void);
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20) /* Initial Memory map for Linux */
+#define CFG_SYS_BOOTMAPSZ      (64 << 20) /* Initial Memory map for Linux */
 
 /*
  * Environment Configuration
index c3ef21633354a0bd7fcafc65e141083cd5009952..1e02855fefd8cff86e4a5389c41906d470572ff7 100644 (file)
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_SYS_INIT_L2CSR0         L2CSR0_L2E
+#define CFG_SYS_INIT_L2CSR0            L2CSR0_L2E
 
-#define CONFIG_POST CONFIG_SYS_POST_MEMORY     /* test POST memory test */
+#define CONFIG_POST CFG_SYS_POST_MEMORY        /* test POST memory test */
 
 /*
  *  Config the L3 Cache as L3 SRAM
  */
-#define CONFIG_SYS_INIT_L3_ADDR                CONFIG_RAMBOOT_TEXT_BASE
+#define CFG_SYS_INIT_L3_ADDR           CONFIG_RAMBOOT_TEXT_BASE
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_INIT_L3_ADDR_PHYS   (0xf00000000ull | \
+#define CFG_SYS_INIT_L3_ADDR_PHYS      (0xf00000000ull | \
                CONFIG_RAMBOOT_TEXT_BASE)
 #else
-#define CONFIG_SYS_INIT_L3_ADDR_PHYS   CONFIG_SYS_INIT_L3_ADDR
+#define CFG_SYS_INIT_L3_ADDR_PHYS      CFG_SYS_INIT_L3_ADDR
 #endif
 
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_DCSRBAR             0xf0000000
-#define CONFIG_SYS_DCSRBAR_PHYS                0xf00000000ull
+#define CFG_SYS_DCSRBAR                0xf0000000
+#define CFG_SYS_DCSRBAR_PHYS           0xf00000000ull
 #endif
 
 /*
  * DDR Setup
  */
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 #define SPD_EEPROM_ADDRESS     0x52
 #define CFG_SYS_SDRAM_SIZE     4096    /* for fixed parameter use */
  */
 
 /* Set the local bus clock 1/8 of platform clock */
-#define CONFIG_SYS_LBC_LCRR            LCRR_CLKDIV_8
+#define CFG_SYS_LBC_LCRR               LCRR_CLKDIV_8
 
 /*
  * This board doesn't have a promjet connector.
  * However, it uses commone corenet board LAW and TLB.
  * It is necessary to use the same start address with proper offset.
  */
-#define CONFIG_SYS_FLASH_BASE          0xe0000000
+#define CFG_SYS_FLASH_BASE             0xe0000000
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_FLASH_BASE_PHYS     0xfe0000000ull
+#define CFG_SYS_FLASH_BASE_PHYS        0xfe0000000ull
 #else
-#define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE_PHYS        CFG_SYS_FLASH_BASE
 #endif
 
 #define CONFIG_FSL_CPLD
                               | OR_FCM_EHTR)
 #endif /* CONFIG_NAND_FSL_ELBC */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
-#define CONFIG_SYS_INIT_RAM_ADDR       0xffd00000      /* Initial L1 address */
+#define CFG_SYS_INIT_RAM_ADDR  0xffd00000      /* Initial L1 address */
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW CONFIG_SYS_INIT_RAM_ADDR
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW CFG_SYS_INIT_RAM_ADDR
 /* The assembler doesn't like typecast */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \
-       ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
-         CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW)
+#define CFG_SYS_INIT_RAM_ADDR_PHYS \
+       ((CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
+         CFG_SYS_INIT_RAM_ADDR_PHYS_LOW)
 #else
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS  CONFIG_SYS_INIT_RAM_ADDR
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW CONFIG_SYS_INIT_RAM_ADDR_PHYS
+#define CFG_SYS_INIT_RAM_ADDR_PHYS     CFG_SYS_INIT_RAM_ADDR
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW CFG_SYS_INIT_RAM_ADDR_PHYS
 #endif
-#define CONFIG_SYS_INIT_RAM_SIZE       0x00004000
+#define CFG_SYS_INIT_RAM_SIZE  0x00004000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /* Serial Port - controlled on board with jumper J8
  * open - index 2
  */
 #define CFG_SYS_NS16550_CLK            (get_bus_freq(0)/2)
 
-#define CONFIG_SYS_BAUDRATE_TABLE      \
+#define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
-#define CFG_SYS_NS16550_COM1   (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CFG_SYS_NS16550_COM2   (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CFG_SYS_NS16550_COM3   (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CFG_SYS_NS16550_COM4   (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1   (CFG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2   (CFG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3   (CFG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4   (CFG_SYS_CCSRBAR+0x11D600)
 
 /* I2C */
 
 #define CFG_SYS_PCIE3_MEM_PHYS 0xc40000000ull
 
 /* Qman/Bman */
-#define CONFIG_SYS_BMAN_NUM_PORTALS    10
-#define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
+#define CFG_SYS_BMAN_NUM_PORTALS       10
+#define CFG_SYS_BMAN_MEM_BASE  0xf4000000
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull
+#define CFG_SYS_BMAN_MEM_PHYS  0xff4000000ull
 #else
-#define CONFIG_SYS_BMAN_MEM_PHYS       CONFIG_SYS_BMAN_MEM_BASE
+#define CFG_SYS_BMAN_MEM_PHYS  CFG_SYS_BMAN_MEM_BASE
 #endif
-#define CONFIG_SYS_BMAN_MEM_SIZE       0x00200000
-#define CONFIG_SYS_BMAN_SP_CENA_SIZE    0x4000
-#define CONFIG_SYS_BMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_BMAN_CENA_BASE       CONFIG_SYS_BMAN_MEM_BASE
-#define CONFIG_SYS_BMAN_CENA_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_CINH_BASE       (CONFIG_SYS_BMAN_MEM_BASE + \
-                                       CONFIG_SYS_BMAN_CENA_SIZE)
-#define CONFIG_SYS_BMAN_CINH_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_SWP_ISDR_REG   0xE08
-#define CONFIG_SYS_QMAN_NUM_PORTALS    10
-#define CONFIG_SYS_QMAN_MEM_BASE       0xf4200000
+#define CFG_SYS_BMAN_MEM_SIZE  0x00200000
+#define CFG_SYS_BMAN_SP_CENA_SIZE    0x4000
+#define CFG_SYS_BMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_BMAN_CENA_BASE       CFG_SYS_BMAN_MEM_BASE
+#define CFG_SYS_BMAN_CENA_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_CINH_BASE       (CFG_SYS_BMAN_MEM_BASE + \
+                                       CFG_SYS_BMAN_CENA_SIZE)
+#define CFG_SYS_BMAN_CINH_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_SWP_ISDR_REG      0xE08
+#define CFG_SYS_QMAN_NUM_PORTALS       10
+#define CFG_SYS_QMAN_MEM_BASE  0xf4200000
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_QMAN_MEM_PHYS       0xff4200000ull
+#define CFG_SYS_QMAN_MEM_PHYS  0xff4200000ull
 #else
-#define CONFIG_SYS_QMAN_MEM_PHYS       CONFIG_SYS_QMAN_MEM_BASE
+#define CFG_SYS_QMAN_MEM_PHYS  CFG_SYS_QMAN_MEM_BASE
 #endif
-#define CONFIG_SYS_QMAN_MEM_SIZE       0x00200000
-#define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
-                                       CONFIG_SYS_QMAN_CENA_SIZE)
-#define CONFIG_SYS_QMAN_CINH_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_SWP_ISDR_REG   0xE08
+#define CFG_SYS_QMAN_MEM_SIZE  0x00200000
+#define CFG_SYS_QMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_QMAN_CENA_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_CINH_BASE       (CFG_SYS_QMAN_MEM_BASE + \
+                                       CFG_SYS_QMAN_CENA_SIZE)
+#define CFG_SYS_QMAN_CINH_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_SWP_ISDR_REG      0xE08
 
 #ifdef CONFIG_FMAN_ENET
-#define CONFIG_SYS_FM1_DTSEC1_PHY_ADDR 0x2
-#define CONFIG_SYS_FM1_DTSEC2_PHY_ADDR 0x3
-#define CONFIG_SYS_FM1_DTSEC3_PHY_ADDR 0x4
-#define CONFIG_SYS_FM1_DTSEC4_PHY_ADDR 0x1
-#define CONFIG_SYS_FM1_DTSEC5_PHY_ADDR 0x0
+#define CFG_SYS_FM1_DTSEC1_PHY_ADDR    0x2
+#define CFG_SYS_FM1_DTSEC2_PHY_ADDR    0x3
+#define CFG_SYS_FM1_DTSEC3_PHY_ADDR    0x4
+#define CFG_SYS_FM1_DTSEC4_PHY_ADDR    0x1
+#define CFG_SYS_FM1_DTSEC5_PHY_ADDR    0x0
 
-#define CONFIG_SYS_FM1_DTSEC1_RISER_PHY_ADDR   0x1c
-#define CONFIG_SYS_FM1_DTSEC2_RISER_PHY_ADDR   0x1d
-#define CONFIG_SYS_FM1_DTSEC3_RISER_PHY_ADDR   0x1e
-#define CONFIG_SYS_FM1_DTSEC4_RISER_PHY_ADDR   0x1f
+#define CFG_SYS_FM1_DTSEC1_RISER_PHY_ADDR      0x1c
+#define CFG_SYS_FM1_DTSEC2_RISER_PHY_ADDR      0x1d
+#define CFG_SYS_FM1_DTSEC3_RISER_PHY_ADDR      0x1e
+#define CFG_SYS_FM1_DTSEC4_RISER_PHY_ADDR      0x1f
 
-#define CONFIG_SYS_FM1_10GEC1_PHY_ADDR 0
+#define CFG_SYS_FM1_10GEC1_PHY_ADDR    0
 
-#define CONFIG_SYS_TBIPA_VALUE 8
+#define CFG_SYS_TBIPA_VALUE    8
 #endif
 
 #ifdef CONFIG_MMC
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial Memory for Linux */
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial Memory for Linux */
 
 /*
  * Environment Configuration
index 417b9ae7b2415e3abe56a4310d0a14f1d23cffb5..bad34d9771ecf53a8305017447bf709963284764 100644 (file)
@@ -12,7 +12,7 @@
 /*
  * NS16550 Configuration
  */
-#define CFG_SYS_NS16550_CLK            CONFIG_SYS_TCLK
+#define CFG_SYS_NS16550_CLK            CFG_SYS_TCLK
 #define CFG_SYS_NS16550_COM1           KW_UART0_BASE
 
 /*
@@ -32,7 +32,7 @@
  * U-Boot bootcode configuration
  */
 
-#define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Mem map for Linux*/
+#define CFG_SYS_BOOTMAPSZ              (8 << 20)       /* Initial Mem map for Linux*/
 
 /* size in bytes reserved for initial data */
 
index 87b68227a0d9080ff931dea7aa39eb24a294db0f..9a9663b34ba8ce5bb440bdb07ffbb3f5091b1035 100644 (file)
@@ -12,7 +12,7 @@
 /*
  * NS16550 Configuration
  */
-#define CFG_SYS_NS16550_CLK            CONFIG_SYS_TCLK
+#define CFG_SYS_NS16550_CLK            CFG_SYS_TCLK
 #define CFG_SYS_NS16550_COM1           KW_UART0_BASE
 
 /*
@@ -37,7 +37,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           (8 << 20)       /* Initial Mem map for Linux*/
+#define CFG_SYS_BOOTMAPSZ              (8 << 20)       /* Initial Mem map for Linux*/
 
 /* size in bytes reserved for initial data */
 
index b567b63980e9f64ae34d701f6d3e9097fa96c354..b5fb0a9b529e179ca9bf0b2544a8a8ec2e6ff177 100644 (file)
 
 #ifdef CONFIG_SPIFLASH
 #define CONFIG_RESET_VECTOR_ADDRESS            0x30000FFC
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x30000000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x30000000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE  (768 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_DST           (0x30000000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_START (0x30000000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_OFFS  (256 << 10)
 #endif
 
 #ifdef CONFIG_SDCARD
 #define CONFIG_RESET_VECTOR_ADDRESS    0x30000FFC
-#define CONFIG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
-#define CONFIG_SYS_MMC_U_BOOT_DST      (0x30000000)
-#define CONFIG_SYS_MMC_U_BOOT_START    (0x30000000)
-#define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
+#define CFG_SYS_MMC_U_BOOT_SIZE        (768 << 10)
+#define CFG_SYS_MMC_U_BOOT_DST (0x30000000)
+#define CFG_SYS_MMC_U_BOOT_START       (0x30000000)
+#define CFG_SYS_MMC_U_BOOT_OFFS        (260 << 10)
 #endif
 
 #endif /* CONFIG_RAMBOOT_PBL */
@@ -93,7 +93,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_SYS_INIT_L2CSR0         L2CSR0_L2E
+#define CFG_SYS_INIT_L2CSR0            L2CSR0_L2E
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 #endif
 /*
  *  Config the L3 Cache as L3 SRAM
  */
-#define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
+#define CFG_SYS_INIT_L3_ADDR           0xFFFC0000
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_DCSRBAR             0xf0000000
-#define CONFIG_SYS_DCSRBAR_PHYS                0xf00000000ull
+#define CFG_SYS_DCSRBAR                0xf0000000
+#define CFG_SYS_DCSRBAR_PHYS           0xf00000000ull
 #endif
 
 /*
  * DDR Setup
  */
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #if defined(CONFIG_TARGET_T1024RDB)
 #define SPD_EEPROM_ADDRESS     0x51
 #define CFG_SYS_SDRAM_SIZE     4096    /* for fixed parameter use */
 /*
  * IFC Definitions
  */
-#define CONFIG_SYS_FLASH_BASE  0xe8000000
+#define CFG_SYS_FLASH_BASE     0xe8000000
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | CONFIG_SYS_FLASH_BASE)
+#define CFG_SYS_FLASH_BASE_PHYS        (0xf00000000ull | CFG_SYS_FLASH_BASE)
 #else
-#define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE_PHYS        CFG_SYS_FLASH_BASE
 #endif
 
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0xf)
-#define CONFIG_SYS_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR0_CSPR_EXT  (0xf)
+#define CFG_SYS_NOR0_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS}
 
 #ifdef CONFIG_TARGET_T1024RDB
 /* CPLD on IFC */
-#define CONFIG_SYS_CPLD_BASE           0xffdf0000
-#define CONFIG_SYS_CPLD_BASE_PHYS      (0xf00000000ull | CONFIG_SYS_CPLD_BASE)
-#define CONFIG_SYS_CSPR2_EXT           (0xf)
-#define CONFIG_SYS_CSPR2               (CSPR_PHYS_ADDR(CONFIG_SYS_CPLD_BASE) \
+#define CFG_SYS_CPLD_BASE              0xffdf0000
+#define CFG_SYS_CPLD_BASE_PHYS (0xf00000000ull | CFG_SYS_CPLD_BASE)
+#define CFG_SYS_CSPR2_EXT              (0xf)
+#define CFG_SYS_CSPR2          (CSPR_PHYS_ADDR(CFG_SYS_CPLD_BASE) \
                                                | CSPR_PORT_SIZE_8 \
                                                | CSPR_MSEL_GPCM \
                                                | CSPR_V)
-#define CONFIG_SYS_AMASK2              IFC_AMASK(64*1024)
-#define CONFIG_SYS_CSOR2               0x0
+#define CFG_SYS_AMASK2         IFC_AMASK(64*1024)
+#define CFG_SYS_CSOR2          0x0
 
 /* CPLD Timing parameters for IFC CS2 */
-#define CONFIG_SYS_CS2_FTIM0           (FTIM0_GPCM_TACSE(0x0e) | \
+#define CFG_SYS_CS2_FTIM0              (FTIM0_GPCM_TACSE(0x0e) | \
                                                FTIM0_GPCM_TEADC(0x0e) | \
                                                FTIM0_GPCM_TEAHC(0x0e))
-#define CONFIG_SYS_CS2_FTIM1           (FTIM1_GPCM_TACO(0x0e) | \
+#define CFG_SYS_CS2_FTIM1              (FTIM1_GPCM_TACO(0x0e) | \
                                                FTIM1_GPCM_TRAD(0x1f))
-#define CONFIG_SYS_CS2_FTIM2           (FTIM2_GPCM_TCS(0x0e) | \
+#define CFG_SYS_CS2_FTIM2              (FTIM2_GPCM_TCS(0x0e) | \
                                                FTIM2_GPCM_TCH(0x8) | \
                                                FTIM2_GPCM_TWP(0x1f))
-#define CONFIG_SYS_CS2_FTIM3           0x0
+#define CFG_SYS_CS2_FTIM3              0x0
 #endif
 
 /* NAND Flash on IFC */
 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 
 #if defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NAND_FTIM3
 #endif
 
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
-#define CONFIG_SYS_INIT_RAM_ADDR       0xfdd00000      /* Initial L1 address */
+#define CFG_SYS_INIT_RAM_ADDR  0xfdd00000      /* Initial L1 address */
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH     0xf
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW      0xfe03c000
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH        0xf
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
 /* The assembler doesn't like typecast */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \
-       ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
-         CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW)
+#define CFG_SYS_INIT_RAM_ADDR_PHYS \
+       ((CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
+         CFG_SYS_INIT_RAM_ADDR_PHYS_LOW)
 #else
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS  0xfe03c000 /* Initial L1 address */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW CONFIG_SYS_INIT_RAM_ADDR_PHYS
+#define CFG_SYS_INIT_RAM_ADDR_PHYS     0xfe03c000 /* Initial L1 address */
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW CFG_SYS_INIT_RAM_ADDR_PHYS
 #endif
-#define CONFIG_SYS_INIT_RAM_SIZE               0x00004000
+#define CFG_SYS_INIT_RAM_SIZE          0x00004000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /* Serial Port */
 #define CFG_SYS_NS16550_CLK            (get_bus_freq(0)/2)
 
-#define CONFIG_SYS_BAUDRATE_TABLE      \
+#define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
-#define CFG_SYS_NS16550_COM1   (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CFG_SYS_NS16550_COM2   (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CFG_SYS_NS16550_COM3   (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CFG_SYS_NS16550_COM4   (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1   (CFG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2   (CFG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3   (CFG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4   (CFG_SYS_CCSRBAR+0x11D600)
 
 /* I2C */
 
  */
 #define RTC
 #define CONFIG_RTC_DS1337      1
-#define CONFIG_SYS_I2C_RTC_ADDR        0x68
+#define CFG_SYS_I2C_RTC_ADDR   0x68
 
 /*
  * eSPI - Enhanced SPI
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_BMAN_NUM_PORTALS    10
-#define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
+#define CFG_SYS_BMAN_NUM_PORTALS       10
+#define CFG_SYS_BMAN_MEM_BASE  0xf4000000
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull
+#define CFG_SYS_BMAN_MEM_PHYS  0xff4000000ull
 #else
-#define CONFIG_SYS_BMAN_MEM_PHYS       CONFIG_SYS_BMAN_MEM_BASE
+#define CFG_SYS_BMAN_MEM_PHYS  CFG_SYS_BMAN_MEM_BASE
 #endif
-#define CONFIG_SYS_BMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_BMAN_SP_CENA_SIZE    0x4000
-#define CONFIG_SYS_BMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_BMAN_CENA_BASE       CONFIG_SYS_BMAN_MEM_BASE
-#define CONFIG_SYS_BMAN_CENA_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_CINH_BASE       (CONFIG_SYS_BMAN_MEM_BASE + \
-                                       CONFIG_SYS_BMAN_CENA_SIZE)
-#define CONFIG_SYS_BMAN_CINH_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_SWP_ISDR_REG   0xE08
-#define CONFIG_SYS_QMAN_NUM_PORTALS    10
-#define CONFIG_SYS_QMAN_MEM_BASE       0xf6000000
+#define CFG_SYS_BMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_BMAN_SP_CENA_SIZE    0x4000
+#define CFG_SYS_BMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_BMAN_CENA_BASE       CFG_SYS_BMAN_MEM_BASE
+#define CFG_SYS_BMAN_CENA_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_CINH_BASE       (CFG_SYS_BMAN_MEM_BASE + \
+                                       CFG_SYS_BMAN_CENA_SIZE)
+#define CFG_SYS_BMAN_CINH_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_SWP_ISDR_REG      0xE08
+#define CFG_SYS_QMAN_NUM_PORTALS       10
+#define CFG_SYS_QMAN_MEM_BASE  0xf6000000
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_QMAN_MEM_PHYS       0xff6000000ull
+#define CFG_SYS_QMAN_MEM_PHYS  0xff6000000ull
 #else
-#define CONFIG_SYS_QMAN_MEM_PHYS       CONFIG_SYS_QMAN_MEM_BASE
+#define CFG_SYS_QMAN_MEM_PHYS  CFG_SYS_QMAN_MEM_BASE
 #endif
-#define CONFIG_SYS_QMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
-                                       CONFIG_SYS_QMAN_CENA_SIZE)
-#define CONFIG_SYS_QMAN_CINH_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_SWP_ISDR_REG   0xE08
+#define CFG_SYS_QMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_QMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_QMAN_CENA_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_CINH_BASE       (CFG_SYS_QMAN_MEM_BASE + \
+                                       CFG_SYS_QMAN_CENA_SIZE)
+#define CFG_SYS_QMAN_CINH_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_SWP_ISDR_REG      0xE08
+
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial map for Linux*/
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial map for Linux*/
 
 /*
  * Environment Configuration
index 37dfe32e21bfdcd0ad34d31491ec9af9583226be..bee4b704a24fd89437eab3be1fa34157cb5bfc74 100644 (file)
 
 #ifdef CONFIG_SPIFLASH
 #define        CONFIG_RESET_VECTOR_ADDRESS             0x30000FFC
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x30000000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x30000000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE  (768 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_DST           (0x30000000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_START (0x30000000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_OFFS  (256 << 10)
 #endif
 
 #ifdef CONFIG_SDCARD
 #define        CONFIG_RESET_VECTOR_ADDRESS             0x30000FFC
-#define CONFIG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
-#define CONFIG_SYS_MMC_U_BOOT_DST      (0x30000000)
-#define CONFIG_SYS_MMC_U_BOOT_START    (0x30000000)
-#define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
+#define CFG_SYS_MMC_U_BOOT_SIZE        (768 << 10)
+#define CFG_SYS_MMC_U_BOOT_DST (0x30000000)
+#define CFG_SYS_MMC_U_BOOT_START       (0x30000000)
+#define CFG_SYS_MMC_U_BOOT_OFFS        (260 << 10)
 #endif
 
 #endif
@@ -63,7 +63,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_SYS_INIT_L2CSR0         L2CSR0_L2E
+#define CFG_SYS_INIT_L2CSR0            L2CSR0_L2E
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 #endif
 /*
  *  Config the L3 Cache as L3 SRAM
  */
-#define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
+#define CFG_SYS_INIT_L3_ADDR           0xFFFC0000
 /*
- * For Secure Boot CONFIG_SYS_INIT_L3_ADDR will be redefined and hence
- * Physical address (CONFIG_SYS_INIT_L3_ADDR) and virtual address
- * (CONFIG_SYS_INIT_L3_VADDR) will be different.
+ * For Secure Boot CFG_SYS_INIT_L3_ADDR will be redefined and hence
+ * Physical address (CFG_SYS_INIT_L3_ADDR) and virtual address
+ * (CFG_SYS_INIT_L3_VADDR) will be different.
  */
-#define CONFIG_SYS_INIT_L3_VADDR       0xFFFC0000
+#define CFG_SYS_INIT_L3_VADDR  0xFFFC0000
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
-#define CONFIG_SYS_DCSRBAR             0xf0000000
-#define CONFIG_SYS_DCSRBAR_PHYS                0xf00000000ull
+#define CFG_SYS_DCSRBAR                0xf0000000
+#define CFG_SYS_DCSRBAR_PHYS           0xf00000000ull
 
 /*
  * DDR Setup
  */
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 #define SPD_EEPROM_ADDRESS     0x51
 
 /*
  * IFC Definitions
  */
-#define CONFIG_SYS_FLASH_BASE  0xe8000000
-#define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | CONFIG_SYS_FLASH_BASE)
+#define CFG_SYS_FLASH_BASE     0xe8000000
+#define CFG_SYS_FLASH_BASE_PHYS        (0xf00000000ull | CFG_SYS_FLASH_BASE)
 
 #define CFG_SYS_NOR_CSPR_EXT   (0xf)
-#define CFG_SYS_NOR_CSPR       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
+#define CFG_SYS_NOR_CSPR       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS}
 
 /* CPLD on IFC */
 #define CPLD_LBMAP_MASK                        0x3F
 #define CPLD_INT_MASK_TDMR2            0x01
 #endif
 
-#define CONFIG_SYS_CPLD_BASE   0xffdf0000
-#define CONFIG_SYS_CPLD_BASE_PHYS      (0xf00000000ull | CONFIG_SYS_CPLD_BASE)
-#define CONFIG_SYS_CSPR2_EXT   (0xf)
-#define CONFIG_SYS_CSPR2       (CSPR_PHYS_ADDR(CONFIG_SYS_CPLD_BASE_PHYS) \
+#define CFG_SYS_CPLD_BASE      0xffdf0000
+#define CFG_SYS_CPLD_BASE_PHYS (0xf00000000ull | CFG_SYS_CPLD_BASE)
+#define CFG_SYS_CSPR2_EXT      (0xf)
+#define CFG_SYS_CSPR2  (CSPR_PHYS_ADDR(CFG_SYS_CPLD_BASE_PHYS) \
                                | CSPR_PORT_SIZE_8 \
                                | CSPR_MSEL_GPCM \
                                | CSPR_V)
-#define CONFIG_SYS_AMASK2      IFC_AMASK(64*1024)
-#define CONFIG_SYS_CSOR2       0x0
+#define CFG_SYS_AMASK2 IFC_AMASK(64*1024)
+#define CFG_SYS_CSOR2  0x0
 /* CPLD Timing parameters for IFC CS2 */
-#define CONFIG_SYS_CS2_FTIM0           (FTIM0_GPCM_TACSE(0x0e) | \
+#define CFG_SYS_CS2_FTIM0              (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
                                        FTIM0_GPCM_TEAHC(0x0e))
-#define CONFIG_SYS_CS2_FTIM1           (FTIM1_GPCM_TACO(0x0e) | \
+#define CFG_SYS_CS2_FTIM1              (FTIM1_GPCM_TACO(0x0e) | \
                                        FTIM1_GPCM_TRAD(0x1f))
-#define CONFIG_SYS_CS2_FTIM2           (FTIM2_GPCM_TCS(0x0e) | \
+#define CFG_SYS_CS2_FTIM2              (FTIM2_GPCM_TCS(0x0e) | \
                                        FTIM2_GPCM_TCH(0x8) | \
                                        FTIM2_GPCM_TWP(0x1f))
-#define CONFIG_SYS_CS2_FTIM3           0x0
+#define CFG_SYS_CS2_FTIM3              0x0
 
 /* NAND Flash on IFC */
 #define CFG_SYS_NAND_BASE              0xff800000
 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 
 #if defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CFG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NAND_FTIM3
 #endif
 
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
-#define CONFIG_SYS_INIT_RAM_ADDR       0xfdd00000      /* Initial L1 address */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH     0xf
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW      0xfe03c000
+#define CFG_SYS_INIT_RAM_ADDR  0xfdd00000      /* Initial L1 address */
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH        0xf
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
 /* The assembler doesn't like typecast */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \
-       ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
-         CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW)
-#define CONFIG_SYS_INIT_RAM_SIZE               0x00004000
+#define CFG_SYS_INIT_RAM_ADDR_PHYS \
+       ((CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
+         CFG_SYS_INIT_RAM_ADDR_PHYS_LOW)
+#define CFG_SYS_INIT_RAM_SIZE          0x00004000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /* Serial Port - controlled on board with jumper J8
  * open - index 2
  */
 #define CFG_SYS_NS16550_CLK            (get_bus_freq(0)/2)
 
-#define CONFIG_SYS_BAUDRATE_TABLE      \
+#define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
-#define CFG_SYS_NS16550_COM1   (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CFG_SYS_NS16550_COM2   (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CFG_SYS_NS16550_COM3   (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CFG_SYS_NS16550_COM4   (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1   (CFG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2   (CFG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3   (CFG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4   (CFG_SYS_CCSRBAR+0x11D600)
 
 /* I2C bus multiplexer */
 #define I2C_MUX_PCA_ADDR                0x70
  */
 #define RTC
 #define CONFIG_RTC_DS1337               1
-#define CONFIG_SYS_I2C_RTC_ADDR         0x68
+#define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /*DVI encoder*/
 #define CONFIG_HDMI_ENCODER_I2C_ADDR  0x75
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_BMAN_NUM_PORTALS    10
-#define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
-#define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull
-#define CONFIG_SYS_BMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_BMAN_SP_CENA_SIZE    0x4000
-#define CONFIG_SYS_BMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_BMAN_CENA_BASE       CONFIG_SYS_BMAN_MEM_BASE
-#define CONFIG_SYS_BMAN_CENA_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_CINH_BASE       (CONFIG_SYS_BMAN_MEM_BASE + \
-                                       CONFIG_SYS_BMAN_CENA_SIZE)
-#define CONFIG_SYS_BMAN_CINH_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_SWP_ISDR_REG   0xE08
-#define CONFIG_SYS_QMAN_NUM_PORTALS    10
-#define CONFIG_SYS_QMAN_MEM_BASE       0xf6000000
-#define CONFIG_SYS_QMAN_MEM_PHYS       0xff6000000ull
-#define CONFIG_SYS_QMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
-                                       CONFIG_SYS_QMAN_CENA_SIZE)
-#define CONFIG_SYS_QMAN_CINH_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_SWP_ISDR_REG   0xE08
+#define CFG_SYS_BMAN_NUM_PORTALS       10
+#define CFG_SYS_BMAN_MEM_BASE  0xf4000000
+#define CFG_SYS_BMAN_MEM_PHYS  0xff4000000ull
+#define CFG_SYS_BMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_BMAN_SP_CENA_SIZE    0x4000
+#define CFG_SYS_BMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_BMAN_CENA_BASE       CFG_SYS_BMAN_MEM_BASE
+#define CFG_SYS_BMAN_CENA_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_CINH_BASE       (CFG_SYS_BMAN_MEM_BASE + \
+                                       CFG_SYS_BMAN_CENA_SIZE)
+#define CFG_SYS_BMAN_CINH_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_SWP_ISDR_REG      0xE08
+#define CFG_SYS_QMAN_NUM_PORTALS       10
+#define CFG_SYS_QMAN_MEM_BASE  0xf6000000
+#define CFG_SYS_QMAN_MEM_PHYS  0xff6000000ull
+#define CFG_SYS_QMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_QMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_QMAN_CENA_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_CINH_BASE       (CFG_SYS_QMAN_MEM_BASE + \
+                                       CFG_SYS_QMAN_CENA_SIZE)
+#define CFG_SYS_QMAN_CINH_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_SWP_ISDR_REG      0xE08
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_FMAN_ENET
 #if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1042RDB)
-#define CONFIG_SYS_SGMII1_PHY_ADDR             0x03
+#define CFG_SYS_SGMII1_PHY_ADDR             0x03
 #elif defined(CONFIG_TARGET_T1040D4RDB)
-#define CONFIG_SYS_SGMII1_PHY_ADDR             0x01
+#define CFG_SYS_SGMII1_PHY_ADDR             0x01
 #elif defined(CONFIG_TARGET_T1042D4RDB)
-#define CONFIG_SYS_SGMII1_PHY_ADDR             0x02
-#define CONFIG_SYS_SGMII2_PHY_ADDR             0x03
-#define CONFIG_SYS_SGMII3_PHY_ADDR             0x01
+#define CFG_SYS_SGMII1_PHY_ADDR             0x02
+#define CFG_SYS_SGMII2_PHY_ADDR             0x03
+#define CFG_SYS_SGMII3_PHY_ADDR             0x01
 #endif
 
 #if defined(CONFIG_TARGET_T1040D4RDB) || defined(CONFIG_TARGET_T1042D4RDB)
-#define CONFIG_SYS_RGMII1_PHY_ADDR             0x04
-#define CONFIG_SYS_RGMII2_PHY_ADDR             0x05
+#define CFG_SYS_RGMII1_PHY_ADDR             0x04
+#define CFG_SYS_RGMII2_PHY_ADDR             0x05
 #else
-#define CONFIG_SYS_RGMII1_PHY_ADDR             0x01
-#define CONFIG_SYS_RGMII2_PHY_ADDR             0x02
+#define CFG_SYS_RGMII1_PHY_ADDR             0x01
+#define CFG_SYS_RGMII2_PHY_ADDR             0x02
 #endif
 
 /* Enable VSC9953 L2 Switch driver on T1040 SoC */
 #if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1040D4RDB)
 #define CONFIG_VSC9953
 #ifdef CONFIG_TARGET_T1040RDB
-#define CONFIG_SYS_FM1_QSGMII11_PHY_ADDR       0x04
-#define CONFIG_SYS_FM1_QSGMII21_PHY_ADDR       0x08
+#define CFG_SYS_FM1_QSGMII11_PHY_ADDR  0x04
+#define CFG_SYS_FM1_QSGMII21_PHY_ADDR  0x08
 #else
-#define CONFIG_SYS_FM1_QSGMII11_PHY_ADDR       0x08
-#define CONFIG_SYS_FM1_QSGMII21_PHY_ADDR       0x0c
+#define CFG_SYS_FM1_QSGMII11_PHY_ADDR  0x08
+#define CFG_SYS_FM1_QSGMII21_PHY_ADDR  0x0c
 #endif
 #endif
 #endif
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial map for Linux*/
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial map for Linux*/
 
 /*
  * Dynamic MTD Partition support with mtdparts
index 798822e5031f13672f3d7cee3ab60843521ad8da..be8c30db26a7e239f270c6d25ae5c5f54446e255 100644 (file)
 
 #ifdef CONFIG_SPIFLASH
 #define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x00200000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE  (768 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_DST           (0x00200000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_START (0x00200000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_OFFS  (256 << 10)
 #endif
 
 #ifdef CONFIG_SDCARD
 #define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
-#define CONFIG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
-#define CONFIG_SYS_MMC_U_BOOT_DST      (0x00200000)
-#define CONFIG_SYS_MMC_U_BOOT_START    (0x00200000)
-#define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
+#define CFG_SYS_MMC_U_BOOT_SIZE        (768 << 10)
+#define CFG_SYS_MMC_U_BOOT_DST (0x00200000)
+#define CFG_SYS_MMC_U_BOOT_START       (0x00200000)
+#define CFG_SYS_MMC_U_BOOT_OFFS        (260 << 10)
 #endif
 
 #endif /* CONFIG_RAMBOOT_PBL */
 /*
  * Config the L3 Cache as L3 SRAM
  */
-#define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
+#define CFG_SYS_INIT_L3_ADDR           0xFFFC0000
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
-#define CONFIG_SYS_DCSRBAR     0xf0000000
-#define CONFIG_SYS_DCSRBAR_PHYS        0xf00000000ull
+#define CFG_SYS_DCSRBAR        0xf0000000
+#define CFG_SYS_DCSRBAR_PHYS   0xf00000000ull
 
 /*
  * DDR Setup
  */
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE     2048    /* for fixed parameter use */
 #define SPD_EEPROM_ADDRESS1    0x51
 #define SPD_EEPROM_ADDRESS2    0x52
 /*
  * IFC Definitions
  */
-#define CONFIG_SYS_FLASH_BASE          0xe0000000
-#define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | CONFIG_SYS_FLASH_BASE)
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0xf)
-#define CONFIG_SYS_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS \
+#define CFG_SYS_FLASH_BASE             0xe0000000
+#define CFG_SYS_FLASH_BASE_PHYS        (0xf00000000ull | CFG_SYS_FLASH_BASE)
+#define CFG_SYS_NOR0_CSPR_EXT  (0xf)
+#define CFG_SYS_NOR0_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS \
                                + 0x8000000) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR_EXT       (0xf)
-#define CONFIG_SYS_NOR1_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR1_CSPR_EXT  (0xf)
+#define CFG_SYS_NOR1_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS \
-                                       + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS \
+                                       + 0x8000000, CFG_SYS_FLASH_BASE_PHYS}
 
 #define QIXIS_BASE                     0xffdf0000
 #define QIXIS_LBMAP_SWITCH             6
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE  0x08
 #define QIXIS_BASE_PHYS                (0xf00000000ull | QIXIS_BASE)
 
-#define CONFIG_SYS_CSPR3_EXT   (0xf)
-#define CONFIG_SYS_CSPR3       (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) \
+#define CFG_SYS_CSPR3_EXT      (0xf)
+#define CFG_SYS_CSPR3  (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) \
                                | CSPR_PORT_SIZE_8 \
                                | CSPR_MSEL_GPCM \
                                | CSPR_V)
-#define CONFIG_SYS_AMASK3      IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_CSOR3       0x0
+#define CFG_SYS_AMASK3 IFC_AMASK(64 * 1024)
+#define CFG_SYS_CSOR3  0x0
 /* QIXIS Timing parameters for IFC CS3 */
-#define CONFIG_SYS_CS3_FTIM0           (FTIM0_GPCM_TACSE(0x0e) | \
+#define CFG_SYS_CS3_FTIM0              (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
                                        FTIM0_GPCM_TEAHC(0x0e))
-#define CONFIG_SYS_CS3_FTIM1           (FTIM1_GPCM_TACO(0xff) | \
+#define CFG_SYS_CS3_FTIM1              (FTIM1_GPCM_TACO(0xff) | \
                                        FTIM1_GPCM_TRAD(0x3f))
-#define CONFIG_SYS_CS3_FTIM2           (FTIM2_GPCM_TCS(0x0e) | \
+#define CFG_SYS_CS3_FTIM2              (FTIM2_GPCM_TCS(0x0e) | \
                                        FTIM2_GPCM_TCH(0x8) | \
                                        FTIM2_GPCM_TWP(0x1f))
-#define CONFIG_SYS_CS3_FTIM3           0x0
+#define CFG_SYS_CS3_FTIM3              0x0
 
 /* NAND Flash on IFC */
 #define CFG_SYS_NAND_BASE              0xff800000
 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 
 #if defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
 #endif
 
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
-#define CONFIG_SYS_INIT_RAM_ADDR       0xfdd00000 /* Initial L1 address */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH     0xf
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW      0xfe03c000
+#define CFG_SYS_INIT_RAM_ADDR  0xfdd00000 /* Initial L1 address */
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH        0xf
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
 /* The assembler doesn't like typecast */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \
-                       ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW)
-#define CONFIG_SYS_INIT_RAM_SIZE       0x00004000
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_RAM_ADDR_PHYS \
+                       ((CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
+                       CFG_SYS_INIT_RAM_ADDR_PHYS_LOW)
+#define CFG_SYS_INIT_RAM_SIZE  0x00004000
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*
  * Serial Port
  */
 #define CFG_SYS_NS16550_CLK            (get_bus_freq(0)/2)
-#define CONFIG_SYS_BAUDRATE_TABLE      \
+#define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CFG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CFG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1 (CFG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2 (CFG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3 (CFG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4 (CFG_SYS_CCSRBAR+0x11D600)
 
 /*
  * I2C
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_BMAN_NUM_PORTALS    18
-#define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
-#define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull
-#define CONFIG_SYS_BMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_BMAN_SP_CENA_SIZE    0x4000
-#define CONFIG_SYS_BMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_BMAN_CENA_BASE       CONFIG_SYS_BMAN_MEM_BASE
-#define CONFIG_SYS_BMAN_CENA_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_CINH_BASE       (CONFIG_SYS_BMAN_MEM_BASE + \
-                                       CONFIG_SYS_BMAN_CENA_SIZE)
-#define CONFIG_SYS_BMAN_CINH_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_SWP_ISDR_REG    0xE08
-#define CONFIG_SYS_QMAN_NUM_PORTALS    18
-#define CONFIG_SYS_QMAN_MEM_BASE       0xf6000000
-#define CONFIG_SYS_QMAN_MEM_PHYS       0xff6000000ull
-#define CONFIG_SYS_QMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
-                                       CONFIG_SYS_QMAN_CENA_SIZE)
-#define CONFIG_SYS_QMAN_CINH_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_SWP_ISDR_REG   0xE08
+#define CFG_SYS_BMAN_NUM_PORTALS       18
+#define CFG_SYS_BMAN_MEM_BASE  0xf4000000
+#define CFG_SYS_BMAN_MEM_PHYS  0xff4000000ull
+#define CFG_SYS_BMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_BMAN_SP_CENA_SIZE    0x4000
+#define CFG_SYS_BMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_BMAN_CENA_BASE       CFG_SYS_BMAN_MEM_BASE
+#define CFG_SYS_BMAN_CENA_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_CINH_BASE       (CFG_SYS_BMAN_MEM_BASE + \
+                                       CFG_SYS_BMAN_CENA_SIZE)
+#define CFG_SYS_BMAN_CINH_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_SWP_ISDR_REG    0xE08
+#define CFG_SYS_QMAN_NUM_PORTALS       18
+#define CFG_SYS_QMAN_MEM_BASE  0xf6000000
+#define CFG_SYS_QMAN_MEM_PHYS  0xff6000000ull
+#define CFG_SYS_QMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_QMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_QMAN_CENA_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_CINH_BASE       (CFG_SYS_QMAN_MEM_BASE + \
+                                       CFG_SYS_QMAN_CENA_SIZE)
+#define CFG_SYS_QMAN_CINH_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_SWP_ISDR_REG      0xE08
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial map for Linux*/
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial map for Linux*/
 
 /*
  * Environment Configuration
index ea366b671c02ded6bd593d772395e6ae85bf047e..795873f42336781f54bcf9b567a0abe12f9bb02f 100644 (file)
 
 #ifdef CONFIG_SPIFLASH
 #define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x00200000)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_START      (0x00200000)
+#define CFG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
 #endif
 
 #ifdef CONFIG_SDCARD
 #define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
-#define CONFIG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
-#define CONFIG_SYS_MMC_U_BOOT_DST      (0x00200000)
-#define CONFIG_SYS_MMC_U_BOOT_START    (0x00200000)
-#define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
+#define CFG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
+#define CFG_SYS_MMC_U_BOOT_DST      (0x00200000)
+#define CFG_SYS_MMC_U_BOOT_START    (0x00200000)
+#define CFG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
 #endif
 
 #endif /* CONFIG_RAMBOOT_PBL */
 /*
  * Config the L3 Cache as L3 SRAM
  */
-#define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
+#define CFG_SYS_INIT_L3_ADDR           0xFFFC0000
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
-#define CONFIG_SYS_DCSRBAR     0xf0000000
-#define CONFIG_SYS_DCSRBAR_PHYS        0xf00000000ull
+#define CFG_SYS_DCSRBAR        0xf0000000
+#define CFG_SYS_DCSRBAR_PHYS   0xf00000000ull
 
 /*
  * DDR Setup
  */
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE     2048    /* for fixed parameter use */
 #define SPD_EEPROM_ADDRESS1    0x51
 #define SPD_EEPROM_ADDRESS2    0x52
 /*
  * IFC Definitions
  */
-#define CONFIG_SYS_FLASH_BASE          0xe8000000
-#define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | CONFIG_SYS_FLASH_BASE)
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0xf)
-#define CONFIG_SYS_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_FLASH_BASE             0xe8000000
+#define CFG_SYS_FLASH_BASE_PHYS        (0xf00000000ull | CFG_SYS_FLASH_BASE)
+#define CFG_SYS_NOR0_CSPR_EXT  (0xf)
+#define CFG_SYS_NOR0_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS }
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS }
 
 /* CPLD on IFC */
-#define CONFIG_SYS_CPLD_BASE   0xffdf0000
-#define CONFIG_SYS_CPLD_BASE_PHYS      (0xf00000000ull | CONFIG_SYS_CPLD_BASE)
-#define CONFIG_SYS_CSPR2_EXT   (0xf)
-#define CONFIG_SYS_CSPR2       (CSPR_PHYS_ADDR(CONFIG_SYS_CPLD_BASE) \
+#define CFG_SYS_CPLD_BASE      0xffdf0000
+#define CFG_SYS_CPLD_BASE_PHYS (0xf00000000ull | CFG_SYS_CPLD_BASE)
+#define CFG_SYS_CSPR2_EXT      (0xf)
+#define CFG_SYS_CSPR2  (CSPR_PHYS_ADDR(CFG_SYS_CPLD_BASE) \
                                | CSPR_PORT_SIZE_8 \
                                | CSPR_MSEL_GPCM \
                                | CSPR_V)
-#define CONFIG_SYS_AMASK2      IFC_AMASK(64*1024)
-#define CONFIG_SYS_CSOR2       0x0
+#define CFG_SYS_AMASK2 IFC_AMASK(64*1024)
+#define CFG_SYS_CSOR2  0x0
 
 /* CPLD Timing parameters for IFC CS2 */
-#define CONFIG_SYS_CS2_FTIM0           (FTIM0_GPCM_TACSE(0x0e) | \
+#define CFG_SYS_CS2_FTIM0              (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
                                        FTIM0_GPCM_TEAHC(0x0e))
-#define CONFIG_SYS_CS2_FTIM1           (FTIM1_GPCM_TACO(0x0e) | \
+#define CFG_SYS_CS2_FTIM1              (FTIM1_GPCM_TACO(0x0e) | \
                                        FTIM1_GPCM_TRAD(0x1f))
-#define CONFIG_SYS_CS2_FTIM2           (FTIM2_GPCM_TCS(0x0e) | \
+#define CFG_SYS_CS2_FTIM2              (FTIM2_GPCM_TCS(0x0e) | \
                                        FTIM2_GPCM_TCH(0x8) | \
                                        FTIM2_GPCM_TWP(0x1f))
-#define CONFIG_SYS_CS2_FTIM3           0x0
+#define CFG_SYS_CS2_FTIM3              0x0
 
 /* NAND Flash on IFC */
 #define CFG_SYS_NAND_BASE              0xff800000
 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 
 #if defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NAND_FTIM3
 #endif
 
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
-#define CONFIG_SYS_INIT_RAM_ADDR       0xfdd00000 /* Initial L1 address */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH     0xf
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW      0xfe03c000
+#define CFG_SYS_INIT_RAM_ADDR  0xfdd00000 /* Initial L1 address */
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH        0xf
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
 /* The assembler doesn't like typecast */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \
-                       ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW)
-#define CONFIG_SYS_INIT_RAM_SIZE       0x00004000
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_RAM_ADDR_PHYS \
+                       ((CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
+                       CFG_SYS_INIT_RAM_ADDR_PHYS_LOW)
+#define CFG_SYS_INIT_RAM_SIZE  0x00004000
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*
  * Serial Port
  */
 #define CFG_SYS_NS16550_CLK            (get_bus_freq(0)/2)
-#define CONFIG_SYS_BAUDRATE_TABLE      \
+#define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CFG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CFG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1 (CFG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2 (CFG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3 (CFG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4 (CFG_SYS_CCSRBAR+0x11D600)
 
 /*
  * I2C
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_BMAN_NUM_PORTALS    18
-#define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
-#define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull
-#define CONFIG_SYS_BMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_BMAN_SP_CENA_SIZE    0x4000
-#define CONFIG_SYS_BMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_BMAN_CENA_BASE       CONFIG_SYS_BMAN_MEM_BASE
-#define CONFIG_SYS_BMAN_CENA_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_CINH_BASE       (CONFIG_SYS_BMAN_MEM_BASE + \
-                                       CONFIG_SYS_BMAN_CENA_SIZE)
-#define CONFIG_SYS_BMAN_CINH_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_SWP_ISDR_REG   0xE08
-#define CONFIG_SYS_QMAN_NUM_PORTALS    18
-#define CONFIG_SYS_QMAN_MEM_BASE       0xf6000000
-#define CONFIG_SYS_QMAN_MEM_PHYS       0xff6000000ull
-#define CONFIG_SYS_QMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
-                                       CONFIG_SYS_QMAN_CENA_SIZE)
-#define CONFIG_SYS_QMAN_CINH_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_SWP_ISDR_REG   0xE08
+#define CFG_SYS_BMAN_NUM_PORTALS       18
+#define CFG_SYS_BMAN_MEM_BASE  0xf4000000
+#define CFG_SYS_BMAN_MEM_PHYS  0xff4000000ull
+#define CFG_SYS_BMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_BMAN_SP_CENA_SIZE    0x4000
+#define CFG_SYS_BMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_BMAN_CENA_BASE       CFG_SYS_BMAN_MEM_BASE
+#define CFG_SYS_BMAN_CENA_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_CINH_BASE       (CFG_SYS_BMAN_MEM_BASE + \
+                                       CFG_SYS_BMAN_CENA_SIZE)
+#define CFG_SYS_BMAN_CINH_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_SWP_ISDR_REG      0xE08
+#define CFG_SYS_QMAN_NUM_PORTALS       18
+#define CFG_SYS_QMAN_MEM_BASE  0xf6000000
+#define CFG_SYS_QMAN_MEM_PHYS  0xff6000000ull
+#define CFG_SYS_QMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_QMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_QMAN_CENA_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_CINH_BASE       (CFG_SYS_QMAN_MEM_BASE + \
+                                       CFG_SYS_QMAN_CENA_SIZE)
+#define CFG_SYS_QMAN_CINH_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_SWP_ISDR_REG      0xE08
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial map for Linux*/
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial map for Linux*/
 
 /*
  * Environment Configuration
index cc86c9d4a51bd30693375f218333eed1e862787d..ffd56454939e06c622f008c5f4d50b228a7a7e55 100644 (file)
 
 #ifdef CONFIG_SDCARD
 #define CONFIG_RESET_VECTOR_ADDRESS    0x200FFC
-#define CONFIG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
-#define CONFIG_SYS_MMC_U_BOOT_DST      0x00200000
-#define CONFIG_SYS_MMC_U_BOOT_START    0x00200000
-#define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
+#define CFG_SYS_MMC_U_BOOT_SIZE        (768 << 10)
+#define CFG_SYS_MMC_U_BOOT_DST 0x00200000
+#define CFG_SYS_MMC_U_BOOT_START       0x00200000
+#define CFG_SYS_MMC_U_BOOT_OFFS        (260 << 10)
 #endif
 
 #endif
 /*
  *  Config the L3 Cache as L3 SRAM
  */
-#define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
+#define CFG_SYS_INIT_L3_ADDR           0xFFFC0000
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
-#define CONFIG_SYS_DCSRBAR             0xf0000000
-#define CONFIG_SYS_DCSRBAR_PHYS                0xf00000000ull
+#define CFG_SYS_DCSRBAR                0xf0000000
+#define CFG_SYS_DCSRBAR_PHYS           0xf00000000ull
 
 /*
  * DDR Setup
  */
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 /*
  * IFC Definitions
  */
-#define CONFIG_SYS_FLASH_BASE  0xe0000000
-#define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | CONFIG_SYS_FLASH_BASE)
+#define CFG_SYS_FLASH_BASE     0xe0000000
+#define CFG_SYS_FLASH_BASE_PHYS        (0xf00000000ull | CFG_SYS_FLASH_BASE)
 
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
-#define CONFIG_SYS_INIT_RAM_ADDR       0xfdd00000      /* Initial L1 address */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH     0xf
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW      0xfe03c000
+#define CFG_SYS_INIT_RAM_ADDR  0xfdd00000      /* Initial L1 address */
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH        0xf
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
 /* The assembler doesn't like typecast */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \
-       ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
-         CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW)
-#define CONFIG_SYS_INIT_RAM_SIZE               0x00004000
+#define CFG_SYS_INIT_RAM_ADDR_PHYS \
+       ((CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
+         CFG_SYS_INIT_RAM_ADDR_PHYS_LOW)
+#define CFG_SYS_INIT_RAM_SIZE          0x00004000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /* Serial Port - controlled on board with jumper J8
  * open - index 2
  */
 #define CFG_SYS_NS16550_CLK            (get_bus_freq(0)/2)
 
-#define CONFIG_SYS_BAUDRATE_TABLE      \
+#define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
-#define CFG_SYS_NS16550_COM1   (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CFG_SYS_NS16550_COM2   (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CFG_SYS_NS16550_COM3   (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CFG_SYS_NS16550_COM4   (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1   (CFG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2   (CFG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3   (CFG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4   (CFG_SYS_CCSRBAR+0x11D600)
 
 /* I2C */
 
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial map for Linux*/
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial map for Linux*/
 
 /*
  * Environment Configuration
 /*
  * IFC Definitions
  */
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0xf)
-#define CONFIG_SYS_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS \
+#define CFG_SYS_NOR0_CSPR_EXT  (0xf)
+#define CFG_SYS_NOR0_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS \
                                + 0x8000000) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR_EXT       (0xf)
-#define CONFIG_SYS_NOR1_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR1_CSPR_EXT  (0xf)
+#define CFG_SYS_NOR1_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS \
-                                       + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS \
+                                       + 0x8000000, CFG_SYS_FLASH_BASE_PHYS}
 
 /* NAND Flash on IFC */
 #define CFG_SYS_NAND_BASE              0xff800000
 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 
 #if defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NAND_FTIM3
 #endif
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NOR_FTIM3
 
 /* CPLD on IFC */
-#define CONFIG_SYS_CPLD_BASE   0xffdf0000
-#define CONFIG_SYS_CPLD_BASE_PHYS      (0xf00000000ull | CONFIG_SYS_CPLD_BASE)
-#define CONFIG_SYS_CSPR3_EXT   (0xf)
-#define CONFIG_SYS_CSPR3       (CSPR_PHYS_ADDR(CONFIG_SYS_CPLD_BASE_PHYS) \
+#define CFG_SYS_CPLD_BASE      0xffdf0000
+#define CFG_SYS_CPLD_BASE_PHYS (0xf00000000ull | CFG_SYS_CPLD_BASE)
+#define CFG_SYS_CSPR3_EXT      (0xf)
+#define CFG_SYS_CSPR3  (CSPR_PHYS_ADDR(CFG_SYS_CPLD_BASE_PHYS) \
                                | CSPR_PORT_SIZE_8 \
                                | CSPR_MSEL_GPCM \
                                | CSPR_V)
 
-#define CONFIG_SYS_AMASK3      IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_CSOR3       0x0
+#define CFG_SYS_AMASK3 IFC_AMASK(64 * 1024)
+#define CFG_SYS_CSOR3  0x0
 
 /* CPLD Timing parameters for IFC CS3 */
-#define CONFIG_SYS_CS3_FTIM0           (FTIM0_GPCM_TACSE(0x0e) | \
+#define CFG_SYS_CS3_FTIM0              (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
                                        FTIM0_GPCM_TEAHC(0x0e))
-#define CONFIG_SYS_CS3_FTIM1           (FTIM1_GPCM_TACO(0x0e) | \
+#define CFG_SYS_CS3_FTIM1              (FTIM1_GPCM_TACO(0x0e) | \
                                        FTIM1_GPCM_TRAD(0x1f))
-#define CONFIG_SYS_CS3_FTIM2           (FTIM2_GPCM_TCS(0x0e) | \
+#define CFG_SYS_CS3_FTIM2              (FTIM2_GPCM_TCS(0x0e) | \
                                        FTIM2_GPCM_TCH(0x8) | \
                                        FTIM2_GPCM_TWP(0x1f))
-#define CONFIG_SYS_CS3_FTIM3           0x0
+#define CFG_SYS_CS3_FTIM3              0x0
 
 /* I2C */
 #define I2C_MUX_PCA_ADDR_PRI           0x77 /* I2C bus multiplexer,primary */
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_BMAN_NUM_PORTALS    50
-#define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
-#define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull
-#define CONFIG_SYS_BMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_BMAN_SP_CENA_SIZE    0x4000
-#define CONFIG_SYS_BMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_BMAN_CENA_BASE       CONFIG_SYS_BMAN_MEM_BASE
-#define CONFIG_SYS_BMAN_CENA_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_CINH_BASE       (CONFIG_SYS_BMAN_MEM_BASE + \
-                                       CONFIG_SYS_BMAN_CENA_SIZE)
-#define CONFIG_SYS_BMAN_CINH_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_SWP_ISDR_REG    0xE08
-#define CONFIG_SYS_QMAN_NUM_PORTALS    50
-#define CONFIG_SYS_QMAN_MEM_BASE       0xf6000000
-#define CONFIG_SYS_QMAN_MEM_PHYS       0xff6000000ull
-#define CONFIG_SYS_QMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
-                                       CONFIG_SYS_QMAN_CENA_SIZE)
-#define CONFIG_SYS_QMAN_CINH_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_SWP_ISDR_REG   0xE08
+#define CFG_SYS_BMAN_NUM_PORTALS       50
+#define CFG_SYS_BMAN_MEM_BASE  0xf4000000
+#define CFG_SYS_BMAN_MEM_PHYS  0xff4000000ull
+#define CFG_SYS_BMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_BMAN_SP_CENA_SIZE    0x4000
+#define CFG_SYS_BMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_BMAN_CENA_BASE       CFG_SYS_BMAN_MEM_BASE
+#define CFG_SYS_BMAN_CENA_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_CINH_BASE       (CFG_SYS_BMAN_MEM_BASE + \
+                                       CFG_SYS_BMAN_CENA_SIZE)
+#define CFG_SYS_BMAN_CINH_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_SWP_ISDR_REG    0xE08
+#define CFG_SYS_QMAN_NUM_PORTALS       50
+#define CFG_SYS_QMAN_MEM_BASE  0xf6000000
+#define CFG_SYS_QMAN_MEM_PHYS  0xff6000000ull
+#define CFG_SYS_QMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_QMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_QMAN_CENA_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_CINH_BASE       (CFG_SYS_QMAN_MEM_BASE + \
+                                       CFG_SYS_QMAN_CENA_SIZE)
+#define CFG_SYS_QMAN_CINH_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_SWP_ISDR_REG      0xE08
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
index 25d9c96e164f84fdb2078d5b21be314149a7f710..69b8b048ce39952b74021aeffad5d58a7d9f986a 100644 (file)
  * 0x4C0000 - 0xFFFFFF : Userland (11 MiB + 256 KiB)
  */
 #if defined(CONFIG_NOR)
-#define CONFIG_SYS_FLASH_BASE          (0x08000000)
-#define CONFIG_SYS_FLASH_SIZE          0x01000000
+#define CFG_SYS_FLASH_BASE             (0x08000000)
+#define CFG_SYS_FLASH_SIZE             0x01000000
 #endif  /* NOR support */
 
 #endif /* ! __CONFIG_AM335X_EVM_H */
index a9a4c8d17fc03529394b074745b1d0afcab6c61a..c57a0ddc21dd7afd54db73dd247b55f3ec89015e 100644 (file)
@@ -89,7 +89,7 @@
                                                /* on one chip */
 
 #if defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_FLASH_BASE          NAND_BASE
+#define CFG_SYS_FLASH_BASE             NAND_BASE
 #endif
 
 #endif /* __CONFIG_H */
index 4ff8528cf8ad0b9e89713130e75d43e464167980..bcdff2e98acd383deb8f9ce98a5f14409c1a8df1 100644 (file)
@@ -9,7 +9,7 @@
 #define __CONFIG_AM43XX_EVM_H
 
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 21)    /* 2GB */
-#define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
+#define CFG_SYS_TIMERBASE              0x48040000      /* Use Timer2 */
 
 #include <asm/arch/omap.h>
 
@@ -25,7 +25,7 @@
 /* SPL defines. */
 
 /* Enabling L2 Cache */
-#define CONFIG_SYS_PL310_BASE  0x48242000
+#define CFG_SYS_PL310_BASE     0x48242000
 
 /*
  * When building U-Boot such that there is no previous loader
index 84555f3b13dc887f3c24f441b5de86be9e263ebf..340a8ce6dc88a255ab62ce89ce2e841966e37f65 100644 (file)
@@ -53,9 +53,9 @@
  * 0x1E0000 - 0x9E0000 : QSPI.kernel (8MiB)
  * 0x9E0000 - 0x2000000 : USERLAND
  */
-#define CONFIG_SYS_SPI_KERNEL_OFFS      0x1E0000
-#define CONFIG_SYS_SPI_ARGS_OFFS        0x140000
-#define CONFIG_SYS_SPI_ARGS_SIZE        0x80000
+#define CFG_SYS_SPI_KERNEL_OFFS      0x1E0000
+#define CFG_SYS_SPI_ARGS_OFFS        0x140000
+#define CFG_SYS_SPI_ARGS_SIZE        0x80000
 
 /* SPI SPL */
 
index eba78d3894c890353667deea91b653721dd1316b..ee0be972d243eeb8144aa1bcabbcbba1d26321cb 100644 (file)
@@ -10,7 +10,7 @@
 
 #define CONFIG_HOSTNAME                        "AMCORE"
 
-#define CONFIG_SYS_UART_PORT           0
+#define CFG_SYS_UART_PORT              0
 
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
        "upgrade_uboot=loady; "                                 \
                "erase 0xfff00000 0xffffffff; "                 \
                "cp.b 0x20000 0xfff00000 ${filesize}\0"
 
-#define CONFIG_SYS_CLK                 45000000
-#define CONFIG_SYS_CPU_CLK             (CONFIG_SYS_CLK * 2)
+#define CFG_SYS_CLK                    45000000
+#define CFG_SYS_CPU_CLK                (CFG_SYS_CLK * 2)
 /* Register Base Addrs */
-#define CONFIG_SYS_MBAR                        0x10000000
+#define CFG_SYS_MBAR                   0x10000000
 /* Definitions for initial stack pointer and data area (in DPRAM) */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
+#define CFG_SYS_INIT_RAM_ADDR  0x20000000
 /* size of internal SRAM */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
 
 #define CFG_SYS_SDRAM_BASE             0x00000000
 #define CFG_SYS_SDRAM_SIZE             0x1000000
-#define CONFIG_SYS_FLASH_BASE          0xffc00000
+#define CFG_SYS_FLASH_BASE             0xffc00000
 
 /* amcore design has flash data bytes wired swapped */
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_WRITE_SWAPPED_DATA
 /* reserve 128-4KB */
 
 #define LDS_BOARD_TEXT \
@@ -46,7 +46,7 @@
        env/embedded.o(.text*);
 
 /* memory map space for linux boot data */
-#define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
+#define CFG_SYS_BOOTMAPSZ              (8 << 20)
 
 /*
  * Cache Configuration
  * sdram - single region - no masks
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CF_ACR_CM_WT | CF_ACR_SM_ALL | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV           (CF_CACR_CINVA)
+#define CFG_SYS_CACHE_ACR0             (CF_ACR_CM_WT | CF_ACR_SM_ALL | \
                                         CF_ACR_EN)
-#define CONFIG_SYS_CACHE_ICACR         (CF_CACR_DCM_P | CF_CACR_ESB | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_DCM_P | CF_CACR_ESB | \
                                         CF_CACR_EC)
 
 /* CS0 - AMD Flash, address 0xffc00000 */
-#define        CONFIG_SYS_CS0_BASE             (CONFIG_SYS_FLASH_BASE>>16)
+#define        CFG_SYS_CS0_BASE                (CFG_SYS_FLASH_BASE>>16)
 /* 4MB, AA=0,V=1  C/I BIT for errata */
-#define        CONFIG_SYS_CS0_MASK             0x003f0001
+#define        CFG_SYS_CS0_MASK                0x003f0001
 /* WS=10, AA=1, PS=16bit (10) */
-#define        CONFIG_SYS_CS0_CTRL             0x1980
+#define        CFG_SYS_CS0_CTRL                0x1980
 /* CS1 - DM9000 Ethernet Controller, address 0x30000000 */
-#define CONFIG_SYS_CS1_BASE            0x3000
-#define CONFIG_SYS_CS1_MASK            0x00070001
-#define CONFIG_SYS_CS1_CTRL            0x0100
+#define CFG_SYS_CS1_BASE               0x3000
+#define CFG_SYS_CS1_MASK               0x00070001
+#define CFG_SYS_CS1_CTRL               0x0100
 
 #endif  /* __AMCORE_CONFIG_H */
index 63c7dfc1feba799d6e349e4a6b35ad232f6a5487..9c6f76383debf8de2b5677c886761d8433a89326 100644 (file)
@@ -8,8 +8,8 @@
 
 #define CFG_SYS_SDRAM_BASE           0x80000000
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x8000
+#define CFG_SYS_INIT_RAM_ADDR        0xbd000000
+#define CFG_SYS_INIT_RAM_SIZE        0x8000
 
 /* Miscellaneous configurable options */
 
index 865aad2a3f9083e74bb482723157eaf2f7c11f20..034cd7a7cdf844826f5ebc0db6b0ac99b28ea9dc 100644 (file)
@@ -8,8 +8,8 @@
 
 #define CFG_SYS_SDRAM_BASE           0x80000000
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x2000
+#define CFG_SYS_INIT_RAM_ADDR        0xbd000000
+#define CFG_SYS_INIT_RAM_SIZE        0x2000
 
 /*
  * Serial Port
index 0464a69e8236bd537f92324426595459b24bad22..c56b35150a5f37643776c039aca3981088ca0529 100644 (file)
@@ -8,8 +8,8 @@
 
 #define CFG_SYS_SDRAM_BASE           0x80000000
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x2000
+#define CFG_SYS_INIT_RAM_ADDR        0xbd000000
+#define CFG_SYS_INIT_RAM_SIZE        0x2000
 
 /*
  * Serial Port
index 356d4c35ee2b57a8cca7abc3a23ab370aca75826..c9375b4d162a40e35a6f33cb8665806e889d3838 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #endif /* __CONFIG_H */
index ed32e772f8e2312740b09fbf9fbb3775616b5aa2..60758b0ca02a7d94e573ca4b7e386fcf29f59b20 100644 (file)
@@ -7,9 +7,9 @@
 #define __CONFIG_ARBEL_H
 
 #define CFG_SYS_SDRAM_BASE             0x0
-#define CONFIG_SYS_BOOTMAPSZ           (20 << 20)
-#define CONFIG_SYS_INIT_RAM_ADDR       CFG_SYS_SDRAM_BASE
-#define CONFIG_SYS_INIT_RAM_SIZE       0x8000
+#define CFG_SYS_BOOTMAPSZ              (20 << 20)
+#define CFG_SYS_INIT_RAM_ADDR  CFG_SYS_SDRAM_BASE
+#define CFG_SYS_INIT_RAM_SIZE  0x8000
 
 /* Default environemnt variables */
 #define CONFIG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
index 90cf4705f4f4839f19c385064bfe173fdf3f2d8b..c1eec5d06ccbb976ecdaff44e99050f25d5ba295 100644 (file)
@@ -20,7 +20,7 @@
 #endif
 
 /* Framebuffer */
-#define CONFIG_SYS_LDB_CLOCK   28341000
+#define CFG_SYS_LDB_CLOCK      28341000
 
 #include "mx6_common.h"
 
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #define CFG_SYS_FSL_USDHC_NUM  2
 
index cbd0d6cea011a1baeed15729703a711cbfd32750..bb1bd50838a011435c11d812b43eed2dc412c960 100644 (file)
 #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)
-#define CONFIG_SYS_INIT_RAM_SIZE       (ASPEED_SRAM_SIZE - CONFIG_PRE_CON_BUF_SZ)
+#define CFG_SYS_INIT_RAM_ADDR  (ASPEED_SRAM_BASE + CONFIG_PRE_CON_BUF_SZ)
+#define CFG_SYS_INIT_RAM_SIZE  (ASPEED_SRAM_SIZE - CONFIG_PRE_CON_BUF_SZ)
 #else
-#define CONFIG_SYS_INIT_RAM_ADDR       (ASPEED_SRAM_BASE)
-#define CONFIG_SYS_INIT_RAM_SIZE       (ASPEED_SRAM_SIZE)
+#define CFG_SYS_INIT_RAM_ADDR  (ASPEED_SRAM_BASE)
+#define CFG_SYS_INIT_RAM_SIZE  (ASPEED_SRAM_SIZE)
 #endif
 
 /*
index b142ea3c3350309b016c413a3ac21d83e47dcc3b..f5922fc416eb081df7c25ece742018e20a58dd96 100644 (file)
  * interface etc.
  */
 
-#define CONFIG_SYS_CLK                 80000000
-#define CONFIG_SYS_CPU_CLK             (CONFIG_SYS_CLK * 3)
+#define CFG_SYS_CLK                    80000000
+#define CFG_SYS_CPU_CLK                (CFG_SYS_CLK * 3)
 #define CFG_SYS_SDRAM_SIZE             32              /* SDRAM size in MB */
 
 /*
  * Define baudrate for UART1 (console output, tftp, ...)
  * default value of CONFIG_BAUDRATE for Sentec board: 19200 baud
- * CONFIG_SYS_BAUDRATE_TABLE defines values that can be selected
+ * CFG_SYS_BAUDRATE_TABLE defines values that can be selected
  * in u-boot command interface
  */
 
-#define CONFIG_SYS_UART_PORT           (2)
-#define CONFIG_SYS_UART2_ALT3_GPIO
+#define CFG_SYS_UART_PORT              (2)
+#define CFG_SYS_UART2_ALT3_GPIO
 
 /*
  * Watchdog configuration; Watchdog is disabled for running from RAM
  * it needs non-blocking CFI routines.
  */
 
-#define CONFIG_SYS_FPGA_WAIT           1000
+#define CFG_SYS_FPGA_WAIT              1000
 
 /* End of user parameters to be customized */
 
 
 /* Base register address */
 
-#define CONFIG_SYS_MBAR                0xFC000000      /* Register Base Addrs */
+#define CFG_SYS_MBAR           0xFC000000      /* Register Base Addrs */
 
 /* System Conf. Reg. & System Protection Reg. */
 
-#define CONFIG_SYS_SCR         0x0003;
-#define CONFIG_SYS_SPR         0xffff;
+#define CFG_SYS_SCR            0x0003;
+#define CFG_SYS_SPR            0xffff;
 
 /*
  * Definitions for initial stack pointer and data area (in internal SRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x80000000
-#define CONFIG_SYS_INIT_RAM_SIZE               0x8000
-#define CONFIG_SYS_INIT_RAM_CTRL       0x221
+#define CFG_SYS_INIT_RAM_ADDR  0x80000000
+#define CFG_SYS_INIT_RAM_SIZE          0x8000
+#define CFG_SYS_INIT_RAM_CTRL  0x221
 
 /*
  * Start addresses for the final memory configuration
  * CS4 - unused
  * CS5 - unused
  */
-#define CONFIG_SYS_CS0_BASE            0
-#define CONFIG_SYS_CS0_MASK            0x00ff0001
-#define CONFIG_SYS_CS0_CTRL            0x00001fc0
+#define CFG_SYS_CS0_BASE               0
+#define CFG_SYS_CS0_MASK               0x00ff0001
+#define CFG_SYS_CS0_CTRL               0x00001fc0
 
-#define CONFIG_SYS_CS1_BASE            0x01000000
-#define CONFIG_SYS_CS1_MASK            0x00ff0001
-#define CONFIG_SYS_CS1_CTRL            0x00001fc0
+#define CFG_SYS_CS1_BASE               0x01000000
+#define CFG_SYS_CS1_MASK               0x00ff0001
+#define CFG_SYS_CS1_CTRL               0x00001fc0
 
-#define CONFIG_SYS_CS2_BASE            0x20000000
-#define CONFIG_SYS_CS2_MASK            0x00ff0001
-#define CONFIG_SYS_CS2_CTRL            0x0000fec0
+#define CFG_SYS_CS2_BASE               0x20000000
+#define CFG_SYS_CS2_MASK               0x00ff0001
+#define CFG_SYS_CS2_CTRL               0x0000fec0
 
-#define CONFIG_SYS_CS3_BASE            0x21000000
-#define CONFIG_SYS_CS3_MASK            0x00ff0001
-#define CONFIG_SYS_CS3_CTRL            0x0000fec0
+#define CFG_SYS_CS3_BASE               0x21000000
+#define CFG_SYS_CS3_MASK               0x00ff0001
+#define CFG_SYS_CS3_CTRL               0x0000fec0
 
-#define CONFIG_SYS_FLASH_BASE          0x00000000
+#define CFG_SYS_FLASH_BASE             0x00000000
 
 /* Reserve 256 kB for Monitor */
 
  * 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           (CFG_SYS_SDRAM_BASE + \
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + \
                                                (CFG_SYS_SDRAM_SIZE << 20))
 
 /* FLASH organization */
 
-#define CONFIG_SYS_FLASH_SIZE          0x2000000
+#define CFG_SYS_FLASH_SIZE             0x2000000
 
 #define LDS_BOARD_TEXT \
        . = DEFINED(env_offset) ? env_offset : .; \
 
 /* Cache Configuration */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINVA)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_EC | CF_CACR_CINVA | \
                                         CF_CACR_DCM_P)
 
 #endif /* _CONFIG_ASTRO_MCF5373L_H */
index 4631acfd6643aecd7144a6a29d85ab86223b4534..4aa876a9f79d378f360662ccddb8703e8bf6cc3f 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/kconfig.h>
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK      32768
+#define CFG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 #endif
index 0d76f419db5bf3799601efa1bbda18f02438ffad..b9cc7ba974de545b90f039c14277f7c98dd55c63 100644 (file)
@@ -24,8 +24,8 @@
  */
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* main clock xtal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000        /* main clock xtal */
 
 /*
  * SDRAM: 1 bank, min 32, max 128 MB
 #define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS1
 #define CFG_SYS_SDRAM_SIZE             0x04000000
 
-#define CONFIG_SYS_INIT_RAM_SIZE       (16 * 1024)
+#define CFG_SYS_INIT_RAM_SIZE  (16 * 1024)
 #ifdef CONFIG_AT91SAM9XE
-# define CONFIG_SYS_INIT_RAM_ADDR      ATMEL_BASE_SRAM
+# define CFG_SYS_INIT_RAM_ADDR ATMEL_BASE_SRAM
 #else
-# define CONFIG_SYS_INIT_RAM_ADDR      ATMEL_BASE_SRAM1
+# define CFG_SYS_INIT_RAM_ADDR ATMEL_BASE_SRAM1
 #endif
 
 /* NAND flash */
@@ -51,6 +51,6 @@
 #endif
 
 /* USB */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00500000      /* AT91SAM9260_UHP_BASE */
+#define CFG_SYS_USB_OHCI_REGS_BASE             0x00500000      /* AT91SAM9260_UHP_BASE */
 
 #endif
index dcc1cca4791b68086a2cdd05544f1848626887f3..56247e390bf65b65c3c410f6a2ee5928b359b0ef 100644 (file)
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* 18.432 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000        /* 18.432 MHz crystal */
 
 #include <asm/hardware.h>
 
 /* SDRAM */
 #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
+#define CFG_SYS_INIT_RAM_SIZE  (16 * 1024)
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
@@ -42,6 +42,6 @@
 #define CONFIG_DM9000_NO_SROM
 
 /* USB */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00500000      /* AT91SAM9261_UHP_BASE */
+#define CFG_SYS_USB_OHCI_REGS_BASE             0x00500000      /* AT91SAM9261_UHP_BASE */
 
 #endif
index aefa9fc60c409c94c5251e5ac4cce4c04ab56cc1..afdb74785f8a8ac8e5c00c7ded2719d47ba4a504 100644 (file)
 #include <asm/hardware.h>
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     16367660 /* 16.367 MHz crystal */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768
+#define CFG_SYS_AT91_MAIN_CLOCK        16367660 /* 16.367 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768
 
 /* SDRAM */
 #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
+#define CFG_SYS_INIT_RAM_SIZE  (16 * 1024)
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM1
 
 /* NOR flash, if populated */
 #ifdef CONFIG_SYS_USE_NORFLASH
 #define PHYS_FLASH_1                           0x10000000
-#define CONFIG_SYS_FLASH_BASE                  PHYS_FLASH_1
+#define CFG_SYS_FLASH_BASE                     PHYS_FLASH_1
 
 /* Address and size of Primary Environment Sector */
 
@@ -50,9 +50,9 @@
 #define MASTER_PLL_OUT         3
 
 /* clocks */
-#define CONFIG_SYS_MOR_VAL                                             \
+#define CFG_SYS_MOR_VAL                                                \
                (AT91_PMC_MOR_MOSCEN | AT91_PMC_MOR_OSCOUNT(255))
-#define CONFIG_SYS_PLLAR_VAL                                   \
+#define CFG_SYS_PLLAR_VAL                                      \
        (AT91_PMC_PLLAR_29 |                                    \
        AT91_PMC_PLLXR_OUT(MASTER_PLL_OUT) |                    \
        AT91_PMC_PLLXR_PLLCOUNT(63) |                           \
        AT91_PMC_PLLXR_DIV(MASTER_PLL_DIV))
 
 /* PCK/2 = MCK Master Clock from PLLA */
-#define        CONFIG_SYS_MCKR1_VAL            \
+#define        CFG_SYS_MCKR1_VAL               \
        (AT91_PMC_MCKR_CSS_SLOW | AT91_PMC_MCKR_PRES_1 |        \
         AT91_PMC_MCKR_MDIV_2)
 
 /* PCK/2 = MCK Master Clock from PLLA */
-#define        CONFIG_SYS_MCKR2_VAL            \
+#define        CFG_SYS_MCKR2_VAL               \
        (AT91_PMC_MCKR_CSS_PLLA | AT91_PMC_MCKR_PRES_1 |        \
        AT91_PMC_MCKR_MDIV_2)
 
 /* define PDC[31:16] as DATA[31:16] */
-#define CONFIG_SYS_PIOD_PDR_VAL1       0xFFFF0000
+#define CFG_SYS_PIOD_PDR_VAL1  0xFFFF0000
 /* no pull-up for D[31:16] */
-#define CONFIG_SYS_PIOD_PPUDR_VAL      0xFFFF0000
+#define CFG_SYS_PIOD_PPUDR_VAL 0xFFFF0000
 /* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 3.3V memories */
-#define CONFIG_SYS_MATRIX_EBICSA_VAL                                   \
+#define CFG_SYS_MATRIX_EBICSA_VAL                                      \
        (AT91_MATRIX_CSA_DBPUC | AT91_MATRIX_CSA_VDDIOMSEL_3_3V |       \
         AT91_MATRIX_CSA_EBI_CS1A)
 
 /* SDRAM */
 /* SDRAMC_MR Mode register */
-#define CONFIG_SYS_SDRC_MR_VAL1                0
+#define CFG_SYS_SDRC_MR_VAL1           0
 /* SDRAMC_TR - Refresh Timer register */
-#define CONFIG_SYS_SDRC_TR_VAL1                0x13C
+#define CFG_SYS_SDRC_TR_VAL1           0x13C
 /* SDRAMC_CR - Configuration register*/
-#define CONFIG_SYS_SDRC_CR_VAL                                                 \
+#define CFG_SYS_SDRC_CR_VAL                                                    \
                (AT91_SDRAMC_NC_9 |                                             \
                 AT91_SDRAMC_NR_13 |                                            \
                 AT91_SDRAMC_NB_4 |                                             \
                 (1 << 28))             /* Exit Self Refresh to Active Delay */
 
 /* 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 CFG_SYS_SDRC_MDR_VAL           AT91_SDRAMC_MD_SDRAM
+#define CFG_SYS_SDRC_MR_VAL2           AT91_SDRAMC_MODE_PRECHARGE
 #define CFG_SYS_SDRAM_VAL1             0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRC_MR_VAL3                AT91_SDRAMC_MODE_REFRESH
+#define CFG_SYS_SDRC_MR_VAL3           AT91_SDRAMC_MODE_REFRESH
 #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_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 CFG_SYS_SDRC_MR_VAL4           AT91_SDRAMC_MODE_LMR
 #define CFG_SYS_SDRAM_VAL10            0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRC_MR_VAL5                AT91_SDRAMC_MODE_NORMAL
+#define CFG_SYS_SDRC_MR_VAL5           AT91_SDRAMC_MODE_NORMAL
 #define CFG_SYS_SDRAM_VAL11            0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRC_TR_VAL2                1200            /* SDRAM_TR */
+#define CFG_SYS_SDRC_TR_VAL2           1200            /* SDRAM_TR */
 #define CFG_SYS_SDRAM_VAL12            0               /* SDRAM_BASE */
 
 /* setup SMC0, CS0 (NOR Flash) - 16-bit, 15 WS */
-#define CONFIG_SYS_SMC0_SETUP0_VAL                             \
+#define CFG_SYS_SMC0_SETUP0_VAL                                \
        (AT91_SMC_SETUP_NWE(10) | AT91_SMC_SETUP_NCS_WR(10) |   \
         AT91_SMC_SETUP_NRD(10) | AT91_SMC_SETUP_NCS_RD(10))
-#define CONFIG_SYS_SMC0_PULSE0_VAL                             \
+#define CFG_SYS_SMC0_PULSE0_VAL                                \
        (AT91_SMC_PULSE_NWE(11) | AT91_SMC_PULSE_NCS_WR(11) |   \
         AT91_SMC_PULSE_NRD(11) | AT91_SMC_PULSE_NCS_RD(11))
-#define CONFIG_SYS_SMC0_CYCLE0_VAL     \
+#define CFG_SYS_SMC0_CYCLE0_VAL        \
        (AT91_SMC_CYCLE_NWE(22) | AT91_SMC_CYCLE_NRD(22))
-#define CONFIG_SYS_SMC0_MODE0_VAL                              \
+#define CFG_SYS_SMC0_MODE0_VAL                         \
        (AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |          \
         AT91_SMC_MODE_DBW_16 |                                 \
         AT91_SMC_MODE_TDF | AT91_SMC_MODE_TDF_CYCLE(6))
 
 /* user reset enable */
-#define CONFIG_SYS_RSTC_RMR_VAL                        \
+#define CFG_SYS_RSTC_RMR_VAL                   \
                (AT91_RSTC_KEY |                \
                AT91_RSTC_MR_URSTEN |           \
                AT91_RSTC_MR_ERSTL(15))
 
 /* Disable Watchdog */
-#define CONFIG_SYS_WDTC_WDMR_VAL                               \
+#define CFG_SYS_WDTC_WDMR_VAL                          \
                (AT91_WDT_MR_WDIDLEHLT | AT91_WDT_MR_WDDBGHLT | \
                 AT91_WDT_MR_WDV(0xfff) |                       \
                 AT91_WDT_MR_WDDIS |                            \
 #endif
 
 /* USB */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00a00000      /* AT91SAM9263_UHP_BASE */
+#define CFG_SYS_USB_OHCI_REGS_BASE             0x00a00000      /* AT91SAM9263_UHP_BASE */
 
 #endif
index 08cfee1a4e18412038d8c9ceb2815516175c91df..2ceb8067d580033c129cc985fd655f6fc7486066 100644 (file)
@@ -11,8 +11,8 @@
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK      32768
+#define CFG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE           0x70000000
@@ -41,9 +41,9 @@
                                          56, 57, 58, 59, 60, 61, 62, 63, }
 #endif
 
-#define CONFIG_SYS_MASTER_CLOCK                132096000
-#define CONFIG_SYS_AT91_PLLA           0x20c73f03
-#define CONFIG_SYS_MCKR                        0x1301
-#define CONFIG_SYS_MCKR_CSS            0x1302
+#define CFG_SYS_MASTER_CLOCK           132096000
+#define CFG_SYS_AT91_PLLA              0x20c73f03
+#define CFG_SYS_MCKR                   0x1301
+#define CFG_SYS_MCKR_CSS               0x1302
 
 #endif
index 76f87c16192e95dd43d5d158f90d69e835aa0aa2..0f9e2cfb582dcf160d9e3ee54420d4f7f65ab247 100644 (file)
@@ -10,8 +10,8 @@
 #define __AT91SAM9N12_CONFIG_H_
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     16000000        /* main clock xtal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        16000000        /* main clock xtal */
 
 /* Misc CPU related */
 #define CFG_SYS_SDRAM_BASE             0x20000000
@@ -35,9 +35,9 @@
 
 /* SPL */
 
-#define CONFIG_SYS_MASTER_CLOCK                132096000
-#define CONFIG_SYS_AT91_PLLA           0x20953f03
-#define CONFIG_SYS_MCKR                        0x1301
-#define CONFIG_SYS_MCKR_CSS            0x1302
+#define CFG_SYS_MASTER_CLOCK           132096000
+#define CFG_SYS_AT91_PLLA              0x20953f03
+#define CFG_SYS_MCKR                   0x1301
+#define CFG_SYS_MCKR_CSS               0x1302
 
 #endif
index e1111b6dd38ef533b0dba8995503e14bd8f6a07f..cad00f647b60982587757ec28ebe9886cf07b1e4 100644 (file)
 #include <asm/hardware.h>
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* main clock xtal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        12000000        /* main clock xtal */
 
 /* SDRAM */
 #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
+#define CFG_SYS_INIT_RAM_SIZE  (16 * 1024)
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index eb1d1ad60d1a8670b12a3f3144a89e185745547f..509c458e5faf926c399dd10ac580b2539fdebaa9 100644 (file)
@@ -9,8 +9,8 @@
 #define __CONFIG_H__
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* 12 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768
+#define CFG_SYS_AT91_MAIN_CLOCK        12000000        /* 12 MHz crystal */
 
 /* general purpose I/O */
 
@@ -38,9 +38,9 @@
 
 /* SPL */
 
-#define CONFIG_SYS_MASTER_CLOCK                132096000
-#define CONFIG_SYS_AT91_PLLA           0x20c73f03
-#define CONFIG_SYS_MCKR                        0x1301
-#define CONFIG_SYS_MCKR_CSS            0x1302
+#define CFG_SYS_MASTER_CLOCK           132096000
+#define CFG_SYS_AT91_PLLA              0x20c73f03
+#define CFG_SYS_MCKR                   0x1301
+#define CFG_SYS_MCKR_CSS               0x1302
 
 #endif
index 83ac87b10a58af7e7e21f2b26f14dcc8298b7c27..03e04e6e68051ded8caf714d4ed83956143e16ce 100644 (file)
 
 /* support JEDEC */
 #define PHYS_FLASH_1                   0x88000000      /* BANK 0 */
-#define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
-#define CONFIG_SYS_FLASH_BANKS_LIST    { PHYS_FLASH_1, }
+#define CFG_SYS_FLASH_BASE             PHYS_FLASH_1
+#define CFG_SYS_FLASH_BANKS_LIST       { PHYS_FLASH_1, }
 
 /* max number of memory banks */
 /*
  * There are 4 banks supported for this Controller,
  * but we have only 1 bank connected to flash on board
 */
-#define CONFIG_SYS_FLASH_BANKS_SIZES {0x4000000}
+#define CFG_SYS_FLASH_BANKS_SIZES {0x4000000}
 
 /* max number of sectors on one chip */
 #define CONFIG_FLASH_SECTOR_SIZE       (0x10000*2)
@@ -63,7 +63,7 @@
  */
 
 /* Initial Memory map for Linux*/
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)
 /* Increase max gunzip size */
 
 /* Support autoboot from RAM (kernel image is loaded via debug port) */
index 6d82712186d4e6f621caac107c7ea9a62691b9c0..04dc50b1cb2204411ec07ce5bcecbccb4547278d 100644 (file)
@@ -19,8 +19,8 @@
  * Memory configuration
  */
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE             SZ_512M
 
 /*
index cba109b74a9f61c2588fbd4c9a08b233181cb3c9..43edc91b101102932181e4e496f7a676aab787f9 100644 (file)
@@ -12,7 +12,7 @@
 
 #define CFG_SYS_NS16550_COM1   0xf040c000
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x10200000
+#define CFG_SYS_INIT_RAM_ADDR  0x10200000
 
 #include "bcmstb.h"
 
index a07f1b7ad0f125f618129ba61e1824ad8db9aeff..114337294e02ce9e2c3f83d10f57e3f9e25233e7 100644 (file)
@@ -12,7 +12,7 @@
 
 #define CFG_SYS_NS16550_COM1   0xf040ab00
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x80200000
+#define CFG_SYS_INIT_RAM_ADDR  0x80200000
 
 #include "bcmstb.h"
 
index f1b68ba67338d9b22c97f8e1dee42603d5ca13ce..c61acf6b86b861e78c25d46dfe31e88c1c3fbadf 100644 (file)
@@ -7,6 +7,6 @@
 #define __BCM963138_H
 
 #define CFG_SYS_SDRAM_BASE             0x00000000
-#define CONFIG_SYS_HZ_CLOCK            500000000
+#define CFG_SYS_HZ_CLOCK               500000000
 
 #endif
index 9769a7140926ec24d82236ff032ad1737f9db4b8..57360b60ca9c241b2f75a8a1170f9a5c665904f5 100644 (file)
@@ -82,7 +82,7 @@ extern phys_addr_t prior_stage_fdt_address;
  * initramfs images, in which case this limitation is eliminated.
  */
 #define CFG_SYS_SDRAM_BASE             0x00000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x100000
+#define CFG_SYS_INIT_RAM_SIZE  0x100000
 
 /*
  * CONFIG_SYS_LOAD_ADDR - 1 MiB.
@@ -102,7 +102,7 @@ extern phys_addr_t prior_stage_fdt_address;
 /*
  * Serial console configuration.
  */
-#define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600, \
+#define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
                                         115200}
 
 /*
index a075a5b2f3266c11e64425eb403818558037b3d6..0842a4a8f5430c292b737fbc0f99315bd395770b 100644 (file)
 #define PHYS_SDRAM_SIZE                (SZ_512M)
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #endif /* __CONFIG_H */
index 0b1fc91d9e1788f4be58486e255aff561aadb2de..cb28ae28dd3e93dea9fd47203bafcc19d40438f5 100644 (file)
 #define CONFIG_SH_QSPI_BASE    0xE6B10000
 #else
 #define CONFIG_FLASH_SHOW_PROGRESS     45
-#define CONFIG_SYS_FLASH_BASE          0x00000000
-#define CONFIG_SYS_FLASH_SIZE          0x04000000      /* 64 MB */
-#define CONFIG_SYS_FLASH_BANKS_LIST    { (CONFIG_SYS_FLASH_BASE) }
-#define CONFIG_SYS_FLASH_BANKS_SIZES   { (CONFIG_SYS_FLASH_SIZE) }
+#define CFG_SYS_FLASH_BASE             0x00000000
+#define CFG_SYS_FLASH_SIZE             0x04000000      /* 64 MB */
+#define CFG_SYS_FLASH_BANKS_LIST       { (CFG_SYS_FLASH_BASE) }
+#define CFG_SYS_FLASH_BANKS_SIZES      { (CFG_SYS_FLASH_SIZE) }
 #endif
 
 /* Board Clock */
index e40f110cac6e90dae15c33dcc1b036411956afbb..0d254cd7f9c8d56bcaf5fdffd38e500918d05b10 100644 (file)
@@ -14,7 +14,7 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM3380_H */
index 508317f231ee0d477236351a960ca39b06daafd4..7865b9c17e59716cc1a75b486f52ae0929e73bad 100644 (file)
@@ -14,7 +14,7 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM6318_H */
index c5bda16d2bcd59f1cf7cbc838832fcf1287c39ee..93426d2661d42cb7730405462649850269204057 100644 (file)
@@ -14,7 +14,7 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM63268_H */
index 32397c26e8abee5b293ccbceb12bc4a1caae00bf..e992fe6a560e327421adb118db1cfefd5162acc1 100644 (file)
@@ -14,7 +14,7 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM6328_H */
index 18c99727a04296fca74db03d76c637434437342d..224b6977747fb3f6b4c90205bc34f8e184f8fe0c 100644 (file)
@@ -14,9 +14,9 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
-#define CONFIG_SYS_FLASH_BASE                  0xbfc00000
+#define CFG_SYS_FLASH_BASE                     0xbfc00000
 
 #endif /* __CONFIG_BMIPS_BCM6338_H */
index f8d7148d497ea108646777f3022d9259a15b3c96..3211d23049ee623d9323b41912d2c200b19b27c5 100644 (file)
@@ -14,9 +14,9 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
-#define CONFIG_SYS_FLASH_BASE                  0xbfc00000
+#define CFG_SYS_FLASH_BASE                     0xbfc00000
 
 #endif /* __CONFIG_BMIPS_BCM6348_H */
index d564a32ee52678136711d1ec4207db1d207e8be5..7e2449ca24fda72676068bd4e61bc5db19733535 100644 (file)
@@ -14,9 +14,9 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
-#define CONFIG_SYS_FLASH_BASE                  0xbe000000
+#define CFG_SYS_FLASH_BASE                     0xbe000000
 
 #endif /* __CONFIG_BMIPS_BCM6358_H */
index f982a4363db65964a61909b9c0941ddde97febe5..443ee470107fea5d31c5879a7c2381cb0dc2a524 100644 (file)
@@ -14,7 +14,7 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM6362_H */
index 11d623c28b213cdb6e1e7bd262bf70b4c21439e3..c550f97b935b5b131400a6668a597d52f03ded2e 100644 (file)
@@ -14,9 +14,9 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
-#define CONFIG_SYS_FLASH_BASE                  0xb8000000
+#define CFG_SYS_FLASH_BASE                     0xb8000000
 
 #endif /* __CONFIG_BMIPS_BCM6368_H */
index 30965c85bfaa01c347e0eaf7b46d37fc3b6145cc..f2129140725c0a5c903f346d1930432bd33e2a58 100644 (file)
@@ -14,7 +14,7 @@
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
-#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
+#define CFG_SYS_INIT_SP_OFFSET SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM6838_H */
index 7e358a6314bfef83ba32180ecd58c8eb436ccadb..3cdd0e47eaebd4820b974ec15ef11b21373d69bb 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 
 /* UART */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \
                                          230400, 500000, 1500000 }
 
 #endif /* __CONFIG_BMIPS_COMMON_H */
index 0033a7fb0223e35c8ff10a1ddd59a0dfac151e21..14ce8a4c0f341248de7c28f856134945aa16ac22 100644 (file)
@@ -27,7 +27,7 @@
 # define CFG_SYS_SDRAM_BASE            0x80000000
 #endif
 
-#define CONFIG_SYS_INIT_SP_OFFSET      0x400000
+#define CFG_SYS_INIT_SP_OFFSET 0x400000
 
 /*
  * Console
index 78b2000aa2ed4771b743108190b83ac1dcf8a383..d35c7c4a591e5bb16b604139e1036cfd9c3c38df 100644 (file)
@@ -13,7 +13,7 @@
 
 /* -- i.mx6 specifica -- */
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_PL310_BASE          L2_PL310_BASE
+#define CFG_SYS_PL310_BASE             L2_PL310_BASE
 #endif /* !CONFIG_SYS_L2CACHE_OFF */
 
 #define CONFIG_MXC_GPT_HCLK
@@ -77,8 +77,8 @@ BUR_COMMON_ENV \
 /* RAM */
 #define PHYS_SDRAM_1                   MMDC0_ARB_BASE_ADDR
 #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
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Ethernet */
 #define CONFIG_FEC_FIXED_SPEED         _1000BASET
index f1734aaca7f5025f1f35abbcb4c1e835b34a2b8f..3e0b4250788816ab2ef48243fb19d4195bb46ea5 100644 (file)
@@ -22,7 +22,7 @@
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
 
 /* Timer information */
-#define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
+#define CFG_SYS_TIMERBASE              0x48040000      /* Use Timer2 */
 
 #include <asm/arch/omap.h>
 
index 6f2b8245b9860c627326fa4ea9695c08311a3799..6f3396bad4c8a01180109ad31f43a03ce6aee2a4 100644 (file)
@@ -19,7 +19,7 @@
 
 /* Flat Device Tree Definitions */
 
-#define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
+#define CFG_SYS_BOOTMAPSZ              (256 << 20)
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 #define USDHC1_BASE_ADDR               0x5B010000
 #define USDHC2_BASE_ADDR               0x5B020000
index f268dfd0943d82ac0b95d5a51f5ca831d43a365a..3329c24fa68c62361460df20e554d0e697e495d7 100644 (file)
@@ -12,7 +12,7 @@
 /* Memory configuration */
 
 #define CFG_SYS_SDRAM_BASE             0x80000000 /* cached (KSEG0) address */
-#define CONFIG_SYS_INIT_SP_OFFSET      0x400000
+#define CFG_SYS_INIT_SP_OFFSET 0x400000
 
 /* NS16550-ish UARTs */
 #define CFG_SYS_NS16550_CLK            48000000
index eb899c455782db3df44b38895a4cbc7d90944ffb..b1f9470d9ca434c740af9d0a4f22f8d69a15c14e 100644 (file)
@@ -23,8 +23,8 @@
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR        0x08
 
 #define CONFIG_PCA953X
-#define CONFIG_SYS_I2C_PCA953X_ADDR    0x20
-#define CONFIG_SYS_I2C_PCA953X_WIDTH   { {0x20, 16} }
+#define CFG_SYS_I2C_PCA953X_ADDR       0x20
+#define CFG_SYS_I2C_PCA953X_WIDTH      { {0x20, 16} }
 
 #undef CONFIG_EXTRA_ENV_SETTINGS
 
@@ -83,8 +83,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* SPI Flash support */
 
index 47c4aacc436b25edb653b9d10301425345b49c11..d5c039579759e3a1ced878ed9de504354cec92fc 100644 (file)
@@ -22,8 +22,8 @@
 #define PHYS_SDRAM_1                   MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_2                   MMDC1_ARB_BASE_ADDR
 #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
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Serial console */
 #define CONFIG_MXC_UART_BASE           UART4_BASE
 #define CONFIG_MXC_USB_FLAGS           0
 
 /* Boot */
-#define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
+#define CFG_SYS_BOOTMAPSZ              (8 << 20)
 
 /* misc */
 
index 8f058213e9e74cc46ca607e893b9efee86f4abe7..8ad1cfb5ded370a0a9337e7b26d54f83fe789669 100644 (file)
@@ -9,7 +9,7 @@
 #define __CONFIG_CM_T43_H
 
 #define CONFIG_MAX_RAM_BANK_SIZE       (2048 << 20)    /* 2GB */
-#define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
+#define CFG_SYS_TIMERBASE              0x48040000      /* Use Timer2 */
 
 #include <asm/arch/omap.h>
 
@@ -32,7 +32,7 @@
 #define CONFIG_POWER_TPS65218
 
 /* Enabling L2 Cache */
-#define CONFIG_SYS_PL310_BASE          0x48242000
+#define CFG_SYS_PL310_BASE             0x48242000
 
 /*
  * Since SPL did pll and ddr initialization for us,
index 65b9074cd9cb68565916ebaf9d38d00d3a65ca3e..01828ea2011c1c2e959d43f2fe4c2a7399acf7d8 100644 (file)
  * ---
  */
 
-#define CONFIG_SYS_CLK                 66000000
+#define CFG_SYS_CLK                    66000000
 #define CFG_SYS_SDRAM_SIZE             16              /* SDRAM size in MB */
 
 /* ---
  * Define baudrate for UART1 (console output, tftp, ...)
  * default value of CONFIG_BAUDRATE for Sentec board: 19200 baud
- * CONFIG_SYS_BAUDRATE_TABLE defines values that can be selected in u-boot command
+ * CFG_SYS_BAUDRATE_TABLE defines values that can be selected in u-boot command
  * interface
  * ---
  */
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 /* ---
  * set "#if 0" to "#if 1" if (Hardware)-WATCHDOG should be enabled & change
@@ -133,21 +133,21 @@ enter a valid image address in flash */
  * ---
  */
 
-#define CONFIG_SYS_MBAR                0x10000000      /* Register Base Addrs */
+#define CFG_SYS_MBAR           0x10000000      /* Register Base Addrs */
 
 /* ---
  * System Conf. Reg. & System Protection Reg.
  * ---
  */
 
-#define CONFIG_SYS_SCR                 0x0003
-#define CONFIG_SYS_SPR                 0xffff
+#define CFG_SYS_SCR                    0x0003
+#define CFG_SYS_SPR                    0xffff
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in internal SRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000  /* Size of used area in internal SRAM   */
+#define CFG_SYS_INIT_RAM_ADDR  0x20000000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000  /* Size of used area in internal SRAM   */
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
@@ -168,28 +168,28 @@ enter a valid image address in flash */
  *-----------------------------------------------------------------------
  */
 
-#define CONFIG_SYS_FLASH_BASE          0xffe00000
+#define CFG_SYS_FLASH_BASE             0xffe00000
 
 /*
  * 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           (8 << 20)       /* Initial Memory map for Linux */
+#define CFG_SYS_BOOTMAPSZ              (8 << 20)       /* Initial Memory map for Linux */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINV | CF_CACR_INVI)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_CENB | CF_CACR_CINV | \
                                         CF_CACR_DISD | CF_CACR_INVI | \
                                         CF_CACR_CEIB | CF_CACR_DCM | \
                                         CF_CACR_EUSP)
@@ -209,15 +209,15 @@ enter a valid image address in flash */
 /*-----------------------------------------------------------------------
  * Port configuration (GPIO)
  */
-#define CONFIG_SYS_PACNT               0x00000000              /* PortA control reg.: All pins are external
+#define CFG_SYS_PACNT          0x00000000              /* PortA control reg.: All pins are external
 GPIO*/
-#define CONFIG_SYS_PADDR               0x00FF                  /* PortA direction reg.: PA7 to PA0 are outputs
+#define CFG_SYS_PADDR          0x00FF                  /* PortA direction reg.: PA7 to PA0 are outputs
 (1^=output, 0^=input) */
-#define CONFIG_SYS_PADAT               LED_STAT_0              /* PortA value reg.: Turn all LED off */
-#define CONFIG_SYS_PBCNT               0x55554155              /* PortB control reg.: Ethernet/UART
+#define CFG_SYS_PADAT          LED_STAT_0              /* PortA value reg.: Turn all LED off */
+#define CFG_SYS_PBCNT          0x55554155              /* PortB control reg.: Ethernet/UART
 configuration */
-#define CONFIG_SYS_PBDDR               0x0000                  /* PortB direction: All pins configured as inputs */
-#define CONFIG_SYS_PBDAT               0x0000                  /* PortB value reg. */
-#define CONFIG_SYS_PDCNT               0x00000000              /* PortD control reg. */
+#define CFG_SYS_PBDDR          0x0000                  /* PortB direction: All pins configured as inputs */
+#define CFG_SYS_PBDAT          0x0000                  /* PortB value reg. */
+#define CFG_SYS_PDCNT          0x00000000              /* PortD control reg. */
 
 #endif /* _CONFIG_COBRA5272_H */
index ca8445a3d05a6a580e4b0754be2fe23fc386d45a..12dc946fc7828c12b81a3eccda67df0bbe8f03a7 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #ifdef CONFIG_TARGET_COLIBRI_IMX6ULL_NAND
 /* NAND stuff */
index 14278e9ca4f7c07a2ced88bfa60a0d9ca65ddce5..c6a79debd6bad5568b462c2881f34cd0b543fda3 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #endif /* __CONFIG_H */
index c08095561d839ca332f56c5c05c392a6dcf2d881..32a79b0255458c2ad2e7dc1be90a31202ae79558 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND
 /* NAND stuff */
index 11283071397f1cb1e7fa6d83c55398302b49e2ea..fa778ec9e2b71775385e7fe5292a8752df8e40c9 100644 (file)
@@ -86,8 +86,8 @@
 #define PHYS_SDRAM_SIZE                        (256 * SZ_1M)
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* USB Host Support */
 
index c7a3e47437bc8c89402a3b1b9a4d0662e325eae4..8a61086ecc154f756088905656968818d673d925 100644 (file)
@@ -24,8 +24,8 @@
  */
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK      32768
+#define CFG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 /* serial console */
 #define CONFIG_USART_BASE              ATMEL_BASE_DBGU
                                          48, 49, 50, 51, 52, 53, 54, 55, \
                                          56, 57, 58, 59, 60, 61, 62, 63, }
 
-#define CONFIG_SYS_MASTER_CLOCK                132096000
+#define CFG_SYS_MASTER_CLOCK           132096000
 #define AT91_PLL_LOCK_TIMEOUT          1000000
-#define CONFIG_SYS_AT91_PLLA           0x20c73f03
-#define CONFIG_SYS_MCKR                        0x1301
-#define CONFIG_SYS_MCKR_CSS            0x1302
+#define CFG_SYS_AT91_PLLA              0x20c73f03
+#define CFG_SYS_MCKR                   0x1301
+#define CFG_SYS_MCKR_CSS               0x1302
 
 #endif
index e2e1cfedbde199f4b678a80ebcf37a82b25a64d6..578277fc75c1324eca16297d2b3501624b161636 100644 (file)
 /*
  * SoC Configuration
  */
-#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
-#define CONFIG_SYS_OSCIN_FREQ          24000000
-#define CONFIG_SYS_TIMERBASE           DAVINCI_TIMER0_BASE
-#define CONFIG_SYS_HZ_CLOCK            clk_get(DAVINCI_AUXCLK_CLKID)
+#define CFG_SYS_EXCEPTION_VECTORS_HIGH
+#define CFG_SYS_OSCIN_FREQ             24000000
+#define CFG_SYS_TIMERBASE              DAVINCI_TIMER0_BASE
+#define CFG_SYS_HZ_CLOCK               clk_get(DAVINCI_AUXCLK_CLKID)
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_SYS_DV_NOR_BOOT_CFG     (0x11)
+#define CFG_SYS_DV_NOR_BOOT_CFG        (0x11)
 #endif
 
 /*
@@ -36,7 +36,7 @@
 
 /* memtest will be run on 16MB */
 
-#define CONFIG_SYS_DA850_SYSCFG_SUSPSRC (      \
+#define CFG_SYS_DA850_SYSCFG_SUSPSRC ( \
        DAVINCI_SYSCFG_SUSPSRC_TIMER0 |         \
        DAVINCI_SYSCFG_SUSPSRC_SPI1 |           \
        DAVINCI_SYSCFG_SUSPSRC_UART2 |          \
  * PLL configuration
  */
 
-#define CONFIG_SYS_DA850_PLL0_PLLM     24
-#define CONFIG_SYS_DA850_PLL1_PLLM     21
+#define CFG_SYS_DA850_PLL0_PLLM     24
+#define CFG_SYS_DA850_PLL1_PLLM     21
 
 /*
  * DDR2 memory configuration
  */
-#define CONFIG_SYS_DA850_DDR2_DDRPHYCR (DV_DDR_PHY_PWRDNEN | \
+#define CFG_SYS_DA850_DDR2_DDRPHYCR (DV_DDR_PHY_PWRDNEN | \
                                        DV_DDR_PHY_EXT_STRBEN | \
                                        (0x4 << DV_DDR_PHY_RD_LATENCY_SHIFT))
 
-#define CONFIG_SYS_DA850_DDR2_SDBCR (          \
+#define CFG_SYS_DA850_DDR2_SDBCR (             \
        (1 << DV_DDR_SDCR_MSDRAMEN_SHIFT) |     \
        (1 << DV_DDR_SDCR_DDREN_SHIFT) |        \
        (1 << DV_DDR_SDCR_SDRAMEN_SHIFT) |      \
@@ -67,9 +67,9 @@
        (0x2 << DV_DDR_SDCR_PAGESIZE_SHIFT))
 
 /* SDBCR2 is only used if IBANK_POS bit in SDBCR is set */
-#define CONFIG_SYS_DA850_DDR2_SDBCR2 0
+#define CFG_SYS_DA850_DDR2_SDBCR2 0
 
-#define CONFIG_SYS_DA850_DDR2_SDTIMR (         \
+#define CFG_SYS_DA850_DDR2_SDTIMR (            \
        (14 << DV_DDR_SDTMR1_RFC_SHIFT) |       \
        (2 << DV_DDR_SDTMR1_RP_SHIFT) |         \
        (2 << DV_DDR_SDTMR1_RCD_SHIFT) |        \
@@ -79,7 +79,7 @@
        (1 << DV_DDR_SDTMR1_RRD_SHIFT) |        \
        (0 << DV_DDR_SDTMR1_WTR_SHIFT))
 
-#define CONFIG_SYS_DA850_DDR2_SDTIMR2 (                \
+#define CFG_SYS_DA850_DDR2_SDTIMR2 (           \
        (7 << DV_DDR_SDTMR2_RASMAX_SHIFT) |     \
        (0 << DV_DDR_SDTMR2_XP_SHIFT) |         \
        (0 << DV_DDR_SDTMR2_ODT_SHIFT) |        \
        (0 << DV_DDR_SDTMR2_RTP_SHIFT) |        \
        (0 << DV_DDR_SDTMR2_CKE_SHIFT))
 
-#define CONFIG_SYS_DA850_DDR2_SDRCR    0x00000494
-#define CONFIG_SYS_DA850_DDR2_PBBPR    0x30
+#define CFG_SYS_DA850_DDR2_SDRCR    0x00000494
+#define CFG_SYS_DA850_DDR2_PBBPR    0x30
 
 /*
  * Serial Driver info
  */
 #define CFG_SYS_NS16550_CLK    clk_get(DAVINCI_UART2_CLKID)
 
-#define CONFIG_SYS_SPI_CLK             clk_get(DAVINCI_SPI1_CLKID)
+#define CFG_SYS_SPI_CLK                clk_get(DAVINCI_SPI1_CLKID)
 
 /*
  * I2C Configuration
  */
-#define CONFIG_SYS_I2C_EXPANDER_ADDR   0x20
+#define CFG_SYS_I2C_EXPANDER_ADDR   0x20
 
 /*
  * Flash & Environment
 #endif
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_SYS_FLASH_BASE          DAVINCI_ASYNC_EMIF_DATA_CE2_BASE
+#define CFG_SYS_FLASH_BASE             DAVINCI_ASYNC_EMIF_DATA_CE2_BASE
 #define PHYS_FLASH_SIZE                        (8 << 20) /* Flash size 8MB */
 #endif
 
index b16f3d48e38601e0edca7f97455e137286322012..4b31bbf4e11a9685388d3a977696c9328d4c6ed1 100644 (file)
@@ -43,8 +43,8 @@
 #define PHYS_SDRAM_SIZE                        SZ_512M
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
index c473f3d86ebf4f60d6b821a3c914651ddd0594b4..66aa6d5c3c450925d84618633d2f3d288f02ceb2 100644 (file)
@@ -29,8 +29,8 @@
 /*
  * NOR Flash
  */
-#define CONFIG_SYS_FLASH_BASE          EMC_CS0_BASE
-#define CONFIG_SYS_FLASH_SIZE          SZ_4M
+#define CFG_SYS_FLASH_BASE             EMC_CS0_BASE
+#define CFG_SYS_FLASH_SIZE             SZ_4M
 
 /*
  * NAND controller
index ddc436d50190029417fb915129a7b06d12850d92..f9b3d19480ed88f5e10ee268dbf8c3a6bc79a620 100644 (file)
@@ -73,8 +73,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment */
 
index 0a7428b02caf1a9f9f639df0e4e54c2eaff4e233..7636d2869a9f9206db923af22024fc3e0cbd16e2 100644 (file)
@@ -30,9 +30,9 @@
  */
 
 /* Below values are "dummy" - only to avoid build break */
-#define CONFIG_SYS_SPI_KERNEL_OFFS      0x150000
-#define CONFIG_SYS_SPI_ARGS_OFFS        0x140000
-#define CONFIG_SYS_SPI_ARGS_SIZE        0x10000
+#define CFG_SYS_SPI_KERNEL_OFFS      0x150000
+#define CFG_SYS_SPI_ARGS_OFFS        0x140000
+#define CFG_SYS_SPI_ARGS_SIZE        0x10000
 
 #define CONFIG_MXC_UART_BASE           UART5_BASE
 
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* ENV config */
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
index bb335a0a473cbb8993a5d44793d79850293ef6f1..8217712e3904885534fe2cbc1ed8910439d5ac94 100644 (file)
@@ -63,9 +63,9 @@
  * 0x1E0000 - 0x9E0000 : QSPI.kernel (8MiB)
  * 0x9E0000 - 0x2000000 : USERLAND
  */
-#define CONFIG_SYS_SPI_KERNEL_OFFS     0x1E0000
-#define CONFIG_SYS_SPI_ARGS_OFFS       0x140000
-#define CONFIG_SYS_SPI_ARGS_SIZE       0x80000
+#define CFG_SYS_SPI_KERNEL_OFFS        0x1E0000
+#define CFG_SYS_SPI_ARGS_OFFS  0x140000
+#define CFG_SYS_SPI_ARGS_SIZE  0x80000
 
 /* SPI SPL */
 
@@ -87,8 +87,8 @@
 /* Parallel NOR Support */
 #if defined(CONFIG_NOR)
 /* NOR: device related configs */
-#define CONFIG_SYS_FLASH_SIZE          (64 * 1024 * 1024) /* 64 MB */
-#define CONFIG_SYS_FLASH_BASE          (0x08000000)
+#define CFG_SYS_FLASH_SIZE             (64 * 1024 * 1024) /* 64 MB */
+#define CFG_SYS_FLASH_BASE             (0x08000000)
 /* Reduce SPL size by removing unlikey targets */
 #endif  /* NOR support */
 
index 8bfba78dc8e473122e397c5a26816e287d91769d..8140bc469c52937f24ddb01a9347754ae06d9171 100644 (file)
@@ -14,7 +14,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45
-#define CONFIG_SYS_FLASH_BANKS_LIST    { 0x08000000 }
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_FLASH_BANKS_LIST       { 0x08000000 }
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
 #endif /* __DRAAK_H */
index 677a48562309b7ee690b7faffc0ff6bc256f23c3..bd88c42a3ba57289e3c2a1b56bd2f9a9bcaf052e 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/sysmap-sdm845.h>
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 230400, 460800, 921600 }
+#define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 }
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x5000000\0"        \
index 80de73d15d507fa888b78763eeacd15e4a06ea70..426155dbdbf16cdf04172e2c51b2205c9843a382 100644 (file)
@@ -12,7 +12,7 @@
  * High Level Configuration Options (easy to change)                    *
  *----------------------------------------------------------------------*/
 
-#define CONFIG_SYS_UART_PORT           (0)
+#define CFG_SYS_UART_PORT              (0)
 
 #undef CONFIG_MONITOR_IS_IN_RAM                /* starts uboot direct */
 
  * Environment is in the second sector of the first 256k of flash      *
  *----------------------------------------------------------------------*/
 
-/*#define CONFIG_SYS_DRAM_TEST         1 */
-#undef CONFIG_SYS_DRAM_TEST
+/*#define CFG_SYS_DRAM_TEST            1 */
+#undef CFG_SYS_DRAM_TEST
 
 /*----------------------------------------------------------------------*
  * Clock and PLL Configuration                                         *
  *----------------------------------------------------------------------*/
-#define        CONFIG_SYS_CLK                  80000000      /* 8MHz * 8 */
+#define        CFG_SYS_CLK                     80000000      /* 8MHz * 8 */
 
 /* PLL Configuration: Ext Clock * 8 (see table 9-4 of MCF user manual) */
 
-#define CONFIG_SYS_MFD         0x02    /* PLL Multiplication Factor Devider */
-#define CONFIG_SYS_RFD         0x00    /* PLL Reduce Frecuency Devider */
+#define CFG_SYS_MFD            0x02    /* PLL Multiplication Factor Devider */
+#define CFG_SYS_RFD            0x00    /* PLL Reduce Frecuency Devider */
 
 /*----------------------------------------------------------------------*
  * Network                                                             *
  * You should know what you are doing if you make changes here.
  *-----------------------------------------------------------------------*/
 
-#define        CONFIG_SYS_MBAR                 0x40000000
+#define        CFG_SYS_MBAR                    0x40000000
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  *-----------------------------------------------------------------------*/
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x10000
+#define CFG_SYS_INIT_RAM_ADDR  0x20000000
+#define CFG_SYS_INIT_RAM_SIZE  0x10000
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * 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    (8 << 20) /* Initial Memory map for Linux */
+#define        CFG_SYS_BOOTMAPSZ       (8 << 20) /* Initial Memory map for Linux */
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #define CONFIG_FLASH_SHOW_PROGRESS     45
 
-#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_CS0_BASE
-#define        CONFIG_SYS_INT_FLASH_BASE       0xF0000000
-#define CONFIG_SYS_INT_FLASH_ENABLE    0x21
+#define CFG_SYS_FLASH_BASE             CFG_SYS_CS0_BASE
+#define        CFG_SYS_INT_FLASH_BASE  0xF0000000
+#define CFG_SYS_INT_FLASH_ENABLE       0x21
 
-#define CONFIG_SYS_FLASH_SIZE          16*1024*1024
+#define CFG_SYS_FLASH_SIZE             16*1024*1024
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE }
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_CINV + CF_CACR_DCM)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_CENB | CF_CACR_DISD | \
                                         CF_CACR_CEIB | CF_CACR_DBWE | \
                                         CF_CACR_EUSP)
 
  * Memory bank definitions
  */
 
-#define CONFIG_SYS_CS0_BASE            0xFF000000
-#define CONFIG_SYS_CS0_CTRL            0x00001980
-#define CONFIG_SYS_CS0_MASK            0x00FF0001
+#define CFG_SYS_CS0_BASE               0xFF000000
+#define CFG_SYS_CS0_CTRL               0x00001980
+#define CFG_SYS_CS0_MASK               0x00FF0001
 
-#define CONFIG_SYS_CS2_BASE            0xE0000000
-#define CONFIG_SYS_CS2_CTRL            0x00001980
-#define CONFIG_SYS_CS2_MASK            0x000F0001
+#define CFG_SYS_CS2_BASE               0xE0000000
+#define CFG_SYS_CS2_CTRL               0x00001980
+#define CFG_SYS_CS2_MASK               0x000F0001
 
-#define CONFIG_SYS_CS3_BASE            0xE0100000
-#define CONFIG_SYS_CS3_CTRL            0x00001980
-#define CONFIG_SYS_CS3_MASK            0x000F0001
+#define CFG_SYS_CS3_BASE               0xE0100000
+#define CFG_SYS_CS3_CTRL               0x00001980
+#define CFG_SYS_CS3_MASK               0x000F0001
 
 /*-----------------------------------------------------------------------
  * Port configuration
  */
-#define CONFIG_SYS_PACNT               0x0000000       /* Port A D[31:24] */
-#define CONFIG_SYS_PADDR               0x0000000
-#define CONFIG_SYS_PADAT               0x0000000
+#define CFG_SYS_PACNT          0x0000000       /* Port A D[31:24] */
+#define CFG_SYS_PADDR          0x0000000
+#define CFG_SYS_PADAT          0x0000000
 
-#define CONFIG_SYS_PBCNT               0x0000000       /* Port B D[23:16] */
-#define CONFIG_SYS_PBDDR               0x0000000
-#define CONFIG_SYS_PBDAT               0x0000000
+#define CFG_SYS_PBCNT          0x0000000       /* Port B D[23:16] */
+#define CFG_SYS_PBDDR          0x0000000
+#define CFG_SYS_PBDAT          0x0000000
 
-#define CONFIG_SYS_PDCNT               0x0000000       /* Port D D[07:00] */
+#define CFG_SYS_PDCNT          0x0000000       /* Port D D[07:00] */
 
-#define CONFIG_SYS_PASPAR              0x0F0F
-#define CONFIG_SYS_PEHLPAR             0xC0
-#define CONFIG_SYS_PUAPAR              0x0F
-#define CONFIG_SYS_DDRUA               0x05
-#define CONFIG_SYS_PJPAR               0xFF
+#define CFG_SYS_PASPAR         0x0F0F
+#define CFG_SYS_PEHLPAR                0xC0
+#define CFG_SYS_PUAPAR         0x0F
+#define CFG_SYS_DDRUA          0x05
+#define CFG_SYS_PJPAR          0xFF
 
 /*-----------------------------------------------------------------------
  * I2C
index 597efd6745cd397b36edc7c4f68660990eb14a4e..d1882a9646bebb945a3f975d7605360d97adcb89 100644 (file)
@@ -16,7 +16,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45
-#define CONFIG_SYS_FLASH_BANKS_LIST    { 0x08000000 }
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_FLASH_BANKS_LIST       { 0x08000000 }
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
 #endif /* __EBISU_H */
index b05141ad6450ec891e9dde14cca87e347238ed56..455a889b64c11c038757a3109310b8b2b8b46f5b 100644 (file)
@@ -10,6 +10,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_STACK_SIZE                  (32 * 1024)
+#define CFG_SYS_STACK_SIZE                     (32 * 1024)
 
 #endif
index d24bc56f34ab2c1254c4bc6136853dd4d2ecca0c..141f9913e6391608d986e127c6dd5cf24d768a19 100644 (file)
@@ -51,8 +51,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* environment organization */
 
index e39bb94314f301da4b33ee538a7bb19dba1aee6d..29b7748e7865b3e7ff1d5460fe967cb165bea535 100644 (file)
@@ -28,8 +28,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Environment organization */
 
index 6cae663cb8a03a742ea7681f08ea2baeb153b9aa..6647148c96f4a81a1e5e728b9a80ad18d74c4a1c 100644 (file)
@@ -16,7 +16,7 @@
 /* NAND specific changes for etamin due to different page size */
 #undef CFG_SYS_NAND_ECCPOS
 
-#define CONFIG_SYS_ENV_SECT_SIZE       (512 << 10)     /* 512 KiB */
+#define CFG_SYS_ENV_SECT_SIZE       (512 << 10)     /* 512 KiB */
 #define CFG_SYS_NAND_ECCPOS    { 2, 3, 4, 5, 6, 7, 8, 9, \
                                10, 11, 12, 13, 14, 15, 16, 17, 18, 19, \
                                20, 21, 22, 23, 24, 25, 26, 27, 28, 29, \
index 97a8ffb4f61e592a2a735afba8f9069968419443..52eb0be676113ab5be3f3c6571dd379681b307b3 100644 (file)
 /* CPU information */
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768   /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000 /* 18.432 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768   /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000 /* 18.432 MHz crystal */
 
 /* 32kB internal SRAM */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x00300000 /*AT91SAM9XE_SRAM_BASE */
-#define CONFIG_SYS_INIT_RAM_SIZE       (32 << 10)
+#define CFG_SYS_INIT_RAM_ADDR  0x00300000 /*AT91SAM9XE_SRAM_BASE */
+#define CFG_SYS_INIT_RAM_SIZE  (32 << 10)
 
 /* 128MB SDRAM in 1 bank */
 #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 */
+# define CFG_SYS_FLASH_BASE            0x00200000 /* AT91SAM9XE_FLASH_BASE */
 
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_SYS_MMC_CD_PIN          AT91_PIO_PORTC, 8
+#define CFG_SYS_MMC_CD_PIN             AT91_PIO_PORTC, 8
 #endif
 
 /* RTC */
 #if defined(CONFIG_CMD_DATE) || defined(CONFIG_CMD_SNTP)
-#define CONFIG_SYS_I2C_RTC_ADDR                0x51
+#define CFG_SYS_I2C_RTC_ADDR           0x51
 #endif
 
 /* I2C */
-#define CONFIG_SYS_MAX_I2C_BUS 1
+#define CFG_SYS_MAX_I2C_BUS    1
 
 #define I2C_SOFT_DECLARATIONS
 
index cd6cb062eca2bbe8948c86272021a620816512f2..bec1660cf485201345bf4d08260c39fdf15248ac 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <configs/aspeed-common.h>
 
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 
 /* Misc */
 #define CONFIG_EXTRA_ENV_SETTINGS \
index ecd05fe15cecca1978de46df6b4da014264580b9..c9c988b93740b390ae12a41f7c1a4b20717b09c5 100644 (file)
@@ -8,7 +8,7 @@
 
 #include <configs/aspeed-common.h>
 
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 
 /* Misc */
 #define STR_HELPER(s)  #s
index a94f5a15f0d13ac77048ac51f0eed437dfd9a1cc..c9e0c13172cc24b55b665faa989c2010a318d5fd 100644 (file)
@@ -15,7 +15,7 @@
                "stdout=serial,vidconsole\0" \
                "stderr=serial,vidconsole\0"
 
-#define CONFIG_SYS_SPI_BASE    0x12D30000
+#define CFG_SYS_SPI_BASE       0x12D30000
 #define FLASH_SIZE             (4 << 20)
 #define CONFIG_SPI_BOOTING
 
index 68c36dc2fd9574fe2e688024decd69ab0a2edc15..8672b9e9527006ad6ecd7c184e2d7bbc570c9f1b 100644 (file)
@@ -18,7 +18,7 @@
 
 #define CPU_RELEASE_ADDR               secondary_boot_addr
 
-#define CONFIG_SYS_BAUDRATE_TABLE \
+#define CFG_SYS_BAUDRATE_TABLE \
        {9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600}
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
index f5353ec79a1a9fe78e2431c32a6f444672727fb4..89e531649a61c511536a5fb1e944935f1eb29f7c 100644 (file)
@@ -14,8 +14,8 @@
 #endif
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* 12 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768
+#define CFG_SYS_AT91_MAIN_CLOCK        12000000        /* 12 MHz crystal */
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE             0x20000000
 
 /* SPL */
 
-#define CONFIG_SYS_MASTER_CLOCK                132096000
-#define CONFIG_SYS_AT91_PLLA           0x20c73f03
-#define CONFIG_SYS_MCKR                        0x1301
-#define CONFIG_SYS_MCKR_CSS            0x1302
+#define CFG_SYS_MASTER_CLOCK           132096000
+#define CFG_SYS_AT91_PLLA              0x20c73f03
+#define CFG_SYS_MCKR                   0x1301
+#define CFG_SYS_MCKR_CSS               0x1302
 
 #define CFG_SYS_NAND_U_BOOT_SIZE       0xa0000
 #define        CFG_SYS_NAND_U_BOOT_START       CONFIG_TEXT_BASE
index a7557144402b89d0f4c728bdd6d2c221d67c5e95..0ba4efe67ac34b9d1e3a71149363487199174033 100644 (file)
@@ -9,14 +9,14 @@
 /* RAM */
 #define CFG_SYS_SDRAM_BASE             0x80000000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      0x400000
+#define CFG_SYS_INIT_SP_OFFSET 0x400000
 
 /* SPL */
 
-#define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_START            CONFIG_TEXT_BASE
 
 /* Dummy value */
-#define CONFIG_SYS_UBOOT_BASE          0
+#define CFG_SYS_UBOOT_BASE             0
 
 /* Serial SPL */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
@@ -25,7 +25,7 @@
 #endif
 
 /* UART */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \
                                          230400, 460800, 921600 }
 
 /* RAM */
index 6cdfe8c4c3c0f823e3156fb8fb189348135e1ba3..36dcee87c5fbb7eb1d153f7b82835213ad33e103 100644 (file)
@@ -14,7 +14,7 @@
  */
 #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
+#define CFG_SYS_DDR_SDRAM_BASE CFG_SYS_SDRAM_BASE
 
 /*
  * Memory test
 /*
  * Initial RAM Base Address Setup
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0xE6000000 /* Initial RAM address */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000 /* Size of used area in RAM */
+#define CFG_SYS_INIT_RAM_ADDR  0xE6000000 /* Initial RAM address */
+#define CFG_SYS_INIT_RAM_SIZE  0x1000 /* Size of used area in RAM */
 
 /*
  * FLASH on the Local Bus
  */
-#define CONFIG_SYS_FLASH_BASE          0xFE000000 /* FLASH base address */
-#define CONFIG_SYS_FLASH_SIZE          8 /* FLASH size is up to 8M */
+#define CFG_SYS_FLASH_BASE             0xFE000000 /* FLASH base address */
+#define CFG_SYS_FLASH_SIZE             8 /* FLASH size is up to 8M */
 
-#define CONFIG_SYS_BAUDRATE_TABLE  \
+#define CFG_SYS_BAUDRATE_TABLE  \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
 /*
@@ -49,7 +49,7 @@
  * have to be in the first 256 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
+#define CFG_SYS_BOOTMAPSZ      (256 << 20) /* Initial Memory map for Linux */
 
 /*
  * Environment Configuration
index 85ceaf8ccb1a5e009831d5921cad4893e73571fa..97fe76cfa8ec016f41b076c984bc439e2ea26020 100644 (file)
@@ -38,8 +38,8 @@
 #define PHYS_SDRAM                    MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE            PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Command definition */
 #define CONFIG_EXTRA_ENV_SETTINGS \
index 1dba2e92fb9d43a6190fcf7550f1de64df245b17..cbaf03c2a22637c085f709db1112820a3798df55 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_BOOTMAPSZ (256 << 20)     /* 256M */
+#define CFG_SYS_BOOTMAPSZ (256 << 20)     /* 256M */
 
 #define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* environment organization */
 
index fe00272a1bd0f41f2b42a2ebfe1714d9bde99684..b855bbc25fb8c10aec4b38c5b39872e66624b79c 100644 (file)
@@ -54,8 +54,8 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /*
  * MTD Command for mtdparts
index 0d281a3379aa29753224664f07041852759b694a..4aef0b4abd12232029aba5dcf6d4d94a5533b806 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_BOOTMAPSZ           (16 << 20)
+#define CFG_SYS_BOOTMAPSZ              (16 << 20)
 
 #define CONFIG_PL011_CLOCK             150000000
 
index 775f166f1d35660a7375a9a67745fe54c1e4ac45..c5ef2f99b0f40fa59dd8772f3e8e1dd56757b558 100644 (file)
@@ -26,7 +26,7 @@
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE                      0xf6801000
index 914c3ad9ef04c6875a363deb5b63a225b34e945b..fad1f980481e79b694904d75fdb21a0fc7f83536 100644 (file)
@@ -18,7 +18,7 @@
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE                      0xe82b1000
index fcb2dec54ec13f91c51d3e9a08bd3bc3dcfa7494..59ea8960071a235fdb44771c59d909bd8342c220 100644 (file)
@@ -21,8 +21,8 @@
  * Memory configuration
  */
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE             SZ_1G
 
 /*
index 0ae935208ca56c72c636a0ff00c3644a6cc2a3b6..fbfcded4712333ff106d0f47f8eae0f848a305b8 100644 (file)
@@ -20,8 +20,8 @@
  * Memory configuration
  */
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE             SZ_1G
 
 /*
index 594aa4f75e77a6ad035c9afb18727cc01334c833..b0abd54882623890b64faa17140adbfd3fcb881c 100644 (file)
@@ -80,7 +80,7 @@
 /* CS2 Base address */
 #define PHYS_FLASH_1                   0xc0000000
 /* Flash Base for U-Boot */
-#define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
+#define CFG_SYS_FLASH_BASE             PHYS_FLASH_1
 /* Address and size of Redundant Environment Sector    */
 
 /*
index d4e2583ee8a4ad8a2a5437b8377986f4cb839110..1f30798550c6adcbb2dd01a350f2681b6b625466 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* UART */
 #ifdef CONFIG_MXC_UART
index 1b08c5e9a7e6e2fb8fa7b249e051791f18f0f599..4e23f1a2dc5dac1c44ce541644aba19048cc1436 100644 (file)
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Environment organization */
 
index a074df5829b4f77c702b5f90b34fcec945b07c91..402f83c18eaec04220bbefe733fe84ad89bbfa20 100644 (file)
@@ -56,7 +56,7 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #endif /* __IMX6DL_MAMOJ_CONFIG_H */
index 855af29ec96d445a5646a9f7a9a95c157c486b83..99da081cdae8644611b474497aab07223183ddc5 100644 (file)
@@ -86,8 +86,8 @@
 #define PHYS_SDRAM                      MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE           PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR        IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE        IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR        IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE        IRAM_SIZE
 
 /* SPL */
 #ifdef CONFIG_SPL
index 0a688afe6cdb83a5a431fe9d5f9d12962937bb8b..2d9d3c34b0dba12c189ebbc3d192cbf9cca10c3b 100644 (file)
@@ -64,8 +64,8 @@
 #define PHYS_SDRAM_SIZE                        SZ_128M
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* NAND */
 
index e5118f11580eb2a025f6eef8ebd2888e6ca369ca..76771fd66ce96e41fa28f56d118fbcac5f42a7e9 100644 (file)
@@ -70,8 +70,8 @@
 #define PHYS_SDRAM                                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* MMC Config*/
 #define CFG_SYS_FSL_ESDHC_ADDR       USDHC1_BASE_ADDR
index e62f9c5462b294a14e74898969ba97f2a30ab4ac..c228cf7f37ba519e9f3ad4dd2b38e929fc36e3c4 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x80000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x80000
 
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
index 143da00110469f224b37144235d9a6d675ff09d9..03325e6c3a7a41040eae9703c1c2f85d66fea96c 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
@@ -71,8 +71,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x200000
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        0x200000
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
index c7669305f59223b08421d07db8828de3fde87364..80321cf2d8d3cd8f5075877bfefc83cdd1b4f8c4 100644 (file)
@@ -18,8 +18,8 @@
 #endif
 
 /* Link Definitions */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x200000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x200000
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
index 9937071874fd05725d8e8b62b6d162eab6fab6b9..8a694c88a53a9a7a6339caab5ff4b07550cf1035 100644 (file)
 #define UBOOT_ITB_OFFSET_FSPI  \
        (UBOOT_ITB_OFFSET + FSPI_CONF_BLOCK_SIZE)
 #ifdef CONFIG_FSPI_CONF_HEADER
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE  \
        (QSPI0_AMBA_BASE + UBOOT_ITB_OFFSET_FSPI)
 #else
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 #endif
 
@@ -53,8 +53,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x200000
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        0x200000
 
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
index cd47d842ffc7878c6709d791a8676a4584fc1cf0..41ab9307793f0266750b2267e9059f51e8857962 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE \
+#define CFG_SYS_UBOOT_BASE \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
@@ -38,8 +38,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        SZ_2M
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
 
index 58e165c35a7b14af2edd0c0330d45fa6a34e4a8a..28ce834769c38546fab5b70aeba581ea09c911d9 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
@@ -29,8 +29,8 @@
        "splblk=0x42\0" \
        BOOTENV
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        SZ_2M
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
 
index f532c1052f5d81516765b11794b45a93c059c439..85fd5e2371f976b1e7aabba0f74ddf4772d0e02c 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 /* Initial environment variables */
@@ -75,8 +75,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x200000
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        0x200000
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
index 415248eadfc501a3659d6a80f5342a2fe02f313a..204fc4b31647fa04bedb061cd33579de5296a44e 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #define MEM_LAYOUT_ENV_SETTINGS \
@@ -23,8 +23,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  SZ_512K
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
index 8857bc7c598b5cbad57dd4ebbbf6ffb8437c10ce..024b86c7f1d013c6ee30b55ac9b40cded69f9b22 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #define BOOT_TARGET_DEVICES(func) \
@@ -45,8 +45,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x200000
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        0x200000
 
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
index 628bb5813ff160bd7755b20209ed10d18424abfb..4633843d1bbb9b4dcfcfd5ccc80bbf45a776bd72 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #define BOOT_TARGET_DEVICES(func) \
@@ -43,8 +43,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  SZ_512K
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
index a169be35a4926c823c1bb1e2991192cf814db511..a585cbf87e44ac6264909e82218edc49e16f1f2b 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 /* Enable Distro Boot */
@@ -23,8 +23,8 @@
        "splblk=0x40\0" \
        BOOTENV
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        SZ_2M
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
 
index 62bcef5eecdb398355c3ea2d66136aabb0f229c3..5443022b04c77a2ea4e0ecdfb793feb7d2d7945f 100644 (file)
@@ -11,8 +11,8 @@
 #include <asm/arch/imx-regs.h>
 
 /* Link Definitions */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x200000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x200000
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
index d394762e3bb2c03181b56a3b615de2096eac74b4..738677ff37cd99180a557ec4673d2a30bf246f61 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
+#define CFG_SYS_UBOOT_BASE     (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
@@ -50,8 +50,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x80000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x80000
 
 
 /* Totally 2GB DDR */
index 3e995c9721725973222cbb37be232085daa689c0..d67bad8971ddf392f58701e8b77db20a5787c1df 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
+#define CFG_SYS_UBOOT_BASE     (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
@@ -52,8 +52,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x80000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x80000
 
 /* Totally 2GB DDR */
 #define CFG_SYS_SDRAM_BASE             0x40000000
index 1943a24b79db13c03dc1253c95605d6ee381276a..58f7dc6518c1dcfdb9a593876d5b9768fecb6d38 100644 (file)
@@ -12,7 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_SYS_UBOOT_BASE  (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
+#define CFG_SYS_UBOOT_BASE     (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 /* GUIDs for capsule updatable firmware images */
 #define IMX8MP_RSB3720A1_4G_FIT_IMAGE_GUID \
                "fi;\0"
 
 /* Link Definitions */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x80000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x80000
 
 
 /* Totally 6GB or 4G DDR */
index 7d360583c416dc64d37418374ad846f7f0f5a8e0..e79aa5707537946f2a327421530f96809ec65496 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 /* Enable Distro Boot */
@@ -23,8 +23,8 @@
        "splblk=0x40\0" \
        BOOTENV
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        SZ_2M
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
 
index 271376cb9fc85f1975793ded8f93bd28f6e87a22..4df98e3f3735fba98c18381efa47b7d74a8a2934 100644 (file)
@@ -46,8 +46,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x80000
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        0x80000
 
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
index 672a9fa7a34261f0334174dca67f0e3297636d14..aa29e7884f9ec14bc9b27cfcfc9d2706736224ff 100644 (file)
@@ -52,8 +52,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x80000
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        0x80000
 
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
index dd354b0265de5622bcb82d65b87d910347074c10..3b4cd656223540245c3fcf719f92abebf6f8d6e3 100644 (file)
@@ -84,8 +84,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x80000
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        0x80000
 
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
index fe27ac36a3b1b895ad5b2a6d703b20425e0cd9f7..2e2e5ed43cde4513541aea19929a30c63baa961a 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
+#define CFG_SYS_BOOTMAPSZ              (256 << 20)
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 #define USDHC1_BASE_ADDR               0x5B010000
 #define USDHC2_BASE_ADDR               0x5B020000
index 592df2795b13f0e6626766b213c48362f6ca8141..d313bdc2a4485ed9fa6e7c48cb20fe4e955d4e25 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
+#define CFG_SYS_UBOOT_BASE     (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_MALLOC_F_ADDR           0x22040000
@@ -50,8 +50,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x80000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x80000
+#define CFG_SYS_INIT_RAM_ADDR  0x80000000
+#define CFG_SYS_INIT_RAM_SIZE  0x80000
 
 
 #define CFG_SYS_SDRAM_BASE             0x80000000
index 077a4d843dcdf2fd48f59a7fc35209ad3f86e2be..895c50f602531031afa00f13a718fb587066216d 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x80000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x200000
+#define CFG_SYS_INIT_RAM_ADDR        0x80000000
+#define CFG_SYS_INIT_RAM_SIZE        0x200000
 
 #define CFG_SYS_SDRAM_BASE           0x80000000
 #define PHYS_SDRAM                      0x80000000
index a2c004880a7e64e911c27693d61eceaa545c6466..e180387c687ad48ff256c8ae0c156487a4f71f7f 100644 (file)
@@ -22,6 +22,6 @@
  * Configuration of the external SDRAM memory
  */
 
-#define CONFIG_SYS_UBOOT_START         0x800023FD
+#define CFG_SYS_UBOOT_START            0x800023FD
 
 #endif /* __IMXRT1020_EVK_H */
index d1a7dab37c554d8a209242fe9fa1cbfa781c2643..84228676c7fd1ff613f9a4ec64d65bc149c60157 100644 (file)
@@ -29,6 +29,6 @@
  * Configuration of the external SDRAM memory
  */
 
-#define CONFIG_SYS_UBOOT_START         0x800023FD
+#define CFG_SYS_UBOOT_START            0x800023FD
 
 #endif /* __IMXRT1050_EVK_H */
index 2459fe24e24ad41e53825813f87b67ae59a9af00..f83429082ac70819b347ec7912ca5d679ad4a4e9 100644 (file)
@@ -23,7 +23,7 @@
 #define DMAMEM_BASE                    (PHYS_SDRAM + PHYS_SDRAM_SIZE - \
                                         DMAMEM_SZ_ALL)
 /* For SPL */
-#define CONFIG_SYS_UBOOT_START         0x202403FD
+#define CFG_SYS_UBOOT_START            0x202403FD
 /* For SPL ends */
 
 #endif /* __IMXRT1170_EVK_H */
index 8d0458d1d63f457df277ce948b3db6d44f44a647..7a55c6aeefc61e3e85eb659c9a775e0d69687c8e 100644 (file)
@@ -6,7 +6,7 @@
  * Common ARM Integrator configuration settings
  */
 
-#define CONFIG_SYS_TIMERBASE           0x13000100      /* Timer1 */
+#define CFG_SYS_TIMERBASE              0x13000100      /* Timer1 */
 
 /*
  * The ARM boot monitor initializes the board.
@@ -41,6 +41,6 @@
  * - SIB block
  * - U-Boot environment
  */
-#define CONFIG_SYS_FLASH_BASE          0x24000000
+#define CFG_SYS_FLASH_BASE             0x24000000
 
 /* Timeout values in ticks */
index c8457d97161a10a8c1296022750c794354056874..6bee098d6a8c3e03990a96eec3e5c1ff6011fb98 100644 (file)
 #include "integrator-common.h"
 
 /* Integrator/AP-specific configuration */
-#define CONFIG_SYS_HZ_CLOCK            24000000        /* Timer 1 is clocked at 24Mhz */
+#define CFG_SYS_HZ_CLOCK               24000000        /* Timer 1 is clocked at 24Mhz */
 
 /* Flash settings */
-#define CONFIG_SYS_FLASH_SIZE          0x02000000 /* 32 MiB */
+#define CFG_SYS_FLASH_SIZE             0x02000000 /* 32 MiB */
 
 /*-----------------------------------------------------------------------
  * PCI definitions
index bf09510d02f6079759bd2191fea1f3801470fdea..25bb41ebc46cf9e4e187b7f72e3615fce3489b0d 100644 (file)
@@ -17,7 +17,7 @@
 #include "integrator-common.h"
 
 /* Integrator CP-specific configuration */
-#define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer 1 is clocked at 1Mhz */
+#define CFG_SYS_HZ_CLOCK               1000000 /* Timer 1 is clocked at 1Mhz */
 
 #define CONFIG_SERVERIP 192.168.1.100
 #define CONFIG_IPADDR 192.168.1.104
index 2a0b0c7163a7e351ac76eb9b0407a1a0dd0966a5..e66f994a375ff368796d0c971af68f410de2623c 100644 (file)
 /* DDR Configuration */
 #define CFG_SYS_SDRAM_BASE1            0x880000000
 /* FLASH Configuration */
-#define CONFIG_SYS_FLASH_BASE          0x000000000
+#define CFG_SYS_FLASH_BASE             0x000000000
 
 /* SPL Loader Configuration */
 #if defined(CONFIG_TARGET_J721E_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
-#define CONFIG_SYS_UBOOT_BASE          0x50280000
+#define CFG_SYS_UBOOT_BASE             0x50280000
 /* Image load address in RAM for DFU boot*/
 #else
-#define CONFIG_SYS_UBOOT_BASE          0x50080000
+#define CFG_SYS_UBOOT_BASE             0x50080000
 #endif
 
 /* HyperFlash related configuration */
index e690ef959060a8403f7a18710d564ea5d62171d5..ab204c62b7d65d6822ef385effd96cf100953ee7 100644 (file)
 
 /* SPL Loader Configuration */
 #if defined(CONFIG_TARGET_J721S2_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
-#define CONFIG_SYS_UBOOT_BASE          0x50280000
+#define CFG_SYS_UBOOT_BASE             0x50280000
 /* Image load address in RAM for DFU boot*/
 #else
-#define CONFIG_SYS_UBOOT_BASE          0x50080000
+#define CFG_SYS_UBOOT_BASE             0x50080000
 #endif
 
 /* U-Boot general configuration */
index 35cf27a2eb90541cb628c29d3759e19864d4f465..cc5ec219b8db13eaeb94a3ede7ecd9106aac96cd 100644 (file)
@@ -13,7 +13,7 @@
  * Miscellaneous configurable options
  */
 
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
 #define CONFIG_KM_DEF_ENV_BOOTPARAMS \
index 888bb2981f7bc501f6ded23553dfaded271107b2..f64c0eee1bb5ff95d5ac01f633d1ab5d2a6a0bff 100644 (file)
@@ -1,34 +1,34 @@
 /*
  * System IO Config
  */
-#define CONFIG_SYS_SICRL       SICRL_IRQ_CKS
+#define CFG_SYS_SICRL  SICRL_IRQ_CKS
 
-#define CONFIG_SYS_DDRCDR (\
+#define CFG_SYS_DDRCDR (\
        DDRCDR_EN | \
        DDRCDR_PZ_MAXZ | \
        DDRCDR_NZ_MAXZ | \
        DDRCDR_M_ODR)
 
-#define CONFIG_SYS_DDR_CS0_BNDS                0x0000007f
-#define CONFIG_SYS_DDR_SDRAM_CFG       (SDRAM_CFG_SDRAM_TYPE_DDR2 | \
+#define CFG_SYS_DDR_CS0_BNDS           0x0000007f
+#define CFG_SYS_DDR_SDRAM_CFG  (SDRAM_CFG_SDRAM_TYPE_DDR2 | \
                                         SDRAM_CFG_32_BE | \
                                         SDRAM_CFG_SREN | \
                                         SDRAM_CFG_HSE)
 
-#define CONFIG_SYS_DDR_SDRAM_CFG2      0x00401000
-#define CONFIG_SYS_DDR_CLK_CNTL                (DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05)
-#define CONFIG_SYS_DDR_INTERVAL        ((0x064 << SDRAM_INTERVAL_BSTOPRE_SHIFT) | \
+#define CFG_SYS_DDR_SDRAM_CFG2 0x00401000
+#define CFG_SYS_DDR_CLK_CNTL           (DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05)
+#define CFG_SYS_DDR_INTERVAL   ((0x064 << SDRAM_INTERVAL_BSTOPRE_SHIFT) | \
                                 (0x200 << SDRAM_INTERVAL_REFINT_SHIFT))
 
-#define CONFIG_SYS_DDR_CS0_CONFIG      (CSCONFIG_EN | CSCONFIG_AP | \
+#define CFG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN | CSCONFIG_AP | \
                                         CSCONFIG_ODT_WR_CFG | \
                                         CSCONFIG_ROW_BIT_13 | \
                                         CSCONFIG_COL_BIT_10)
 
-#define CONFIG_SYS_DDR_MODE    0x47860242
-#define CONFIG_SYS_DDR_MODE2   0x8080c000
+#define CFG_SYS_DDR_MODE       0x47860242
+#define CFG_SYS_DDR_MODE2      0x8080c000
 
-#define CONFIG_SYS_DDR_TIMING_0        ((2 << TIMING_CFG0_MRS_CYC_SHIFT) | \
+#define CFG_SYS_DDR_TIMING_0   ((2 << TIMING_CFG0_MRS_CYC_SHIFT) | \
                                 (8 << TIMING_CFG0_ODT_PD_EXIT_SHIFT) | \
                                 (2 << TIMING_CFG0_PRE_PD_EXIT_SHIFT) | \
                                 (2 << TIMING_CFG0_ACT_PD_EXIT_SHIFT) | \
@@ -37,7 +37,7 @@
                                 (0 << TIMING_CFG0_WRT_SHIFT) | \
                                 (0 << TIMING_CFG0_RWT_SHIFT))
 
-#define CONFIG_SYS_DDR_TIMING_1        ((TIMING_CFG1_CASLAT_40) | \
+#define CFG_SYS_DDR_TIMING_1   ((TIMING_CFG1_CASLAT_40) | \
                                 (2 << TIMING_CFG1_WRTORD_SHIFT) | \
                                 (2 << TIMING_CFG1_ACTTOACT_SHIFT) | \
                                 (3 << TIMING_CFG1_WRREC_SHIFT) | \
@@ -46,7 +46,7 @@
                                 (7 << TIMING_CFG1_ACTTOPRE_SHIFT) | \
                                 (3 << TIMING_CFG1_PRETOACT_SHIFT))
 
-#define CONFIG_SYS_DDR_TIMING_2        ((8 << TIMING_CFG2_FOUR_ACT_SHIFT) | \
+#define CFG_SYS_DDR_TIMING_2   ((8 << TIMING_CFG2_FOUR_ACT_SHIFT) | \
                                 (3 << TIMING_CFG2_CKE_PLS_SHIFT) | \
                                 (2 << TIMING_CFG2_WR_DATA_DELAY_SHIFT) | \
                                 (2 << TIMING_CFG2_RD_TO_PRE_SHIFT) | \
@@ -54,7 +54,7 @@
                                 (0 << TIMING_CFG2_ADD_LAT_SHIFT) | \
                                 (5 << TIMING_CFG2_CPO_SHIFT))
 
-#define CONFIG_SYS_DDR_TIMING_3        0x00000000
+#define CFG_SYS_DDR_TIMING_3   0x00000000
 
-#define CONFIG_SYS_KMBEC_FPGA_BASE     0xE8000000
-#define CONFIG_SYS_KMBEC_FPGA_SIZE     128
+#define CFG_SYS_KMBEC_FPGA_BASE        0xE8000000
+#define CFG_SYS_KMBEC_FPGA_SIZE        128
index fb43fb81bc077c1572f8aa594c31737dc5f2c540..5c9f912383da78a7ea7765b6292a0185ccc79270 100644 (file)
@@ -1,6 +1,6 @@
 /* KMBEC FPGA (PRIO) */
-#define CONFIG_SYS_KMBEC_FPGA_BASE     0xE8000000
-#define CONFIG_SYS_KMBEC_FPGA_SIZE     64
+#define CFG_SYS_KMBEC_FPGA_BASE        0xE8000000
+#define CFG_SYS_KMBEC_FPGA_SIZE        64
 
 /*
  * High Level Configuration Options
@@ -9,34 +9,34 @@
 /*
  * System IO Setup
  */
-#define CONFIG_SYS_SICRH               (SICRH_UC1EOBI | SICRH_UC2E1OBI)
+#define CFG_SYS_SICRH          (SICRH_UC1EOBI | SICRH_UC2E1OBI)
 
 /**
  * DDR RAM settings
  */
-#define CONFIG_SYS_DDR_SDRAM_CFG (\
+#define CFG_SYS_DDR_SDRAM_CFG (\
        SDRAM_CFG_SDRAM_TYPE_DDR2 | \
        SDRAM_CFG_SREN | \
        SDRAM_CFG_HSE)
 
-#define CONFIG_SYS_DDR_SDRAM_CFG2      0x00401000
+#define CFG_SYS_DDR_SDRAM_CFG2 0x00401000
 
-#define CONFIG_SYS_DDR_CLK_CNTL (\
+#define CFG_SYS_DDR_CLK_CNTL (\
        DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05)
 
-#define CONFIG_SYS_DDR_INTERVAL (\
+#define CFG_SYS_DDR_INTERVAL (\
        (0x080 << SDRAM_INTERVAL_BSTOPRE_SHIFT) | \
        (0x203 << SDRAM_INTERVAL_REFINT_SHIFT))
 
-#define CONFIG_SYS_DDR_CS0_BNDS                        0x0000007f
+#define CFG_SYS_DDR_CS0_BNDS                   0x0000007f
 
-#define CONFIG_SYS_DDRCDR (\
+#define CFG_SYS_DDRCDR (\
        DDRCDR_EN | \
        DDRCDR_Q_DRN)
-#define CONFIG_SYS_DDR_MODE            0x47860452
-#define CONFIG_SYS_DDR_MODE2           0x8080c000
+#define CFG_SYS_DDR_MODE               0x47860452
+#define CFG_SYS_DDR_MODE2              0x8080c000
 
-#define CONFIG_SYS_DDR_TIMING_0 (\
+#define CFG_SYS_DDR_TIMING_0 (\
        (2 << TIMING_CFG0_MRS_CYC_SHIFT) | \
        (8 << TIMING_CFG0_ODT_PD_EXIT_SHIFT) | \
        (6 << TIMING_CFG0_PRE_PD_EXIT_SHIFT) | \
@@ -46,7 +46,7 @@
        (0 << TIMING_CFG0_WRT_SHIFT) | \
        (0 << TIMING_CFG0_RWT_SHIFT))
 
-#define CONFIG_SYS_DDR_TIMING_1        ((TIMING_CFG1_CASLAT_50) | \
+#define CFG_SYS_DDR_TIMING_1   ((TIMING_CFG1_CASLAT_50) | \
                                 (2 << TIMING_CFG1_WRTORD_SHIFT) | \
                                 (2 << TIMING_CFG1_ACTTOACT_SHIFT) | \
                                 (3 << TIMING_CFG1_WRREC_SHIFT) | \
@@ -55,7 +55,7 @@
                                 (8 << TIMING_CFG1_ACTTOPRE_SHIFT) | \
                                 (3 << TIMING_CFG1_PRETOACT_SHIFT))
 
-#define CONFIG_SYS_DDR_TIMING_2 (\
+#define CFG_SYS_DDR_TIMING_2 (\
        (0xa << TIMING_CFG2_FOUR_ACT_SHIFT) | \
        (3 << TIMING_CFG2_CKE_PLS_SHIFT) | \
        (2 << TIMING_CFG2_WR_DATA_DELAY_SHIFT) | \
        (5 << TIMING_CFG2_CPO_SHIFT) | \
        (0 << TIMING_CFG2_ADD_LAT_SHIFT))
 
-#define CONFIG_SYS_DDR_TIMING_3                        0x00000000
+#define CFG_SYS_DDR_TIMING_3                   0x00000000
 
 /* EEprom support */
 
 /*
  * PAXE on the local bus CS3
  */
-#define CONFIG_SYS_PAXE_BASE           0xA0000000
+#define CFG_SYS_PAXE_BASE              0xA0000000
index db1daee13633931d79b5b8c8d36e522209d72697..e6a3613b7a24ece1c520ffacc6bac7549c2e90e3 100644 (file)
@@ -9,7 +9,7 @@
  */
 #define CFG_SYS_SDRAM_BASE             0x00000000 /* DDR is system memory */
 
-#define CONFIG_SYS_DDR_SDRAM_CLK_CNTL  (DDR_SDRAM_CLK_CNTL_SS_EN | \
+#define CFG_SYS_DDR_SDRAM_CLK_CNTL     (DDR_SDRAM_CLK_CNTL_SS_EN | \
                                        DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05)
 
 #define CFG_83XX_DDR_USES_CS0
 /*
  * The reserved memory
  */
-#define CONFIG_SYS_FLASH_BASE          0xF0000000
+#define CFG_SYS_FLASH_BASE             0xF0000000
 
 /* Reserve 768 kB for Mon */
 
 /*
  * Initial RAM Base Address Setup
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0xE6000000 /* Initial RAM address */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000 /* End of used area in RAM */
+#define CFG_SYS_INIT_RAM_ADDR  0xE6000000 /* Initial RAM address */
+#define CFG_SYS_INIT_RAM_SIZE  0x1000 /* End of used area in RAM */
 /*
  * Init Local Bus Memory Controller:
  *
 /*
  * FLASH on the Local Bus
  */
-#define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
+#define CFG_SYS_FLASH_SIZE             256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
+#define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE }
 
 /* I2C */
 #define CFG_SYS_NUM_I2C_BUSES  4
-#define CONFIG_SYS_I2C_MAX_HOPS                1
-#define CONFIG_SYS_I2C_BUSES   {{0, {I2C_NULL_HOP} }, \
+#define CFG_SYS_I2C_MAX_HOPS           1
+#define CFG_SYS_I2C_BUSES      {{0, {I2C_NULL_HOP} }, \
                {0, {{I2C_MUX_PCA9547, 0x70, 2} } }, \
                {0, {{I2C_MUX_PCA9547, 0x70, 1} } }, \
                {1, {I2C_NULL_HOP} } }
 
 #if defined(CONFIG_CMD_NAND)
 #define CONFIG_NAND_KMETER1
-#define CFG_SYS_NAND_BASE              CONFIG_SYS_KMBEC_FPGA_BASE
+#define CFG_SYS_NAND_BASE              CFG_SYS_KMBEC_FPGA_BASE
 #endif
 
 /*
@@ -66,7 +66,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           (8 << 20)
+#define CFG_SYS_BOOTMAPSZ              (8 << 20)
 
 /*
  * Environment
index b5913ed70003c1a78275937d8ac95a5256ddd9b8..7307c495c38e0a2fe661f2468d370b716e6bd971 100644 (file)
@@ -9,8 +9,8 @@
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
 
-#define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  OCRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  OCRAM_SIZE
 
 #define CONFIG_PRAM                    ((CONFIG_KM_PNVRAM + \
                                          CONFIG_KM_PHRAM + \
 #define PHYS_SDRAM                     0x80000000
 #define PHYS_SDRAM_SIZE                        (1u * 1024 * 1024 * 1024)
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 #define SPD_EEPROM_ADDRESS             0x54
 
 /* POST memory regions test */
-#define CONFIG_POST                    (CONFIG_SYS_POST_MEM_REGIONS)
+#define CONFIG_POST                    (CFG_SYS_POST_MEM_REGIONS)
 #define CONFIG_POST_EXTERNAL_WORD_FUNCS
 
 /*
  * IFC Definitions
  */
 /* NOR Flash Definitions */
-#define CONFIG_SYS_FLASH_BASE          0x60000000
-#define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE             0x60000000
+#define CFG_SYS_FLASH_BASE_PHYS        CFG_SYS_FLASH_BASE
 
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR0_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_TE | \
                                CSPR_MSEL_NOR | \
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE_PHYS }
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE_PHYS }
 
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
 
 /* NAND Flash Definitions */
 #define CFG_SYS_NAND_BASE              0x68000000
                                        FTIM2_NAND_TWHRE(0x3c))
 #define CFG_SYS_NAND_FTIM3             (FTIM3_NAND_TWW(0x1e))
 
-#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NAND_FTIM3
 
 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 
 /* QRIO FPGA Definitions */
-#define CONFIG_SYS_QRIO_BASE           0x70000000
-#define CONFIG_SYS_QRIO_BASE_PHYS      CONFIG_SYS_QRIO_BASE
+#define CFG_SYS_QRIO_BASE              0x70000000
+#define CFG_SYS_QRIO_BASE_PHYS CFG_SYS_QRIO_BASE
 
-#define CONFIG_SYS_CSPR2_EXT           (0x00)
-#define CONFIG_SYS_CSPR2       (CSPR_PHYS_ADDR(CONFIG_SYS_QRIO_BASE) | \
+#define CFG_SYS_CSPR2_EXT              (0x00)
+#define CFG_SYS_CSPR2  (CSPR_PHYS_ADDR(CFG_SYS_QRIO_BASE) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_TE | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_AMASK2              IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_CSOR2               (CSOR_GPCM_ADM_SHIFT(0x4) | \
+#define CFG_SYS_AMASK2         IFC_AMASK(64 * 1024)
+#define CFG_SYS_CSOR2          (CSOR_GPCM_ADM_SHIFT(0x4) | \
                                        CSOR_GPCM_TRHZ_20 | \
                                        CSOR_GPCM_BCTLD)
-#define CONFIG_SYS_CS2_FTIM0           (FTIM0_GPCM_TACSE(0x2) | \
+#define CFG_SYS_CS2_FTIM0              (FTIM0_GPCM_TACSE(0x2) | \
                                        FTIM0_GPCM_TEADC(0x8) | \
                                        FTIM0_GPCM_TEAHC(0x2))
-#define CONFIG_SYS_CS2_FTIM1           (FTIM1_GPCM_TACO(0x2) | \
+#define CFG_SYS_CS2_FTIM1              (FTIM1_GPCM_TACO(0x2) | \
                                        FTIM1_GPCM_TRAD(0x6))
-#define CONFIG_SYS_CS2_FTIM2           (FTIM2_GPCM_TCS(0x1) | \
+#define CFG_SYS_CS2_FTIM2              (FTIM2_GPCM_TCS(0x1) | \
                                        FTIM2_GPCM_TCH(0x1) | \
                                        FTIM2_GPCM_TWP(0x7))
-#define CONFIG_SYS_CS2_FTIM3           0x04000000
+#define CFG_SYS_CS2_FTIM3              0x04000000
 
 /*
  * Serial Port
  */
 
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_I2C_MAX_HOPS                1
+#define CFG_SYS_I2C_MAX_HOPS           1
 #define CFG_SYS_NUM_I2C_BUSES  3
 #define I2C_MUX_PCA_ADDR               0x70
 #define I2C_MUX_CH_DEFAULT             0x0
-#define CONFIG_SYS_I2C_BUSES   {       {0, {I2C_NULL_HOP} }, \
+#define CFG_SYS_I2C_BUSES      {       {0, {I2C_NULL_HOP} }, \
                                        {0, {{I2C_MUX_PCA9547, 0x70, 1 } } }, \
                                        {1, {I2C_NULL_HOP}                 }, \
                                }
                __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize} && " \
                "protect on " __stringify(CONFIG_SYS_MONITOR_BASE)      \
                " +${filesize}\0"                                       \
-       "update-nor=protect off " __stringify(CONFIG_SYS_FLASH_BASE)    \
+       "update-nor=protect off " __stringify(CFG_SYS_FLASH_BASE)       \
                " +${filesize} && "                                     \
-               "erase " __stringify(CONFIG_SYS_FLASH_BASE)             \
+               "erase " __stringify(CFG_SYS_FLASH_BASE)                \
                " +${filesize} && "                                     \
                "cp.b ${load_addr_r} "                                  \
-               __stringify(CONFIG_SYS_FLASH_BASE) " ${filesize} && "   \
+               __stringify(CFG_SYS_FLASH_BASE) " ${filesize} && "      \
                "protect on " __stringify(CONFIG_SYS_MONITOR_BASE)      \
                " +" __stringify(CONFIG_SYS_MONITOR_LEN)"\0"            \
        "set_fdthigh=true\0"                    \
        "ethrotate=no\0"                                                \
        ""
 
-#define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Increase map for Linux */
+#define CFG_SYS_BOOTMAPSZ      (256 << 20) /* Increase map for Linux */
 
 #endif
index dbf038cefa030389eb404350f2f11203c40baeb1..e152714b11698b5db9c12d00bc376ed7b2f8755a 100644 (file)
 #define SYS_LAWAPP_BASE_PHYS   (0xf00000000ull | SYS_LAWAPP_BASE)
 
 /* Application IFC CS4 MRAM */
-#define CONFIG_SYS_MRAM_BASE           SYS_LAWAPP_BASE
+#define CFG_SYS_MRAM_BASE              SYS_LAWAPP_BASE
 #define SYS_MRAM_BASE_PHYS     SYS_LAWAPP_BASE_PHYS
 #define SYS_MRAM_CSPR_EXT      (0x0f)
-#define SYS_MRAM_CSPR  (CSPR_PHYS_ADDR(CONFIG_SYS_MRAM_BASE) | \
+#define SYS_MRAM_CSPR  (CSPR_PHYS_ADDR(CFG_SYS_MRAM_BASE) | \
                                CSPR_PORT_SIZE_8 | /* 8 bit */          \
                                CSPR_MSEL_GPCM   | /* msel = gpcm */    \
                                CSPR_V /* bank is valid */)
                        FTIM2_GPCM_TCH(0x2)  | \
                        FTIM2_GPCM_TWP(0x8))
 #define SYS_MRAM_FTIM3 0x04000000
-#define CONFIG_SYS_CSPR4_EXT   SYS_MRAM_CSPR_EXT
-#define CONFIG_SYS_CSPR4       SYS_MRAM_CSPR
-#define CONFIG_SYS_AMASK4      SYS_MRAM_AMASK
-#define CONFIG_SYS_CSOR4       SYS_MRAM_CSOR
-#define CONFIG_SYS_CS4_FTIM0   SYS_MRAM_FTIM0
-#define CONFIG_SYS_CS4_FTIM1   SYS_MRAM_FTIM1
-#define CONFIG_SYS_CS4_FTIM2   SYS_MRAM_FTIM2
-#define CONFIG_SYS_CS4_FTIM3   SYS_MRAM_FTIM3
+#define CFG_SYS_CSPR4_EXT      SYS_MRAM_CSPR_EXT
+#define CFG_SYS_CSPR4  SYS_MRAM_CSPR
+#define CFG_SYS_AMASK4 SYS_MRAM_AMASK
+#define CFG_SYS_CSOR4  SYS_MRAM_CSOR
+#define CFG_SYS_CS4_FTIM0      SYS_MRAM_FTIM0
+#define CFG_SYS_CS4_FTIM1      SYS_MRAM_FTIM1
+#define CFG_SYS_CS4_FTIM2      SYS_MRAM_FTIM2
+#define CFG_SYS_CS4_FTIM3      SYS_MRAM_FTIM3
 
 /* Application IFC CS6: BFTIC */
 #define SYS_BFTIC_BASE         0xd0000000
                                FTIM2_GPCM_TCH(0x1) | \
                                FTIM2_GPCM_TWP(0x12))
 #define SYS_BFTIC_FTIM3        0x04000000
-#define CONFIG_SYS_CSPR6_EXT   SYS_BFTIC_CSPR_EXT
-#define CONFIG_SYS_CSPR6       SYS_BFTIC_CSPR
-#define CONFIG_SYS_AMASK6      SYS_BFTIC_AMASK
-#define CONFIG_SYS_CSOR6       SYS_BFTIC_CSOR
-#define CONFIG_SYS_CS6_FTIM0   SYS_BFTIC_FTIM0
-#define CONFIG_SYS_CS6_FTIM1   SYS_BFTIC_FTIM1
-#define CONFIG_SYS_CS6_FTIM2   SYS_BFTIC_FTIM2
-#define CONFIG_SYS_CS6_FTIM3   SYS_BFTIC_FTIM3
+#define CFG_SYS_CSPR6_EXT      SYS_BFTIC_CSPR_EXT
+#define CFG_SYS_CSPR6  SYS_BFTIC_CSPR
+#define CFG_SYS_AMASK6 SYS_BFTIC_AMASK
+#define CFG_SYS_CSOR6  SYS_BFTIC_CSOR
+#define CFG_SYS_CS6_FTIM0      SYS_BFTIC_FTIM0
+#define CFG_SYS_CS6_FTIM1      SYS_BFTIC_FTIM1
+#define CFG_SYS_CS6_FTIM2      SYS_BFTIC_FTIM2
+#define CFG_SYS_CS6_FTIM3      SYS_BFTIC_FTIM3
 
 /* Application IFC CS7 PAXE */
-#define CONFIG_SYS_PAXE_BASE           0xd8000000
-#define SYS_PAXE_BASE_PHYS     (0xf00000000ull | CONFIG_SYS_PAXE_BASE)
+#define CFG_SYS_PAXE_BASE              0xd8000000
+#define SYS_PAXE_BASE_PHYS     (0xf00000000ull | CFG_SYS_PAXE_BASE)
 #define SYS_PAXE_CSPR_EXT      (0x0f)
-#define SYS_PAXE_CSPR  (CSPR_PHYS_ADDR(CONFIG_SYS_PAXE_BASE) | \
+#define SYS_PAXE_CSPR  (CSPR_PHYS_ADDR(CFG_SYS_PAXE_BASE) | \
                                CSPR_PORT_SIZE_8 | /* Port size = 8 bit */\
                                CSPR_MSEL_GPCM |   /* MSEL = GPCM */\
                                CSPR_V)            /* valid */
                        FTIM2_GPCM_TCH(0x1) | \
                        FTIM2_GPCM_TWP(0x12))
 #define SYS_PAXE_FTIM3 0x04000000
-#define CONFIG_SYS_CSPR7_EXT   SYS_PAXE_CSPR_EXT
-#define CONFIG_SYS_CSPR7       SYS_PAXE_CSPR
-#define CONFIG_SYS_AMASK7      SYS_PAXE_AMASK
-#define CONFIG_SYS_CSOR7       SYS_PAXE_CSOR
-#define CONFIG_SYS_CS7_FTIM0   SYS_PAXE_FTIM0
-#define CONFIG_SYS_CS7_FTIM1   SYS_PAXE_FTIM1
-#define CONFIG_SYS_CS7_FTIM2   SYS_PAXE_FTIM2
-#define CONFIG_SYS_CS7_FTIM3   SYS_PAXE_FTIM3
+#define CFG_SYS_CSPR7_EXT      SYS_PAXE_CSPR_EXT
+#define CFG_SYS_CSPR7  SYS_PAXE_CSPR
+#define CFG_SYS_AMASK7 SYS_PAXE_AMASK
+#define CFG_SYS_CSOR7  SYS_PAXE_CSOR
+#define CFG_SYS_CS7_FTIM0      SYS_PAXE_FTIM0
+#define CFG_SYS_CS7_FTIM1      SYS_PAXE_FTIM1
+#define CFG_SYS_CS7_FTIM2      SYS_PAXE_FTIM2
+#define CFG_SYS_CS7_FTIM3      SYS_PAXE_FTIM3
 
 /* PRST */
 #define KM_BFTIC4_RST          0
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_SYS_INIT_L2CSR0         L2CSR0_L2E
+#define CFG_SYS_INIT_L2CSR0            L2CSR0_L2E
 
 /* POST memory regions test */
-#define CONFIG_POST CONFIG_SYS_POST_MEM_REGIONS
+#define CONFIG_POST CFG_SYS_POST_MEM_REGIONS
 
 /*
  *  Config the L3 Cache as L3 SRAM
  */
-#define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
+#define CFG_SYS_INIT_L3_ADDR           0xFFFC0000
 
-#define CONFIG_SYS_DCSRBAR             0xf0000000
-#define CONFIG_SYS_DCSRBAR_PHYS                0xf00000000ull
+#define CFG_SYS_DCSRBAR                0xf0000000
+#define CFG_SYS_DCSRBAR_PHYS           0xf00000000ull
 
 /*
  * DDR Setup
  */
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 #define SPD_EEPROM_ADDRESS     0x54
 #define CFG_SYS_SDRAM_SIZE     4096    /* for fixed parameter use */
  * IFC Definitions
  */
 /* NOR flash on IFC CS0 */
-#define CONFIG_SYS_FLASH_BASE          0xe8000000
-#define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | \
-                                       CONFIG_SYS_FLASH_BASE)
+#define CFG_SYS_FLASH_BASE             0xe8000000
+#define CFG_SYS_FLASH_BASE_PHYS        (0xf00000000ull | \
+                                       CFG_SYS_FLASH_BASE)
 
 #define CFG_SYS_NOR_CSPR_EXT   (0x0f)
-#define CFG_SYS_NOR_CSPR       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
+#define CFG_SYS_NOR_CSPR       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE) | \
                                CSPR_PORT_SIZE_16 | /* Port size = 16 bit */\
                                0x00000010 |        /* drive TE high */\
                                CSPR_MSEL_NOR |     /* MSEL = NOR */\
                                FTIM2_NOR_TWPH(0x6))
 #define CFG_SYS_NOR_FTIM3      0x0
 
-#define CONFIG_SYS_CSPR0_EXT   CFG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0       CFG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0      CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0       CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0   CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1   CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2   CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3   CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT      CFG_SYS_NOR_CSPR_EXT
+#define CFG_SYS_CSPR0  CFG_SYS_NOR_CSPR
+#define CFG_SYS_AMASK0 CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0  CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0      CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1      CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2      CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3      CFG_SYS_NOR_FTIM3
 
 /* More NOR Flash params */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS}
 
 /* NAND Flash on IFC CS1*/
 #define CFG_SYS_NAND_BASE              0xfa000000
                                FTIM2_NAND_TWHRE(0x3c))
 #define CFG_SYS_NAND_FTIM3     (FTIM3_NAND_TWW(0x1e))
 
-#define CONFIG_SYS_CSPR1_EXT   CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR1       CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK1      CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR1       CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS1_FTIM0   CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS1_FTIM1   CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS1_FTIM2   CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS1_FTIM3   CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT      CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR1  CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK1 CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR1  CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS1_FTIM0      CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS1_FTIM1      CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS1_FTIM2      CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS1_FTIM3      CFG_SYS_NAND_FTIM3
 
 /* More NAND Flash Params */
 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 
 /* QRIO on IFC CS2 */
-#define CONFIG_SYS_QRIO_BASE           0xfb000000
-#define CONFIG_SYS_QRIO_BASE_PHYS      (0xf00000000ull | CONFIG_SYS_QRIO_BASE)
+#define CFG_SYS_QRIO_BASE              0xfb000000
+#define CFG_SYS_QRIO_BASE_PHYS (0xf00000000ull | CFG_SYS_QRIO_BASE)
 #define SYS_QRIO_CSPR_EXT      (0x0f)
-#define SYS_QRIO_CSPR  (CSPR_PHYS_ADDR(CONFIG_SYS_QRIO_BASE) | \
+#define SYS_QRIO_CSPR  (CSPR_PHYS_ADDR(CFG_SYS_QRIO_BASE) | \
                                CSPR_PORT_SIZE_8 | /* Port size = 8 bit */\
                                0x00000010 |       /* drive TE high */\
                                CSPR_MSEL_GPCM |   /* MSEL = GPCM */\
                        FTIM2_GPCM_TCH(0x1) | \
                        FTIM2_GPCM_TWP(0x7))
 #define SYS_QRIO_FTIM3 0x04000000
-#define CONFIG_SYS_CSPR2_EXT   SYS_QRIO_CSPR_EXT
-#define CONFIG_SYS_CSPR2       SYS_QRIO_CSPR
-#define CONFIG_SYS_AMASK2      SYS_QRIO_AMASK
-#define CONFIG_SYS_CSOR2       SYS_QRIO_CSOR
-#define CONFIG_SYS_CS2_FTIM0   SYS_QRIO_FTIM0
-#define CONFIG_SYS_CS2_FTIM1   SYS_QRIO_FTIM1
-#define CONFIG_SYS_CS2_FTIM2   SYS_QRIO_FTIM2
-#define CONFIG_SYS_CS2_FTIM3   SYS_QRIO_FTIM3
+#define CFG_SYS_CSPR2_EXT      SYS_QRIO_CSPR_EXT
+#define CFG_SYS_CSPR2  SYS_QRIO_CSPR
+#define CFG_SYS_AMASK2 SYS_QRIO_AMASK
+#define CFG_SYS_CSOR2  SYS_QRIO_CSOR
+#define CFG_SYS_CS2_FTIM0      SYS_QRIO_FTIM0
+#define CFG_SYS_CS2_FTIM1      SYS_QRIO_FTIM1
+#define CFG_SYS_CS2_FTIM2      SYS_QRIO_FTIM2
+#define CFG_SYS_CS2_FTIM3      SYS_QRIO_FTIM3
 
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
-#define CONFIG_SYS_INIT_RAM_ADDR       0xfdd00000      /* Initial L1 address */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH     0xf
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW      0xfe03c000
+#define CFG_SYS_INIT_RAM_ADDR  0xfdd00000      /* Initial L1 address */
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH        0xf
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
 /* The assembler doesn't like typecast */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \
-       ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
-         CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW)
-#define CONFIG_SYS_INIT_RAM_SIZE               0x00004000
+#define CFG_SYS_INIT_RAM_ADDR_PHYS \
+       ((CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
+         CFG_SYS_INIT_RAM_ADDR_PHYS_LOW)
+#define CFG_SYS_INIT_RAM_SIZE          0x00004000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*
  * Serial Port - controlled on board with jumper J8
  */
 #if !defined(CONFIG_DM_SERIAL)
 #define CFG_SYS_NS16550_CLK            (get_bus_freq(0) / 2)
-#define CFG_SYS_NS16550_COM1   (CONFIG_SYS_CCSRBAR + 0x11C500)
+#define CFG_SYS_NS16550_COM1   (CFG_SYS_CCSRBAR + 0x11C500)
 #endif
 
 #ifndef __ASSEMBLY__
@@ -351,30 +351,30 @@ int get_scl(void);
 #define CFG_SYS_PCIE1_IO_VIRT  0xf8000000
 #define CFG_SYS_PCIE1_IO_PHYS  0xff8000000ull
 
-#define CONFIG_SYS_BMAN_NUM_PORTALS    10
-#define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
-#define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull
-#define CONFIG_SYS_BMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_BMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_BMAN_CENA_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_CINH_BASE       (CONFIG_SYS_BMAN_MEM_BASE + \
-                                       CONFIG_SYS_BMAN_CENA_SIZE)
-#define CONFIG_SYS_BMAN_CINH_SIZE       (CONFIG_SYS_BMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_BMAN_SWP_ISDR_REG   0xE08
-#define CONFIG_SYS_QMAN_NUM_PORTALS    10
-#define CONFIG_SYS_QMAN_MEM_BASE       0xf6000000
-#define CONFIG_SYS_QMAN_MEM_PHYS       0xff6000000ull
-#define CONFIG_SYS_QMAN_MEM_SIZE       0x02000000
-#define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
-                                       CONFIG_SYS_QMAN_CENA_SIZE)
-#define CONFIG_SYS_QMAN_CINH_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
-#define CONFIG_SYS_QMAN_SWP_ISDR_REG   0xE08
+#define CFG_SYS_BMAN_NUM_PORTALS       10
+#define CFG_SYS_BMAN_MEM_BASE  0xf4000000
+#define CFG_SYS_BMAN_MEM_PHYS  0xff4000000ull
+#define CFG_SYS_BMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_BMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_BMAN_CENA_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_CINH_BASE       (CFG_SYS_BMAN_MEM_BASE + \
+                                       CFG_SYS_BMAN_CENA_SIZE)
+#define CFG_SYS_BMAN_CINH_SIZE       (CFG_SYS_BMAN_MEM_SIZE >> 1)
+#define CFG_SYS_BMAN_SWP_ISDR_REG      0xE08
+#define CFG_SYS_QMAN_NUM_PORTALS       10
+#define CFG_SYS_QMAN_MEM_BASE  0xf6000000
+#define CFG_SYS_QMAN_MEM_PHYS  0xff6000000ull
+#define CFG_SYS_QMAN_MEM_SIZE  0x02000000
+#define CFG_SYS_QMAN_SP_CINH_SIZE    0x1000
+#define CFG_SYS_QMAN_CENA_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_CINH_BASE       (CFG_SYS_QMAN_MEM_BASE + \
+                                       CFG_SYS_QMAN_CENA_SIZE)
+#define CFG_SYS_QMAN_CINH_SIZE       (CFG_SYS_QMAN_MEM_SIZE >> 1)
+#define CFG_SYS_QMAN_SWP_ISDR_REG      0xE08
 
 /* Qman / Bman */
 /* RGMII (FM1@DTESC5) is local managemant interface */
-#define CONFIG_SYS_RGMII2_PHY_ADDR             0x11
+#define CFG_SYS_RGMII2_PHY_ADDR             0x11
 
 /*
  * Hardware Watchdog
@@ -387,7 +387,7 @@ int get_scl(void);
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial map for Linux*/
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial map for Linux*/
 
 /*
  * Environment Configuration
@@ -412,12 +412,12 @@ int get_scl(void);
                __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize} && " \
                "protect on " __stringify(CONFIG_SYS_MONITOR_BASE)      \
                " +${filesize}\0"                                       \
-       "update-nor=protect off " __stringify(CONFIG_SYS_FLASH_BASE)    \
+       "update-nor=protect off " __stringify(CFG_SYS_FLASH_BASE)       \
                " +${filesize} && "                                     \
-               "erase " __stringify(CONFIG_SYS_FLASH_BASE)             \
+               "erase " __stringify(CFG_SYS_FLASH_BASE)                \
                " +${filesize} && "                                     \
                "cp.b ${load_addr_r} "                                  \
-               __stringify(CONFIG_SYS_FLASH_BASE) " ${filesize} && "   \
+               __stringify(CFG_SYS_FLASH_BASE) " ${filesize} && "      \
                "protect on " __stringify(CONFIG_SYS_MONITOR_BASE)      \
                " +" __stringify(CONFIG_SYS_MONITOR_LEN) "\0"           \
        "set_fdthigh=true\0"                                            \
index b95402987472b3447a1e80e40b1c061f33bf83d6..2be996aaaf083f2023cd43ae1993d9ebb566a429 100644 (file)
@@ -12,7 +12,7 @@
 #define CONFIG_NAND_ECC_BCH
 #define CONFIG_NAND_KMETER1
 #define NAND_MAX_CHIPS                         1
-#define CFG_SYS_NAND_BASE CONFIG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
+#define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT      "ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP       "ubi1"
@@ -26,7 +26,7 @@
 /**
  * KMCOGE5NE has 512 MB RAM
  */
-#define CONFIG_SYS_DDR_CS0_CONFIG (\
+#define CFG_SYS_DDR_CS0_CONFIG (\
        CSCONFIG_EN | \
        CSCONFIG_AP | \
        CSCONFIG_ODT_WR_ONLY_CURRENT | \
@@ -35,7 +35,7 @@
        CSCONFIG_COL_BIT_10)
 
 /* enable POST tests */
-#define CONFIG_POST (CONFIG_SYS_POST_MEMORY|CONFIG_SYS_POST_MEM_REGIONS)
+#define CONFIG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS)
 #define CONFIG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
 #define CONFIG_TESTPIN_REG  gprt3      /* for kmcoge5ne */
index 4245875e39e4a26d97e6a91bf720f73779983544..910fc1b2cb258dfdd72e214a68a3db19c2c8cc40 100644 (file)
@@ -16,7 +16,7 @@
 #include "km/km-mpc83xx.h"
 #include "km/km-mpc8360.h"
 
-#define CONFIG_SYS_DDR_CS0_CONFIG      (CSCONFIG_EN | CSCONFIG_AP | \
+#define CFG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN | CSCONFIG_AP | \
                                         CSCONFIG_ROW_BIT_13 | \
                                         CSCONFIG_COL_BIT_10 | \
                                         CSCONFIG_ODT_WR_ONLY_CURRENT)
index e2808ec02dc1bb2cd49fab7a19b89466a79b27b6..6fcacdb0c6640f2ea37f77325cf6228630cdc08a 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 
 /* Board and environment settings */
 #define CONFIG_MXC_UART_BASE           UART4_BASE
index 73b595176219ad0cfb46f1550dc1a03c01c9c11e..80a32304606ac8127d79f1637a4c6e8899ba9a51 100644 (file)
@@ -19,8 +19,8 @@
 #define PHYS_SDRAM_SIZE                        (SZ_4G)
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x200000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x200000
 
 /* Board and environment settings */
 #define CONFIG_HOSTNAME                        "kontron-mx8mm"
index 9b452818c1e166830bf5ea719144de19b0209431..2abcb849a28162b1c7dd8f7e5310a327d016225f 100644 (file)
@@ -61,8 +61,8 @@
        BOOTENV
 
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x80000
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        0x80000
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
index bbf0761814b4b6cb6ed6d40f9600c425065bd07c..9c3174d0e02ca596cc0155374fe42e5669c78045 100644 (file)
 
 /* we don't have secure memory unless we have a BL31 */
 #ifndef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
-#undef CONFIG_SYS_MEM_RESERVE_SECURE
+#undef CFG_SYS_MEM_RESERVE_SECURE
 #endif
 
 /* DDR */
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_DDR_BLOCK2_BASE     0x2080000000ULL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_BLOCK2_BASE        0x2080000000ULL
 
 /* early stack pointer */
 
index 967de66f3c9d3eae1cd3aa825aa2d59317d473b1..c551585a206252c31740780557fe19f295bb2920 100644 (file)
@@ -68,8 +68,8 @@
 #define PHYS_SDRAM_SIZE                (PHYS_SDRAM_1_SIZE)
 
 #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)
+#define CFG_SYS_INIT_RAM_ADDR  (IRAM_BASE_ADDR)
+#define CFG_SYS_INIT_RAM_SIZE  (IRAM_SIZE)
 
 /* environment organization */
 
index de1fc0bfa4c603dabf3030bb0920500c8df8d380..136e228682a6f2d716523b246e60bcbed8176893 100644 (file)
@@ -87,8 +87,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment */
 
index 9b70eed46f7cd324037c809186817c1a1039e1e4..828f91096344ba1fa2d6bd2c3508cd1e28495c7c 100644 (file)
@@ -31,7 +31,7 @@
 #ifdef CONFIG_CMD_I2C
 /* I2C EEPROM HT24LC04 (512B - 32 pages of 16 Bytes) */
 #if defined(CONFIG_NET2BIG_V2)
-#define CONFIG_SYS_I2C_G762_ADDR               0x3e
+#define CFG_SYS_I2C_G762_ADDR          0x3e
 #endif
 #endif /* CONFIG_CMD_I2C */
 
index bee064c6f385c7b8e6c6c6ff38ef26cd65c5e383..2664982715f11e09d960de6761bf15050cb790a0 100644 (file)
 /*
  * SoC Configuration
  */
-#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
-#define CONFIG_SYS_OSCIN_FREQ          24000000
-#define CONFIG_SYS_TIMERBASE           DAVINCI_TIMER0_BASE
-#define CONFIG_SYS_HZ_CLOCK            clk_get(DAVINCI_AUXCLK_CLKID)
+#define CFG_SYS_EXCEPTION_VECTORS_HIGH
+#define CFG_SYS_OSCIN_FREQ             24000000
+#define CFG_SYS_TIMERBASE              DAVINCI_TIMER0_BASE
+#define CFG_SYS_HZ_CLOCK               clk_get(DAVINCI_AUXCLK_CLKID)
 
 /*
  * Memory Info
@@ -38,7 +38,7 @@
  */
 #define CFG_SYS_NS16550_CLK    clk_get(DAVINCI_UART2_CLKID)
 
-#define CONFIG_SYS_SPI_CLK             clk_get(DAVINCI_SPI0_CLKID)
+#define CFG_SYS_SPI_CLK                clk_get(DAVINCI_SPI0_CLKID)
 
 /*
  * U-Boot general configuration
index 3a2c508ffacfab625b0ba273aac9d31cffc7ea31..11b3fa6c857d0f466462cd0058c0566150b429ff 100644 (file)
@@ -79,8 +79,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        0x80000
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        0x80000
 
 #define CFG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
index b9134508853b3364590a019688acbb136977ad2a..f16c7e912217000775b91bd13218d60530948368 100644 (file)
@@ -9,14 +9,14 @@
 /* RAM */
 #define CFG_SYS_SDRAM_BASE             0x80000000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      0x400000
+#define CFG_SYS_INIT_SP_OFFSET 0x400000
 
 /* SPL */
 
-#define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_START            CONFIG_TEXT_BASE
 
 /* Dummy value */
-#define CONFIG_SYS_UBOOT_BASE          0
+#define CFG_SYS_UBOOT_BASE             0
 
 /* Serial SPL */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
@@ -26,7 +26,7 @@
 #endif
 
 /* UART */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \
                                          230400, 460800, 921600 }
 
 /* RAM */
index d1ebd99ae144125b643c1b89f8928b75e307702b..721da818633a2a6e0a4a798dd65a7b5c9d4a7e8c 100644 (file)
@@ -88,8 +88,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* FLASH and environment organization */
 
index 07124370775bd11c16e843555fdbd7c94797d504..7598e54ed2b1865a823734bdbcc1f21c1b0f4181 100644 (file)
 #include <asm/arch/stream_id_lsch2.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_DDR_BLOCK2_BASE     0x880000000ULL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_BLOCK2_BASE     0x880000000ULL
 
 /*SPI device */
 #define CFG_SYS_FSL_QSPI_BASE  0x40000000
index 54555b34dd47a695b31108ea9fc30e84775f05ba..e772c019077d5b18b31905f70e45af8a2db63772 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 #ifdef CONFIG_FSL_QIXIS
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_LBMAP_BRDCFG_REG         0x04
 #define QIXIS_LBMAP_SWITCH             6
 #define QIXIS_LBMAP_MASK               0x08
@@ -47,7 +47,7 @@
 * RTC configuration
 */
 #define RTC
-#define CONFIG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
+#define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
 
 
 /* Voltage monitor on channel 2*/
index 49a77fd6b6bb8605dfb9fa44a4de5d7739f1d607..b058308ecdbebb59212f10827dc215f673da287e 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  OCRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  OCRAM_SIZE
 
 /*
  * DDR: 800 MHz ( 1600 MT/s data rate )
@@ -41,8 +41,8 @@
 #define SDRAM_CFG2_FRC_SR              0x80000000
 #define SDRAM_CFG_BI                   0x00000001
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 /*
  * Serial Port
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
+#define CFG_SYS_BOOTMAPSZ              (256 << 20)
 
 #define CONFIG_LS102XA_STREAM_ID
 
index 1f5a80ff085aa1cbadb859514f1e672f6612b9ee..5494b71e2b211ad70dece9e3b6b18130ce1aa1a5 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  OCRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  OCRAM_SIZE
 
 #ifdef CONFIG_NAND_BOOT
 #define CFG_SYS_NAND_U_BOOT_SIZE       (400 << 10)
@@ -19,8 +19,8 @@
 
 #define SPD_EEPROM_ADDRESS             0x51
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE           0xdeadbeef
  * IFC Definitions
  */
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_FLASH_BASE          0x60000000
-#define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE             0x60000000
+#define CFG_SYS_FLASH_BASE_PHYS        CFG_SYS_FLASH_BASE
 
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR0_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR1_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS \
+#define CFG_SYS_NOR1_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR1_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS \
                                + 0x8000000) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
 #define CFG_SYS_NOR_FTIM3              0
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS, \
-                                       CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS, \
+                                       CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
 /*
  * NAND Flash Definitions
 #ifdef CONFIG_FSL_QIXIS
 #define QIXIS_BASE                     0x7fb00000
 #define QIXIS_BASE_PHYS                        QIXIS_BASE
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_LBMAP_SWITCH             6
 #define QIXIS_LBMAP_MASK               0x0f
 #define QIXIS_LBMAP_SHIFT              0
 #define QIXIS_PWR_CTL2                 0x21
 #define QIXIS_PWR_CTL2_PCTL            0x2
 
-#define CONFIG_SYS_FPGA_CSPR_EXT       (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
+#define CFG_SYS_FPGA_CSPR_EXT  (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_FPGA_AMASK          IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_FPGA_CSOR           (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_FPGA_AMASK             IFC_AMASK(64 * 1024)
+#define CFG_SYS_FPGA_CSOR              (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_NOR_MODE_AVD_NOR | \
                                        CSOR_NOR_TRHZ_80)
 
 /*
  * QIXIS Timing parameters for IFC GPCM
  */
-#define CONFIG_SYS_FPGA_FTIM0          (FTIM0_GPCM_TACSE(0xe) | \
+#define CFG_SYS_FPGA_FTIM0             (FTIM0_GPCM_TACSE(0xe) | \
                                        FTIM0_GPCM_TEADC(0xe) | \
                                        FTIM0_GPCM_TEAHC(0xe))
-#define CONFIG_SYS_FPGA_FTIM1          (FTIM1_GPCM_TACO(0xe) | \
+#define CFG_SYS_FPGA_FTIM1             (FTIM1_GPCM_TACO(0xe) | \
                                        FTIM1_GPCM_TRAD(0x1f))
-#define CONFIG_SYS_FPGA_FTIM2          (FTIM2_GPCM_TCS(0xe) | \
+#define CFG_SYS_FPGA_FTIM2             (FTIM2_GPCM_TCS(0xe) | \
                                        FTIM2_GPCM_TCH(0xe) | \
                                        FTIM2_GPCM_TWP(0xf0))
-#define CONFIG_SYS_FPGA_FTIM3          0x0
+#define CFG_SYS_FPGA_FTIM3             0x0
 #endif
 
 #if defined(CONFIG_NAND_BOOT)
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #endif
 
 /*
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
+#define CFG_SYS_BOOTMAPSZ              (256 << 20)
 
 #define CONFIG_LS102XA_STREAM_ID
 
index 49546066115055778ccb8a8d99853eb89d5a124a..bc9eac700e98590b9851063c1d0807c8e183f86f 100644 (file)
@@ -6,8 +6,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  OCRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  OCRAM_SIZE
 
 /* XHCI Support - enabled by default */
 
@@ -56,8 +56,8 @@
 #define PHYS_SDRAM                     0x80000000
 #define PHYS_SDRAM_SIZE                        (1u * 1024 * 1024 * 1024)
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 /* Serial Port */
 #define CFG_SYS_NS16550_CLK            get_serial_clock()
                "bootm $load_addr#$board\0"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
+#define CFG_SYS_BOOTMAPSZ              (256 << 20)
 
 #define CONFIG_LS102XA_STREAM_ID
 
index d77224934c01f297597ba36e0ae5cd31a345b733..f1ccb5fc0840b57772f45188f31a258a8763407e 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  OCRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  OCRAM_SIZE
 
 #define DDR_SDRAM_CFG                  0x470c0008
 #define DDR_CS0_BNDS                   0x008000bf
 #define PHYS_SDRAM                     0x80000000
 #define PHYS_SDRAM_SIZE                        (1u * 1024 * 1024 * 1024)
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
-#define CFG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE      0x80000000UL
+#define CFG_SYS_SDRAM_BASE          CFG_SYS_DDR_SDRAM_BASE
 
 /*
  * IFC Definitions
  */
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_FLASH_BASE          0x60000000
-#define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE             0x60000000
+#define CFG_SYS_FLASH_BASE_PHYS        CFG_SYS_FLASH_BASE
 
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR0_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE_PHYS }
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE_PHYS }
 
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_WRITE_SWAPPED_DATA
 #endif
 
 /* CPLD */
 
-#define CONFIG_SYS_CPLD_BASE   0x7fb00000
-#define CPLD_BASE_PHYS         CONFIG_SYS_CPLD_BASE
+#define CFG_SYS_CPLD_BASE      0x7fb00000
+#define CPLD_BASE_PHYS         CFG_SYS_CPLD_BASE
 
-#define CONFIG_SYS_FPGA_CSPR_EXT        (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(CPLD_BASE_PHYS) | \
+#define CFG_SYS_FPGA_CSPR_EXT        (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(CPLD_BASE_PHYS) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_FPGA_AMASK          IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_FPGA_CSOR           (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_FPGA_AMASK             IFC_AMASK(64 * 1024)
+#define CFG_SYS_FPGA_CSOR              (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_NOR_MODE_AVD_NOR | \
                                        CSOR_NOR_TRHZ_80)
 
 /* CPLD Timing parameters for IFC GPCM */
-#define CONFIG_SYS_FPGA_FTIM0          (FTIM0_GPCM_TACSE(0xf) | \
+#define CFG_SYS_FPGA_FTIM0             (FTIM0_GPCM_TACSE(0xf) | \
                                        FTIM0_GPCM_TEADC(0xf) | \
                                        FTIM0_GPCM_TEAHC(0xf))
-#define CONFIG_SYS_FPGA_FTIM1          (FTIM1_GPCM_TACO(0xff) | \
+#define CFG_SYS_FPGA_FTIM1             (FTIM1_GPCM_TACO(0xff) | \
                                        FTIM1_GPCM_TRAD(0x3f))
-#define CONFIG_SYS_FPGA_FTIM2          (FTIM2_GPCM_TCS(0xf) | \
+#define CFG_SYS_FPGA_FTIM2             (FTIM2_GPCM_TCS(0xf) | \
                                        FTIM2_GPCM_TCH(0xf) | \
                                        FTIM2_GPCM_TWP(0xff))
-#define CONFIG_SYS_FPGA_FTIM3           0x0
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_FPGA_FTIM3           0x0
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_FPGA_FTIM3
 
 /*
  * Serial Port
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
+#define CFG_SYS_BOOTMAPSZ              (256 << 20)
 
 #define CONFIG_LS102XA_STREAM_ID
 
index 064c4f069cbd5d32272148c507a6d541c4448437..bdd3951e85f466ad4711ecd3c524973064a5aceb 100644 (file)
 /* Link Definitions */
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_DDR_BLOCK2_BASE     0x2080000000ULL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_BLOCK2_BASE        0x2080000000ULL
 
 /*
  * SMP Definitinos
index 253911518669f723bd5463ce3a404c6d5811d154..228fb122f5f3bcc5b2a7657998aa3bbf38c001c5 100644 (file)
@@ -17,7 +17,7 @@
 #ifdef CONFIG_FSL_QIXIS
 #define QIXIS_BASE                     0x7fb00000
 #define QIXIS_BASE_PHYS                        QIXIS_BASE
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_LBMAP_SWITCH             1
 #define QIXIS_LBMAP_MASK               0x0f
 #define QIXIS_LBMAP_SHIFT              5
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE  0x08
 #define QIXIS_RST_FORCE_MEM            0x01
 
-#define CONFIG_SYS_FPGA_CSPR_EXT       (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
+#define CFG_SYS_FPGA_CSPR_EXT  (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_FPGA_AMASK          IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_FPGA_CSOR           (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_FPGA_AMASK             IFC_AMASK(64 * 1024)
+#define CFG_SYS_FPGA_CSOR              (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_NOR_MODE_AVD_NOR | \
                                        CSOR_NOR_TRHZ_80)
 #endif
 
 /* RTC */
-#define CONFIG_SYS_RTC_BUS_NUM         1
+#define CFG_SYS_RTC_BUS_NUM         1
 #define I2C_MUX_CH_RTC                 0xB
 
 /* Store environment at top of flash */
index e7b2543b7301865dadc48706ff57b318924f6542..5c134612576cd49e48f93a02b1b9f92a0b0a5851 100644 (file)
@@ -10,7 +10,7 @@
 
 #define COUNTER_FREQUENCY_REAL         (get_board_sys_clk() / 4)
 
-#define CONFIG_SYS_RTC_BUS_NUM         0
+#define CFG_SYS_RTC_BUS_NUM         0
 
 /* Store environment at top of flash */
 
@@ -21,7 +21,7 @@
 #ifdef CONFIG_FSL_QIXIS
 #define QIXIS_BASE                     0x7fb00000
 #define QIXIS_BASE_PHYS                        QIXIS_BASE
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_LBMAP_SWITCH             2
 #define QIXIS_LBMAP_MASK               0xe0
 #define QIXIS_LBMAP_SHIFT              0x5
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE  0x08
 #define QIXIS_RST_FORCE_MEM            0x01
 
-#define CONFIG_SYS_FPGA_CSPR_EXT       (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
+#define CFG_SYS_FPGA_CSPR_EXT  (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_FPGA_CSOR           (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_FPGA_CSOR              (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_NOR_MODE_AVD_NOR | \
                                        CSOR_NOR_TRHZ_80)
 #endif
index e940dff99889b8220b890c9e33190580c9bb2dba..b4048744b1ea7529bf299dfdab590a4561b19da1 100644 (file)
 /* Link Definitions */
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_DDR_BLOCK2_BASE      0x880000000ULL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_BLOCK2_BASE      0x880000000ULL
 
 #define CPU_RELEASE_ADDR               secondary_boot_addr
 
 #if defined(CONFIG_TFABOOT) || \
        (!defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI))
 /*
- * CONFIG_SYS_FLASH_BASE has the final address (core view)
- * CONFIG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
- * CONFIG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
+ * CFG_SYS_FLASH_BASE has the final address (core view)
+ * CFG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
+ * CFG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
  * CONFIG_TEXT_BASE is linked to 0x60000000 for booting
  */
-#define CONFIG_SYS_FLASH_BASE                  0x60000000
-#define CONFIG_SYS_FLASH_BASE_PHYS             CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_FLASH_BASE_PHYS_EARLY       0x00000000
+#define CFG_SYS_FLASH_BASE                     0x60000000
+#define CFG_SYS_FLASH_BASE_PHYS                CFG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE_PHYS_EARLY  0x00000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 /* FMan ucode */
 #ifndef SPL_NO_FMAN
 #ifdef CONFIG_SYS_DPAA_FMAN
-#define CONFIG_SYS_FM_MURAM_SIZE       0x60000
+#define CFG_SYS_FM_MURAM_SIZE  0x60000
 #endif
 #endif
 
index 87751f786c8b0c9461e12a95dd1cae3820188e67..dab57382eddfc0d1d8f258ece717d15fffe876e1 100644 (file)
  * IFC Definitions
  */
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR0_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR1_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS \
+#define CFG_SYS_NOR1_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR1_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS \
                                + 0x8000000) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                        FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3              0
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS, \
-                                       CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS, \
+                                       CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
 /*
  * NAND Flash Definitions
 #ifdef CONFIG_FSL_QIXIS
 #define QIXIS_BASE                     0x7fb00000
 #define QIXIS_BASE_PHYS                        QIXIS_BASE
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_LBMAP_SWITCH             6
 #define QIXIS_LBMAP_MASK               0x0f
 #define QIXIS_LBMAP_SHIFT              0
 #define QIXIS_RCFG_CTL_RECONFIG_START  0x21
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE  0x08
 
-#define CONFIG_SYS_FPGA_CSPR_EXT       (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
+#define CFG_SYS_FPGA_CSPR_EXT  (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_FPGA_AMASK          IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_FPGA_CSOR           (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_FPGA_AMASK             IFC_AMASK(64 * 1024)
+#define CFG_SYS_FPGA_CSOR              (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_NOR_MODE_AVD_NOR | \
                                        CSOR_NOR_TRHZ_80)
 
 /*
  * QIXIS Timing parameters for IFC GPCM
  */
-#define CONFIG_SYS_FPGA_FTIM0          (FTIM0_GPCM_TACSE(0xc) | \
+#define CFG_SYS_FPGA_FTIM0             (FTIM0_GPCM_TACSE(0xc) | \
                                        FTIM0_GPCM_TEADC(0x20) | \
                                        FTIM0_GPCM_TEAHC(0x10))
-#define CONFIG_SYS_FPGA_FTIM1          (FTIM1_GPCM_TACO(0x50) | \
+#define CFG_SYS_FPGA_FTIM1             (FTIM1_GPCM_TACO(0x50) | \
                                        FTIM1_GPCM_TRAD(0x1f))
-#define CONFIG_SYS_FPGA_FTIM2          (FTIM2_GPCM_TCS(0x8) | \
+#define CFG_SYS_FPGA_FTIM2             (FTIM2_GPCM_TCS(0x8) | \
                                        FTIM2_GPCM_TCH(0x8) | \
                                        FTIM2_GPCM_TWP(0xf0))
-#define CONFIG_SYS_FPGA_FTIM3          0x0
+#define CFG_SYS_FPGA_FTIM3             0x0
 #endif
 
 #ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #else
 #ifdef CONFIG_NAND_BOOT
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #endif
 #endif
 
index 76251fde57cc5ced61aedb6e07d37ad0eef1aeec..12c4853ea963c7997333eba022465ba796aaeb8c 100644 (file)
@@ -21,7 +21,7 @@
 #define CFG_SYS_NOR_CSPR_EXT           (0x0)
 #define CFG_SYS_NOR_AMASK              IFC_AMASK(128*1024*1024)
 #define CFG_SYS_NOR_CSPR                                       \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS)                | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
                                        FTIM2_NOR_TWPH(0x8) | \
                                        FTIM2_NOR_TWP(0x10))
 #define CFG_SYS_NOR_FTIM3              0
-#define CONFIG_SYS_IFC_CCR             0x01000000
+#define CFG_SYS_IFC_CCR                0x01000000
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE_PHYS }
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE_PHYS }
 
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
 /*
  * NAND Flash Definitions
 /*
  * CPLD
  */
-#define CONFIG_SYS_CPLD_BASE           0x7fb00000
-#define CPLD_BASE_PHYS                 CONFIG_SYS_CPLD_BASE
+#define CFG_SYS_CPLD_BASE              0x7fb00000
+#define CPLD_BASE_PHYS                 CFG_SYS_CPLD_BASE
 
-#define CONFIG_SYS_CPLD_CSPR_EXT       (0x0)
-#define CONFIG_SYS_CPLD_CSPR           (CSPR_PHYS_ADDR(CPLD_BASE_PHYS) | \
+#define CFG_SYS_CPLD_CSPR_EXT  (0x0)
+#define CFG_SYS_CPLD_CSPR              (CSPR_PHYS_ADDR(CPLD_BASE_PHYS) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_CPLD_AMASK          IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_CPLD_CSOR           (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_CPLD_AMASK             IFC_AMASK(64 * 1024)
+#define CFG_SYS_CPLD_CSOR              (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_NOR_MODE_AVD_NOR | \
                                        CSOR_NOR_TRHZ_80)
 
 /* CPLD Timing parameters for IFC GPCM */
-#define CONFIG_SYS_CPLD_FTIM0          (FTIM0_GPCM_TACSE(0xf) | \
+#define CFG_SYS_CPLD_FTIM0             (FTIM0_GPCM_TACSE(0xf) | \
                                        FTIM0_GPCM_TEADC(0xf) | \
                                        FTIM0_GPCM_TEAHC(0xf))
-#define CONFIG_SYS_CPLD_FTIM1          (FTIM1_GPCM_TACO(0xff) | \
+#define CFG_SYS_CPLD_FTIM1             (FTIM1_GPCM_TACO(0xff) | \
                                        FTIM1_GPCM_TRAD(0x3f))
-#define CONFIG_SYS_CPLD_FTIM2          (FTIM2_GPCM_TCS(0xf) | \
+#define CFG_SYS_CPLD_FTIM2             (FTIM2_GPCM_TCS(0xf) | \
                                        FTIM2_GPCM_TCH(0xf) | \
                                        FTIM2_GPCM_TWP(0xff))
-#define CONFIG_SYS_CPLD_FTIM3          0x0
+#define CFG_SYS_CPLD_FTIM3             0x0
 
 /* IFC Timing Params */
 #ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-
-#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NAND_FTIM3
 #else
 #ifdef CONFIG_NAND_BOOT
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-
-#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CFG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-
-#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NAND_FTIM3
 #endif
 #endif
 
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_CPLD_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_CPLD_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_CPLD_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_CPLD_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_CPLD_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_CPLD_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_CPLD_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_CPLD_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_CPLD_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_CPLD_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_CPLD_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_CPLD_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_CPLD_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_CPLD_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_CPLD_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_CPLD_FTIM3
 
 /*
  * Environment
index ce254d8b3f12714c3af6a99e15284788d981b926..cac30e4679ebb7da8f4465332cead56e922b845b 100644 (file)
 /* Link Definitions */
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_DDR_BLOCK2_BASE      0x880000000ULL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_BLOCK2_BASE      0x880000000ULL
 
 #define CPU_RELEASE_ADDR               secondary_boot_addr
 
@@ -68,7 +68,7 @@
 /* FMan ucode */
 #ifndef SPL_NO_FMAN
 #ifdef CONFIG_SYS_DPAA_FMAN
-#define CONFIG_SYS_FM_MURAM_SIZE       0x60000
+#define CFG_SYS_FM_MURAM_SIZE  0x60000
 #endif
 #endif
 
index 8402eac4184c5a22b31019db1da183d6e25c9b38..58ae0fb0a6c15f9481082ef63c3e4967ef5fd447 100644 (file)
@@ -8,7 +8,7 @@
 
 #include "ls1046a_common.h"
 
-#define CONFIG_SYS_UBOOT_BASE          0x40100000
+#define CFG_SYS_UBOOT_BASE             0x40100000
 
 /*
  * NAND Flash Definitions
 #define CONFIG_MTD_NAND_VERIFY_WRITE
 
 /* IFC Timing Params */
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
 
 /* EEPROM */
 #define I2C_RETIMER_ADDR                       0x18
@@ -67,8 +67,8 @@
 
 /* RTC */
 #define RTC
-#define CONFIG_SYS_I2C_RTC_ADDR                0x51  /* Channel 0 I2C bus 0*/
-#define CONFIG_SYS_RTC_BUS_NUM                 0
+#define CFG_SYS_I2C_RTC_ADDR           0x51  /* Channel 0 I2C bus 0*/
+#define CFG_SYS_RTC_BUS_NUM                    0
 
 /*
  * Environment
index d565492f1d1cbc68e3636cd483ee2bf3c6fa40cf..553ae841caba44b76f0bd72f746be796be0686bf 100644 (file)
 /* IFC */
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
 /*
- * CONFIG_SYS_FLASH_BASE has the final address (core view)
- * CONFIG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
- * CONFIG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
+ * CFG_SYS_FLASH_BASE has the final address (core view)
+ * CFG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
+ * CFG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
  * CONFIG_TEXT_BASE is linked to 0x60000000 for booting
  */
-#define CONFIG_SYS_FLASH_BASE                  0x60000000
-#define CONFIG_SYS_FLASH_BASE_PHYS             CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_FLASH_BASE_PHYS_EARLY       0x00000000
+#define CFG_SYS_FLASH_BASE                     0x60000000
+#define CFG_SYS_FLASH_BASE_PHYS                CFG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE_PHYS_EARLY  0x00000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
  * IFC Definitions
  */
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR0_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR1_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS \
+#define CFG_SYS_NOR1_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR1_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS \
                                + 0x8000000) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                        FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3              0
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS, \
-                                       CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS, \
+                                       CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
 /*
  * NAND Flash Definitions
 #ifdef CONFIG_FSL_QIXIS
 #define QIXIS_BASE                     0x7fb00000
 #define QIXIS_BASE_PHYS                        QIXIS_BASE
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_LBMAP_SWITCH             6
 #define QIXIS_LBMAP_MASK               0x0f
 #define QIXIS_LBMAP_SHIFT              0
 #define QIXIS_RCFG_CTL_RECONFIG_START  0x21
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE  0x08
 
-#define CONFIG_SYS_FPGA_CSPR_EXT       (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
+#define CFG_SYS_FPGA_CSPR_EXT  (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_FPGA_AMASK          IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_FPGA_CSOR           (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_FPGA_AMASK             IFC_AMASK(64 * 1024)
+#define CFG_SYS_FPGA_CSOR              (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_NOR_MODE_AVD_NOR | \
                                        CSOR_NOR_TRHZ_80)
 
 /*
  * QIXIS Timing parameters for IFC GPCM
  */
-#define CONFIG_SYS_FPGA_FTIM0          (FTIM0_GPCM_TACSE(0xc) | \
+#define CFG_SYS_FPGA_FTIM0             (FTIM0_GPCM_TACSE(0xc) | \
                                        FTIM0_GPCM_TEADC(0x20) | \
                                        FTIM0_GPCM_TEAHC(0x10))
-#define CONFIG_SYS_FPGA_FTIM1          (FTIM1_GPCM_TACO(0x50) | \
+#define CFG_SYS_FPGA_FTIM1             (FTIM1_GPCM_TACO(0x50) | \
                                        FTIM1_GPCM_TRAD(0x1f))
-#define CONFIG_SYS_FPGA_FTIM2          (FTIM2_GPCM_TCS(0x8) | \
+#define CFG_SYS_FPGA_FTIM2             (FTIM2_GPCM_TCS(0x8) | \
                                        FTIM2_GPCM_TCH(0x8) | \
                                        FTIM2_GPCM_TWP(0xf0))
-#define CONFIG_SYS_FPGA_FTIM3          0x0
+#define CFG_SYS_FPGA_FTIM3             0x0
 #endif
 
 #ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #else
 #ifdef CONFIG_NAND_BOOT
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #endif
 #endif
 
index 0df68915989216cfd00a41bc6e5d7908fe0ed4de..f3904e7b3f7be4e789365b0f8ce8739071c28143 100644 (file)
@@ -16,7 +16,7 @@
 #define CONFIG_MEM_INIT_VALUE           0xdeadbeef
 
 #if defined(CONFIG_QSPI_BOOT)
-#define CONFIG_SYS_UBOOT_BASE          0x40100000
+#define CFG_SYS_UBOOT_BASE             0x40100000
 #endif
 
 #define CFG_SYS_NAND_BASE              0x7e800000
 /*
  * CPLD
  */
-#define CONFIG_SYS_CPLD_BASE           0x7fb00000
-#define CPLD_BASE_PHYS                 CONFIG_SYS_CPLD_BASE
+#define CFG_SYS_CPLD_BASE              0x7fb00000
+#define CPLD_BASE_PHYS                 CFG_SYS_CPLD_BASE
 
-#define CONFIG_SYS_CPLD_CSPR_EXT       (0x0)
-#define CONFIG_SYS_CPLD_CSPR           (CSPR_PHYS_ADDR(CPLD_BASE_PHYS) | \
+#define CFG_SYS_CPLD_CSPR_EXT  (0x0)
+#define CFG_SYS_CPLD_CSPR              (CSPR_PHYS_ADDR(CPLD_BASE_PHYS) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_CPLD_AMASK          IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_CPLD_CSOR           CSOR_NOR_ADM_SHIFT(16)
+#define CFG_SYS_CPLD_AMASK             IFC_AMASK(64 * 1024)
+#define CFG_SYS_CPLD_CSOR              CSOR_NOR_ADM_SHIFT(16)
 
 /* CPLD Timing parameters for IFC GPCM */
-#define CONFIG_SYS_CPLD_FTIM0          (FTIM0_GPCM_TACSE(0x0e) | \
+#define CFG_SYS_CPLD_FTIM0             (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
                                        FTIM0_GPCM_TEAHC(0x0e))
-#define CONFIG_SYS_CPLD_FTIM1          (FTIM1_GPCM_TACO(0xff) | \
+#define CFG_SYS_CPLD_FTIM1             (FTIM1_GPCM_TACO(0xff) | \
                                        FTIM1_GPCM_TRAD(0x3f))
-#define CONFIG_SYS_CPLD_FTIM2          (FTIM2_GPCM_TCS(0xf) | \
+#define CFG_SYS_CPLD_FTIM2             (FTIM2_GPCM_TCS(0xf) | \
                                        FTIM2_GPCM_TCH(0xf) | \
                                        FTIM2_GPCM_TWP(0x3E))
-#define CONFIG_SYS_CPLD_FTIM3          0x0
+#define CFG_SYS_CPLD_FTIM3             0x0
 
 /* IFC Timing Params */
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_CPLD_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_CPLD_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_CPLD_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_CPLD_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_CPLD_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_CPLD_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_CPLD_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_CPLD_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_CPLD_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_CPLD_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_CPLD_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_CPLD_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_CPLD_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_CPLD_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_CPLD_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_CPLD_FTIM3
 
 /* EEPROM */
 #define I2C_RETIMER_ADDR                       0x18
index f8eaee881d06f82f144539eead9ebb737dea58c4..bacc84f629ae2c64363046759e5e516f572acab0 100644 (file)
 #define CFG_SYS_FSL_QSPI_BASE  0x20000000
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_DDR_BLOCK2_BASE     0x8080000000ULL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_BLOCK2_BASE        0x8080000000ULL
 /*
  * SMP Definitinos
  */
  * 0x5_C000_0000..0x5_ffff_ffff        IFC CS1 1GB (NOR/Promjet)
  *
  * For e.g. NOR flash at CS0 will be mapped to 0x580000000 after relocation.
- * CONFIG_SYS_FLASH_BASE has the final address (core view)
- * CONFIG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
- * CONFIG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
+ * CFG_SYS_FLASH_BASE has the final address (core view)
+ * CFG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
+ * CFG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
  * CONFIG_TEXT_BASE is linked to 0x30000000 for booting
  */
 
-#define CONFIG_SYS_FLASH_BASE                  0x580000000ULL
-#define CONFIG_SYS_FLASH_BASE_PHYS             0x80000000
-#define CONFIG_SYS_FLASH_BASE_PHYS_EARLY       0x00000000
+#define CFG_SYS_FLASH_BASE                     0x580000000ULL
+#define CFG_SYS_FLASH_BASE_PHYS                0x80000000
+#define CFG_SYS_FLASH_BASE_PHYS_EARLY  0x00000000
 
-#define CONFIG_SYS_FLASH1_BASE_PHYS            0xC0000000
-#define CONFIG_SYS_FLASH1_BASE_PHYS_EARLY      0x8000000
+#define CFG_SYS_FLASH1_BASE_PHYS               0xC0000000
+#define CFG_SYS_FLASH1_BASE_PHYS_EARLY 0x8000000
 
 #ifndef __ASSEMBLY__
 unsigned long long get_qixis_addr(void);
@@ -92,12 +92,12 @@ unsigned long long get_qixis_addr(void);
 
 /* MC firmware */
 /* TODO Actual DPL max length needs to be confirmed with the MC FW team */
-#define CONFIG_SYS_LS_MC_DPC_MAX_LENGTH            0x20000
-#define CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET    0x00F00000
-#define CONFIG_SYS_LS_MC_DPL_MAX_LENGTH            0x20000
-#define CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET    0x00F20000
-#define CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH   0x200000
-#define CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET  0x07000000
+#define CFG_SYS_LS_MC_DPC_MAX_LENGTH       0x20000
+#define CFG_SYS_LS_MC_DRAM_DPC_OFFSET    0x00F00000
+#define CFG_SYS_LS_MC_DPL_MAX_LENGTH       0x20000
+#define CFG_SYS_LS_MC_DRAM_DPL_OFFSET    0x00F20000
+#define CFG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH      0x200000
+#define CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET     0x07000000
 
 /*
  * Carve out a DDR region which will not be used by u-boot/Linux
@@ -107,7 +107,7 @@ unsigned long long get_qixis_addr(void);
  */
 
 #if defined(CONFIG_FSL_MC_ENET)
-#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE           (128UL * 1024 * 1024)
+#define CFG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE              (128UL * 1024 * 1024)
 #endif
 
 /* Miscellaneous configurable options */
index b75d4ccf5cfdf090074c6401d0a530a6245befdc..d84622f32259b72b64746405aab1f456fe684a49 100644 (file)
  * IFC Definitions
  */
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
 #define CFG_SYS_NOR_AMASK              IFC_AMASK(128*1024*1024)
 #define CFG_SYS_NOR_AMASK_EARLY        IFC_AMASK(64*1024*1024)
 
-#define CONFIG_SYS_NOR0_CSPR                                   \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
+#define CFG_SYS_NOR0_CSPR                                      \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS)                | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR0_CSPR_EARLY                             \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS_EARLY)       | \
+#define CFG_SYS_NOR0_CSPR_EARLY                                \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS_EARLY)  | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR                                   \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH1_BASE_PHYS)            | \
+#define CFG_SYS_NOR1_CSPR                                      \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH1_BASE_PHYS)               | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR_EARLY                             \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH1_BASE_PHYS_EARLY)      | \
+#define CFG_SYS_NOR1_CSPR_EARLY                                \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH1_BASE_PHYS_EARLY) | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
                                FTIM2_NOR_TWPH(0xe) | \
                                FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3      0x04000000
-#define CONFIG_SYS_IFC_CCR     0x01000000
+#define CFG_SYS_IFC_CCR        0x01000000
 
 #ifndef SYS_NO_FLASH
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE,\
-                                        CONFIG_SYS_FLASH_BASE + 0x40000000}
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE,\
+                                        CFG_SYS_FLASH_BASE + 0x40000000}
 #endif
 #endif
 
 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 #define CONFIG_MTD_NAND_VERIFY_WRITE
 
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_LBMAP_SWITCH             6
 #define QIXIS_QMAP_MASK                        0xe0
 #define QIXIS_QMAP_SHIFT               5
 #define QIXIS_SDID_MASK                        0x07
 #define QIXIS_ESDHC_NO_ADAPTER         0x7
 
-#define CONFIG_SYS_FPGA_CSPR_EXT       (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
+#define CFG_SYS_FPGA_CSPR_EXT  (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
                                        | CSPR_PORT_SIZE_8 \
                                        | CSPR_MSEL_GPCM \
                                        | CSPR_V)
 
 #define SYS_FPGA_AMASK         IFC_AMASK(64 * 1024)
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_FPGA_CSOR           CSOR_GPCM_ADM_SHIFT(0)
+#define CFG_SYS_FPGA_CSOR              CSOR_GPCM_ADM_SHIFT(0)
 #else
-#define CONFIG_SYS_FPGA_CSOR           CSOR_GPCM_ADM_SHIFT(12)
+#define CFG_SYS_FPGA_CSOR              CSOR_GPCM_ADM_SHIFT(12)
 #endif
 /* QIXIS Timing parameters*/
 #define SYS_FPGA_CS_FTIM0      (FTIM0_GPCM_TACSE(0x0e) | \
 #define SYS_FPGA_CS_FTIM3      0x0
 
 #ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
-#define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR_EARLY
-#define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK1_FINAL                CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_CSPR3_FINAL         SYS_FPGA_CSPR_FINAL
-#define CONFIG_SYS_AMASK3              SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           SYS_FPGA_CS_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           SYS_FPGA_CS_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           SYS_FPGA_CS_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           SYS_FPGA_CS_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR_EARLY
+#define CFG_SYS_CSPR0_FINAL            CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR_EARLY
+#define CFG_SYS_CSPR1_FINAL            CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK_EARLY
+#define CFG_SYS_AMASK1_FINAL           CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_CSPR3_FINAL            SYS_FPGA_CSPR_FINAL
+#define CFG_SYS_AMASK3         SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              SYS_FPGA_CS_FTIM0
+#define CFG_SYS_CS3_FTIM1              SYS_FPGA_CS_FTIM1
+#define CFG_SYS_CS3_FTIM2              SYS_FPGA_CS_FTIM2
+#define CFG_SYS_CS3_FTIM3              SYS_FPGA_CS_FTIM3
 #else
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_CSPR2_FINAL         SYS_FPGA_CSPR_FINAL
-#define CONFIG_SYS_AMASK2              SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS2_FTIM0           SYS_FPGA_CS_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           SYS_FPGA_CS_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           SYS_FPGA_CS_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           SYS_FPGA_CS_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_CSPR2_FINAL            SYS_FPGA_CSPR_FINAL
+#define CFG_SYS_AMASK2         SYS_FPGA_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS2_FTIM0              SYS_FPGA_CS_FTIM0
+#define CFG_SYS_CS2_FTIM1              SYS_FPGA_CS_FTIM1
+#define CFG_SYS_CS2_FTIM2              SYS_FPGA_CS_FTIM2
+#define CFG_SYS_CS2_FTIM3              SYS_FPGA_CS_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
-#define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR_EARLY
-#define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK1_FINAL                CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_CSPR3_FINAL         SYS_FPGA_CSPR_FINAL
-#define CONFIG_SYS_AMASK3              SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           SYS_FPGA_CS_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           SYS_FPGA_CS_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           SYS_FPGA_CS_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           SYS_FPGA_CS_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR_EARLY
+#define CFG_SYS_CSPR0_FINAL            CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR_EARLY
+#define CFG_SYS_CSPR1_FINAL            CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK_EARLY
+#define CFG_SYS_AMASK1_FINAL           CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_CSPR3_FINAL            SYS_FPGA_CSPR_FINAL
+#define CFG_SYS_AMASK3         SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              SYS_FPGA_CS_FTIM0
+#define CFG_SYS_CS3_FTIM1              SYS_FPGA_CS_FTIM1
+#define CFG_SYS_CS3_FTIM2              SYS_FPGA_CS_FTIM2
+#define CFG_SYS_CS3_FTIM3              SYS_FPGA_CS_FTIM3
 #endif
 #endif
 
-#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
+#define CFG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
 
 /*
  * I2C bus multiplexer
 * RTC configuration
 */
 #define RTC
-#define CONFIG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
+#define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
 
 #ifdef CONFIG_FSL_DSPI
 #if !defined(CONFIG_TFABOOT) && \
index 27510adae67771832aa2391cbdfae8e65c322f4b..187b3072f02ec8d7a8b18cb566725722f943533d 100644 (file)
 
 
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
 #define CFG_SYS_NOR_AMASK              IFC_AMASK(128 * 1024 * 1024)
 #define CFG_SYS_NOR_AMASK_EARLY        IFC_AMASK(64 * 1024 * 1024)
 
-#define CONFIG_SYS_NOR0_CSPR                                   \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
+#define CFG_SYS_NOR0_CSPR                                      \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS)                | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR0_CSPR_EARLY                             \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS_EARLY)       | \
+#define CFG_SYS_NOR0_CSPR_EARLY                                \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS_EARLY)  | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
                                FTIM2_NOR_TCH(0x0) | \
                                FTIM2_NOR_TWP(0x1))
 #define CFG_SYS_NOR_FTIM3      0x04000000
-#define CONFIG_SYS_IFC_CCR     0x01000000
+#define CFG_SYS_IFC_CCR        0x01000000
 
 #ifndef SYS_NO_FLASH
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE }
 #endif
 #endif
 
@@ -85,7 +85,7 @@
 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 #define CONFIG_MTD_NAND_VERIFY_WRITE
 
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_BRDCFG4_OFFSET            0x54
 #define QIXIS_LBMAP_SWITCH             2
 #define QIXIS_QMAP_MASK                        0xe0
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE  0x08
 #define        QIXIS_RST_FORCE_MEM             0x01
 
-#define CONFIG_SYS_FPGA_CSPR_EXT       (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
+#define CFG_SYS_FPGA_CSPR_EXT  (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
                                        | CSPR_PORT_SIZE_8 \
                                        | CSPR_MSEL_GPCM \
                                        | CSPR_V)
                                        | CSPR_MSEL_GPCM \
                                        | CSPR_V)
 
-#define CONFIG_SYS_FPGA_AMASK          IFC_AMASK(64*1024)
-#define CONFIG_SYS_FPGA_CSOR           CSOR_GPCM_ADM_SHIFT(0)
+#define CFG_SYS_FPGA_AMASK             IFC_AMASK(64*1024)
+#define CFG_SYS_FPGA_CSOR              CSOR_GPCM_ADM_SHIFT(0)
 /* QIXIS Timing parameters*/
 #define SYS_FPGA_CS_FTIM0      (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
 
 #if defined(CONFIG_TFABOOT) || \
        defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_CSPR2_FINAL         SYS_FPGA_CSPR_FINAL
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS2_FTIM0           SYS_FPGA_CS_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           SYS_FPGA_CS_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           SYS_FPGA_CS_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           SYS_FPGA_CS_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_CSPR2_FINAL            SYS_FPGA_CSPR_FINAL
+#define CFG_SYS_AMASK2         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS2_FTIM0              SYS_FPGA_CS_FTIM0
+#define CFG_SYS_CS2_FTIM1              SYS_FPGA_CS_FTIM1
+#define CFG_SYS_CS2_FTIM2              SYS_FPGA_CS_FTIM2
+#define CFG_SYS_CS2_FTIM3              SYS_FPGA_CS_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
-#define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR_EARLY
+#define CFG_SYS_CSPR0_FINAL            CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
 #endif
 
-#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
+#define CFG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
 
 #define I2C_MUX_CH_VOL_MONITOR         0xA
 /* Voltage monitor on channel 2*/
 * RTC configuration
 */
 #define RTC
-#define CONFIG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
+#define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
 #endif
 
 #ifndef SPL_NO_ENV
index 21c097ecbbdf4119b824b6400e3d695a670716fa..18defd5e5a63332b5412e4e4780a27e6af8f1488 100644 (file)
 /* Link Definitions */
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000UL
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_DDR_BLOCK2_BASE     0x8080000000ULL
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_BLOCK2_BASE        0x8080000000ULL
 
 /*
  * SMP Definitinos
  * 0x5_C000_0000..0x5_ffff_ffff        IFC CS1 1GB (NOR/Promjet)
  *
  * For e.g. NOR flash at CS0 will be mapped to 0x580000000 after relocation.
- * CONFIG_SYS_FLASH_BASE has the final address (core view)
- * CONFIG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
- * CONFIG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
+ * CFG_SYS_FLASH_BASE has the final address (core view)
+ * CFG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
+ * CFG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
  * CONFIG_TEXT_BASE is linked to 0x30000000 for booting
  */
 
-#define CONFIG_SYS_FLASH_BASE                  0x580000000ULL
-#define CONFIG_SYS_FLASH_BASE_PHYS             0x80000000
-#define CONFIG_SYS_FLASH_BASE_PHYS_EARLY       0x00000000
+#define CFG_SYS_FLASH_BASE                     0x580000000ULL
+#define CFG_SYS_FLASH_BASE_PHYS                0x80000000
+#define CFG_SYS_FLASH_BASE_PHYS_EARLY  0x00000000
 
-#define CONFIG_SYS_FLASH1_BASE_PHYS            0xC0000000
-#define CONFIG_SYS_FLASH1_BASE_PHYS_EARLY      0x8000000
+#define CFG_SYS_FLASH1_BASE_PHYS               0xC0000000
+#define CFG_SYS_FLASH1_BASE_PHYS_EARLY 0x8000000
 
 #ifndef __ASSEMBLY__
 unsigned long long get_qixis_addr(void);
@@ -84,13 +84,13 @@ unsigned long long get_qixis_addr(void);
 
 /* MC firmware */
 /* TODO Actual DPL max length needs to be confirmed with the MC FW team */
-#define CONFIG_SYS_LS_MC_DPC_MAX_LENGTH            0x20000
-#define CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET    0x00F00000
-#define CONFIG_SYS_LS_MC_DPL_MAX_LENGTH            0x20000
-#define CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET    0x00F20000
+#define CFG_SYS_LS_MC_DPC_MAX_LENGTH       0x20000
+#define CFG_SYS_LS_MC_DRAM_DPC_OFFSET    0x00F00000
+#define CFG_SYS_LS_MC_DPL_MAX_LENGTH       0x20000
+#define CFG_SYS_LS_MC_DRAM_DPL_OFFSET    0x00F20000
 /* For LS2085A */
-#define CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH   0x200000
-#define CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET  0x07000000
+#define CFG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH      0x200000
+#define CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET     0x07000000
 
 /*
  * Carve out a DDR region which will not be used by u-boot/Linux
@@ -99,7 +99,7 @@ unsigned long long get_qixis_addr(void);
  * 512MB aligned, so the min size to hide is 512MB.
  */
 #ifdef CONFIG_FSL_MC_ENET
-#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE           (128UL * 1024 * 1024)
+#define CFG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE              (128UL * 1024 * 1024)
 #endif
 
 /* Miscellaneous configurable options */
index 7315790f1fe105717ebaf84ad9a0b504d0ed7e45..067587b53c5dd777945964ac128769180b32a0d4 100644 (file)
 #include "ls2080a_common.h"
 
 #ifdef CONFIG_FSL_QSPI
-#define CONFIG_SYS_I2C_IFDR_DIV                0x7e
+#define CFG_SYS_I2C_IFDR_DIV           0x7e
 #endif
 
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define COUNTER_FREQUENCY_REAL         (get_board_sys_clk()/4)
 
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 #define SPD_EEPROM_ADDRESS6    0x56    /* dummy address */
 #define SPD_EEPROM_ADDRESS     SPD_EEPROM_ADDRESS1
 
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
 #define CFG_SYS_NOR_AMASK              IFC_AMASK(128*1024*1024)
 #define CFG_SYS_NOR_AMASK_EARLY        IFC_AMASK(64*1024*1024)
 
-#define CONFIG_SYS_NOR0_CSPR                                   \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
+#define CFG_SYS_NOR0_CSPR                                      \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS)                | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR0_CSPR_EARLY                             \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS_EARLY)       | \
+#define CFG_SYS_NOR0_CSPR_EARLY                                \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS_EARLY)  | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR                                   \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH1_BASE_PHYS)            | \
+#define CFG_SYS_NOR1_CSPR                                      \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH1_BASE_PHYS)               | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR_EARLY                             \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH1_BASE_PHYS_EARLY)      | \
+#define CFG_SYS_NOR1_CSPR_EARLY                                \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH1_BASE_PHYS_EARLY) | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
                                FTIM2_NOR_TWPH(0x0E) | \
                                FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3      0x04000000
-#define CONFIG_SYS_IFC_CCR     0x01000000
+#define CFG_SYS_IFC_CCR        0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE,\
-                                        CONFIG_SYS_FLASH_BASE + 0x40000000}
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE,\
+                                        CFG_SYS_FLASH_BASE + 0x40000000}
 #endif
 
 #define CFG_SYS_NAND_CSPR_EXT  (0x0)
 #define QIXIS_RCW_SRC_QSPI             0x62
 #define        QIXIS_RST_FORCE_MEM             0x01
 
-#define CONFIG_SYS_CSPR3_EXT   (0x0)
-#define CONFIG_SYS_CSPR3       (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
+#define CFG_SYS_CSPR3_EXT      (0x0)
+#define CFG_SYS_CSPR3  (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
                                | CSPR_PORT_SIZE_8 \
                                | CSPR_MSEL_GPCM \
                                | CSPR_V)
-#define CONFIG_SYS_CSPR3_FINAL (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) \
+#define CFG_SYS_CSPR3_FINAL    (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) \
                                | CSPR_PORT_SIZE_8 \
                                | CSPR_MSEL_GPCM \
                                | CSPR_V)
 
-#define CONFIG_SYS_AMASK3      IFC_AMASK(64*1024)
-#define CONFIG_SYS_CSOR3       CSOR_GPCM_ADM_SHIFT(12)
+#define CFG_SYS_AMASK3 IFC_AMASK(64*1024)
+#define CFG_SYS_CSOR3  CSOR_GPCM_ADM_SHIFT(12)
 /* QIXIS Timing parameters for IFC CS3 */
-#define CONFIG_SYS_CS3_FTIM0           (FTIM0_GPCM_TACSE(0x0e) | \
+#define CFG_SYS_CS3_FTIM0              (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
                                        FTIM0_GPCM_TEAHC(0x0e))
-#define CONFIG_SYS_CS3_FTIM1           (FTIM1_GPCM_TACO(0xff) | \
+#define CFG_SYS_CS3_FTIM1              (FTIM1_GPCM_TACO(0xff) | \
                                        FTIM1_GPCM_TRAD(0x3f))
-#define CONFIG_SYS_CS3_FTIM2           (FTIM2_GPCM_TCS(0xf) | \
+#define CFG_SYS_CS3_FTIM2              (FTIM2_GPCM_TCS(0xf) | \
                                        FTIM2_GPCM_TCH(0xf) | \
                                        FTIM2_GPCM_TWP(0x3E))
-#define CONFIG_SYS_CS3_FTIM3           0x0
+#define CFG_SYS_CS3_FTIM3              0x0
 
 #if defined(CONFIG_SPL)
 #if defined(CONFIG_NAND_BOOT)
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR_EARLY
-#define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR_EARLY
-#define CONFIG_SYS_CSPR2_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK2_FINAL                CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR0_CSPR_EARLY
+#define CFG_SYS_CSPR1_FINAL            CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NOR1_CSPR_EARLY
+#define CFG_SYS_CSPR2_FINAL            CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NOR_AMASK_EARLY
+#define CFG_SYS_AMASK2_FINAL           CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
 
 #define CFG_SYS_NAND_U_BOOT_SIZE       (640 * 1024)
 #endif
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
-#define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR_EARLY
-#define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK1_FINAL                CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR_EARLY
+#define CFG_SYS_CSPR0_FINAL            CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR_EARLY
+#define CFG_SYS_CSPR1_FINAL            CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK_EARLY
+#define CFG_SYS_AMASK1_FINAL           CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
 #endif
 
-#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
+#define CFG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
 
 /*
  * I2C
  */
 #define RTC
 #define CONFIG_RTC_DS3231               1
-#define CONFIG_SYS_I2C_RTC_ADDR         0x68
+#define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /* Initial environment variables */
 #undef CONFIG_EXTRA_ENV_SETTINGS
index daca3be16c510c0017dcfbd94525d3ccb2c3bef2..32a119487234dd5352b02ad3bc29644e74b05c94 100644 (file)
 
 #if !defined(CONFIG_FSL_QSPI) || defined(CONFIG_TFABOOT)
 
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
 #define CFG_SYS_NOR_AMASK              IFC_AMASK(128*1024*1024)
 #define CFG_SYS_NOR_AMASK_EARLY        IFC_AMASK(64*1024*1024)
 
-#define CONFIG_SYS_NOR0_CSPR                                   \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
+#define CFG_SYS_NOR0_CSPR                                      \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS)                | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR0_CSPR_EARLY                             \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS_EARLY)       | \
+#define CFG_SYS_NOR0_CSPR_EARLY                                \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS_EARLY)  | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
                                FTIM2_NOR_TWPH(0x0E) | \
                                FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3      0x04000000
-#define CONFIG_SYS_IFC_CCR     0x01000000
+#define CFG_SYS_IFC_CCR        0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE,\
-                                        CONFIG_SYS_FLASH_BASE + 0x40000000}
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE,\
+                                        CFG_SYS_FLASH_BASE + 0x40000000}
 #endif
 
 #define CFG_SYS_NAND_CSPR_EXT  (0x0)
 #define QIXIS_RCW_SRC_NAND             0x119
 #define        QIXIS_RST_FORCE_MEM             0x01
 
-#define CONFIG_SYS_CSPR3_EXT   (0x0)
-#define CONFIG_SYS_CSPR3       (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
+#define CFG_SYS_CSPR3_EXT      (0x0)
+#define CFG_SYS_CSPR3  (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
                                | CSPR_PORT_SIZE_8 \
                                | CSPR_MSEL_GPCM \
                                | CSPR_V)
-#define CONFIG_SYS_CSPR3_FINAL (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) \
+#define CFG_SYS_CSPR3_FINAL    (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) \
                                | CSPR_PORT_SIZE_8 \
                                | CSPR_MSEL_GPCM \
                                | CSPR_V)
 
-#define CONFIG_SYS_AMASK3      IFC_AMASK(64*1024)
-#define CONFIG_SYS_CSOR3       CSOR_GPCM_ADM_SHIFT(12)
+#define CFG_SYS_AMASK3 IFC_AMASK(64*1024)
+#define CFG_SYS_CSOR3  CSOR_GPCM_ADM_SHIFT(12)
 /* QIXIS Timing parameters for IFC CS3 */
-#define CONFIG_SYS_CS3_FTIM0           (FTIM0_GPCM_TACSE(0x0e) | \
+#define CFG_SYS_CS3_FTIM0              (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
                                        FTIM0_GPCM_TEAHC(0x0e))
-#define CONFIG_SYS_CS3_FTIM1           (FTIM1_GPCM_TACO(0xff) | \
+#define CFG_SYS_CS3_FTIM1              (FTIM1_GPCM_TACO(0xff) | \
                                        FTIM1_GPCM_TRAD(0x3f))
-#define CONFIG_SYS_CS3_FTIM2           (FTIM2_GPCM_TCS(0xf) | \
+#define CFG_SYS_CS3_FTIM2              (FTIM2_GPCM_TCS(0xf) | \
                                        FTIM2_GPCM_TCH(0xf) | \
                                        FTIM2_GPCM_TWP(0x3E))
-#define CONFIG_SYS_CS3_FTIM3           0x0
+#define CFG_SYS_CS3_FTIM3              0x0
 
 #if defined(CONFIG_SPL) && defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR0_CSPR_EARLY
-#define CONFIG_SYS_CSPR2_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NOR0_CSPR_EARLY
+#define CFG_SYS_CSPR2_FINAL            CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
 
 #define CFG_SYS_NAND_U_BOOT_SIZE       (512 * 1024)
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
-#define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR_EARLY
+#define CFG_SYS_CSPR0_FINAL            CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
 #endif
 #endif
-#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
+#define CFG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
 
 #ifdef CONFIG_TARGET_LS2081ARDB
 #define QIXIS_QMAP_MASK                        0x07
  * I2C
  */
 #ifdef CONFIG_TARGET_LS2081ARDB
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #endif
 #define I2C_MUX_PCA_ADDR               0x75
 #define I2C_MUX_PCA_ADDR_PRI           0x75 /* Primary Mux*/
  */
 #define RTC
 #ifdef CONFIG_TARGET_LS2081ARDB
-#define CONFIG_SYS_I2C_RTC_ADDR         0x51
+#define CFG_SYS_I2C_RTC_ADDR         0x51
 #else
 #define CONFIG_RTC_DS3231               1
-#define CONFIG_SYS_I2C_RTC_ADDR         0x68
+#define CFG_SYS_I2C_RTC_ADDR         0x68
 #endif
 
 #define BOOT_TARGET_DEVICES(func) \
index ad85e2de6eda2c9f0f6fe7fcfad70bbce557ac59..bbee9df404a1d77952ec28fec62505139c9a0fef 100644 (file)
 #include <asm/arch/config.h>
 #include <asm/arch/soc.h>
 
-#define CONFIG_SYS_FLASH_BASE          0x20000000
+#define CFG_SYS_FLASH_BASE             0x20000000
 
 /* DDR */
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE              0x80000000UL
+#define CFG_SYS_DDR_SDRAM_BASE         0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
-#define CONFIG_SYS_DDR_BLOCK2_BASE             0x2080000000ULL
+#define CFG_SYS_DDR_BLOCK2_BASE                0x2080000000ULL
 #define CFG_SYS_SDRAM_SIZE                     0x200000000UL
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 #define SPD_EEPROM_ADDRESS1            0x51
 #define SPD_EEPROM_ADDRESS2            0x52
 
 /* Serial Port */
 #define CONFIG_PL011_CLOCK             (get_bus_freq(0) / 4)
-#define CONFIG_SYS_SERIAL0             0x21c0000
-#define CONFIG_SYS_SERIAL1             0x21d0000
-#define CONFIG_SYS_SERIAL2             0x21e0000
-#define CONFIG_SYS_SERIAL3             0x21f0000
+#define CFG_SYS_SERIAL0                0x21c0000
+#define CFG_SYS_SERIAL1                0x21d0000
+#define CFG_SYS_SERIAL2                0x21e0000
+#define CFG_SYS_SERIAL3                0x21f0000
 /*below might needs to be removed*/
-#define CONFIG_PL01x_PORTS             {(void *)CONFIG_SYS_SERIAL0, \
-                                       (void *)CONFIG_SYS_SERIAL1, \
-                                       (void *)CONFIG_SYS_SERIAL2, \
-                                       (void *)CONFIG_SYS_SERIAL3 }
+#define CONFIG_PL01x_PORTS             {(void *)CFG_SYS_SERIAL0, \
+                                       (void *)CFG_SYS_SERIAL1, \
+                                       (void *)CFG_SYS_SERIAL2, \
+                                       (void *)CFG_SYS_SERIAL3 }
 
 /* MC firmware */
-#define CONFIG_SYS_LS_MC_DPC_MAX_LENGTH                0x20000
-#define CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET       0x00F00000
-#define CONFIG_SYS_LS_MC_DPL_MAX_LENGTH                0x20000
-#define CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET       0x00F20000
-#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS       5000
+#define CFG_SYS_LS_MC_DPC_MAX_LENGTH           0x20000
+#define CFG_SYS_LS_MC_DRAM_DPC_OFFSET  0x00F00000
+#define CFG_SYS_LS_MC_DPL_MAX_LENGTH           0x20000
+#define CFG_SYS_LS_MC_DRAM_DPL_OFFSET  0x00F20000
+#define CFG_SYS_LS_MC_BOOT_TIMEOUT_MS  5000
 
 /*
  * Carve out a DDR region which will not be used by u-boot/Linux
@@ -66,7 +66,7 @@
  * 512MB aligned, so the min size to hide is 512MB.
  */
 #ifdef CONFIG_FSL_MC_ENET
-#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE   (256UL * 1024 * 1024)
+#define CFG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE      (256UL * 1024 * 1024)
 #endif
 
 /* I2C bus multiplexer */
 
 /* RTC */
 #define RTC
-#define CONFIG_SYS_I2C_RTC_ADDR                0x51  /* Channel 3*/
+#define CFG_SYS_I2C_RTC_ADDR           0x51  /* Channel 3*/
 
 /* Qixis */
-#define CONFIG_SYS_I2C_FPGA_ADDR               0x66
+#define CFG_SYS_I2C_FPGA_ADDR          0x66
 
 /* USB */
 
index 4e8a90485960774aed6f5caae294b03d209be311..9f891064bd5d5ee32dffe724e30b339efbad5701 100644 (file)
@@ -9,7 +9,7 @@
 #include "lx2160a_common.h"
 
 /* RTC */
-#define CONFIG_SYS_RTC_BUS_NUM         0
+#define CFG_SYS_RTC_BUS_NUM            0
 
 /* MAC/PHY configuration */
 
index bb9239cc5996808199b3b6d400d06858005c3cfc..58c0ff36571e95806e84ef4e9c3ff25b67a82bce 100644 (file)
@@ -9,7 +9,7 @@
 #include "lx2160a_common.h"
 
 /* RTC */
-#define CONFIG_SYS_RTC_BUS_NUM         4
+#define CFG_SYS_RTC_BUS_NUM            4
 
 /* EMC2305 */
 #define I2C_MUX_CH_EMC2305             0x09
index b70abb013f47fdb003ec28ef56003e264dfec6ab..157688ef7d7a35967d5f4ab4a249506ade8ccde2 100644 (file)
@@ -11,7 +11,7 @@
 /* USB */
 
 /* RTC */
-#define CONFIG_SYS_RTC_BUS_NUM         0
+#define CFG_SYS_RTC_BUS_NUM            0
 
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS              \
index cbdb2fa1357e1a5b5120e973982e546b6dbce018..f87bbf7ccf323b4e2eac23506e5eeaa698fe27a1 100644 (file)
@@ -21,8 +21,8 @@
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
 #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)
+#define CFG_SYS_INIT_RAM_ADDR  (IRAM_BASE_ADDR)
+#define CFG_SYS_INIT_RAM_SIZE  (IRAM_SIZE)
 
 /*
  * U-Boot general configurations
 #define CONFIG_FEC_MXC_PHYADDR         0x0
 #endif
 
-#define CONFIG_SYS_RTC_BUS_NUM         1 /* I2C2 */
+#define CFG_SYS_RTC_BUS_NUM            1 /* I2C2 */
 
 /*
  * RTC
  */
 #ifdef CONFIG_CMD_DATE
-#define CONFIG_SYS_I2C_RTC_ADDR                0x68
+#define CFG_SYS_I2C_RTC_ADDR           0x68
 #endif
 
 /*
@@ -77,7 +77,7 @@
 #endif
 
 /* LVDS display */
-#define CONFIG_SYS_LDB_CLOCK                   33260000
+#define CFG_SYS_LDB_CLOCK                      33260000
 #define CONFIG_IMX_VIDEO_SKIP
 
 /* IIM Fuses */
index c9aee00cd357c59e184acd10d013f53832eff7be..65f4b05649b26639781c80a2fa4ba4bf048847be 100644 (file)
@@ -28,7 +28,7 @@
 #endif
 #define CFG_SYS_SDRAM_SIZE             0x10000000      /* 256 MiB */
 
-#define CONFIG_SYS_INIT_SP_OFFSET      0x400000
+#define CFG_SYS_INIT_SP_OFFSET 0x400000
 
 /*
  * Serial driver
@@ -38,9 +38,9 @@
  * Flash configuration
  */
 #ifdef CONFIG_64BIT
-# define CONFIG_SYS_FLASH_BASE         0xffffffffbe000000
+# define CFG_SYS_FLASH_BASE            0xffffffffbe000000
 #else
-# define CONFIG_SYS_FLASH_BASE         0xbe000000
+# define CFG_SYS_FLASH_BASE            0xbe000000
 #endif
 
 /*
index 8aa3b0cd808cb7b3705b75a0fc26f234513f07e2..7c401a2cfd6cfe91a47cf839466dd5ed9819e47c 100644 (file)
@@ -9,7 +9,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
+#define CFG_SYS_UBOOT_BASE (CFG_SYS_FLASH_BASE + 0x80000)
 
 /*
  * Below defines are set but NOT really used since we by
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 
 /* NOR 16-bit mode */
-#define CONFIG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
+#define CFG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
 #define CONFIG_FLASH_VERIFY
 
 /* NOR Flash MTD */
-#define CONFIG_SYS_FLASH_BANKS_LIST    { (CONFIG_SYS_FLASH_BASE) }
-#define CONFIG_SYS_FLASH_BANKS_SIZES   { (32 * SZ_1M) }
+#define CFG_SYS_FLASH_BANKS_LIST       { (CFG_SYS_FLASH_BASE) }
+#define CFG_SYS_FLASH_BANKS_SIZES      { (32 * SZ_1M) }
 
 /* Ethernet Configuration */
 #define CONFIG_FEC_MXC_PHYADDR         1
        "nor_img_addr=0x11000000\0" \
        "nor_img_file=core-image-lwn-mccmon6.nor\0" \
        "emmc_img_file=core-image-lwn-mccmon6.ext4\0" \
-       "nor_bank_start=" __stringify(CONFIG_SYS_FLASH_BASE) "\0" \
+       "nor_bank_start=" __stringify(CFG_SYS_FLASH_BASE) "\0" \
        "nor_img_size=0x02000000\0" \
        "factory_script_file=factory.scr\0" \
        "factory_load_script=" \
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment organization */
 
index 2422cbf9f0b6e79909ce567e03b34570804f51b2..9e480fe0558e30414687d15fdaf0f281d481afc2 100644 (file)
@@ -18,8 +18,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment configs */
 
index 2e07886c194bab9e1a8215fb141f5815983397ff..d190e4b5039266f499074a9e14d4d3e742ecba9f 100644 (file)
@@ -28,8 +28,8 @@
  */
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768   /* 32.768 kHz crystal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     16000000/* 16.0 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768   /* 32.768 kHz crystal */
+#define CFG_SYS_AT91_MAIN_CLOCK        16000000/* 16.0 MHz crystal */
 
 /* Misc CPU related */
 
@@ -47,8 +47,8 @@
 #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)
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM0
+#define CFG_SYS_INIT_RAM_SIZE  (16 * 1024)
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index 139b5bca108e2b00ece0189ed509c40cb729fbe0..edd2466caa981893ec6eab6e9e3b784be2933b39 100644 (file)
@@ -13,7 +13,7 @@
 
 /* uart */
 /* The following table includes the supported baudrates */
-# define CONFIG_SYS_BAUDRATE_TABLE \
+# define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
 #define        CONFIG_HOSTNAME         "microblaze-generic"
@@ -95,6 +95,6 @@
 
 /* SPL part */
 
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 
 #endif /* __CONFIG_H */
index ac5ff9289a52513d8ccc2d45d6179c06798c43fa..cfe926c0a141d3ac7f2ef641e37b2af090be7d22 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE  (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
+#define CFG_SYS_UBOOT_BASE     (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR          1
@@ -46,8 +46,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x80000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x80000
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
 #define PHYS_SDRAM                     0x40000000
index 65cd6f5bc4c2bd0ef09ae2c527f1896784330e37..d5bd492634844fa419c068e90763769d203eff25 100644 (file)
 
 #define CFG_SYS_SDRAM_BASE             0x80000000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      0x400000
+#define CFG_SYS_INIT_SP_OFFSET 0x400000
 
 /* SPL */
 
-#define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_START            CONFIG_TEXT_BASE
 
 /* Dummy value */
-#define CONFIG_SYS_UBOOT_BASE          0
+#define CFG_SYS_UBOOT_BASE             0
 
 #endif /* __CONFIG_MT7620_H */
index 1211bb4748807e0125f09c7fad97eabc044dd7f8..7c8c67f4469751450323f6444419c691c0582db1 100644 (file)
@@ -13,7 +13,7 @@
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED          0x1c000000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      0x800000
+#define CFG_SYS_INIT_SP_OFFSET 0x800000
 
 /* MMC */
 #define MMC_SUPPORTS_TUNING
 #endif
 
 /* Serial common */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \
                                          230400, 460800, 921600 }
 
 /* Dummy value */
-#define CONFIG_SYS_UBOOT_BASE          0
+#define CFG_SYS_UBOOT_BASE             0
 
 #endif /* __CONFIG_MT7621_H */
index e5d60e1cd2b1451cabf17123b04dc4f7e5e7bc07..8c297266d8b1517bb2f1249d7982303e1f1a081c 100644 (file)
 #define __MT7622_H
 
 /* Uboot definition */
-#define CONFIG_SYS_UBOOT_BASE                   CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE                   CONFIG_TEXT_BASE
 
 /* SPL -> Uboot */
-#define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_START            CONFIG_TEXT_BASE
 /* DRAM */
 #define CFG_SYS_SDRAM_BASE             0x40000000
 
index 9c5034f5f08630cca5c0eb9941839f972b63d4ff..9df2715fc7dc0bbfb8f35b53a5c2d4d0762e4266 100644 (file)
@@ -10,7 +10,7 @@
 
 #define CFG_SYS_SDRAM_BASE             0x80000000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      0x80000
+#define CFG_SYS_INIT_SP_OFFSET 0x80000
 
 /* Serial SPL */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
 #endif
 
 /* Serial common */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \
                                          230400, 460800, 921600 }
 
 /* SPL */
 
-#define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_START            CONFIG_TEXT_BASE
 
 /* Dummy value */
-#define CONFIG_SYS_UBOOT_BASE          0
+#define CFG_SYS_UBOOT_BASE             0
 
 #endif /* __CONFIG_MT7628_H */
index d330adbc01b90294274e29a5de7fa2030a88d1f1..bfa44aacc726b90fd0de525f6a1d8a0239bbf65e 100644 (file)
@@ -18,7 +18,7 @@
 /* Defines for SPL */
 
 #define CONFIG_SPI_ADDR                        0x30000000
-#define CONFIG_SYS_UBOOT_BASE          (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO)
+#define CFG_SYS_UBOOT_BASE             (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO)
 
 /* SPL -> Uboot */
 
index 249f0b9662d0f1348bd5d2b6bc34799ae1e230a1..14c885ec55c5c8eba312371c48eb49fa178c9fd4 100644 (file)
 #define __MT7981_H
 
 /* Uboot definition */
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 
 /* SPL -> Uboot */
-#define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_START            CONFIG_TEXT_BASE
 
 /* DRAM */
 #define CFG_SYS_SDRAM_BASE             0x40000000
index 990e411a64063c719ce2533ef22f71bb6e531882..0c41af1fc3293d98d340a785d5d6be1ba519c7a0 100644 (file)
 #define __MT7986_H
 
 /* Uboot definition */
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 
 /* SPL -> Uboot */
-#define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_START            CONFIG_TEXT_BASE
 
 /* DRAM */
 #define CFG_SYS_SDRAM_BASE             0x40000000
index d15941660abc67968c34658e767883b428c9ca1a..3a35527da10d80bc8b30f895eaf66d82d20e6f0c 100644 (file)
@@ -10,7 +10,7 @@
 #define __MT8512_H
 
 /* Uboot definition */
-#define CONFIG_SYS_UBOOT_START                 CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_START                    CONFIG_TEXT_BASE
 
 #define ENV_BOOT_READ_IMAGE \
        "boot_rd_img=mmc dev 0" \
index e45bfd76b6e19495c895fd560f20aa284adce3cf..fa275d61d185d85fe4571979b5376c1c7ff1dcd5 100644 (file)
 /*
  * NS16550 Configuration
  */
-#define CFG_SYS_NS16550_CLK            CONFIG_SYS_TCLK
+#define CFG_SYS_NS16550_CLK            CFG_SYS_TCLK
 #if !defined(CONFIG_DM_SERIAL)
 #define CFG_SYS_NS16550_COM1           MV_UART_CONSOLE_BASE
 #endif
 
-#if defined(CONFIG_ARMADA_38X) && !defined(CONFIG_SYS_BAUDRATE_TABLE)
-#define CONFIG_SYS_BAUDRATE_TABLE      { 300, 600, 1200, 1800, 2400, 4800, \
+#if defined(CONFIG_ARMADA_38X) && !defined(CFG_SYS_BAUDRATE_TABLE)
+#define CFG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \
                                          9600, 19200, 38400, 57600, 115200, \
                                          230400, 460800, 500000, 576000, \
                                          921600, 1000000, 1152000, 1500000, \
index 9c4038be8b0490ca7fa36890e874edeb3cf2c71a..5c9620371e3c2e28eff0badff2aecf1e58708e3c 100644 (file)
@@ -11,7 +11,7 @@
 /* additions for new ARM relocation support */
 #define CFG_SYS_SDRAM_BASE   0x200000000
 
-#define CONFIG_SYS_BAUDRATE_TABLE   { 9600, 19200, 38400, 57600, \
+#define CFG_SYS_BAUDRATE_TABLE   { 9600, 19200, 38400, 57600, \
                                      115200, 230400, 460800, 921600 }
 
 /* Default Env vars */
@@ -37,6 +37,6 @@
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_SYS_TCLK     325000000
+#define CFG_SYS_TCLK     325000000
 
 #endif /* _CONFIG_MVEBU_ALLEYCAY_5_H */
index 7641b5622194de0c03f21d37b386de854c0d7c7d..9bfc48c52d904cccdc6b190f4012adf264250370 100644 (file)
@@ -15,7 +15,7 @@
 /* additions for new ARM relocation support */
 #define CFG_SYS_SDRAM_BASE     0x00000000
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 300, 600, 1200, 1800, 2400, 4800, \
+#define CFG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \
                                          9600, 19200, 38400, 57600, 115200, \
                                          230400, 460800, 500000, 576000, \
                                          921600, 1000000, 1152000, 1500000, \
index 358e06fd20797eb0ab0250aafec4797cc65fc06a..beac3ae6496d44a55dd9373ebb99bfb77d2b94ba 100644 (file)
@@ -9,14 +9,14 @@
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_SYS_TCLK                250000000       /* 250MHz */
+#define CFG_SYS_TCLK           250000000       /* 250MHz */
 
 /* additions for new ARM relocation support */
 #define CFG_SYS_SDRAM_BASE     0x00000000
 
 /* auto boot */
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, \
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
                                          115200, 230400, 460800, 921600 }
 
 /*
index 2229980db370a388e56e2080d7cf96542fd3ea84..3c99b70a2bb15cd166060e55a24e49c25a6ef019 100644 (file)
 #define PHYS_SDRAM_1_SIZE      (512 * 1024 * 1024)
 
 #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)
+#define CFG_SYS_INIT_RAM_ADDR  (IRAM_BASE_ADDR)
+#define CFG_SYS_INIT_RAM_SIZE  (IRAM_SIZE)
 
-#define CONFIG_SYS_DDR_CLKSEL  0
-#define CONFIG_SYS_CLKTL_CBCDR 0x59E35100
-#define CONFIG_SYS_MAIN_PWR_ON
+#define CFG_SYS_DDR_CLKSEL     0
+#define CFG_SYS_CLKTL_CBCDR    0x59E35100
+#define CFG_SYS_MAIN_PWR_ON
 
 /*-----------------------------------------------------------------------
  * environment organization
index e84bac67ef72e9a0d963e4d223f877597eb119b6..2bc462cc37ef81f66f3d4e461f6742d7e0a2b6a9 100644 (file)
@@ -61,8 +61,8 @@
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
 #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)
+#define CFG_SYS_INIT_RAM_ADDR  (IRAM_BASE_ADDR)
+#define CFG_SYS_INIT_RAM_SIZE  (IRAM_SIZE)
 
 /* environment organization */
 
index 9e837a38833713bcd7a4a9d91543b10d487986f0..b52e70c95a0477b7dfa8e2e0cb0e702b05578714 100644 (file)
@@ -24,7 +24,7 @@
 /* PMIC Controller */
 #define CONFIG_POWER_FSL
 #define CONFIG_POWER_FSL_MC13892
-#define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR        0x48
+#define CFG_SYS_DIALOG_PMIC_I2C_ADDR   0x48
 #define CFG_SYS_FSL_PMIC_I2C_ADDR      0x8
 
 /* Command definition */
@@ -96,8 +96,8 @@
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
 #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)
+#define CFG_SYS_INIT_RAM_ADDR  (IRAM_BASE_ADDR)
+#define CFG_SYS_INIT_RAM_SIZE  (IRAM_SIZE)
 
 /* Framebuffer and LCD */
 
index 52ff7b00b436ab2a7503ef17c982d6cd7fe41678..7160654eb30ce35a897e7a2c84f2690df6d97aba 100644 (file)
@@ -87,7 +87,7 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_BOOTMAPSZ (256 << 20)     /* 256M */
+#define CFG_SYS_BOOTMAPSZ (256 << 20)     /* 256M */
 
 /* Physical Memory Map */
 #define PHYS_SDRAM_1                   CSD0_BASE_ADDR
@@ -97,8 +97,8 @@
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
 #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)
+#define CFG_SYS_INIT_RAM_ADDR  (IRAM_BASE_ADDR)
+#define CFG_SYS_INIT_RAM_SIZE  (IRAM_SIZE)
 
 /* FLASH and environment organization */
 
index 43145567544467c89919d66f4d9f6c5cd08bffbd..245530aa640b846e083f9ccd31c419919a0afe8d 100644 (file)
@@ -12,7 +12,7 @@
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 #else
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_PL310_BASE  L2_PL310_BASE
+#define CFG_SYS_PL310_BASE     L2_PL310_BASE
 #endif
 
 #endif
index 3c4ba095e4e71bbcc9d6e85e94c33a58602a203a..12741c08de58865c2479fa1e4d30058ee12c0414 100644 (file)
@@ -86,8 +86,8 @@
 
 /* Physical Memory Map */
 #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
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Environment organization */
 
index 9c160c41ece6f4ca297be58761600dee5d17a7e4..f6d3b2eeb9cf6cca36ab0f9a5387a32bd4099228 100644 (file)
@@ -28,8 +28,8 @@
 #define PHYS_SDRAM                    MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE            PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 #define CONFIG_MXC_USB_PORTSC  PORT_PTS_UTMI
 
index 711b5a334aad9acc3a2751caf00ca28781cfdfba..5e95e430c49faa5c9ff5b1a0529e5ea777af13c4 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Environment organization */
 
index 3fdf829e968633a4fa7888952107599a2948c684..1a2160cce59447e6e8a0d7e2cf94cde6cdab13b0 100644 (file)
@@ -16,7 +16,7 @@
 #define CONFIG_MXC_USB_FLAGS   0
 
 #define CONFIG_PCA953X
-#define CONFIG_SYS_I2C_PCA953X_WIDTH   { {0x30, 8}, {0x32, 8}, {0x34, 8} }
+#define CFG_SYS_I2C_PCA953X_WIDTH      { {0x30, 8}, {0x32, 8}, {0x34, 8} }
 
 #include "mx6sabre_common.h"
 
@@ -26,7 +26,7 @@
 #endif
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
+#define CFG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
 #endif
 
 #define CFG_SYS_FSL_USDHC_NUM  2
index 3c2621d8c91ad3c3bbd6b2ad7b77192a1b903387..358d9f47c0f356f54cf3d909a9238c3865dad1e5 100644 (file)
@@ -83,8 +83,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment organization */
 
index a3a12aeb39007b7ed0c40340a482e36c796be82b..6632e4ea29ce4d00c652e2c06b2d2ae82d63ce50 100644 (file)
@@ -83,8 +83,8 @@
 #define PHYS_SDRAM_SIZE                        SZ_2G
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment organization */
 
index f0e239fdb6eb705e7ec90e20e4945d2c5bb35e37..0dd40563c29b2b482193c355537b93463b753205 100644 (file)
@@ -79,8 +79,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR
index a0f9c537e5dd5ef776d8a33fa8ed22bd7a15fe96..6f5dffe4fbb8c3757abfe189c737df1630be57d7 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR
index 8199b4b8319e424b6976e7f49d18be4feb4fc66d..cb1019bd56a766193f7ccef709a38ee2d35c8659 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* environment organization */
 
index 827385c65e2a4ebc2a946e4c90738fdeb6692761..4154d328dedf99c6e48d59837964abf6dcc3e028 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* environment organization */
 
index c39b3572b84befdbed5657946ede821f0f4b1db9..6c165521f7a0dbe96d163aa336ddb51a50f9cc2d 100644 (file)
@@ -82,8 +82,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* environment organization */
 
index 362de482f575fcf3a38bb9df1871980082501027..85922fa436cb3b34687f447ba3d4bba16ecab8e1 100644 (file)
@@ -18,7 +18,7 @@
 /* Using ULP WDOG for reset */
 #define WDOG_BASE_ADDR                 WDG1_RBASE
 
-#define CONFIG_SYS_HZ_CLOCK            1000000 /* Fixed at 1MHz from TSTMR */
+#define CFG_SYS_HZ_CLOCK               1000000 /* Fixed at 1MHz from TSTMR */
 
 /* UART */
 #define LPUART_BASE                    LPUART4_RBASE
@@ -48,8 +48,8 @@
                        "bootz ${loadaddr} - ${fdt_addr}; " \
                "fi;\0" \
 
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       SZ_256K
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  SZ_256K
 
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* __CONFIG_H */
index 9ef1eea5e61d11a220f1e0d5772faf735b8d1960..99e01896c71b26ec8e6d0020fd3eb48718a72720 100644 (file)
@@ -15,7 +15,7 @@
 /* Using ULP WDOG for reset */
 #define WDOG_BASE_ADDR                 WDG1_RBASE
 
-#define CONFIG_SYS_HZ_CLOCK            1000000 /* Fixed at 1Mhz from TSTMR */
+#define CFG_SYS_HZ_CLOCK               1000000 /* Fixed at 1Mhz from TSTMR */
 
 /* UART */
 #define LPUART_BASE                    LPUART4_RBASE
@@ -92,7 +92,7 @@
                        "bootz; " \
                "fi;\0" \
 
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       SZ_256K
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  SZ_256K
 
 #endif /* __CONFIG_H */
index 9d6b3d404844d016c0c6cee063e22c6454df0f59..5df080ade4a2f23240cba71e61521d9affbafafc 100644 (file)
 /* Memory sizes */
 
 /* OCRAM at 0x0 ; 32kB on MX23 ; 128kB on MX28 */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x00000000
+#define CFG_SYS_INIT_RAM_ADDR  0x00000000
 #if defined(CONFIG_MX23)
-#define CONFIG_SYS_INIT_RAM_SIZE       (32 * 1024)
+#define CFG_SYS_INIT_RAM_SIZE  (32 * 1024)
 #elif defined(CONFIG_MX28)
-#define CONFIG_SYS_INIT_RAM_SIZE       (128 * 1024)
+#define CFG_SYS_INIT_RAM_SIZE  (128 * 1024)
 #endif
 
 /* Point initial SP in SRAM so SPL can use it too. */
index cdd12866ac0aed2ca600d653a5d8a6562c699ce6..a32fcd57f8fce23193d36b81378d1835335c9571 100644 (file)
@@ -23,8 +23,8 @@
 #define PHYS_SDRAM_SIZE                        SZ_256M
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* NAND */
 #define CFG_SYS_NAND_BASE              0x40000000
index 9d09811316478ee7ad3a32024c39e948adce223a..dd7f9513199c52405c772c385cd57681a658e961 100644 (file)
@@ -91,8 +91,8 @@
 #define PHYS_SDRAM                    MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE            PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Environment organization */
 
index 9ad4f590697785eb70b4efcf2f2f2dff7d5fa0f5..9c364adc63647efe50d765c7e029a11455443861 100644 (file)
@@ -47,7 +47,7 @@
  */
 #define CFG_SYS_NS16550_COM3           OMAP34XX_UART3
 
-#define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
+#define CFG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
 
 /* USB device configuration */
 #define CONFIG_USB_DEVICE
@@ -64,7 +64,7 @@
  * Board ONENAND Info.
  */
 
-#define CONFIG_SYS_ONENAND_BASE                ONENAND_MAP
+#define CFG_SYS_ONENAND_BASE           ONENAND_MAP
 
 /* Environment information */
 #define CONFIG_EXTRA_ENV_SETTINGS \
  * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
  * This rate is divided by a local divisor.
  */
-#define CONFIG_SYS_TIMERBASE           (OMAP34XX_GPT2)
+#define CFG_SYS_TIMERBASE              (OMAP34XX_GPT2)
 
 /*
  * Physical Memory Map
  */
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_RAM_ADDR       0x4020f800
-#define CONFIG_SYS_INIT_RAM_SIZE       0x800
+#define CFG_SYS_INIT_RAM_ADDR  0x4020f800
+#define CFG_SYS_INIT_RAM_SIZE  0x800
 
 /*
  * Attached kernel image
index 8d39d75a42bc12c8bb0c2a518eb4100ab89a7219..6f588f99c34b02e7e78cc42c7969bb54e64af8a8 100644 (file)
@@ -31,8 +31,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* I2C */
 #define CONFIG_I2C_MULTI_BUS
index 080c659b6ecbc3309112687acf52a3b878ee9a5e..09c4ddb6646bec20acfc9caee8f4fa845315b098 100644 (file)
@@ -24,8 +24,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* NAND */
 #define CFG_SYS_NAND_BASE              0x40000000
index b930a538640dfc8441edabc360118b7690285fd6..013a3491a39f202f0e5a5af17e04da29c61b65aa 100644 (file)
@@ -12,8 +12,8 @@
  * Memory configuration
  */
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE             SZ_256M
 
 /*
index 5ac951a370a45547a549bed7fe9b743cc0a5cfb5..ea1edab9fc1271e6944b331afcf369ec0af6fc8f 100644 (file)
@@ -8,8 +8,8 @@
 
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #if IS_ENABLED(CONFIG_CMD_USB)
 #      define CONFIG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
index b475354bbc6df3b062199e0ecc5bf2239b5be63b..c0ea9e852dce0d925c7c59f6e35cb323fd30b416 100644 (file)
@@ -8,10 +8,10 @@
 #define __OCTEON_COMMON_H__
 
 #if defined(CONFIG_RAM_OCTEON)
-#define CONFIG_SYS_INIT_SP_OFFSET      0x20180000
+#define CFG_SYS_INIT_SP_OFFSET 0x20180000
 #else
 /* No DDR init -> run in L2 cache with limited resources */
-#define CONFIG_SYS_INIT_SP_OFFSET      0x00180000
+#define CFG_SYS_INIT_SP_OFFSET 0x00180000
 #endif
 
 #define CFG_SYS_SDRAM_BASE             0xffffffff80000000
index ce8ea583fa106dbc28eda71dac41aa54f21bd5a5..8b00a2792150a797b834245c21120e8feeac98a9 100644 (file)
@@ -14,7 +14,7 @@
 #include <configs/exynos4-common.h>
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_PL310_BASE  0x10502000
+#define CFG_SYS_PL310_BASE     0x10502000
 #endif
 
 #define CFG_SYS_SDRAM_BASE     0x40000000
index 0890f51eff286cc3e1ec58c5db7a4f0ccbc29e3b..f4e23bbb0f30154114c0a415f17649f96bb06bef 100644 (file)
@@ -20,7 +20,7 @@
 
 /* NAND */
 #if defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_FLASH_BASE          NAND_BASE
+#define CFG_SYS_FLASH_BASE             NAND_BASE
 #define CFG_SYS_NAND_ECCPOS          {2, 3, 4, 5, 6, 7, 8, 9,\
                                          10, 11, 12, 13}
 #define CFG_SYS_NAND_ECCSIZE         512
index 6eec955e88f77bc61c5bcf3c5bc6ef5262278b5d..8bb8521f1c1cf963d9f4ef5d461df7698678f138 100644 (file)
@@ -25,7 +25,7 @@
 
 /* NAND */
 #if defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_FLASH_BASE          NAND_BASE
+#define CFG_SYS_FLASH_BASE             NAND_BASE
 #define CFG_SYS_NAND_ECCPOS          {2, 3, 4, 5, 6, 7, 8, 9,\
                                          10, 11, 12, 13}
 #define CFG_SYS_NAND_ECCSIZE         512
index 10f6ba63601ae3ae09d8cccd74acf3ee444198af..a6b5e55b5415334be2a9a36592a06b6a74c594b8 100644 (file)
@@ -66,8 +66,8 @@
        BOOTENV
 
 /* OneNAND config */
-#define CONFIG_SYS_ONENAND_BASE                ONENAND_MAP
-#define CONFIG_SYS_ONENAND_BLOCK_SIZE  (128*1024)
+#define CFG_SYS_ONENAND_BASE           ONENAND_MAP
+#define CFG_SYS_ONENAND_BLOCK_SIZE     (128*1024)
 
 /* NAND config */
 #define CFG_SYS_NAND_ECCPOS            { 2,  3,  4,  5,  6,  7,  8,  9, \
index 6001037ae8861bd342c90e54dcaf64df8e179f7e..3895537751004d01b5628d5a6132c68b6ab7d36d 100644 (file)
 
 /* **** PISMO SUPPORT *** */
 #if defined(CONFIG_CMD_NAND)
-#define CONFIG_SYS_FLASH_BASE          0x10000000
+#define CFG_SYS_FLASH_BASE             0x10000000
 #endif
 
-#define CONFIG_SYS_FLASH_SIZE          0x4000000
+#define CFG_SYS_FLASH_SIZE             0x4000000
 
 #endif /* __CONFIG_H */
index 883cc0b99c9e5fd409b0c8e2618e574f18de1fd3..1634db860640da50658f733137d8fc618c02efb7 100644 (file)
@@ -37,8 +37,8 @@
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CONFIG_TCA642X
-#define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
-#define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
+#define CFG_SYS_I2C_TCA642X_BUS_NUM 4
+#define CFG_SYS_I2C_TCA642X_ADDR 0x22
 
 /* Enabled commands */
 
index 5b0d87a33679c343d4c5ff17bf3ff66a2edbb512..788a1113868b36669862c6cf3ac939992ade9a92 100644 (file)
@@ -17,9 +17,9 @@
 /*
  * SoC Configuration
  */
-#define CONFIG_SYS_OSCIN_FREQ          24000000
-#define CONFIG_SYS_TIMERBASE           DAVINCI_TIMER0_BASE
-#define CONFIG_SYS_HZ_CLOCK            clk_get(DAVINCI_AUXCLK_CLKID)
+#define CFG_SYS_OSCIN_FREQ             24000000
+#define CFG_SYS_TIMERBASE              DAVINCI_TIMER0_BASE
+#define CFG_SYS_HZ_CLOCK               clk_get(DAVINCI_AUXCLK_CLKID)
 
 /*
  * Memory Info
@@ -32,7 +32,7 @@
 
 /* memtest will be run on 16MB */
 
-#define CONFIG_SYS_DA850_SYSCFG_SUSPSRC (      \
+#define CFG_SYS_DA850_SYSCFG_SUSPSRC ( \
        DAVINCI_SYSCFG_SUSPSRC_TIMER0 |         \
        DAVINCI_SYSCFG_SUSPSRC_SPI1 |           \
        DAVINCI_SYSCFG_SUSPSRC_UART2 |          \
  */
 
 /* Requires CONFIG_SYS_DA850_PLL0_POSTDIV=0, set in Kconfig */
-#define CONFIG_SYS_DA850_PLL0_PLLM     18
-#define CONFIG_SYS_DA850_PLL1_PLLM     21
+#define CFG_SYS_DA850_PLL0_PLLM     18
+#define CFG_SYS_DA850_PLL1_PLLM     21
 
 /*
  * DDR2 memory configuration
  */
-#define CONFIG_SYS_DA850_DDR2_DDRPHYCR (DV_DDR_PHY_PWRDNEN | \
+#define CFG_SYS_DA850_DDR2_DDRPHYCR (DV_DDR_PHY_PWRDNEN | \
                                        DV_DDR_PHY_EXT_STRBEN | \
                                        (0x5 << DV_DDR_PHY_RD_LATENCY_SHIFT))
 
-#define CONFIG_SYS_DA850_DDR2_SDBCR (            \
+#define CFG_SYS_DA850_DDR2_SDBCR (               \
        (1 << DV_DDR_SDCR_DDR2EN_SHIFT)         | \
        (1 << DV_DDR_SDCR_DDREN_SHIFT)          | \
        (1 << DV_DDR_SDCR_SDRAMEN_SHIFT)        | \
@@ -64,9 +64,9 @@
        (2 << DV_DDR_SDCR_PAGESIZE_SHIFT))
 
 /* SDBCR2 is only used if IBANK_POS bit in SDBCR is set */
-#define CONFIG_SYS_DA850_DDR2_SDBCR2 0
+#define CFG_SYS_DA850_DDR2_SDBCR2 0
 
-#define CONFIG_SYS_DA850_DDR2_SDTIMR (           \
+#define CFG_SYS_DA850_DDR2_SDTIMR (              \
        (19 << DV_DDR_SDTMR1_RFC_SHIFT)         | \
        (1 << DV_DDR_SDTMR1_RP_SHIFT)           | \
        (1 << DV_DDR_SDTMR1_RCD_SHIFT)          | \
@@ -76,7 +76,7 @@
        (1 << DV_DDR_SDTMR1_RRD_SHIFT)          | \
        (1 << DV_DDR_SDTMR1_WTR_SHIFT))
 
-#define CONFIG_SYS_DA850_DDR2_SDTIMR2 (                  \
+#define CFG_SYS_DA850_DDR2_SDTIMR2 (             \
        (7 << DV_DDR_SDTMR2_RASMAX_SHIFT)       | \
        (2 << DV_DDR_SDTMR2_XP_SHIFT)           | \
        (0 << DV_DDR_SDTMR2_ODT_SHIFT)          | \
        (1 << DV_DDR_SDTMR2_RTP_SHIFT)          | \
        (2 << DV_DDR_SDTMR2_CKE_SHIFT))
 
-#define CONFIG_SYS_DA850_DDR2_SDRCR    0x00000492
-#define CONFIG_SYS_DA850_DDR2_PBBPR    0x30
+#define CFG_SYS_DA850_DDR2_SDRCR    0x00000492
+#define CFG_SYS_DA850_DDR2_PBBPR    0x30
 
 /*
  * Serial Driver info
  */
 #define CFG_SYS_NS16550_CLK    clk_get(DAVINCI_UART2_CLKID)
 
-#define CONFIG_SYS_SPI_BASE            DAVINCI_SPI1_BASE
-#define CONFIG_SYS_SPI_CLK             clk_get(DAVINCI_SPI1_CLKID)
+#define CFG_SYS_SPI_BASE               DAVINCI_SPI1_BASE
+#define CFG_SYS_SPI_CLK                clk_get(DAVINCI_SPI1_CLKID)
 
 /*
  * I2C Configuration
  */
-#define CONFIG_SYS_I2C_EXPANDER_ADDR   0x20
+#define CFG_SYS_I2C_EXPANDER_ADDR      0x20
 
 /*
  * Flash & Environment
index 53889d699b267be4d77454dd5c8d6246a54698eb..e42a736136bc95f50df30471a396fa19760fe7e3 100644 (file)
@@ -15,8 +15,8 @@
 
 /* Physical Memory Map */
 #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
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
index d155e553e20d1726957e83769efb287ec0515af6..c96deda61d77e662a15f27b2eb04eed2ff322168 100644 (file)
@@ -7,11 +7,11 @@
 
 #include <linux/stringify.h>
 
-#if !defined(CONFIG_SYS_SPD_BUS_NUM) || !defined(CONFIG_SYS_I2C_PCA9557_ADDR)
-#error "CONFIG_SYS_SPD_BUS_NUM and CONFIG_SYS_I2C_PCA9557_ADDR are required"
+#if !defined(CONFIG_SYS_SPD_BUS_NUM) || !defined(CFG_SYS_I2C_PCA9557_ADDR)
+#error "CONFIG_SYS_SPD_BUS_NUM and CFG_SYS_I2C_PCA9557_ADDR are required"
 #endif
 
-#define __BOOTSRC_CMD(src, msk) i2c dev CONFIG_SYS_SPD_BUS_NUM; i2c mw CONFIG_SYS_I2C_PCA9557_ADDR 1 src 1; i2c mw CONFIG_SYS_I2C_PCA9557_ADDR 3 msk 1
+#define __BOOTSRC_CMD(src, msk) i2c dev CONFIG_SYS_SPD_BUS_NUM; i2c mw CFG_SYS_I2C_PCA9557_ADDR 1 src 1; i2c mw CFG_SYS_I2C_PCA9557_ADDR 3 msk 1
 
 #define __VAR_CMD(var, cmd) __stringify(var=cmd\0)
 #define __VAR_CMD_RST(var, cmd) __VAR_CMD(var, cmd; reset)
index 14d702e1efeb85f8691fe57114e74bcfc319f1c9..e8b752785b4d14075173264fb18a4321e32aeb61 100644 (file)
 #endif
 
 #ifdef CONFIG_SDCARD
-#define CONFIG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
-#define CONFIG_SYS_MMC_U_BOOT_DST      CONFIG_TEXT_BASE
-#define CONFIG_SYS_MMC_U_BOOT_START    CONFIG_TEXT_BASE
+#define CFG_SYS_MMC_U_BOOT_SIZE        (768 << 10)
+#define CFG_SYS_MMC_U_BOOT_DST CONFIG_TEXT_BASE
+#define CFG_SYS_MMC_U_BOOT_START       CONFIG_TEXT_BASE
 #ifdef CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR
-#define CONFIG_SYS_MMC_U_BOOT_OFFS     (CONFIG_SPL_PAD_TO - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA*512)
+#define CFG_SYS_MMC_U_BOOT_OFFS        (CONFIG_SPL_PAD_TO - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA*512)
 #else
-#define CONFIG_SYS_MMC_U_BOOT_OFFS     CONFIG_SPL_PAD_TO
+#define CFG_SYS_MMC_U_BOOT_OFFS        CONFIG_SPL_PAD_TO
 #endif
 #elif defined(CONFIG_SPIFLASH)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                CONFIG_TEXT_BASE
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_START      CONFIG_TEXT_BASE
-#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       CONFIG_SPL_PAD_TO
+#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE  (768 << 10)
+#define CFG_SYS_SPI_FLASH_U_BOOT_DST           CONFIG_TEXT_BASE
+#define CFG_SYS_SPI_FLASH_U_BOOT_START CONFIG_TEXT_BASE
+#define CFG_SYS_SPI_FLASH_U_BOOT_OFFS  CONFIG_SPL_PAD_TO
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CFG_SYS_NAND_U_BOOT_SIZE       (832 << 10)
  */
 #define CONFIG_L2_CACHE
 
-#define CONFIG_SYS_CCSRBAR             0xffe00000
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
+#define CFG_SYS_CCSRBAR                0xffe00000
+#define CFG_SYS_CCSRBAR_PHYS_LOW       CFG_SYS_CCSRBAR
 
 /* DDR Setup */
 #define SPD_EEPROM_ADDRESS 0x52
 #define CFG_SYS_SDRAM_SIZE_LAW LAW_SIZE_1G
 #endif
 #define CFG_SYS_SDRAM_SIZE             (1u << (CFG_SYS_SDRAM_SIZE_LAW - 19))
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 /* Default settings for DDR3 */
 #ifndef CONFIG_TARGET_P2020RDB
-#define CONFIG_SYS_DDR_CS0_BNDS                0x0000003f
-#define CONFIG_SYS_DDR_CS0_CONFIG      0x80014302
-#define CONFIG_SYS_DDR_CS0_CONFIG_2    0x00000000
-#define CONFIG_SYS_DDR_CS1_BNDS                0x0040007f
-#define CONFIG_SYS_DDR_CS1_CONFIG      0x80014302
-#define CONFIG_SYS_DDR_CS1_CONFIG_2    0x00000000
-
-#define CONFIG_SYS_DDR_INIT_ADDR       0x00000000
-#define CONFIG_SYS_DDR_INIT_EXT_ADDR   0x00000000
-#define CONFIG_SYS_DDR_MODE_CONTROL    0x00000000
-
-#define CONFIG_SYS_DDR_ZQ_CONTROL      0x89080600
-#define CONFIG_SYS_DDR_WRLVL_CONTROL   0x8655A608
-#define CONFIG_SYS_DDR_SR_CNTR         0x00000000
-#define CONFIG_SYS_DDR_RCW_1           0x00000000
-#define CONFIG_SYS_DDR_RCW_2           0x00000000
-#define CONFIG_SYS_DDR_CONTROL         0xC70C0000      /* Type = DDR3  */
-#define CONFIG_SYS_DDR_CONTROL_2       0x04401050
-#define CONFIG_SYS_DDR_TIMING_4                0x00220001
-#define CONFIG_SYS_DDR_TIMING_5                0x03402400
-
-#define CONFIG_SYS_DDR_TIMING_3                0x00020000
-#define CONFIG_SYS_DDR_TIMING_0                0x00330004
-#define CONFIG_SYS_DDR_TIMING_1                0x6f6B4846
-#define CONFIG_SYS_DDR_TIMING_2                0x0FA8C8CF
-#define CONFIG_SYS_DDR_CLK_CTRL                0x03000000
-#define CONFIG_SYS_DDR_MODE_1          0x40461520
-#define CONFIG_SYS_DDR_MODE_2          0x8000c000
-#define CONFIG_SYS_DDR_INTERVAL                0x0C300000
+#define CFG_SYS_DDR_CS0_BNDS           0x0000003f
+#define CFG_SYS_DDR_CS0_CONFIG 0x80014302
+#define CFG_SYS_DDR_CS0_CONFIG_2       0x00000000
+#define CFG_SYS_DDR_CS1_BNDS           0x0040007f
+#define CFG_SYS_DDR_CS1_CONFIG 0x80014302
+#define CFG_SYS_DDR_CS1_CONFIG_2       0x00000000
+
+#define CFG_SYS_DDR_INIT_ADDR  0x00000000
+#define CFG_SYS_DDR_INIT_EXT_ADDR      0x00000000
+#define CFG_SYS_DDR_MODE_CONTROL       0x00000000
+
+#define CFG_SYS_DDR_ZQ_CONTROL 0x89080600
+#define CFG_SYS_DDR_WRLVL_CONTROL      0x8655A608
+#define CFG_SYS_DDR_SR_CNTR            0x00000000
+#define CFG_SYS_DDR_RCW_1              0x00000000
+#define CFG_SYS_DDR_RCW_2              0x00000000
+#define CFG_SYS_DDR_CONTROL            0xC70C0000      /* Type = DDR3  */
+#define CFG_SYS_DDR_CONTROL_2  0x04401050
+#define CFG_SYS_DDR_TIMING_4           0x00220001
+#define CFG_SYS_DDR_TIMING_5           0x03402400
+
+#define CFG_SYS_DDR_TIMING_3           0x00020000
+#define CFG_SYS_DDR_TIMING_0           0x00330004
+#define CFG_SYS_DDR_TIMING_1           0x6f6B4846
+#define CFG_SYS_DDR_TIMING_2           0x0FA8C8CF
+#define CFG_SYS_DDR_CLK_CTRL           0x03000000
+#define CFG_SYS_DDR_MODE_1             0x40461520
+#define CFG_SYS_DDR_MODE_2             0x8000c000
+#define CFG_SYS_DDR_INTERVAL           0x0C300000
 #endif
 
 /*
  * Local Bus Definitions
  */
 #if defined(CONFIG_TARGET_P1020RDB_PD)
-#define CONFIG_SYS_FLASH_BASE          0xec000000
+#define CFG_SYS_FLASH_BASE             0xec000000
 #else
-#define CONFIG_SYS_FLASH_BASE          0xef000000
+#define CFG_SYS_FLASH_BASE             0xef000000
 #endif
 
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | CONFIG_SYS_FLASH_BASE)
+#define CFG_SYS_FLASH_BASE_PHYS        (0xf00000000ull | CFG_SYS_FLASH_BASE)
 #else
-#define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE_PHYS        CFG_SYS_FLASH_BASE
 #endif
 
-#define CONFIG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) \
+#define CONFIG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \
        | BR_PS_16 | BR_V)
 
 #define CONFIG_FLASH_OR_PRELIM 0xfc000ff7
 
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS}
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
 /* Nand Flash */
 #endif
 #endif /* CONFIG_NAND_FSL_ELBC */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0xffd00000 /* stack in RAM */
+#define CFG_SYS_INIT_RAM_ADDR  0xffd00000 /* stack in RAM */
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW CONFIG_SYS_INIT_RAM_ADDR
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW CFG_SYS_INIT_RAM_ADDR
 /* The assembler doesn't like typecast */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \
-       ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
-         CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW)
+#define CFG_SYS_INIT_RAM_ADDR_PHYS \
+       ((CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
+         CFG_SYS_INIT_RAM_ADDR_PHYS_LOW)
 #else
 /* Initial L1 address */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS  CONFIG_SYS_INIT_RAM_ADDR
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW CONFIG_SYS_INIT_RAM_ADDR_PHYS
+#define CFG_SYS_INIT_RAM_ADDR_PHYS     CFG_SYS_INIT_RAM_ADDR
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW CFG_SYS_INIT_RAM_ADDR_PHYS
 #endif
 /* Size of used area in RAM */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x00004000
+#define CFG_SYS_INIT_RAM_SIZE  0x00004000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
-#define CONFIG_SYS_CPLD_BASE   0xffa00000
+#define CFG_SYS_CPLD_BASE      0xffa00000
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_CPLD_BASE_PHYS      0xfffa00000ull
+#define CFG_SYS_CPLD_BASE_PHYS 0xfffa00000ull
 #else
-#define CONFIG_SYS_CPLD_BASE_PHYS      CONFIG_SYS_CPLD_BASE
+#define CFG_SYS_CPLD_BASE_PHYS CFG_SYS_CPLD_BASE
 #endif
 /* CPLD config size: 1Mb */
 
 /* Vsc7385 switch */
 #ifdef CONFIG_VSC7385_ENET
 #define __VSCFW_ADDR                   "vscfw_addr=ef000000\0"
-#define CONFIG_SYS_VSC7385_BASE                0xffb00000
+#define CFG_SYS_VSC7385_BASE           0xffb00000
 
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_VSC7385_BASE_PHYS   0xfffb00000ull
+#define CFG_SYS_VSC7385_BASE_PHYS      0xfffb00000ull
 #else
-#define CONFIG_SYS_VSC7385_BASE_PHYS   CONFIG_SYS_VSC7385_BASE
+#define CFG_SYS_VSC7385_BASE_PHYS      CFG_SYS_VSC7385_BASE
 #endif
 
 /* The size of the VSC7385 firmware image */
 */
 #if defined(CONFIG_SPL_BUILD)
 #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH)
-#define CONFIG_SYS_INIT_L2_ADDR                0xf8f80000
-#define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR
-#define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
+#define CFG_SYS_INIT_L2_ADDR           0xf8f80000
+#define CFG_SYS_INIT_L2_ADDR_PHYS      CFG_SYS_INIT_L2_ADDR
+#define CFG_SYS_INIT_L2_END    (CFG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
-#define CONFIG_SYS_INIT_L2_ADDR                0xf8f80000
-#define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR
-#define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
+#define CFG_SYS_INIT_L2_ADDR           0xf8f80000
+#define CFG_SYS_INIT_L2_ADDR_PHYS      CFG_SYS_INIT_L2_ADDR
+#define CFG_SYS_INIT_L2_END    (CFG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
 #else
-#define CONFIG_SYS_INIT_L2_ADDR                0xf8f80000
-#define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR
-#define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
+#define CFG_SYS_INIT_L2_ADDR           0xf8f80000
+#define CFG_SYS_INIT_L2_ADDR_PHYS      CFG_SYS_INIT_L2_ADDR
+#define CFG_SYS_INIT_L2_END    (CFG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
 #endif /* CONFIG_TPL_BUILD */
 #endif
 #endif
 #undef CONFIG_SERIAL_SOFTWARE_FIFO
 #define CFG_SYS_NS16550_CLK            get_bus_freq(0)
 
-#define CONFIG_SYS_BAUDRATE_TABLE      \
+#define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
-#define CFG_SYS_NS16550_COM1   (CONFIG_SYS_CCSRBAR+0x4500)
-#define CFG_SYS_NS16550_COM2   (CONFIG_SYS_CCSRBAR+0x4600)
+#define CFG_SYS_NS16550_COM1   (CFG_SYS_CCSRBAR+0x4500)
+#define CFG_SYS_NS16550_COM2   (CFG_SYS_CCSRBAR+0x4600)
 
 /* I2C */
 #if !CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_SYS_I2C_NOPROBES                { {0, 0x29} }
+#define CFG_SYS_I2C_NOPROBES           { {0, 0x29} }
 #endif
 
 /*
  */
 
 #define CONFIG_RTC_PT7C4338
-#define CONFIG_SYS_I2C_RTC_ADDR                0x68
-#define CONFIG_SYS_I2C_PCA9557_ADDR    0x18
+#define CFG_SYS_I2C_RTC_ADDR           0x68
+#define CFG_SYS_I2C_PCA9557_ADDR       0x18
 
 /* enable read and write access to EEPROM */
 
  */
 #if defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
-#define SPL_ENV_ADDR           (CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
+#define SPL_ENV_ADDR           (CFG_SYS_INIT_L2_ADDR + (160 << 10))
 #endif
 #endif
 
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial Memory for Linux*/
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial Memory for Linux*/
 
 /*
  * Environment Configuration
index 85cedde098842f45114f1caf46994ff98b664bb3..2a1660bf188dbd0186e007d0f9f1b96b993d00be 100644 (file)
@@ -35,8 +35,8 @@
 #define PHYS_SDRAM_SIZE                        SZ_256M
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* NAND */
 #define CFG_SYS_NAND_BASE              0x40000000
index f7e36f22ce87a1b1a1756a5f606b79c75d7dad46..4421e740d9ea2beabd3c9cce7e09e1531842f21b 100644 (file)
@@ -37,8 +37,8 @@
 #define PHYS_SDRAM_SIZE                        SZ_256M
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* NAND */
 #define CFG_SYS_NAND_BASE              0x40000000
index 586cddf41848109159d0df49934bbf5f294c0a70..5c2ff5d02ee7498e5e928af9ebe9eb8da44f1da3 100644 (file)
 #define PHYS_SDRAM_SIZE                        (CONFIG_PCM052_DDR_SIZE * SZ_1M)
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* environment organization */
 
index cf705dcb19725fe47f4e27eaaa95e3a8706a523a..3674e4cddaedac51328253a287141705c7ec458d 100644 (file)
@@ -16,8 +16,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Environment organization */
 #define ENV_MMC \
index e08d941412970a357c7e3c0dff6f4a9d8f044572..1b72739d143d26763716315d502db18f06834ace 100644 (file)
 #define CONFIG_KM_UBI_PARTITION_NAME_APP       "ubi1"
 
 /* CLIPS FPGA Definitions */
-#define CONFIG_SYS_CSPR3_EXT   (0x00)
-#define CONFIG_SYS_CSPR3       (CSPR_PHYS_ADDR(CONFIG_SYS_CLIPS_BASE) | \
+#define CFG_SYS_CSPR3_EXT      (0x00)
+#define CFG_SYS_CSPR3  (CSPR_PHYS_ADDR(CONFIG_SYS_CLIPS_BASE) | \
                                CSPR_PORT_SIZE_8 | \
                                CSPR_MSEL_GPCM | \
                                CSPR_V)
-#define CONFIG_SYS_AMASK3      IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_CSOR3       (CSOR_GPCM_ADM_SHIFT(0x4) | \
+#define CFG_SYS_AMASK3 IFC_AMASK(64 * 1024)
+#define CFG_SYS_CSOR3  (CSOR_GPCM_ADM_SHIFT(0x4) | \
                                CSOR_GPCM_TRHZ_40)
-#define CONFIG_SYS_CS3_FTIM0   (FTIM0_GPCM_TACSE(0x6) | \
+#define CFG_SYS_CS3_FTIM0      (FTIM0_GPCM_TACSE(0x6) | \
                                FTIM0_GPCM_TEADC(0x7) | \
                                FTIM0_GPCM_TEAHC(0x2))
-#define CONFIG_SYS_CS3_FTIM1   (FTIM1_GPCM_TACO(0x2) | \
+#define CFG_SYS_CS3_FTIM1      (FTIM1_GPCM_TACO(0x2) | \
                                FTIM1_GPCM_TRAD(0x12))
-#define CONFIG_SYS_CS3_FTIM2   (FTIM2_GPCM_TCS(0x3) | \
+#define CFG_SYS_CS3_FTIM2      (FTIM2_GPCM_TCS(0x3) | \
                                FTIM2_GPCM_TCH(0x1) | \
                                FTIM2_GPCM_TWP(0x12))
-#define CONFIG_SYS_CS3_FTIM3   0x04000000
+#define CFG_SYS_CS3_FTIM3      0x04000000
 
 /* PRST */
 #define WCOM_CLIPS_RST         0
index 9a7669c940b4c45c266fbad44b1590e3d60d9a56..e4bcae5bb5e18137691529d3c85c33f55572bb81 100644 (file)
 #define CONFIG_KM_UBI_PARTITION_NAME_APP       "ubi1"
 
 /* PAXK FPGA Definitions */
-#define CONFIG_SYS_CSPR3_EXT   (0x00)
-#define CONFIG_SYS_CSPR3       (CSPR_PHYS_ADDR(CONFIG_SYS_PAX_BASE) | \
+#define CFG_SYS_CSPR3_EXT      (0x00)
+#define CFG_SYS_CSPR3  (CSPR_PHYS_ADDR(CONFIG_SYS_PAX_BASE) | \
                                CSPR_PORT_SIZE_8 | \
                                CSPR_MSEL_GPCM | \
                                CSPR_V)
-#define CONFIG_SYS_AMASK3      IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_CSOR3       (CSOR_GPCM_ADM_SHIFT(0x4) | \
+#define CFG_SYS_AMASK3 IFC_AMASK(64 * 1024)
+#define CFG_SYS_CSOR3  (CSOR_GPCM_ADM_SHIFT(0x4) | \
                                CSOR_GPCM_TRHZ_40)
-#define CONFIG_SYS_CS3_FTIM0   (FTIM0_GPCM_TACSE(0x6) | \
+#define CFG_SYS_CS3_FTIM0      (FTIM0_GPCM_TACSE(0x6) | \
                                FTIM0_GPCM_TEADC(0x7) | \
                                FTIM0_GPCM_TEAHC(0x2))
-#define CONFIG_SYS_CS3_FTIM1   (FTIM1_GPCM_TACO(0x2) | \
+#define CFG_SYS_CS3_FTIM1      (FTIM1_GPCM_TACO(0x2) | \
                                FTIM1_GPCM_TRAD(0x12))
-#define CONFIG_SYS_CS3_FTIM2   (FTIM2_GPCM_TCS(0x3) | \
+#define CFG_SYS_CS3_FTIM2      (FTIM2_GPCM_TCS(0x3) | \
                                FTIM2_GPCM_TCH(0x1) | \
                                FTIM2_GPCM_TWP(0x12))
-#define CONFIG_SYS_CS3_FTIM3   0x04000000
+#define CFG_SYS_CS3_FTIM3      0x04000000
 
 /* PRST */
 #define KM_LIU_RST             0
index ac68c933a06ea646cac71d28cd5548972375a620..7f73117ac1c84c0d47d548f3184a6ef764d43bfa 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE \
+#define CFG_SYS_UBOOT_BASE \
                (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
@@ -60,8 +60,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  SZ_512K
 
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
index aedaf806e5e7379abea7073e0009341c486d355c..11a833bb12761b85b9093bfc70b62be0e1a1d27c 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_UBOOT_BASE \
+#define CFG_SYS_UBOOT_BASE \
                (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
@@ -59,8 +59,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  SZ_512K
 
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
index d9abbbc28b37778cbbe23f6e870c0c3155d38d81..3cc2a693ceee916caad0bdd545897d578d92858b 100644 (file)
@@ -18,9 +18,9 @@
  * Memory Layout
  */
 /* Initial RAM for temporary stack, global data */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x10000
-#define CONFIG_SYS_INIT_RAM_ADDR       \
-       (CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE - CONFIG_SYS_INIT_RAM_SIZE)
+#define CFG_SYS_INIT_RAM_SIZE  0x10000
+#define CFG_SYS_INIT_RAM_ADDR  \
+       (CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE - CFG_SYS_INIT_RAM_SIZE)
 
 /* SDRAM Configuration (for final code, data, stack, heap) */
 #define CFG_SYS_SDRAM_BASE             0x88000000
index fc2cab960c672a2d0061857503c1c372aaff1f32..9e6c210c40b4dcb8f7c6cb2dd480096375930ad1 100644 (file)
@@ -92,8 +92,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment organization */
 
index 22b4976d722f5cceaaf8bd1389d4d4af8e80e193..8af8883fad6499b00a0c32b51c1f2d4ff1b95b15 100644 (file)
@@ -92,8 +92,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #ifdef CONFIG_VIDEO
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
index f5b9eed2bcd9033af16c2c3dea96b2e05ff768ea..7028264d72209d426dc3ebe574985324ecbd2ea0 100644 (file)
@@ -94,8 +94,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* PMIC */
 #define CONFIG_POWER_PFUZE3000
index 91baff9638624fd87ea52e4a9f728e6f85e63db1..f9301a5524b9838fb6b2516cae072f6ca566d470 100644 (file)
@@ -63,8 +63,8 @@
 
 /* Link Definitions */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x80000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x80000
 
 
 #define CFG_SYS_SDRAM_BASE             0x40000000
index 3fbddd903a3f15eeb35e8b65291a955b91d190ef..a233fb8ed746d600595106b05ddf7f4b5321cca6 100644 (file)
 #define MASTER_PLL_DIV         15
 #define MASTER_PLL_MUL         162
 #define MAIN_PLL_DIV           2
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000
 
 /* clocks */
 /* CKGR_MOR - enable main osc. */
-#define CONFIG_SYS_MOR_VAL                                             \
+#define CFG_SYS_MOR_VAL                                                \
                (AT91_PMC_MOR_MOSCEN |                                  \
                 (255 << 8))            /* Main Oscillator Start-up Time */
-#define CONFIG_SYS_PLLAR_VAL                                           \
+#define CFG_SYS_PLLAR_VAL                                              \
                (AT91_PMC_PLLAR_29 | /* Bit 29 must be 1 when prog */ \
                 AT91_PMC_PLLXR_OUT(3) |                                                \
                 ((MASTER_PLL_MUL - 1) << 16) | (MASTER_PLL_DIV))
 
 /* PCK/2 = MCK Master Clock from PLLA */
-#define        CONFIG_SYS_MCKR1_VAL            \
+#define        CFG_SYS_MCKR1_VAL               \
                (AT91_PMC_MCKR_CSS_SLOW |       \
                 AT91_PMC_MCKR_PRES_1 | \
                 AT91_PMC_MCKR_MDIV_2)
 
 /* PCK/2 = MCK Master Clock from PLLA */
-#define        CONFIG_SYS_MCKR2_VAL            \
+#define        CFG_SYS_MCKR2_VAL               \
                (AT91_PMC_MCKR_CSS_PLLA |       \
                 AT91_PMC_MCKR_PRES_1 | \
                 AT91_PMC_MCKR_MDIV_2)
 
 /* define PDC[31:16] as DATA[31:16] */
-#define CONFIG_SYS_PIOC_PDR_VAL1       0xFFFF0000
+#define CFG_SYS_PIOC_PDR_VAL1  0xFFFF0000
 /* no pull-up for D[31:16] */
-#define CONFIG_SYS_PIOC_PPUDR_VAL      0xFFFF0000
+#define CFG_SYS_PIOC_PPUDR_VAL 0xFFFF0000
 
 /* EBI_CSA, no pull-ups for D[15:0], CS1 SDRAM, CS3 NAND Flash */
-#define CONFIG_SYS_MATRIX_EBICSA_VAL           \
+#define CFG_SYS_MATRIX_EBICSA_VAL              \
        (AT91_MATRIX_CSA_DBPUC | AT91_MATRIX_CSA_EBI_CS1A)
 
 /* SDRAM */
 /* SDRAMC_MR Mode register */
-#define CONFIG_SYS_SDRC_MR_VAL1                AT91_SDRAMC_MODE_NORMAL
+#define CFG_SYS_SDRC_MR_VAL1           AT91_SDRAMC_MODE_NORMAL
 /* SDRAMC_TR - Refresh Timer register */
-#define CONFIG_SYS_SDRC_TR_VAL1                0x13C
+#define CFG_SYS_SDRC_TR_VAL1           0x13C
 /* SDRAMC_CR - Configuration register*/
-#define CONFIG_SYS_SDRC_CR_VAL                                                 \
+#define CFG_SYS_SDRC_CR_VAL                                                    \
                (AT91_SDRAMC_NC_9 |                                             \
                 AT91_SDRAMC_NR_13 |                                            \
                 AT91_SDRAMC_NB_4 |                                             \
                 (1 << 28))             /* Exit Self Refresh to Active Delay */
 
 /* 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 CFG_SYS_SDRC_MDR_VAL           AT91_SDRAMC_MD_SDRAM
+#define CFG_SYS_SDRC_MR_VAL2           AT91_SDRAMC_MODE_PRECHARGE
 #define CFG_SYS_SDRAM_VAL1             0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRC_MR_VAL3                AT91_SDRAMC_MODE_REFRESH
+#define CFG_SYS_SDRC_MR_VAL3           AT91_SDRAMC_MODE_REFRESH
 #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_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 CFG_SYS_SDRC_MR_VAL4           AT91_SDRAMC_MODE_LMR
 #define CFG_SYS_SDRAM_VAL10            0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRC_MR_VAL5                AT91_SDRAMC_MODE_NORMAL
+#define CFG_SYS_SDRC_MR_VAL5           AT91_SDRAMC_MODE_NORMAL
 #define CFG_SYS_SDRAM_VAL11            0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRC_TR_VAL2                1200            /* SDRAM_TR */
+#define CFG_SYS_SDRC_TR_VAL2           1200            /* SDRAM_TR */
 #define CFG_SYS_SDRAM_VAL12            0               /* SDRAM_BASE */
 
 /* setup SMC0, CS0 (NOR Flash) - 16-bit, 15 WS */
-#define CONFIG_SYS_SMC0_SETUP0_VAL                                     \
+#define CFG_SYS_SMC0_SETUP0_VAL                                        \
                (AT91_SMC_SETUP_NWE(10) | AT91_SMC_SETUP_NCS_WR(10) |   \
                 AT91_SMC_SETUP_NRD(10) | AT91_SMC_SETUP_NCS_RD(10))
-#define CONFIG_SYS_SMC0_PULSE0_VAL                                     \
+#define CFG_SYS_SMC0_PULSE0_VAL                                        \
                (AT91_SMC_PULSE_NWE(11) | AT91_SMC_PULSE_NCS_WR(11) |   \
                 AT91_SMC_PULSE_NRD(11) | AT91_SMC_PULSE_NCS_RD(11))
-#define CONFIG_SYS_SMC0_CYCLE0_VAL     \
+#define CFG_SYS_SMC0_CYCLE0_VAL        \
                (AT91_SMC_CYCLE_NWE(22) | AT91_SMC_CYCLE_NRD(22))
-#define CONFIG_SYS_SMC0_MODE0_VAL                              \
+#define CFG_SYS_SMC0_MODE0_VAL                         \
                (AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |  \
                 AT91_SMC_MODE_DBW_16 |                         \
                 AT91_SMC_MODE_TDF |                            \
                 AT91_SMC_MODE_TDF_CYCLE(6))
 
 /* user reset enable */
-#define CONFIG_SYS_RSTC_RMR_VAL                        \
+#define CFG_SYS_RSTC_RMR_VAL                   \
                (AT91_RSTC_KEY |                \
                AT91_RSTC_CR_PROCRST |          \
                AT91_RSTC_MR_ERSTL(1) | \
                AT91_RSTC_MR_ERSTL(2))
 
 /* Disable Watchdog */
-#define CONFIG_SYS_WDTC_WDMR_VAL                               \
+#define CFG_SYS_WDTC_WDMR_VAL                          \
                (AT91_WDT_MR_WDIDLEHLT | AT91_WDT_MR_WDDBGHLT | \
                 AT91_WDT_MR_WDV(0xfff) |                                       \
                 AT91_WDT_MR_WDDIS |                            \
 
 /* NOR flash */
 #define PHYS_FLASH_1                           0x10000000
-#define CONFIG_SYS_FLASH_BASE                  PHYS_FLASH_1
+#define CFG_SYS_FLASH_BASE                     PHYS_FLASH_1
 
 /* USB */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00500000
+#define CFG_SYS_USB_OHCI_REGS_BASE             0x00500000
 
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
        "partition=nand0,0\0"                                   \
index c1f6334d6a1a04da73933b657caf728a4cda11a8..9fd897958a4fc0d8b815fc29150cf8e7dd9267c7 100644 (file)
 #define MASTER_PLL_DIV         6
 #define MASTER_PLL_MUL         65
 #define MAIN_PLL_DIV           2       /* 2 or 4 */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
 
 /* clocks */
-#define CONFIG_SYS_MOR_VAL                                             \
+#define CFG_SYS_MOR_VAL                                                \
                (AT91_PMC_MOR_MOSCEN |                                  \
                 (255 << 8))            /* Main Oscillator Start-up Time */
-#define CONFIG_SYS_PLLAR_VAL                                           \
+#define CFG_SYS_PLLAR_VAL                                              \
                (AT91_PMC_PLLAR_29 | /* Bit 29 must be 1 when prog */ \
                 AT91_PMC_PLLXR_OUT(3) |                                \
                 AT91_PMC_PLLXR_PLLCOUNT(0x3f) |        /* PLL Counter */\
 
 #if (MAIN_PLL_DIV == 2)
 /* PCK/2 = MCK Master Clock from PLLA */
-#define        CONFIG_SYS_MCKR1_VAL            \
+#define        CFG_SYS_MCKR1_VAL               \
                (AT91_PMC_MCKR_CSS_SLOW |       \
                 AT91_PMC_MCKR_PRES_1 | \
                 AT91_PMC_MCKR_MDIV_2)
 /* PCK/2 = MCK Master Clock from PLLA */
-#define        CONFIG_SYS_MCKR2_VAL            \
+#define        CFG_SYS_MCKR2_VAL               \
                (AT91_PMC_MCKR_CSS_PLLA |       \
                 AT91_PMC_MCKR_PRES_1 | \
                 AT91_PMC_MCKR_MDIV_2)
 #else
 /* PCK/4 = MCK Master Clock from PLLA */
-#define        CONFIG_SYS_MCKR1_VAL                    \
+#define        CFG_SYS_MCKR1_VAL                       \
                (AT91_PMC_MCKR_CSS_SLOW |               \
                 AT91_PMC_MCKR_PRES_1 |         \
                 AT91_PMC_MCKR_MDIV_4)
 /* PCK/4 = MCK Master Clock from PLLA */
-#define        CONFIG_SYS_MCKR2_VAL                    \
+#define        CFG_SYS_MCKR2_VAL                       \
                (AT91_PMC_MCKR_CSS_PLLA |               \
                 AT91_PMC_MCKR_PRES_1 |         \
                 AT91_PMC_MCKR_MDIV_4)
 #endif
 /* define PDC[31:16] as DATA[31:16] */
-#define CONFIG_SYS_PIOD_PDR_VAL1       0xFFFF0000
+#define CFG_SYS_PIOD_PDR_VAL1  0xFFFF0000
 /* no pull-up for D[31:16] */
-#define CONFIG_SYS_PIOD_PPUDR_VAL      0xFFFF0000
+#define CFG_SYS_PIOD_PPUDR_VAL 0xFFFF0000
 /* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 3.3V memories */
-#define CONFIG_SYS_MATRIX_EBI0CSA_VAL                                  \
+#define CFG_SYS_MATRIX_EBI0CSA_VAL                                     \
        (AT91_MATRIX_CSA_DBPUC | AT91_MATRIX_CSA_VDDIOMSEL_3_3V |       \
         AT91_MATRIX_CSA_EBI_CS1A)
 
 /* SDRAM */
 /* SDRAMC_MR Mode register */
-#define CONFIG_SYS_SDRC_MR_VAL1                0
+#define CFG_SYS_SDRC_MR_VAL1           0
 /* SDRAMC_TR - Refresh Timer register */
-#define CONFIG_SYS_SDRC_TR_VAL1                0x3AA
+#define CFG_SYS_SDRC_TR_VAL1           0x3AA
 /* SDRAMC_CR - Configuration register*/
-#define CONFIG_SYS_SDRC_CR_VAL                                                 \
+#define CFG_SYS_SDRC_CR_VAL                                                    \
                (AT91_SDRAMC_NC_9 |                                             \
                 AT91_SDRAMC_NR_13 |                                            \
                 AT91_SDRAMC_NB_4 |                                             \
                 (8 << 28))     /* tXSR - Exit Self Refresh to Active Delay */
 
 /* 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 CFG_SYS_SDRC_MDR_VAL           AT91_SDRAMC_MD_SDRAM
+#define CFG_SYS_SDRC_MR_VAL2           AT91_SDRAMC_MODE_PRECHARGE
 #define CFG_SYS_SDRAM_VAL1             0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRC_MR_VAL3                AT91_SDRAMC_MODE_REFRESH
+#define CFG_SYS_SDRC_MR_VAL3           AT91_SDRAMC_MODE_REFRESH
 #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_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 CFG_SYS_SDRC_MR_VAL4           AT91_SDRAMC_MODE_LMR
 #define CFG_SYS_SDRAM_VAL10            0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRC_MR_VAL5                AT91_SDRAMC_MODE_NORMAL
+#define CFG_SYS_SDRC_MR_VAL5           AT91_SDRAMC_MODE_NORMAL
 #define CFG_SYS_SDRAM_VAL11            0               /* SDRAM_BASE */
-#define CONFIG_SYS_SDRC_TR_VAL2                1200            /* SDRAM_TR */
+#define CFG_SYS_SDRC_TR_VAL2           1200            /* SDRAM_TR */
 #define CFG_SYS_SDRAM_VAL12            0               /* SDRAM_BASE */
 
 /* setup SMC0, CS0 (NOR Flash) - 16-bit, 15 WS */
-#define CONFIG_SYS_SMC0_SETUP0_VAL                                     \
+#define CFG_SYS_SMC0_SETUP0_VAL                                        \
                (AT91_SMC_SETUP_NWE(10) | AT91_SMC_SETUP_NCS_WR(10) |   \
                 AT91_SMC_SETUP_NRD(10) | AT91_SMC_SETUP_NCS_RD(10))
-#define CONFIG_SYS_SMC0_PULSE0_VAL                                     \
+#define CFG_SYS_SMC0_PULSE0_VAL                                        \
                (AT91_SMC_PULSE_NWE(11) | AT91_SMC_PULSE_NCS_WR(11) |   \
                 AT91_SMC_PULSE_NRD(11) | AT91_SMC_PULSE_NCS_RD(11))
-#define CONFIG_SYS_SMC0_CYCLE0_VAL     \
+#define CFG_SYS_SMC0_CYCLE0_VAL        \
                (AT91_SMC_CYCLE_NWE(22) | AT91_SMC_CYCLE_NRD(22))
-#define CONFIG_SYS_SMC0_MODE0_VAL                              \
+#define CFG_SYS_SMC0_MODE0_VAL                         \
                (AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |  \
                 AT91_SMC_MODE_DBW_16 |                         \
                 AT91_SMC_MODE_TDF |                            \
                 AT91_SMC_MODE_TDF_CYCLE(6))
 
 /* user reset enable */
-#define CONFIG_SYS_RSTC_RMR_VAL                        \
+#define CFG_SYS_RSTC_RMR_VAL                   \
                (AT91_RSTC_KEY |                \
                AT91_RSTC_CR_PROCRST |          \
                AT91_RSTC_MR_ERSTL(1) | \
                AT91_RSTC_MR_ERSTL(2))
 
 /* Disable Watchdog */
-#define CONFIG_SYS_WDTC_WDMR_VAL                               \
+#define CFG_SYS_WDTC_WDMR_VAL                          \
                (AT91_WDT_MR_WDIDLEHLT | AT91_WDT_MR_WDDBGHLT | \
                 AT91_WDT_MR_WDV(0xfff) |                                       \
                 AT91_WDT_MR_WDDIS |                            \
 
 /* NOR flash, if populated */
 #define PHYS_FLASH_1                   0x10000000
-#define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
+#define CFG_SYS_FLASH_BASE             PHYS_FLASH_1
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
                                         AT91_MATRIX_SCFG_SLOT_CYCLE(255))
 
 /* USB */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00a00000      /* AT91SAM9263_UHP_BASE */
+#define CFG_SYS_USB_OHCI_REGS_BASE             0x00a00000      /* AT91SAM9263_UHP_BASE */
 
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
        "partition=nand0,0\0"                                   \
index 4a0a16818ed0ef2bd4e532714ea9a688175512d3..686411eee2eabe2a354d4cc0d21cdf1c85d0cd9b 100644 (file)
@@ -16,8 +16,8 @@
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK      32768
+#define CFG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE           0x70000000
@@ -53,9 +53,9 @@
                                          56, 57, 58, 59, 60, 61, 62, 63, }
 #endif
 
-#define CONFIG_SYS_MASTER_CLOCK                132096000
-#define CONFIG_SYS_AT91_PLLA           0x20c73f03
-#define CONFIG_SYS_MCKR                        0x1301
-#define CONFIG_SYS_MCKR_CSS            0x1302
+#define CFG_SYS_MASTER_CLOCK           132096000
+#define CFG_SYS_AT91_PLLA              0x20c73f03
+#define CFG_SYS_MCKR                   0x1301
+#define CFG_SYS_MCKR_CSS               0x1302
 
 #endif
index 365fdd30c08c426deb15ef1208919cbc35c161c5..518d7a3639c58c11df5034e2c67c9f540fe59265 100644 (file)
@@ -7,10 +7,10 @@
 #define __CONFIG_POLEG_H
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_PL310_BASE  0xF03FC000       /* L2 - Cache Regs Base (4k Space)*/
+#define CFG_SYS_PL310_BASE     0xF03FC000       /* L2 - Cache Regs Base (4k Space)*/
 #endif
 
-#define CONFIG_SYS_BOOTMAPSZ            (0x30 << 20)
+#define CFG_SYS_BOOTMAPSZ            (0x30 << 20)
 #define CFG_SYS_SDRAM_BASE           0x0
 
 /* Default environemnt variables */
index bee1ef649488f784435a84d9d58868e973a949c3..2b25c31b1d8d1fe736818d0fa36f2b78bd199f51 100644 (file)
@@ -9,8 +9,8 @@
 #define __PRESIDIO_ASIC_H
 
 /* Generic Timer Definitions */
-#define CONFIG_SYS_TIMER_RATE          25000000
-#define CONFIG_SYS_TIMER_COUNTER       0xf4321008
+#define CFG_SYS_TIMER_RATE             25000000
+#define CFG_SYS_TIMER_COUNTER  0xf4321008
 
 /* note: arch/arm/cpu/armv8/start.S which references GICD_BASE/GICC_BASE
  * does not yet support DT. Thus define it here.
@@ -18,7 +18,7 @@
 #define GICD_BASE                      0xf7011000
 #define GICC_BASE                      0xf7012000
 
-#define CONFIG_SYS_TIMER_BASE          0xf4321000
+#define CFG_SYS_TIMER_BASE             0xf4321000
 
 /* Use external clock source */
 #define PRESIDIO_APB_CLK               125000000
 
 /* Cortina Serial Configuration */
 #define CORTINA_UART_CLOCK             (PRESIDIO_APB_CLK)
-#define CORTINA_SERIAL_PORTS           {(void *)CONFIG_SYS_SERIAL0, \
-                                        (void *)CONFIG_SYS_SERIAL1}
+#define CORTINA_SERIAL_PORTS           {(void *)CFG_SYS_SERIAL0, \
+                                        (void *)CFG_SYS_SERIAL1}
 
-#define CONFIG_SYS_SERIAL0             PER_UART0_CFG
-#define CONFIG_SYS_SERIAL1             PER_UART1_CFG
+#define CFG_SYS_SERIAL0                PER_UART0_CFG
+#define CFG_SYS_SERIAL1                PER_UART1_CFG
 
 /* SDRAM Bank #1 */
 #define DDR_BASE                       0x00000000
@@ -58,7 +58,7 @@
 
 /* nand driver parameters */
 #ifdef CONFIG_TARGET_PRESIDIO_ASIC
-       #define CFG_SYS_NAND_BASE            CONFIG_SYS_FLASH_BASE
+       #define CFG_SYS_NAND_BASE            CFG_SYS_FLASH_BASE
        #define CFG_SYS_NAND_BASE_LIST       { CFG_SYS_NAND_BASE }
 #endif
 
index 58020ae95b1d0249569ec7daaa9a7b4c9b2dfe7f..c41bb341d82ead3456aef5e43512c6d2eb5f5214 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/sysmap-qcs404.h>
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 230400, 460800, 921600 }
+#define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 }
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x5000000\0"        \
index e7c810957d6dd4e89cdf61e3e5cd796825012043..aa9cae017d9ac3b52a569e4f15914448854d043f 100644 (file)
 /* Needed to fill the ccsrbar pointer */
 
 /* Virtual address to CCSRBAR */
-#define CONFIG_SYS_CCSRBAR             0xe0000000
+#define CFG_SYS_CCSRBAR                0xe0000000
 /* Physical address should be a function call */
 #ifndef __ASSEMBLY__
 extern unsigned long long get_phys_ccsrbar_addr_early(void);
-#define CONFIG_SYS_CCSRBAR_PHYS_HIGH (get_phys_ccsrbar_addr_early() >> 32)
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW get_phys_ccsrbar_addr_early()
+#define CFG_SYS_CCSRBAR_PHYS_HIGH (get_phys_ccsrbar_addr_early() >> 32)
+#define CFG_SYS_CCSRBAR_PHYS_LOW get_phys_ccsrbar_addr_early()
 #else
-#define CONFIG_SYS_CCSRBAR_PHYS_HIGH 0x0
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW CONFIG_SYS_CCSRBAR
+#define CFG_SYS_CCSRBAR_PHYS_HIGH 0x0
+#define CFG_SYS_CCSRBAR_PHYS_LOW CFG_SYS_CCSRBAR
 #endif
 
 /* Virtual address to a temporary map if we need it (max 128MB) */
-#define CONFIG_SYS_TMPVIRT             0xe8000000
+#define CFG_SYS_TMPVIRT                0xe8000000
 
 /*
  * DDR Setup
  */
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
 #define CONFIG_HWCONFIG
 
-#define CONFIG_SYS_INIT_RAM_ADDR               0x00100000
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH     0x0
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW      0x00100000
+#define CFG_SYS_INIT_RAM_ADDR          0x00100000
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH        0x0
+#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0x00100000
 /* The assembler doesn't like typecast */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \
-       ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
-         CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW)
-#define CONFIG_SYS_INIT_RAM_SIZE               0x00004000
+#define CFG_SYS_INIT_RAM_ADDR_PHYS \
+       ((CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \
+         CFG_SYS_INIT_RAM_ADDR_PHYS_LOW)
+#define CFG_SYS_INIT_RAM_SIZE          0x00004000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /* RTC */
 #define CONFIG_RTC_PT7C4338
@@ -58,7 +58,7 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
  * have to be in the first 64 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial map for Linux*/
+#define CFG_SYS_BOOTMAPSZ      (64 << 20)      /* Initial map for Linux*/
 
 /*
  * Environment Configuration
index f6ee7201eba103c938fb7cc9df4116d279b5dd21..bad74cc620d634f798a3dadeefc586f5e73b5aed 100644 (file)
 #define CFG_SYS_SDRAM_SIZE             0x04000000
 
 /* Address of u-boot image in Flash */
-#define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
+#define CFG_SYS_BOOTMAPSZ              (8 * 1024 * 1024)
 
 /*
  * NOR Flash ( Spantion S29GL256P )
  */
-#define CONFIG_SYS_FLASH_BASE          (0xA0000000)
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
+#define CFG_SYS_FLASH_BASE             (0xA0000000)
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE }
 
 #endif /* __CONFIG_H */
index 606a0a7ecde1d126458d4a3016e405bbe619eed4..a86180ead576473eb7cabdca25b220a25d8655a4 100644 (file)
 #endif
 
 /* console */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 38400, 115200 }
+#define CFG_SYS_BAUDRATE_TABLE { 38400, 115200 }
 
 #define CFG_SYS_SDRAM_BASE             (RCAR_GEN2_SDRAM_BASE)
 #define CFG_SYS_SDRAM_SIZE             (RCAR_GEN2_UBOOT_SDRAM_SIZE)
 
 /* Timer */
 #define CONFIG_TMU_TIMER
-#define CONFIG_SYS_TIMER_COUNTER       (TMU_BASE + 0xc)        /* TCNT0 */
-#define CONFIG_SYS_TIMER_RATE          (get_board_sys_clk() / 8)
+#define CFG_SYS_TIMER_COUNTER  (TMU_BASE + 0xc)        /* TCNT0 */
+#define CFG_SYS_TIMER_RATE             (get_board_sys_clk() / 8)
 
 #endif /* __RCAR_GEN2_COMMON_H */
index 5853072597804e3d5adb63a0c12b76ee41e92af2..e9cbd2538240129e953dfba4fd4e228140271b8d 100644 (file)
@@ -18,7 +18,7 @@
 #define GICC_BASE      0xF1020000
 
 /* console */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 38400 }
+#define CFG_SYS_BAUDRATE_TABLE { 115200, 38400 }
 
 /* PHY needs a longer autoneg timeout */
 #define PHY_ANEG_TIMEOUT               20000
index b4c19727478e01403c1d3ecb5da05cf0ddc4f94b..a4cae697181da66c86a6b7b0fdb00def288c4141 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_HZ_CLOCK            24000000
+#define CFG_SYS_HZ_CLOCK               24000000
 
 #define CFG_SYS_SDRAM_BASE             0x60000000
 #define SDRAM_BANK_SIZE                        (512UL << 20UL)
index fac27a7d27c6f96617305e0276393515992e51a8..302546630ac6307c182dd2f4ee2416ce11e0a28c 100644 (file)
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_HZ_CLOCK            24000000
+#define CFG_SYS_HZ_CLOCK               24000000
 
 #define CONFIG_IRAM_BASE               0x10080000
 
index 6889ba591b3d9bca1f0d21e5fcc812e2251b77da..58ad62afe165b9cbe3cbd71bd3fb42b6093cba3c 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_HZ_CLOCK            24000000
+#define CFG_SYS_HZ_CLOCK               24000000
 
 #define CONFIG_IRAM_BASE               0x10080000
 
index 4aa7e0449dbcbe778410a3702595711f91923ede..6b55c57dd770d0ae07b0dba1365f732891a1998b 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_HZ_CLOCK            24000000
+#define CFG_SYS_HZ_CLOCK               24000000
 
 #define CONFIG_IRAM_BASE               0xff700000
 
index 2c24944d9c3db82f7715eb60b1cae0c9f449cb15..e3549275138b23cc83bccde3b4e088f75b85ad3d 100644 (file)
 
 /* Use SoC timer for AArch32, but architected timer for AArch64 */
 #ifndef CONFIG_ARM64
-#define CONFIG_SYS_TIMER_RATE          1000000
-#define CONFIG_SYS_TIMER_COUNTER       \
+#define CFG_SYS_TIMER_RATE             1000000
+#define CFG_SYS_TIMER_COUNTER  \
        (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo)
 #endif
 
 /* Memory layout */
 #define CFG_SYS_SDRAM_BASE             0x00000000
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 /*
  * The board really has 256M. However, the VC (VideoCore co-processor) shares
  * the RAM, and uses a configurable portion at the top. We tell U-Boot that a
index 76836add3027db9405c44ddcc03c55777b20137f..84a5ae6965dd44af58e47ee48554016524113fa1 100644 (file)
 
 #define CONFIG_IRAM_BASE               0x10080000
 
-#define CONFIG_SYS_TIMER_RATE          (24 * 1000 * 1000)
+#define CFG_SYS_TIMER_RATE             (24 * 1000 * 1000)
 /* TIMER1,initialized by ddr initialize code */
-#define CONFIG_SYS_TIMER_BASE          0x10350020
-#define CONFIG_SYS_TIMER_COUNTER       (CONFIG_SYS_TIMER_BASE + 8)
+#define CFG_SYS_TIMER_BASE             0x10350020
+#define CFG_SYS_TIMER_COUNTER  (CFG_SYS_TIMER_BASE + 8)
 
 #define CFG_SYS_SDRAM_BASE             0x60000000
 
index ed891ab22a983575ebd7c2e2a8257c419f78c0d5..3d49d52b381c2f9f783b5063e60c298c9254b517 100644 (file)
 /* FLASH and environment organization */
 #define CONFIG_MMC_DEFAULT_DEV 0
 
-#define CONFIG_SYS_ONENAND_BASE                0xB0000000
+#define CFG_SYS_ONENAND_BASE           0xB0000000
 
 #endif /* __CONFIG_H */
index 614d04fda072e8aa78373042a58f2f5f2fd17482..06be9c0f65288e4706249e5e3efccbe8bd1fb8dc 100644 (file)
@@ -87,7 +87,7 @@
        "mmcrootpart=3\0" \
        "opts=always_resume=1"
 
-#define CONFIG_SYS_ONENAND_BASE                0x0C000000
+#define CFG_SYS_ONENAND_BASE           0x0C000000
 
 #ifndef        __ASSEMBLY__
 void universal_spi_scl(int bit);
index 41e52546ed325502fe242f8171d13838b6967415..2e422cd241e90c309880d3bad0b7629fb8623ad9 100644 (file)
@@ -14,7 +14,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45
-#define CONFIG_SYS_FLASH_BANKS_LIST    { 0x08000000 }
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_FLASH_BANKS_LIST       { 0x08000000 }
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
 #endif /* __SALVATOR_X_H */
index 75302bf5c05d62e260ba23c361bec69000bfaab8..f44ce909b918d60bd9837d4de01149a13112a6cc 100644 (file)
@@ -10,8 +10,8 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK     24000000        /* 24 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768
+#define CFG_SYS_AT91_MAIN_CLOCK        24000000        /* 24 MHz crystal */
 
 #define CONFIG_USART_BASE   ATMEL_BASE_DBGU
 #define CONFIG_USART_ID     0 /* ignored in arm */
index 22813d4c5448d4a221550be13b0f6122ec790847..27b39ebf41742df6a23ce9c584f22b6f3eae7bde 100644 (file)
@@ -11,8 +11,8 @@
 #define __CONFIG_H__
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK     24000000        /* 24 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768
+#define CFG_SYS_AT91_MAIN_CLOCK        24000000        /* 24 MHz crystal */
 
 #define CONFIG_USART_BASE   ATMEL_BASE_DBGU
 #define CONFIG_USART_ID     0 /* ignored in arm */
index 79f354d2e6cc49c67efa447105e989c241e902c2..d62146e779726e8ce4169b34676197f094438176 100644 (file)
@@ -11,8 +11,8 @@
 
 #include "at91-sama5_common.h"
 
-#undef CONFIG_SYS_AT91_MAIN_CLOCK
-#define CONFIG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
+#undef CFG_SYS_AT91_MAIN_CLOCK
+#define CFG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
 
 /* SPL */
 
index f826eab9ff2a9bae458e8b5ac2e08dd730cf655c..1979cb366e54c94ae9a00bc61cd8a382cbaf9a98 100644 (file)
@@ -12,8 +12,8 @@
 
 #include "at91-sama5_common.h"
 
-#undef CONFIG_SYS_AT91_MAIN_CLOCK
-#define CONFIG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
+#undef CFG_SYS_AT91_MAIN_CLOCK
+#define CFG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE             0x20000000
index 01ed1a3c8e7df5c75e5da1d97bea0294a59aebdb..a072b21dfb863bce06d84bc5b86953dec4befd1b 100644 (file)
@@ -11,8 +11,8 @@
 
 #include "at91-sama5_common.h"
 
-#undef CONFIG_SYS_AT91_MAIN_CLOCK
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
+#undef CFG_SYS_AT91_MAIN_CLOCK
+#define CFG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE             0x20000000
index 2e3c1ea40063bfc3f48fc7822a3da3fb28358d8b..bf3c92bdf396a51518562c2c0b096c89e42a8fb8 100644 (file)
@@ -12,8 +12,8 @@
 
 #include "at91-sama5_common.h"
 
-#undef CONFIG_SYS_AT91_MAIN_CLOCK
-#define CONFIG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
+#undef CFG_SYS_AT91_MAIN_CLOCK
+#define CFG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE             0x20000000
index 3f58928565ff940da6f60d8387b26981d21f8986..4f579ad9c5616f7c9d193de3544b8590b626693e 100644 (file)
@@ -27,7 +27,7 @@
 
 /* NOR flash */
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_SYS_FLASH_BASE          0x10000000
+#define CFG_SYS_FLASH_BASE             0x10000000
 #endif
 
 /* SDRAM */
index 68fa31fe76fdabbeceab2f4a27c8941d4e972eec..59f13edbc85057a475330a59864a497626e40bdd 100644 (file)
@@ -9,8 +9,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK      32768
+#define CFG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE             0x60000000
 #define CFG_SYS_SDRAM_SIZE             0x20000000
index 5a7f5e135b5361f41d488f532bc7a9c8d5a84300..1081e0bbc49170ccf0c3f503e912b2ebf50258b9 100644 (file)
@@ -17,7 +17,7 @@
 #define CFG_SYS_SDRAM_SIZE \
                (SB_TO_UL(CONFIG_SANDBOX_RAM_SIZE_MB) << 20)
 
-#define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
+#define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
 #ifndef SANDBOX_NO_SDL
index af5fe27e68bd04902f6a1462c9c99213b2e756e5..f7cdd5a19568576cf72678399760790f91f100ac 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/sysmap-sdm845.h>
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 230400, 460800, 921600 }
+#define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 }
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x4000000\0"        \
index 31552f4619d7225f0bbc5f2171f4b758d4aafd29..5a001716fb0114f52eac37184e4f4b65573a1179 100644 (file)
@@ -35,7 +35,7 @@
 
 #define CFG_SYS_SDRAM_BASE             PHYS_DRAM_1
  /* Platform/Board specific defs */
-#define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
+#define CFG_SYS_TIMERBASE              0x48040000      /* Use Timer2 */
 
 /* NS16550 Configuration */
 #define CFG_SYS_NS16550_CLK            (48000000)
index d2bc73a400e5f37182e9a4528d3f2c34e6c75a00..794475942a23a01ef4b5824f856490582480a0e9 100644 (file)
@@ -36,8 +36,8 @@
  */
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* 18.432MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000        /* 18.432MHz crystal */
 
 /* misc settings */
 
@@ -87,8 +87,8 @@
  * leaving the correct space for initial global data structure above that
  * address while providing maximum stack area below.
  */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
-#define CONFIG_SYS_INIT_RAM_ADDR       ATMEL_BASE_SRAM1
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM1
 
 /* Defines for SPL */
 
                                          48, 49, 50, 51, 52, 53, 54, 55, \
                                          56, 57, 58, 59, 60, 61, 62, 63, }
 
-#define CONFIG_SYS_MASTER_CLOCK                (198656000/2)
+#define CFG_SYS_MASTER_CLOCK           (198656000/2)
 #define AT91_PLL_LOCK_TIMEOUT          1000000
-#define CONFIG_SYS_AT91_PLLA           0x2060bf09
-#define CONFIG_SYS_MCKR                        0x100
-#define CONFIG_SYS_MCKR_CSS            (0x02 | CONFIG_SYS_MCKR)
-#define CONFIG_SYS_AT91_PLLB           0x10483f0e
+#define CFG_SYS_AT91_PLLA              0x2060bf09
+#define CFG_SYS_MCKR                   0x100
+#define CFG_SYS_MCKR_CSS               (0x02 | CFG_SYS_MCKR)
+#define CFG_SYS_AT91_PLLB              0x10483f0e
 
 #endif /* __CONFIG_H */
index 64963eebe5cef974519996b6c495736d27884881..ffa1a1fcb0efa799f20fd4745f2db6c93cf817cc 100644 (file)
@@ -88,7 +88,7 @@
  * Boot configuration
  */
 
-#define CONFIG_SYS_ONENAND_BASE                0xE7100000
+#define CFG_SYS_ONENAND_BASE           0xE7100000
 
 /*
  * Ethernet Contoller driver
index 44b9109d442fe72a5fa985c01497ec8fc773b607..14f9cf5602866657052078e9a077fca99ea8001d 100644 (file)
@@ -39,7 +39,7 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #endif
index 9b1cb372ece7f96d94f3c56a480433c348544939..b7aa49ce435ebe1c1bff257024b86e806431ae12 100644 (file)
 #include <linux/sizes.h>
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768
+#define CFG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768
 
 /* CPU */
 
 /* SDRAM */
 #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
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM
 
 /* Mem test settings */
 
index 95516800793abb27a756d3c4b91cea01993bd149..afca7e18e9bef6433eefcf084c17dac4268c0faf 100644 (file)
@@ -15,7 +15,7 @@
  * Clocks
  */
 
-#define CONFIG_SYS_TIMERBASE   OMAP34XX_GPT2
+#define CFG_SYS_TIMERBASE      OMAP34XX_GPT2
 
 #define V_NS16550_CLK          48000000
 #define V_OSCK                 26000000
@@ -55,7 +55,7 @@
 #define CFG_SYS_NS16550_CLK            V_NS16550_CLK
 #define CFG_SYS_NS16550_COM3           OMAP34XX_UART3
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 4800, 9600, 19200, 38400, 57600, \
+#define CFG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \
                                          115200 }
 
 /*
index 49883ea7a3cc041fe95c55d1627ffc400789d159..35c777b774efa36f15e59f4243f99ec3c13ae850 100644 (file)
@@ -18,7 +18,7 @@
 /*
  * Serial / UART configurations
  */
-#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
+#define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
 
 /*
  * L4 OSC1 Timer 0
index 261ae56c1dcec074d2e8ee02b5afd6f56fcf0234..29b4b22b3988a83337d1dee5b0f684468b784687 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/stringify.h>
 
 /* Eternal oscillator */
-#define CONFIG_SYS_TIMER_RATE  40000000
+#define CFG_SYS_TIMER_RATE     40000000
 
 /* Memory configurations */
 #define PHYS_SDRAM_1_SIZE      0x20000000      /* 512MiB on SECU1 */
@@ -21,7 +21,7 @@
  * the last two bytes of the 128 bytes large NVRAM in the
  * RTC which begin at address 0x20
  */
-#define CONFIG_SYS_I2C_RTC_ADDR         0x68
+#define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /* Environment settings */
 
index 7012097276c78dfff01dd7ae444b1e60aef01201..aa13878177effd57dc7ebcf0732e9b1d6698d2f4 100644 (file)
@@ -17,7 +17,7 @@
 /*
  * Serial / UART configurations
  */
-#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
+#define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "autoload=no\0" \
index 7ef7c5da8289fe4a8d463815a053eaee02aee1e0..bbbdea6664ca27ea5c29701bc74c815d23d502ed 100644 (file)
  */
 #define PHYS_SDRAM_1                   0x0
 #if defined(CONFIG_TARGET_SOCFPGA_GEN5)
-#define CONFIG_SYS_INIT_RAM_ADDR       0xFFFF0000
-#define CONFIG_SYS_INIT_RAM_SIZE       SOCFPGA_PHYS_OCRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  0xFFFF0000
+#define CFG_SYS_INIT_RAM_SIZE  SOCFPGA_PHYS_OCRAM_SIZE
 #elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
-#define CONFIG_SYS_INIT_RAM_ADDR       0xFFE00000
+#define CFG_SYS_INIT_RAM_ADDR  0xFFE00000
 /* SPL memory allocation configuration, this is for FAT implementation */
-#define CONFIG_SYS_INIT_RAM_SIZE       (SOCFPGA_PHYS_OCRAM_SIZE - \
+#define CFG_SYS_INIT_RAM_SIZE  (SOCFPGA_PHYS_OCRAM_SIZE - \
                                         CONFIG_SYS_SPL_MALLOC_SIZE)
 #endif
 
@@ -27,9 +27,9 @@
  * at this address to not overwrite the bootcounter by checking, if the
  * bootcounter address is located in the internal SRAM.
  */
-#if ((CONFIG_SYS_BOOTCOUNT_ADDR > CONFIG_SYS_INIT_RAM_ADDR) && \
-     (CONFIG_SYS_BOOTCOUNT_ADDR < (CONFIG_SYS_INIT_RAM_ADDR +  \
-                                  CONFIG_SYS_INIT_RAM_SIZE)))
+#if ((CONFIG_SYS_BOOTCOUNT_ADDR > CFG_SYS_INIT_RAM_ADDR) &&    \
+     (CONFIG_SYS_BOOTCOUNT_ADDR < (CFG_SYS_INIT_RAM_ADDR +     \
+                                  CFG_SYS_INIT_RAM_SIZE)))
 #endif
 
 /*
 /*
  * Cache
  */
-#define CONFIG_SYS_PL310_BASE          SOCFPGA_MPUL2_ADDRESS
+#define CFG_SYS_PL310_BASE             SOCFPGA_MPUL2_ADDRESS
 
 /*
  * L4 OSC1 Timer 0
  */
 #ifndef CONFIG_TIMER
-#define CONFIG_SYS_TIMERBASE           SOCFPGA_OSC1TIMER0_ADDRESS
-#define CONFIG_SYS_TIMER_COUNTER       (CONFIG_SYS_TIMERBASE + 0x4)
-#ifndef CONFIG_SYS_TIMER_RATE
-#define CONFIG_SYS_TIMER_RATE          25000000
+#define CFG_SYS_TIMERBASE              SOCFPGA_OSC1TIMER0_ADDRESS
+#define CFG_SYS_TIMER_COUNTER  (CFG_SYS_TIMERBASE + 0x4)
+#ifndef CFG_SYS_TIMER_RATE
+#define CFG_SYS_TIMER_RATE             25000000
 #endif
 #endif
 
index 9403e2f4306d38bbe72482593189916ad9c102a0..47089f312d2c5d90f27d9ed36d2ea57ee60e76e8 100644 (file)
@@ -26,8 +26,8 @@
 /*
  * U-Boot run time memory configurations
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0xFFE00000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x40000
+#define CFG_SYS_INIT_RAM_ADDR  0xFFE00000
+#define CFG_SYS_INIT_RAM_SIZE  0x40000
 
 /*
  * U-Boot environment configurations
index c628860eac7458d8796b4fce27cb29c0855cb000..0a2d5815170b39edbb62e67a5673845e0382134d 100644 (file)
  */
 #define CONFIG_L2_CACHE                        /* toggle L2 cache              */
 
-#define CONFIG_SYS_INIT_DBCR DBCR_IDM          /* Enable Debug Exceptions      */
+#define CFG_SYS_INIT_DBCR DBCR_IDM             /* Enable Debug Exceptions      */
 
-#undef CONFIG_SYS_DRAM_TEST                    /* memory test, takes time      */
+#undef CFG_SYS_DRAM_TEST                       /* memory test, takes time      */
 
-#define CONFIG_SYS_CCSRBAR             0xE0000000
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
+#define CFG_SYS_CCSRBAR                0xE0000000
+#define CFG_SYS_CCSRBAR_PHYS_LOW       CFG_SYS_CCSRBAR
 
 /* DDR Setup */
 #define CONFIG_SPD_EEPROM              /* Use SPD EEPROM for DDR setup */
 
 #define CONFIG_MEM_INIT_VALUE  0xDeadBeef
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #define CONFIG_VERY_BIG_RAM
 
 /* I2C addresses of SPD EEPROMs */
 
 
 /* Hardcoded values, to use instead of SPD */
-#define CONFIG_SYS_DDR_CS0_BNDS                0x0000000f
-#define CONFIG_SYS_DDR_CS0_CONFIG              0x80010102
-#define CONFIG_SYS_DDR_TIMING_0                0x00260802
-#define CONFIG_SYS_DDR_TIMING_1                0x3935D322
-#define CONFIG_SYS_DDR_TIMING_2                0x14904CC8
-#define CONFIG_SYS_DDR_MODE                    0x00480432
-#define CONFIG_SYS_DDR_INTERVAL                0x030C0100
-#define CONFIG_SYS_DDR_CONFIG_2                0x04400000
-#define CONFIG_SYS_DDR_CONFIG                  0xC3008000
-#define CONFIG_SYS_DDR_CLK_CONTROL             0x03800000
+#define CFG_SYS_DDR_CS0_BNDS           0x0000000f
+#define CFG_SYS_DDR_CS0_CONFIG         0x80010102
+#define CFG_SYS_DDR_TIMING_0           0x00260802
+#define CFG_SYS_DDR_TIMING_1           0x3935D322
+#define CFG_SYS_DDR_TIMING_2           0x14904CC8
+#define CFG_SYS_DDR_MODE                       0x00480432
+#define CFG_SYS_DDR_INTERVAL           0x030C0100
+#define CFG_SYS_DDR_CONFIG_2           0x04400000
+#define CFG_SYS_DDR_CONFIG                     0xC3008000
+#define CFG_SYS_DDR_CLK_CONTROL                0x03800000
 #define CFG_SYS_SDRAM_SIZE                     256 /* in Megs */
 
 /*
  * Flash on the LocalBus
  */
-#define CONFIG_SYS_FLASH0              0xFE000000
-#define CONFIG_SYS_FLASH1              0xFC000000
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH1, CONFIG_SYS_FLASH0 }
+#define CFG_SYS_FLASH0         0xFE000000
+#define CFG_SYS_FLASH1         0xFC000000
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH1, CFG_SYS_FLASH0 }
 
-#define CONFIG_SYS_LBC_FLASH_BASE      CONFIG_SYS_FLASH1       /* Localbus flash start */
-#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_LBC_FLASH_BASE /* start of FLASH     */
+#define CFG_SYS_LBC_FLASH_BASE CFG_SYS_FLASH1  /* Localbus flash start */
+#define CFG_SYS_FLASH_BASE             CFG_SYS_LBC_FLASH_BASE /* start of FLASH        */
 
-#define CONFIG_SYS_LBC_LCRR            0x00030004    /* LB clock ratio reg     */
-#define CONFIG_SYS_LBC_LBCR            0x00000000    /* LB config reg          */
-#define CONFIG_SYS_LBC_LSRT            0x20000000    /* LB sdram refresh timer */
-#define CONFIG_SYS_LBC_MRTPR           0x20000000    /* LB refresh timer presc.*/
+#define CFG_SYS_LBC_LCRR               0x00030004    /* LB clock ratio reg     */
+#define CFG_SYS_LBC_LBCR               0x00000000    /* LB config reg          */
+#define CFG_SYS_LBC_LSRT               0x20000000    /* LB sdram refresh timer */
+#define CFG_SYS_LBC_MRTPR              0x20000000    /* LB refresh timer presc.*/
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0xe4010000      /* Initial RAM address  */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x4000          /* Size used area in RAM*/
+#define CFG_SYS_INIT_RAM_ADDR  0xe4010000      /* Initial RAM address  */
+#define CFG_SYS_INIT_RAM_SIZE  0x4000          /* Size used area in RAM*/
 
-#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_SP_OFFSET (CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /* FPGA and NAND */
-#define CONFIG_SYS_FPGA_BASE           0xc0000000
-#define CONFIG_SYS_FPGA_SIZE           0x00100000      /* 1 MB         */
+#define CFG_SYS_FPGA_BASE              0xc0000000
+#define CFG_SYS_FPGA_SIZE              0x00100000      /* 1 MB         */
 
-#define CFG_SYS_NAND_BASE              (CONFIG_SYS_FPGA_BASE + 0x70)
+#define CFG_SYS_NAND_BASE              (CFG_SYS_FPGA_BASE + 0x70)
 
 /* LIME GDC */
-#define CONFIG_SYS_LIME_BASE           0xc8000000
+#define CFG_SYS_LIME_BASE              0xc8000000
 
 /*
  * General PCI
  * 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   (8 << 20)       /* Initial Memory map for Linux */
+#define CFG_SYS_BOOTMAPSZ      (8 << 20)       /* Initial Memory map for Linux */
 
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
index 008aa500107298f6bd274437f0e0c19bb70e4745..de0f48b79a15bcedffd7d11efa442e4ddab2d257 100644 (file)
@@ -54,8 +54,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* environment organization */
 
index 3c70856fc70aa49e93c47ce3bb3c76cc24659a56..a5987c5e17a1a2e2c03151cc1fcd9956de2593b3 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 /* FIXME: This should be loaded from device tree... */
-#define CONFIG_SYS_PL310_BASE          0xa0412000
+#define CFG_SYS_PL310_BASE             0xa0412000
 
 /* Linux does not boot if FDT / initrd is loaded to end of RAM */
 #define BOOT_ENV \
index 806323e375dfb8d54ce2254c8e85835a2ab7302b..9294d57ca84ed9c9b8cc1798f6b9e6996b6cda9a 100644 (file)
@@ -14,7 +14,7 @@
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 #define PHYS_SDRAM_1_SIZE              0x3E000000
 
-#define CONFIG_SYS_HZ_CLOCK            750000000       /* 750 MHz */
+#define CFG_SYS_HZ_CLOCK               750000000       /* 750 MHz */
 
 /* Environment */
 
@@ -22,7 +22,7 @@
  * For booting Linux, use the first 256 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_256M
+#define CFG_SYS_BOOTMAPSZ              SZ_256M
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
index 51f69010b17929e58ad9c1664f55ea3bdd5adf0a..afd7d50428bf733ebb379593ec041c32b503408a 100644 (file)
@@ -7,13 +7,13 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_FLASH_BASE          0x08000000
+#define CFG_SYS_FLASH_BASE             0x08000000
 
 /*
  * Configuration of the external SDRAM memory
  */
 
-#define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer is clocked at 1MHz */
+#define CFG_SYS_HZ_CLOCK               1000000 /* Timer is clocked at 1MHz */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \
index 221b7abe1ad7b378efe63bcd9cb32ef375426257..c8aad47966fed24c50512184661217959e6b85bb 100644 (file)
 #include <linux/sizes.h>
 
 /* For booting Linux, use the first 16MB of memory */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_16M
+#define CFG_SYS_BOOTMAPSZ              SZ_16M
 
-#define CONFIG_SYS_FLASH_BASE          0x08000000
+#define CFG_SYS_FLASH_BASE             0x08000000
 
 /*
  * Configuration of the external SDRAM memory
  */
 
-#define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer is clocked at 1MHz */
+#define CFG_SYS_HZ_CLOCK               1000000 /* Timer is clocked at 1MHz */
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0)
index 55e70ce92508aed608f0f930209f62921beb875e..573a6b179561c25a8e5bb40d9ba8ee5c984c9231 100644 (file)
 #include <linux/sizes.h>
 
 /* For booting Linux, use the first 12MB of memory */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_8M + SZ_4M
+#define CFG_SYS_BOOTMAPSZ              SZ_8M + SZ_4M
 
-#define CONFIG_SYS_FLASH_BASE          0x08000000
+#define CFG_SYS_FLASH_BASE             0x08000000
 
 /*
  * Configuration of the external SDRAM memory
  */
 
-#define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer is clocked at 1MHz */
+#define CFG_SYS_HZ_CLOCK               1000000 /* Timer is clocked at 1MHz */
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0)
index c7d6d9368a2e0bc675a5a6a35e0aadd3981a2d4b..14e883a35892ad017640bfdb518c46b98a16f313 100644 (file)
 #include <linux/sizes.h>
 
 /* For booting Linux, use the first 6MB of memory */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_4M + SZ_2M
+#define CFG_SYS_BOOTMAPSZ              SZ_4M + SZ_2M
 
-#define CONFIG_SYS_FLASH_BASE          0x08000000
+#define CFG_SYS_FLASH_BASE             0x08000000
 
 /*
  * Configuration of the external SDRAM memory
  */
 
-#define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer is clocked at 1MHz */
+#define CFG_SYS_HZ_CLOCK               1000000 /* Timer is clocked at 1MHz */
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0)
@@ -33,7 +33,7 @@
                        "ramdisk_addr_r=0xC0438000\0"           \
                        BOOTENV
 
-#define CONFIG_SYS_UBOOT_BASE          (CONFIG_SYS_FLASH_BASE + \
+#define CFG_SYS_UBOOT_BASE             (CFG_SYS_FLASH_BASE + \
                                         CONFIG_SPL_PAD_TO)
 
 /* For splashcreen */
index f959fcf26f3eaf31b9c31bddeb6e3b939fcaa510..67e6a3a19d21c741cf5eea81ecbfc1a7f4163357 100644 (file)
 #include <linux/sizes.h>
 
 /* For booting Linux, use the first 16MB of memory */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_16M
+#define CFG_SYS_BOOTMAPSZ              SZ_16M
 
-#define CONFIG_SYS_FLASH_BASE          0x08000000
+#define CFG_SYS_FLASH_BASE             0x08000000
 
-#define CONFIG_SYS_HZ_CLOCK            1000000
+#define CFG_SYS_HZ_CLOCK               1000000
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0)
index c8688e9ca7b5b464bcb48d9c20585d04f1d50fa1..4786eb001bc131f767a6b067fa9a44f4ebbd5450 100644 (file)
 #include <linux/sizes.h>
 
 /* For booting Linux, use the first 16MB of memory */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_16M
+#define CFG_SYS_BOOTMAPSZ              SZ_16M
 
-#define CONFIG_SYS_FLASH_BASE          0x08000000
+#define CFG_SYS_FLASH_BASE             0x08000000
 
-#define CONFIG_SYS_HZ_CLOCK            1000000
+#define CFG_SYS_HZ_CLOCK               1000000
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0)
index f7fa8c51d8e9b4172cdf57df78902434cee9c23a..e667fe6f6ac2ab9ad8ccf015662f7fcef35b8ba1 100644 (file)
 #include <linux/sizes.h>
 
 /* For booting Linux, use the first 16MB of memory */
-#define CONFIG_SYS_BOOTMAPSZ           (SZ_16M + SZ_8M)
+#define CFG_SYS_BOOTMAPSZ              (SZ_16M + SZ_8M)
 
-#define CONFIG_SYS_FLASH_BASE          0x90000000
+#define CFG_SYS_FLASH_BASE             0x90000000
 
-#define CONFIG_SYS_HZ_CLOCK            1000000
+#define CFG_SYS_HZ_CLOCK               1000000
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0)
index d71114931427975bca9ff493a7d9d645e7ffb4cf..c259a616133b42cffba9917c154e558a0447be6b 100644 (file)
@@ -19,7 +19,7 @@
  * For booting Linux, use the first 256 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_256M
+#define CFG_SYS_BOOTMAPSZ              SZ_256M
 
 /* NAND support */
 
index c51022b40d267230e30730f70551b8768679bb95..ad8126f61039393b9f09a5578a61ba0c49e0b8ea 100644 (file)
@@ -15,7 +15,7 @@
 #include <configs/stm32mp13_common.h>
 
 /* uart with on-board st-link */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
+#define CFG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
                                         230400, 460800, 921600, \
                                         1000000, 2000000, 4000000}
 
index f78ce41ed85446c3edd7dcaaa9020f4d25167a7e..c9cfadd9ce0b939acc613b3ce13cd342a2ac6862 100644 (file)
@@ -19,7 +19,7 @@
  * For booting Linux, use the first 256 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_256M
+#define CFG_SYS_BOOTMAPSZ              SZ_256M
 
 /* NAND support */
 
index 6bdc286cfca2abdc00d757c7cf1b6d0ad65ac16e..38b5aa7319cfc21f9cc5f2b8194540d4a375e602 100644 (file)
@@ -14,7 +14,7 @@
 #include <configs/stm32mp15_common.h>
 
 /* uart with on-board st-link */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
+#define CFG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
                                         230400, 460800, 921600, \
                                         1000000, 2000000 }
 
index 234327e017bc73a1774f275c26ad4a42e6ad5646..faff8d6ed6d1c7f12d3578a48c23d15b5f42a64c 100644 (file)
@@ -10,7 +10,7 @@
 
 #define CONFIG_HOSTNAME                        "stmark2"
 
-#define CONFIG_SYS_UART_PORT           0
+#define CFG_SYS_UART_PORT              0
 
 #define LDS_BOARD_TEXT                                         \
        board/sysam/stmark2/sbf_dram_init.o (.text*)
                "sf write ${loadaddr} 0x00800000 ${filesize}\0" \
        ""
 
-#define CONFIG_SYS_SBFHDR_SIZE         0x7
+#define CFG_SYS_SBFHDR_SIZE            0x7
 
 /* Input, PCI, Flexbus, and VCO */
 
 #define CONFIG_PRAM                    2048    /* 2048 KB */
 
-#define CONFIG_SYS_MBAR                        0xFC000000
+#define CFG_SYS_MBAR                   0xFC000000
 
 /*
  * Definitions for initial stack pointer and data area (in internal SRAM)
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x80000000
+#define CFG_SYS_INIT_RAM_ADDR  0x80000000
 /* End of used area in internal SRAM */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x10000
-#define CONFIG_SYS_INIT_RAM_CTRL       0x221
-#define CONFIG_SYS_INIT_SP_OFFSET      ((CONFIG_SYS_INIT_RAM_SIZE - \
+#define CFG_SYS_INIT_RAM_SIZE  0x10000
+#define CFG_SYS_INIT_RAM_CTRL  0x221
+#define CFG_SYS_INIT_SP_OFFSET ((CFG_SYS_INIT_RAM_SIZE - \
                                        GENERATED_GBL_DATA_SIZE) - 32)
-#define CONFIG_SYS_SBFHDR_DATA_OFFSET  (CONFIG_SYS_INIT_RAM_SIZE - 32)
+#define CFG_SYS_SBFHDR_DATA_OFFSET     (CFG_SYS_INIT_RAM_SIZE - 32)
 
 /*
  * Start addresses for the final memory configuration
@@ -61,7 +61,7 @@
 #define CFG_SYS_SDRAM_BASE             0x40000000
 #define CFG_SYS_SDRAM_SIZE             128     /* SDRAM size in MB */
 
-#define CONFIG_SYS_DRAM_TEST
+#define CFG_SYS_DRAM_TEST
 
 #if defined(CONFIG_CF_SBF)
 #define CONFIG_SERIAL_BOOT
@@ -75,7 +75,7 @@
  * the maximum mapped by the Linux kernel during initialization ??
  */
 /* Initial Memory map for Linux */
-#define CONFIG_SYS_BOOTMAPSZ           (CFG_SYS_SDRAM_BASE + \
+#define CFG_SYS_BOOTMAPSZ              (CFG_SYS_SDRAM_BASE + \
                                        (CFG_SYS_SDRAM_SIZE << 20))
 
 /* Configuration for environment
  */
 
 /* Cache Configuration */
-#define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
-#define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        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          (CFG_SYS_SDRAM_BASE | \
+#define ICACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 8)
+#define DCACHE_STATUS                  (CFG_SYS_INIT_RAM_ADDR + \
+                                        CFG_SYS_INIT_RAM_SIZE - 4)
+#define CFG_SYS_ICACHE_INV             (CF_CACR_BCINVA + CF_CACR_ICINVA)
+#define CFG_SYS_DCACHE_INV             (CF_CACR_DCINVA)
+#define CFG_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 | \
+#define CFG_SYS_CACHE_ICACR            (CF_CACR_BEC | CF_CACR_IEC | \
                                         CF_CACR_ICINVA | CF_CACR_EUSP)
-#define CONFIG_SYS_CACHE_DCACR         ((CONFIG_SYS_CACHE_ICACR | \
+#define CFG_SYS_CACHE_DCACR            ((CFG_SYS_CACHE_ICACR | \
                                         CF_CACR_DEC | CF_CACR_DDCM_P | \
                                         CF_CACR_DCINVA) & ~CF_CACR_ICINVA)
 
-#define CACR_STATUS                    (CONFIG_SYS_INIT_RAM_ADDR + \
-                                       CONFIG_SYS_INIT_RAM_SIZE - 12)
+#define CACR_STATUS                    (CFG_SYS_INIT_RAM_ADDR + \
+                                       CFG_SYS_INIT_RAM_SIZE - 12)
 
 #endif /* __STMARK2_CONFIG_H */
index b2dcb6058b1082f7c4e91e613b14d0f3e728693d..7eadb6d421e5d67aee38246828b88ce762ae88e8 100644 (file)
@@ -6,7 +6,7 @@
 
 #ifndef __CONFIG_STV0991_H
 #define __CONFIG_STV0991_H
-#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
+#define CFG_SYS_EXCEPTION_VECTORS_HIGH
 
 /* ram memory-related information */
 #define PHYS_SDRAM_1                           0x00000000
@@ -16,8 +16,8 @@
 /* user interface */
 
 /* MISC */
-#define CONFIG_SYS_INIT_RAM_SIZE               0x8000
-#define CONFIG_SYS_INIT_RAM_ADDR               0x00190000
+#define CFG_SYS_INIT_RAM_SIZE          0x8000
+#define CFG_SYS_INIT_RAM_ADDR          0x00190000
 /* U-Boot Load Address */
 
 /* Misc configuration */
index e1a66f53ff565cf1504119779b7d46c8bc21b62e..1677aafad03bb12cb0bbaa138e1217ec01d25ace 100644 (file)
@@ -62,9 +62,9 @@
  * is known yet.
  * H6 has SRAM A1 at 0x00020000.
  */
-#define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SUNXI_SRAM_ADDRESS
+#define CFG_SYS_INIT_RAM_ADDR  CONFIG_SUNXI_SRAM_ADDRESS
 /* FIXME: this may be larger on some SoCs */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x8000 /* 32 KiB */
+#define CFG_SYS_INIT_RAM_SIZE  0x8000 /* 32 KiB */
 
 #define PHYS_SDRAM_0                   CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_0_SIZE              0x80000000 /* 2 GiB */
index daa9bbec88a7c43fc2b6d0d49dc2b8b277fcd953..6992689001097797eb507fcedd8210199e730a1b 100644 (file)
@@ -6,7 +6,7 @@
 #define __CONFIG_H
 
 /* Timers for fasp(TIMCLK) */
-#define CONFIG_SYS_TIMERBASE           0x31080000      /* AP Timer 1 (ARM-SP804) */
+#define CFG_SYS_TIMERBASE              0x31080000      /* AP Timer 1 (ARM-SP804) */
 
 /*
  * SDRAM (for initialize)
@@ -28,7 +28,7 @@
  */
 
 /* RTC */
-#define CONFIG_SYS_I2C_RTC_ADDR                0x51
+#define CFG_SYS_I2C_RTC_ADDR           0x51
 
 /* Serial (pl011)       */
 #define UART_CLK                       (62500000)
@@ -36,8 +36,8 @@
 #define CONFIG_PL01x_PORTS             {(void *)(0x2a400000)}
 
 /* Support MTD */
-#define CONFIG_SYS_FLASH_BASE          (0x08000000)
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE}
+#define CFG_SYS_FLASH_BASE             (0x08000000)
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE}
 
 /* Since U-Boot 64bit PCIe support is limited, disable 64bit MMIO support */
 
index 1aba986e1e6a4e81d7bccc4c23c6a4feef1b4733..baaf94e2dd54cf1b88a4342aaff0c02b3a1feaec 100644 (file)
@@ -29,8 +29,8 @@
  */
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* main clock xtal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000        /* main clock xtal */
 
 /* Misc CPU related */
 
@@ -49,8 +49,8 @@
  * leaving the correct space for initial global data structure above
  * that address while providing maximum stack area below.
  */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
-#define CONFIG_SYS_INIT_RAM_ADDR       ATMEL_BASE_SRAM1
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM1
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
                                          48, 49, 50, 51, 52, 53, 54, 55, \
                                          56, 57, 58, 59, 60, 61, 62, 63, }
 
-#define CONFIG_SYS_MASTER_CLOCK                132096000
+#define CFG_SYS_MASTER_CLOCK           132096000
 #define AT91_PLL_LOCK_TIMEOUT          1000000
-#define CONFIG_SYS_AT91_PLLA           0x202A3F01
-#define CONFIG_SYS_MCKR                        0x1300
-#define CONFIG_SYS_MCKR_CSS            (0x02 | CONFIG_SYS_MCKR)
-#define CONFIG_SYS_AT91_PLLB           0x10193F05
+#define CFG_SYS_AT91_PLLA              0x202A3F01
+#define CFG_SYS_MCKR                   0x1300
+#define CFG_SYS_MCKR_CSS               (0x02 | CFG_SYS_MCKR)
+#define CFG_SYS_AT91_PLLB              0x10193F05
 
 #endif
index cd1309b3b889fe3881df68606f25558809db212c..1318f5e5ee4456591ffca2351ed8c53309965f16 100644 (file)
@@ -12,8 +12,8 @@
  * Memory configuration
  */
 
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CFG_SYS_SDRAM_BASE             CONFIG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE             SZ_128M
 
 /*
index 2d8bde1cee86d0f73a2e2a57c69291e1e6effef2..f6544f6226c7aa62f3039e4632688ea59894bcf6 100644 (file)
 /* Physical Memory Map */
 #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
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
-#define CONFIG_SYS_BOOTMAPSZ           0x10000000
+#define CFG_SYS_BOOTMAPSZ              0x10000000
 
 /* Framebuffer */
 #define CONFIG_IMX_HDMI
index 7e764b0000b01efb5342377f74e8c48c3274ab39..66cf7ae5847e074342350c9261dd5a37aedb15c0 100644 (file)
@@ -17,8 +17,8 @@
 
 /* Use the Tegra US timer on ARMv7, but the architected timer on ARMv8. */
 #ifndef CONFIG_ARM64
-#define CONFIG_SYS_TIMER_RATE          1000000
-#define CONFIG_SYS_TIMER_COUNTER       NV_PA_TMRUS_BASE
+#define CFG_SYS_TIMER_RATE             1000000
+#define CFG_SYS_TIMER_COUNTER  NV_PA_TMRUS_BASE
 #endif
 
 /* Environment */
 
 #define CFG_SYS_SDRAM_BASE     PHYS_SDRAM_1
 
-#define CONFIG_SYS_BOOTMAPSZ   (256 << 20)     /* 256M */
+#define CFG_SYS_BOOTMAPSZ      (256 << 20)     /* 256M */
 
 #ifndef CONFIG_ARM64
-#define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_STACKBASE
-#define CONFIG_SYS_INIT_RAM_SIZE       CONFIG_SYS_MALLOC_LEN
+#define CFG_SYS_INIT_RAM_ADDR  CONFIG_STACKBASE
+#define CFG_SYS_INIT_RAM_SIZE  CONFIG_SYS_MALLOC_LEN
 
 /* Defines for SPL */
 #endif
index 04772c9e4efc4536686d4860ed52b517c91747a7..57724719a9d6a5cd7615c4cb283db2ea6a72a73d 100644 (file)
@@ -10,7 +10,7 @@
 #include "ls1088a_common.h"
 
 
-#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
+#define CFG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
 
 #define QSPI_NOR_BOOTCOMMAND   "run distro_bootcmd"
 #define SD_BOOTCOMMAND         "run distro_bootcmd"
index 1f60b9b49790c77f812ca971120231a579212dcc..7becf1eb7cb42aa5878389e534e31ff6a71726c8 100644 (file)
@@ -8,7 +8,7 @@
 
 #define MEM_BASE                       0x00500000
 
-#define CONFIG_SYS_LOWMEM_BASE         MEM_BASE
+#define CFG_SYS_LOWMEM_BASE            MEM_BASE
 
 /* Link Definitions */
 
@@ -22,8 +22,8 @@
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE                      (0x801000000000)
 #define GICR_BASE                      (0x801000002000)
-#define CONFIG_SYS_SERIAL0             0x87e024000000
-#define CONFIG_SYS_SERIAL1             0x87e025000000
+#define CFG_SYS_SERIAL0                0x87e024000000
+#define CFG_SYS_SERIAL1                0x87e025000000
 
 /* Miscellaneous configurable options */
 
index e5b23d2a54ca459b50a4cf4c9e06ab25ad75583d..03849adb5abee661dab90b6ae861f63948a90390 100644 (file)
@@ -74,7 +74,7 @@
 /**
  * Platform/Board specific defs
  */
-#define CONFIG_SYS_TIMERBASE           0x4802E000
+#define CFG_SYS_TIMERBASE              0x4802E000
 
 /* NS16550 Configuration */
 #define CFG_SYS_NS16550_CLK            (48000000)
index 4a7c3d5b44954a908ce2aad5a00c3626412b5593..7b04292d21882497f8f441408acde26e0fea625e 100644 (file)
@@ -25,7 +25,7 @@
 /**
  * Platform/Board specific defs
  */
-#define CONFIG_SYS_TIMERBASE    0x4802E000
+#define CFG_SYS_TIMERBASE    0x4802E000
 
 /*
  * NS16550 Configuration
index 00eb329faa8368688a7398af467fd7499092f15e..ed17b42920965d79a3b7ecb2522869f1a0ff9e70 100644 (file)
@@ -12,7 +12,7 @@
 #define __CONFIG_TI_AM335X_COMMON_H__
 
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
-#define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
+#define CFG_SYS_TIMERBASE              0x48040000      /* Use Timer2 */
 
 #include <asm/arch/omap.h>
 
index 65abb187d96df65dfe0706faeb3e12a0e80b73d2..ea45bba409cb598ba508f4a6ff777a43b7b2bc6b 100644 (file)
@@ -14,7 +14,7 @@
 /* SoC Configuration */
 
 /* Memory Configuration */
-#define CONFIG_SYS_LPAE_SDRAM_BASE     0x800000000
+#define CFG_SYS_LPAE_SDRAM_BASE        0x800000000
 #define CONFIG_MAX_RAM_BANK_SIZE       (2 << 30)       /* 2GB */
 
 #ifdef CONFIG_SYS_MALLOC_F_LEN
@@ -44,7 +44,7 @@
 #endif
 
 /* SPI Configuration */
-#define CONFIG_SYS_SPI_CLK             ks_clk_get_rate(KS2_CLK1_6)
+#define CFG_SYS_SPI_CLK                ks_clk_get_rate(KS2_CLK1_6)
 
 /* Keystone net */
 #define CONFIG_KSNET_MAC_ID_BASE               KS2_MAC_ID_BASE_ADDR
 #include <asm/arch/hardware.h>
 #include <asm/arch/clock.h>
 #ifndef CONFIG_SOC_K2G
-#define CONFIG_SYS_HZ_CLOCK            ks_clk_get_rate(KS2_CLK1_6)
+#define CFG_SYS_HZ_CLOCK               ks_clk_get_rate(KS2_CLK1_6)
 #else
-#define CONFIG_SYS_HZ_CLOCK            get_external_clk(sys_clk)
+#define CFG_SYS_HZ_CLOCK               get_external_clk(sys_clk)
 #endif
 
 #endif /* __CONFIG_KS2_EVM_H */
index d282c3956e0c28bf00f93187a05e1472b43fc196..36a05b6896ea537e15c5829f9de1f65178c3d64f 100644 (file)
@@ -27,7 +27,7 @@
 /* NS16550 Configuration */
 #define V_NS16550_CLK                  48000000        /* 48MHz (APLL96/2) */
 #define CFG_SYS_NS16550_CLK            V_NS16550_CLK
-#define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600, \
+#define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
                                        115200}
 
 /* Select serial console configuration */
@@ -46,7 +46,7 @@
  * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
  * This rate is divided by a local divisor.
  */
-#define CONFIG_SYS_TIMERBASE           (OMAP34XX_GPT2)
+#define CFG_SYS_TIMERBASE              (OMAP34XX_GPT2)
 
 /* SPL */
 
index ce50e35d8d4bcd2b934d44837f9acb6e9abe8797..9a068e26140256a388eefa4bef93c906904f9d04 100644 (file)
@@ -12,7 +12,7 @@
 #define __CONFIG_TI_OMAP4_COMMON_H
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_PL310_BASE  0x48242000
+#define CFG_SYS_PL310_BASE     0x48242000
 #endif
 
 /* Get CPU defs */
@@ -20,7 +20,7 @@
 #include <asm/arch/omap.h>
 
 /* Use General purpose timer 1 */
-#define CONFIG_SYS_TIMERBASE           GPT2_BASE
+#define CFG_SYS_TIMERBASE              GPT2_BASE
 
 #include <configs/ti_armv7_omap.h>
 
index c49c177390b3df84dede0d8e8b738f6d9cecb6cf..37ab2e4467245130d1427bf9901c201181f2fb21 100644 (file)
@@ -17,7 +17,7 @@
 #define __CONFIG_TI_OMAP5_COMMON_H
 
 /* Use General purpose timer 1 */
-#define CONFIG_SYS_TIMERBASE           GPT2_BASE
+#define CFG_SYS_TIMERBASE              GPT2_BASE
 
 #include <linux/stringify.h>
 
index a609aa3a2aa9be9f2645e7086e446c9b3cc8aa82..0f28690612abb39a26ca16f48709113ed0d2de03 100644 (file)
@@ -41,6 +41,6 @@
  * Else boot FIT image.
  */
 
-#define CONFIG_SYS_FLASH_BASE          0x0C000000
+#define CFG_SYS_FLASH_BASE             0x0C000000
 
 #endif /* __TOTAL_COMPUTE_H */
index 137898199177ae8b159af7c701520076d27d5a0a..24943c8dcfb85fc54b123099a1788d28f801036f 100644 (file)
@@ -8,8 +8,8 @@
 
 #define CFG_SYS_SDRAM_BASE             0xa0000000
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0xbd000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x8000
+#define CFG_SYS_INIT_RAM_ADDR  0xbd000000
+#define CFG_SYS_INIT_RAM_SIZE  0x8000
 
 /*
  * Serial Port
index f8e3a2d017a3153ec0804b244254f9ca2995c4c3..9c3454add463511a181349ad672d9cf256c3fc90 100644 (file)
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /*
  * All the defines above are for the TQMa6 SoM
index 999130600ccb4cd44c74db76819ade186acb0fe5..ce897fcd9325d523e1925e8f376251a0e5b4e896 100644 (file)
@@ -17,8 +17,8 @@
 
 /* Config on-board RTC */
 #define CONFIG_RTC_DS1337
-#define CONFIG_SYS_RTC_BUS_NUM         2
-#define CONFIG_SYS_I2C_RTC_ADDR                0x68
+#define CFG_SYS_RTC_BUS_NUM            2
+#define CFG_SYS_I2C_RTC_ADDR           0x68
 /* Turn off RTC square-wave output to save battery */
 #define CONFIG_RTC_DS1337_NOOSC
 
index 23dcf20c1f4eb50905fe7e3caecc477fba640f3a..5bd0ca2a96454ae8346857d5e87729700753899c 100644 (file)
@@ -12,7 +12,7 @@
 #include <configs/exynos4-common.h>
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_PL310_BASE  0x10502000
+#define CFG_SYS_PL310_BASE     0x10502000
 #endif
 
 /* TRATS has 4 banks of DRAM */
index 9c6433ccfd87491333d4d447093845ca3f0b49b6..cef563696bde6bf7e3b6d1889bbbe67d7fcbad77 100644 (file)
@@ -13,7 +13,7 @@
 #include <configs/exynos4-common.h>
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_PL310_BASE  0x10502000
+#define CFG_SYS_PL310_BASE     0x10502000
 #endif
 
 /* TRATS2 has 4 banks of DRAM */
index 4ca8eafc91439788d6cabde8da821fc16cf0f460..fdb420ed874e58f6f8561a6ba8ea3844bb760536 100644 (file)
@@ -9,7 +9,7 @@
 #define _CONFIG_TURRIS_MOX_H
 
 #define CFG_SYS_SDRAM_BASE             0x00000000
-#define CONFIG_SYS_BAUDRATE_TABLE      { 300, 600, 1200, 1800, 2400, 4800, \
+#define CFG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \
                                          9600, 19200, 38400, 57600, 115200, \
                                          230400, 460800, 500000, 576000, \
                                          921600, 1000000, 1152000, 1500000, \
index c1e80b44c854cd4bba0e0e57e6cebac8cb506918..fac8c1eeb4e2d73a416f02f901af8aebf4853a91 100644 (file)
@@ -50,8 +50,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment organization */
 
index f73092661a1dc6a1abf43dae89f6a5930462f213..0e0d5b5b3e4ce81d0871572eecdf6f9b5b974cc1 100644 (file)
@@ -58,8 +58,8 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* PMIC */
 #define CONFIG_POWER_PFUZE3000
index a977271c1e6e8447dff1d10e8653a5d53d7625ef..ab199bc726a6b57454c1fa1355ad2e2106f518bb 100644 (file)
@@ -14,7 +14,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45
-#define CONFIG_SYS_FLASH_BANKS_LIST    { 0x08000000 }
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_FLASH_BANKS_LIST       { 0x08000000 }
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
 #endif /* __ULCB_H */
index a57ecffd5961e7879fd46637fb2c953175cd6621..8cd81f1cdddc4b62cf131553aa27d6c440c4417b 100644 (file)
@@ -37,7 +37,7 @@
 
 #if !defined(CONFIG_ARM64)
 /* Time clock 1MHz */
-#define CONFIG_SYS_TIMER_RATE                  1000000
+#define CFG_SYS_TIMER_RATE                     1000000
 #endif
 
 #define CFG_SYS_NAND_REGS_BASE                 0x68100000
        LINUXBOOT_ENV_SETTINGS \
        BOOTENV
 
-#define CONFIG_SYS_BOOTMAPSZ                   0x20000000
+#define CFG_SYS_BOOTMAPSZ                      0x20000000
 
 /* only for SPL */
 
 /* subtract sizeof(struct legacy_img_hdr) */
-#define CONFIG_SYS_UBOOT_BASE                  (0x130000 - 0x40)
+#define CFG_SYS_UBOOT_BASE                     (0x130000 - 0x40)
 
 #endif /* __CONFIG_UNIPHIER_H__ */
index d2fd23e1d91dce37f3f943e829fc0fee45dc9db2..657dbadd3396c5f3b4ad9374204669dbc8ea1e66 100644 (file)
@@ -17,8 +17,8 @@
 #include <asm/hardware.h>
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* 12 MHz crystal */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768
+#define CFG_SYS_AT91_MAIN_CLOCK        12000000        /* 12 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768
 
 /*
  * Hardware drivers
@@ -28,8 +28,8 @@
 #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
+#define CFG_SYS_INIT_RAM_SIZE  (16 * 1024)
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM1
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
index e944e78603e7eec722310d96b96d56b3a89027ee..da68d7a0da994be0459dec82788dc95d1169064a 100644 (file)
@@ -61,7 +61,7 @@
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #endif                         /* __CONFIG_H */
index d9e5dfaceaf8de1e40ce9522d8927bd73293e613..b03159805c150d1d1ebe04efe36f6bb0e6c2b347 100644 (file)
@@ -10,7 +10,7 @@
 
 /* Onboard devices */
 
-#define CONFIG_SYS_INIT_SP_OFFSET       0x400000
+#define CFG_SYS_INIT_SP_OFFSET       0x400000
 
 #define CFG_SYS_NS16550_CLK            CONFIG_SYS_MIPS_TIMER_FREQ
 
index b209d97e5ecb709ae689e3279f531f23c8acb272..18ac6b2b08958c0ea937113e107ddf26c82f16cf 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
@@ -53,8 +53,8 @@
                "${blkcnt} / 0x200; mmc dev 0 1; mmc write ${loadaddr} 0x2 " \
                "${blkcnt}; fi\0"
 
-#define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
+#define CFG_SYS_INIT_RAM_ADDR        0x40000000
+#define CFG_SYS_INIT_RAM_SIZE        SZ_2M
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
index 1b9f2ca26f696e2a2b3bb0a0c9e7dced7bcbd1e2..88839a6e561ac070caf5f22514a37368f9a0bc35 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_UBOOT_BASE  \
+#define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
@@ -65,8 +65,8 @@
                "${blkcnt} / 0x200; mmc dev 2 1; mmc write ${loadaddr} 0x0 " \
                "${blkcnt}; fi\0"
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  SZ_512K
 
 /* i.MX 8M Plus supports max. 8GB memory in two albeit concecutive banks */
 #define CFG_SYS_SDRAM_BASE             0x40000000
index 9a46d50c6f39c00cc1d2e31fac507b2ddc86e030..30c1f5025b05d9a164905f95019e10de0c1ad14d 100644 (file)
                BOOTENV
 
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
-#define CONFIG_SYS_FLASH_BASE          0x08000000
+#define CFG_SYS_FLASH_BASE             0x08000000
 #else
-#define CONFIG_SYS_FLASH_BASE          (V2M_PA_BASE + 0x0C000000)
+#define CFG_SYS_FLASH_BASE             (V2M_PA_BASE + 0x0C000000)
 #endif
 
 #endif /* __VEXPRESS_AEMV8_H */
index de571f63ee125b65c060c61db607eeb3d09be407..e8b6acf8b8feec4e0246c3c11011d0c9c71c9b6e 100644 (file)
 #define SCTL_BASE                      V2M_SYSCTL
 #define VEXPRESS_FLASHPROG_FLVPPEN     (1 << 0)
 
-#define CONFIG_SYS_TIMER_RATE          1000000
-#define CONFIG_SYS_TIMER_COUNTER       (V2M_TIMER01 + 0x4)
+#define CFG_SYS_TIMER_RATE             1000000
+#define CFG_SYS_TIMER_COUNTER  (V2M_TIMER01 + 0x4)
 
 /* PL011 Serial Configuration */
 #define CONFIG_PL011_CLOCK             24000000
-#define CONFIG_PL01x_PORTS             {(void *)CONFIG_SYS_SERIAL0, \
-                                        (void *)CONFIG_SYS_SERIAL1}
+#define CONFIG_PL01x_PORTS             {(void *)CFG_SYS_SERIAL0, \
+                                        (void *)CFG_SYS_SERIAL1}
 
-#define CONFIG_SYS_SERIAL0             V2M_UART0
-#define CONFIG_SYS_SERIAL1             V2M_UART1
+#define CFG_SYS_SERIAL0                V2M_UART0
+#define CFG_SYS_SERIAL1                V2M_UART1
 
 /* Miscellaneous configurable options */
 #define LINUX_BOOT_PARAM_ADDR          (V2M_BASE + 0x2000)
 
 /* additions for new relocation code */
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_RAM_SIZE               0x1000
+#define CFG_SYS_INIT_RAM_SIZE          0x1000
 
 /* Basic environment settings */
 #define BOOT_TARGET_DEVICES(func) \
                "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_FLASH_SIZE          0x04000000
+#define CFG_SYS_FLASH_SIZE             0x04000000
 
 /* Timeout values in ticks */
 
  */
 
 /* Store environment at top of flash */
-#define CONFIG_SYS_FLASH_BANKS_LIST    { V2M_NOR0, V2M_NOR1 }
+#define CFG_SYS_FLASH_BANKS_LIST       { V2M_NOR0, V2M_NOR1 }
 
 #endif /* VEXPRESS_COMMON_H */
index 7b526f725af676c646c6c0971c6ead16d96949eb..14e6b2bac91c00e8e03856f7cbe2a9b06e8895f2 100644 (file)
 #define PHYS_SDRAM_SIZE                        (128 * 1024 * 1024)
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #endif
index df0e269b5d2023edccc992d01fe6a8d627ece1d4..9f72bdde81676b8d322990ac79963476468f3b6a 100644 (file)
@@ -21,7 +21,7 @@
 #define CONFIG_USART_ID                        30
 
 /* Timer */
-#define CONFIG_SYS_TIMER_COUNTER       0xfc06863c
+#define CFG_SYS_TIMER_COUNTER  0xfc06863c
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE           0x20000000
@@ -31,7 +31,7 @@
 
 #ifdef CONFIG_CMD_MMC
 #define ATMEL_BASE_MMCI                        0xfc000000
-#define CONFIG_SYS_MMC_CLK_OD          500000
+#define CFG_SYS_MMC_CLK_OD             500000
 
 /* For generating MMC partitions */
 
index 7555d97c81482fa6d446bd41bc804bacd29043db..ab5cd5cf6365257bb9dbc5a86b04a1e8fcd6975b 100644 (file)
@@ -24,8 +24,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR
index 38b940d35ea89f7fd289e566df40dfd49bcf337d..43050d61c37eed83940403f3a6839e9d24a79ad8 100644 (file)
@@ -9,14 +9,14 @@
 /* RAM */
 #define CFG_SYS_SDRAM_BASE             0x80000000
 
-#define CONFIG_SYS_INIT_SP_OFFSET      0x400000
+#define CFG_SYS_INIT_SP_OFFSET 0x400000
 
 /* SPL */
 
-#define CONFIG_SYS_UBOOT_START         CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_START            CONFIG_TEXT_BASE
 
 /* Dummy value */
-#define CONFIG_SYS_UBOOT_BASE          0
+#define CFG_SYS_UBOOT_BASE             0
 
 /* Serial SPL */
 #define CFG_SYS_NS16550_CLK            40000000
index 3acef22132735416fa5600f97fbc409827587045..23027b1d3d9e8d83857a55f1fe629c807a9529e1 100644 (file)
@@ -90,8 +90,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment organization */
 
index cba215c379fdbfc10f170ee4a1979ae02fc0c4ef..56c90aa1032e98b22d9e7a0660cf1293ed165f39 100644 (file)
@@ -85,8 +85,8 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* environment organization */
 
index 32555c9b6af1ceffec149d61ff9c5fbb6bc93ab5..065006f912c85377344259e11811a0b7370b437c 100644 (file)
@@ -42,7 +42,7 @@
  */
 
 /* driver configuration */
-#define CONFIG_SYS_MAX_NAND_CHIPS 1
+#define CFG_SYS_MAX_NAND_CHIPS 1
 #define CFG_SYS_NAND_BASE MLC_NAND_BASE
 
 /*
index a0162cab219042475468a8d48a633cf8a26c19c8..dee87cb77325d8ba48720cc26f75a179054e280f 100644 (file)
@@ -13,7 +13,7 @@
 /*
  * NS16550 Configuration
  */
-#define CFG_SYS_NS16550_CLK            CONFIG_SYS_TCLK
+#define CFG_SYS_NS16550_CLK            CFG_SYS_TCLK
 #if !defined(CONFIG_DM_SERIAL)
 #define CFG_SYS_NS16550_COM1           MV_UART_CONSOLE_BASE
 #endif
index f76c1f8be0fd4ae79cf4ac987a31eae477744c73..3e17b53dde2dc23e937f35a44a57ee471f86b5be 100644 (file)
@@ -30,7 +30,7 @@
  * CPU Features
  */
 
-#define CONFIG_SYS_STACK_SIZE                  (32 * 1024)
+#define CFG_SYS_STACK_SIZE                     (32 * 1024)
 
 /*-----------------------------------------------------------------------
  * Environment configuration
index 87f628d4ab8e96f347b389d006bc49c342e41dd9..b432ab2dc8ef4212c6c01285f64fe00841ae63b7 100644 (file)
@@ -16,9 +16,9 @@
 
 /* SPL */
 
-#define CONFIG_SYS_SPI_KERNEL_OFFS     SZ_1M
-#define CONFIG_SYS_SPI_ARGS_OFFS       SZ_512K
-#define CONFIG_SYS_SPI_ARGS_SIZE       SZ_32K
+#define CFG_SYS_SPI_KERNEL_OFFS        SZ_1M
+#define CFG_SYS_SPI_ARGS_OFFS  SZ_512K
+#define CFG_SYS_SPI_ARGS_SIZE  SZ_32K
 
 /* Memory configuration */
 #define PHYS_SDRAM_1                   0x40000000      /* Base address */
index 8caf5394ed46bda44edf0175236bec34909bbcb9..ee3130ed327737c46f473cb197bb9cab7cd9b9d6 100644 (file)
@@ -15,7 +15,7 @@
 #define GICR_BASE      0xF9080000
 
 /* Serial setup */
-#define CONFIG_SYS_BAUDRATE_TABLE \
+#define CFG_SYS_BAUDRATE_TABLE \
        { 4800, 9600, 19200, 38400, 57600, 115200 }
 
 /* GUID for capsule updatable firmware image */
index 0ccd38b7e692a071077dcb6396dafd5091895b19..7d77189693e2cf946390b4c41c5db201e04bf5f5 100644 (file)
@@ -20,7 +20,7 @@
 #define GICR_BASE      0xF9060000
 
 /* Serial setup */
-#define CONFIG_SYS_BAUDRATE_TABLE \
+#define CFG_SYS_BAUDRATE_TABLE \
        { 4800, 9600, 19200, 38400, 57600, 115200 }
 
 #if defined(CONFIG_CMD_DFU)
index 60f007a10fcd25991af5da7ccd71de816272b84b..efe241df97eb2166f0f9ef467a965e9fc9ed4f57 100644 (file)
@@ -15,7 +15,7 @@
 #define GICC_BASE      0xF9020000
 
 /* Serial setup */
-#define CONFIG_SYS_BAUDRATE_TABLE \
+#define CFG_SYS_BAUDRATE_TABLE \
        { 4800, 9600, 19200, 38400, 57600, 115200 }
 
 /* GUIDs for capsule updatable firmware images */
 #endif
 
 #if defined(CONFIG_SPL_SPI_FLASH_SUPPORT)
-# define CONFIG_SYS_SPI_KERNEL_OFFS    0x80000
-# define CONFIG_SYS_SPI_ARGS_OFFS      0xa0000
-# define CONFIG_SYS_SPI_ARGS_SIZE      0xa0000
+# define CFG_SYS_SPI_KERNEL_OFFS       0x80000
+# define CFG_SYS_SPI_ARGS_OFFS 0xa0000
+# define CFG_SYS_SPI_ARGS_SIZE 0xa0000
 #endif
 
 /* u-boot is like dtb */
index b6bc402a7e979210d02c4f12335b99fc69087c60..3a7b7e03d6af567480dc231df5c32c192ef8cd19 100644 (file)
 
 /* Serial drivers */
 /* The following table includes the supported baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE  \
+#define CFG_SYS_BAUDRATE_TABLE  \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
 /* Boot configuration */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0xFFFF0000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CFG_SYS_INIT_RAM_ADDR  0xFFFF0000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
 
 /* Extend size of kernel image for uncompression */
 
index 613ed9595532ccba52d9b6fb7541c984c3f45f32..3e604894ad487e6bfdea51a656db69e716a131af 100644 (file)
@@ -22,8 +22,8 @@
 #define PHYS_SDRAM_SIZE                        (128 << 20)
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment is in stored in the eMMC boot partition */
 
index 8739bb24841eb683d17dcab8ab93619416c93477..9201dac7abce26e07a902236798c4aef28d2aad4 100644 (file)
 /*===================*/
 
 #if XCHAL_HAVE_PTP_MMU
-#define CONFIG_SYS_MEMORY_BASE         \
+#define CFG_SYS_MEMORY_BASE            \
        (XCHAL_VECBASE_RESET_VADDR - XCHAL_VECBASE_RESET_PADDR)
-#define CONFIG_SYS_IO_BASE             0xf0000000
+#define CFG_SYS_IO_BASE                0xf0000000
 #else
-#define CONFIG_SYS_MEMORY_BASE         0x60000000
-#define CONFIG_SYS_IO_BASE             0x90000000
+#define CFG_SYS_MEMORY_BASE            0x60000000
+#define CFG_SYS_IO_BASE                0x90000000
 #define CONFIG_MAX_MEM_MAPPED          0x10000000
 #endif
 
  */
 
 /* FPGA core clock frequency in Hz (also input to UART) */
-#define CONFIG_SYS_FPGAREG_FREQ        IOADDR(0x0D020004)      /* CPU clock frequency*/
+#define CFG_SYS_FPGAREG_FREQ   IOADDR(0x0D020004)      /* CPU clock frequency*/
 
 /*
  * DIP switch (left=sw1=lsb=bit0, right=sw8=msb=bit7; off=0, on=1):
  *   Bits 0..5 set the lower 6 bits of the default ethernet MAC.
  *   Bit 6 is reserved for future use by Tensilica.
- *   Bit 7 maps the first 128KB of ROM address space at CONFIG_SYS_ROM_BASE to
+ *   Bit 7 maps the first 128KB of ROM address space at CFG_SYS_ROM_BASE to
  *   the base of flash * (when on/1) or to the base of RAM (when off/0).
  */
-#define CONFIG_SYS_FPGAREG_DIPSW       IOADDR(0x0D02000C)
+#define CFG_SYS_FPGAREG_DIPSW  IOADDR(0x0D02000C)
 #define FPGAREG_MAC_SHIFT              0       /* Ethernet MAC bits 0..5 */
 #define FPGAREG_MAC_WIDTH              6
 #define FPGAREG_MAC_MASK               0x3f
 #define FPGAREG_BOOT_FLASH             (1<<FPGAREG_BOOT_SHIFT)
 
 /* Force hard reset of board by writing a code to this register */
-#define CONFIG_SYS_FPGAREG_RESET       IOADDR(0x0D020010) /* Reset board .. */
-#define CONFIG_SYS_FPGAREG_RESET_CODE  0x0000DEAD   /*  by writing this code */
+#define CFG_SYS_FPGAREG_RESET  IOADDR(0x0D020010) /* Reset board .. */
+#define CFG_SYS_FPGAREG_RESET_CODE     0x0000DEAD   /*  by writing this code */
 
 /*====================*/
 /* Serial Driver Info */
 /*======================*/
 
 #define CONFIG_ETHBASE                 00:50:C2:13:6f:00
-#define CONFIG_SYS_ETHOC_BASE          IOADDR(0x0d030000)
-#define CONFIG_SYS_ETHOC_BUFFER_ADDR   IOADDR(0x0D800000)
+#define CFG_SYS_ETHOC_BASE             IOADDR(0x0d030000)
+#define CFG_SYS_ETHOC_BUFFER_ADDR      IOADDR(0x0D800000)
 
 /*=====================*/
 /* Flash & Environment */
 /*=====================*/
 
 #ifdef CONFIG_XTFPGA_LX60
-# define CONFIG_SYS_FLASH_SIZE         0x0040000       /* 4MB */
-# define CONFIG_SYS_FLASH_PARMSECT_SZ  0x2000          /* param size  8KB */
-# define CONFIG_SYS_FLASH_BASE         IOADDR(0x08000000)
+# define CFG_SYS_FLASH_SIZE            0x0040000       /* 4MB */
+# define CFG_SYS_FLASH_PARMSECT_SZ     0x2000          /* param size  8KB */
+# define CFG_SYS_FLASH_BASE            IOADDR(0x08000000)
 #elif defined(CONFIG_XTFPGA_KC705)
-# define CONFIG_SYS_FLASH_SIZE         0x8000000       /* 128MB */
-# define CONFIG_SYS_FLASH_PARMSECT_SZ  0x8000          /* param size 32KB */
-# define CONFIG_SYS_FLASH_BASE         IOADDR(0x00000000)
+# define CFG_SYS_FLASH_SIZE            0x8000000       /* 128MB */
+# define CFG_SYS_FLASH_PARMSECT_SZ     0x8000          /* param size 32KB */
+# define CFG_SYS_FLASH_BASE            IOADDR(0x00000000)
 #else
-# define CONFIG_SYS_FLASH_SIZE         0x1000000       /* 16MB */
-# define CONFIG_SYS_FLASH_PARMSECT_SZ  0x8000          /* param size 32KB */
-# define CONFIG_SYS_FLASH_BASE         IOADDR(0x08000000)
+# define CFG_SYS_FLASH_SIZE            0x1000000       /* 16MB */
+# define CFG_SYS_FLASH_PARMSECT_SZ     0x8000          /* param size 32KB */
+# define CFG_SYS_FLASH_BASE            IOADDR(0x08000000)
 #endif
 
 /*
index 2d6522af81b843d7efe2b597acc77105e74bb5b7..b8c142fed37b88f752cc45ce0fe6f767d965c9b4 100644 (file)
 
 /* Cache options */
 #ifndef CONFIG_SYS_L2CACHE_OFF
-# define CONFIG_SYS_PL310_BASE         0xf8f02000
+# define CFG_SYS_PL310_BASE            0xf8f02000
 #endif
 
 #define ZYNQ_SCUTIMER_BASEADDR         0xF8F00600
-#define CONFIG_SYS_TIMERBASE           ZYNQ_SCUTIMER_BASEADDR
-#define CONFIG_SYS_TIMER_COUNTER       (CONFIG_SYS_TIMERBASE + 0x4)
+#define CFG_SYS_TIMERBASE              ZYNQ_SCUTIMER_BASEADDR
+#define CFG_SYS_TIMER_COUNTER  (CFG_SYS_TIMERBASE + 0x4)
 
 /* GUIDs for capsule updatable firmware images */
 #define XILINX_BOOT_IMAGE_GUID \
@@ -29,7 +29,7 @@
 
 /* Serial drivers */
 /* The following table includes the supported baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE  \
+#define CFG_SYS_BAUDRATE_TABLE  \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
 /* Ethernet driver */
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0xFFFF0000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x2000
+#define CFG_SYS_INIT_RAM_ADDR  0xFFFF0000
+#define CFG_SYS_INIT_RAM_SIZE  0x2000
 
 
 /* Extend size of kernel image for uncompression */
 
 /* qspi mode is working fine */
 #ifdef CONFIG_ZYNQ_QSPI
-#define CONFIG_SYS_SPI_ARGS_OFFS       0x200000
-#define CONFIG_SYS_SPI_ARGS_SIZE       0x80000
-#define CONFIG_SYS_SPI_KERNEL_OFFS     (CONFIG_SYS_SPI_ARGS_OFFS + \
-                                       CONFIG_SYS_SPI_ARGS_SIZE)
+#define CFG_SYS_SPI_ARGS_OFFS  0x200000
+#define CFG_SYS_SPI_ARGS_SIZE  0x80000
+#define CFG_SYS_SPI_KERNEL_OFFS        (CFG_SYS_SPI_ARGS_OFFS + \
+                                       CFG_SYS_SPI_ARGS_SIZE)
 #endif
 
 /* SP location before relocation, must use scratch RAM */
index cb982c2e74f6f9deeef3ad0fd5d32d4c72faf981..ac6e8c4ff86709124bad48f0b3c4c374e8392942 100644 (file)
@@ -14,9 +14,9 @@
 /* Undef unneeded configs */
 #undef CONFIG_EXTRA_ENV_SETTINGS
 
-#undef CONFIG_SYS_INIT_RAM_ADDR
-#undef CONFIG_SYS_INIT_RAM_SIZE
-#define CONFIG_SYS_INIT_RAM_ADDR       0xFFFDE000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#undef CFG_SYS_INIT_RAM_ADDR
+#undef CFG_SYS_INIT_RAM_SIZE
+#define CFG_SYS_INIT_RAM_ADDR  0xFFFDE000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
 
 #endif /* __CONFIG_ZYNQ_CSE_H */
index 07a46a4a1b0adf9b7d5acc458e11f27bb5102856..c701dc1084b9fb9c4fbbf7395e3a8ca1465d0f6a 100644 (file)
@@ -66,7 +66,7 @@ int get_mc_boot_status(void);
 int get_dpl_apply_status(void);
 int is_lazy_dpl_addr_valid(void);
 void fdt_fixup_mc_ddr(u64 *base, u64 *size);
-#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+#ifdef CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
 int get_aiop_apply_status(void);
 #endif
 u64 mc_get_dram_addr(void);
index 9f243cd945777501c31a8cc45860f4a86c316db0..de1e70a6d0ba1be32cea498f402703a7b1746a89 100644 (file)
@@ -801,7 +801,7 @@ void init_final_memctl_regs(void);
 #define IFC_RREGS_64KOFFSET    (64*1024)
 
 #define IFC_FCM_BASE_ADDR \
-       ((struct fsl_ifc_fcm *)CONFIG_SYS_IFC_ADDR)
+       ((struct fsl_ifc_fcm *)CFG_SYS_IFC_ADDR)
 
 #define get_ifc_cspr_ext(i)    \
                (ifc_in32(&(IFC_FCM_BASE_ADDR)->cspr_cs[i].cspr_ext))
index c07e60b04bd0688ed3b8f1e2f27c1c2428963e7e..51390f8fd84f329cab5ee7b582be4b94260ab982 100644 (file)
@@ -633,10 +633,10 @@ void i2c_early_init_f(void);
  */
 #define I2C_RXTX_LEN   128     /* maximum tx/rx buffer length */
 
-#if !defined(CONFIG_SYS_I2C_MAX_HOPS)
+#if !defined(CFG_SYS_I2C_MAX_HOPS)
 /* no muxes used bus = i2c adapters */
 #define CONFIG_SYS_I2C_DIRECT_BUS      1
-#define CONFIG_SYS_I2C_MAX_HOPS                0
+#define CFG_SYS_I2C_MAX_HOPS           0
 #define CFG_SYS_NUM_I2C_BUSES  ll_entry_count(struct i2c_adapter, i2c)
 #else
 /* we use i2c muxes */
@@ -644,8 +644,8 @@ void i2c_early_init_f(void);
 #endif
 
 /* define the I2C bus number for RTC and DTT if not already done */
-#if !defined(CONFIG_SYS_RTC_BUS_NUM)
-#define CONFIG_SYS_RTC_BUS_NUM         0
+#if !defined(CFG_SYS_RTC_BUS_NUM)
+#define CFG_SYS_RTC_BUS_NUM            0
 #endif
 
 struct i2c_adapter {
@@ -705,7 +705,7 @@ struct i2c_next_hop {
 
 struct i2c_bus_hose {
        int     adapter;
-       struct i2c_next_hop     next_hop[CONFIG_SYS_I2C_MAX_HOPS];
+       struct i2c_next_hop     next_hop[CFG_SYS_I2C_MAX_HOPS];
 };
 #define I2C_NULL_HOP   {{-1, ""}, 0, 0}
 extern struct i2c_bus_hose     i2c_bus[];
@@ -931,12 +931,12 @@ unsigned int i2c_get_bus_speed(void);
  * completely to new multibus support.
  */
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS)
-# if !defined(CONFIG_SYS_MAX_I2C_BUS)
-#  define CONFIG_SYS_MAX_I2C_BUS               2
+# if !defined(CFG_SYS_MAX_I2C_BUS)
+#  define CFG_SYS_MAX_I2C_BUS          2
 # endif
 # define I2C_MULTI_BUS                         1
 #else
-# define CONFIG_SYS_MAX_I2C_BUS                1
+# define CFG_SYS_MAX_I2C_BUS           1
 # define I2C_MULTI_BUS                         0
 #endif
 
index 053b68a10a4a61b50f0d3f30b37b4929bb01d9e1..636734dd3c63afc8595b22e890e20579513a458b 100644 (file)
  * Define default values for some CCSR macros to make header files cleaner*
  *
  * To completely disable CCSR relocation in a board header file, define
- * CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE.  This will force CONFIG_SYS_CCSRBAR_PHYS
- * to a value that is the same as CONFIG_SYS_CCSRBAR.
+ * CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE.  This will force CFG_SYS_CCSRBAR_PHYS
+ * to a value that is the same as CFG_SYS_CCSRBAR.
  */
 
-#ifdef CONFIG_SYS_CCSRBAR_PHYS
-#error "Do not define CONFIG_SYS_CCSRBAR_PHYS directly.  Use \
-CONFIG_SYS_CCSRBAR_PHYS_LOW and/or CONFIG_SYS_CCSRBAR_PHYS_HIGH instead."
+#ifdef CFG_SYS_CCSRBAR_PHYS
+#error "Do not define CFG_SYS_CCSRBAR_PHYS directly.  Use \
+CFG_SYS_CCSRBAR_PHYS_LOW and/or CFG_SYS_CCSRBAR_PHYS_HIGH instead."
 #endif
 
 #if CONFIG_IS_ENABLED(SYS_CCSR_DO_NOT_RELOCATE)
-#undef CONFIG_SYS_CCSRBAR_PHYS_HIGH
-#undef CONFIG_SYS_CCSRBAR_PHYS_LOW
-#define CONFIG_SYS_CCSRBAR_PHYS_HIGH   0
+#undef CFG_SYS_CCSRBAR_PHYS_HIGH
+#undef CFG_SYS_CCSRBAR_PHYS_LOW
+#define CFG_SYS_CCSRBAR_PHYS_HIGH      0
 #endif
 
-#ifndef CONFIG_SYS_CCSRBAR
-#define CONFIG_SYS_CCSRBAR             CONFIG_SYS_CCSRBAR_DEFAULT
+#ifndef CFG_SYS_CCSRBAR
+#define CFG_SYS_CCSRBAR                CONFIG_SYS_CCSRBAR_DEFAULT
 #endif
 
-#ifndef CONFIG_SYS_CCSRBAR_PHYS_HIGH
+#ifndef CFG_SYS_CCSRBAR_PHYS_HIGH
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_CCSRBAR_PHYS_HIGH   0xf
+#define CFG_SYS_CCSRBAR_PHYS_HIGH      0xf
 #else
-#define CONFIG_SYS_CCSRBAR_PHYS_HIGH   0
+#define CFG_SYS_CCSRBAR_PHYS_HIGH      0
 #endif
 #endif
 
-#ifndef CONFIG_SYS_CCSRBAR_PHYS_LOW
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR_DEFAULT
+#ifndef CFG_SYS_CCSRBAR_PHYS_LOW
+#define CFG_SYS_CCSRBAR_PHYS_LOW       CONFIG_SYS_CCSRBAR_DEFAULT
 #endif
 
-#define CONFIG_SYS_CCSRBAR_PHYS ((CONFIG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
-                                CONFIG_SYS_CCSRBAR_PHYS_LOW)
+#define CFG_SYS_CCSRBAR_PHYS ((CFG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
+                                CFG_SYS_CCSRBAR_PHYS_LOW)
 
 #endif /* __MPC85xx_H__ */
index 9fe47480325354270ec9b5cee7194b7d1025464d..ea8d17d557e463996ff13f8640b7e48f056cdf1a 100644 (file)
@@ -16,9 +16,9 @@
  * platform register addresses
  */
 
-#define GUTS_SVR       (CONFIG_SYS_CCSRBAR + 0xE00A4)
-#define MCM_ABCR       (CONFIG_SYS_CCSRBAR + 0x01000)
-#define MCM_DBCR       (CONFIG_SYS_CCSRBAR + 0x01008)
+#define GUTS_SVR       (CFG_SYS_CCSRBAR + 0xE00A4)
+#define MCM_ABCR       (CFG_SYS_CCSRBAR + 0x01000)
+#define MCM_DBCR       (CFG_SYS_CCSRBAR + 0x01008)
 
 /*
  * l2cr values.  Look in config_<BOARD>.h for the actual setup
index 1321da191028f6245d1562595873f241c63aae78..52cd1c4dbc4e06eff6d0a3b276cf18153a1dec47 100644 (file)
@@ -147,8 +147,8 @@ struct cfi_pri_hdr {
        u8      minor_version;
 } __attribute__((packed));
 
-#ifndef CONFIG_SYS_FLASH_BANKS_LIST
-#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
+#ifndef CFG_SYS_FLASH_BANKS_LIST
+#define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE }
 #endif
 
 /*
index e75c3fa32891a82c027e7fc045145e76a8d98c2e..0f6f5c23dee672fd83ab55d40fdfc5c3a847afc4 100644 (file)
@@ -21,7 +21,7 @@
 
 #define MVEBU_MMC_CLOCKRATE_MAX                        50000000
 #define MVEBU_MMC_BASE_DIV_MAX                 0x7ff
-#define MVEBU_MMC_BASE_FAST_CLOCK              CONFIG_SYS_TCLK
+#define MVEBU_MMC_BASE_FAST_CLOCK              CFG_SYS_TCLK
 #define MVEBU_MMC_BASE_FAST_CLK_100            100000000
 #define MVEBU_MMC_BASE_FAST_CLK_200            200000000
 
index ec03556e917ec2a4a5e2e51ee91bfb8bf4c6b1bc..867a66f3007a64cdd09bf7a11cb09864ce0656ea 100644 (file)
@@ -142,7 +142,7 @@ extern int memory_post_test(int flags);
 
 #define CONFIG_SYS_POST_RTC            0x00000001
 #define CONFIG_SYS_POST_WATCHDOG       0x00000002
-#define CONFIG_SYS_POST_MEMORY         0x00000004
+#define CFG_SYS_POST_MEMORY            0x00000004
 #define CONFIG_SYS_POST_CPU            0x00000008
 #define CONFIG_SYS_POST_I2C            0x00000010
 #define CONFIG_SYS_POST_CACHE          0x00000020
@@ -163,7 +163,7 @@ extern int memory_post_test(int flags);
 #define CONFIG_SYS_POST_CODEC          0x00200000
 #define CONFIG_SYS_POST_COPROC         0x00400000
 #define CONFIG_SYS_POST_FLASH          0x00800000
-#define CONFIG_SYS_POST_MEM_REGIONS    0x01000000
+#define CFG_SYS_POST_MEM_REGIONS       0x01000000
 
 #endif /* CONFIG_POST */
 
index 3eb27de616666231bba338bf53282ac14f80adc5..fb8c279d7264fadfe44335d4043ac8134bca5542 100644 (file)
@@ -470,7 +470,7 @@ void spl_set_bd(void);
  * spl_set_header_raw_uboot() - Set up a standard SPL image structure
  *
  * This sets up the given spl_image which the standard values obtained from
- * config options: CONFIG_SYS_MONITOR_LEN, CONFIG_SYS_UBOOT_START,
+ * config options: CONFIG_SYS_MONITOR_LEN, CFG_SYS_UBOOT_START,
  * CONFIG_TEXT_BASE.
  *
  * @spl_image: Image description to set up
index 07c3505e8f586909e7f9cfef80f0608d82e4af46..0d6b71b35a068a0f0b35b3ec5840800e13df831e 100644 (file)
 #define SYS_INIT_SP_ADDR       CONFIG_CUSTOM_SYS_INIT_SP_ADDR
 #else
 #ifdef CONFIG_MIPS
-#define SYS_INIT_SP_ADDR       (CFG_SYS_SDRAM_BASE + CONFIG_SYS_INIT_SP_OFFSET)
+#define SYS_INIT_SP_ADDR       (CFG_SYS_SDRAM_BASE + CFG_SYS_INIT_SP_OFFSET)
 #else
 #define SYS_INIT_SP_ADDR       \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+       (CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #endif
 #endif
 
index bda86c1ed88313359aa980e4bdfa5fabaf0d4c18..c0a3cef5bd5f39f2929c749b8786a2d062f205a2 100644 (file)
@@ -41,13 +41,13 @@ enum {
 #define TCA642X_DIR_IN         1
 
 /* Default to an address that hopefully won't corrupt other i2c devices */
-#ifndef CONFIG_SYS_I2C_TCA642X_ADDR
-#define CONFIG_SYS_I2C_TCA642X_ADDR    (~0)
+#ifndef CFG_SYS_I2C_TCA642X_ADDR
+#define CFG_SYS_I2C_TCA642X_ADDR       (~0)
 #endif
 
 /* Default to an address that hopefully won't corrupt other i2c devices */
-#ifndef CONFIG_SYS_I2C_TCA642X_BUS_NUM
-#define CONFIG_SYS_I2C_TCA642X_BUS_NUM (0)
+#ifndef CFG_SYS_I2C_TCA642X_BUS_NUM
+#define CFG_SYS_I2C_TCA642X_BUS_NUM    (0)
 #endif
 
 struct tca642x_bank_info {
index 72f34851ad19e4fda2eb76e11d9f3792a05dd947..de279b211718d242571dbbe64806c766da60230f 100644 (file)
 
 #define RCTRL_PROM             0x00000008
 
-#ifndef CONFIG_SYS_TBIPA_VALUE
-# define CONFIG_SYS_TBIPA_VALUE        0x1f
+#ifndef CFG_SYS_TBIPA_VALUE
+# define CFG_SYS_TBIPA_VALUE   0x1f
 #endif
 
 #define MRBLR_INIT_SETTINGS    PKTSIZE_ALIGN
index f3aaf472d10384e8b03ca8d60a217498f28b5e76..82350260eac4eef9ed165e19b672870869ad5d5b 100644 (file)
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_SYS_TIMER_RATE
+#ifdef CFG_SYS_TIMER_RATE
 /* Returns tick rate in ticks per second */
 ulong notrace get_tbclk(void)
 {
-       return CONFIG_SYS_TIMER_RATE;
+       return CFG_SYS_TIMER_RATE;
 }
 #endif
 
-#ifdef CONFIG_SYS_TIMER_COUNTER
+#ifdef CFG_SYS_TIMER_COUNTER
 unsigned long notrace timer_read_counter(void)
 {
 #ifdef CONFIG_SYS_TIMER_COUNTS_DOWN
-       return ~readl(CONFIG_SYS_TIMER_COUNTER);
+       return ~readl(CFG_SYS_TIMER_COUNTER);
 #else
-       return readl(CONFIG_SYS_TIMER_COUNTER);
+       return readl(CFG_SYS_TIMER_COUNTER);
 #endif
 }
 
@@ -47,8 +47,8 @@ ulong timer_get_boot_us(void)
 {
        ulong count = timer_read_counter();
 
-#ifdef CONFIG_SYS_TIMER_RATE
-       const ulong timer_rate = CONFIG_SYS_TIMER_RATE;
+#ifdef CFG_SYS_TIMER_RATE
+       const ulong timer_rate = CFG_SYS_TIMER_RATE;
 
        if (timer_rate == 1000000)
                return count;
index 8deac75ebb056244d0b0b9dffb97e7932e6de96f..71dad7b8c026acead080f32bae71d51c024184ce 100644 (file)
 #include <post.h>
 #include <watchdog.h>
 
-#if CONFIG_POST & (CONFIG_SYS_POST_MEMORY | CONFIG_SYS_POST_MEM_REGIONS)
+#if CONFIG_POST & (CFG_SYS_POST_MEMORY | CFG_SYS_POST_MEM_REGIONS)
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -535,4 +535,4 @@ int memory_post_test(int flags)
        return ret;
 }
 
-#endif /* CONFIG_POST&(CONFIG_SYS_POST_MEMORY|CONFIG_SYS_POST_MEM_REGIONS) */
+#endif /* CONFIG_POST&(CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS) */
index 5c019b643df9d16543bfdc79353572c687818383..fc36e738f7316f49581134cd9c10ea078a3d648f 100644 (file)
@@ -109,7 +109,7 @@ struct post_test post_list[] =
        CONFIG_SYS_POST_RTC
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_MEMORY
+#if CONFIG_POST & CFG_SYS_POST_MEMORY
     {
        "Memory test",
        "memory",
@@ -118,7 +118,7 @@ struct post_test post_list[] =
        &memory_post_test,
        NULL,
        NULL,
-       CONFIG_SYS_POST_MEMORY
+       CFG_SYS_POST_MEMORY
     },
 #endif
 #if CONFIG_POST & CONFIG_SYS_POST_CPU
@@ -286,7 +286,7 @@ struct post_test post_list[] =
        CONFIG_SYS_POST_FLASH
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_MEM_REGIONS
+#if CONFIG_POST & CFG_SYS_POST_MEM_REGIONS
     {
        "Memory regions test",
        "mem_regions",
@@ -295,7 +295,7 @@ struct post_test post_list[] =
        &memory_regions_post_test,
        NULL,
        NULL,
-       CONFIG_SYS_POST_MEM_REGIONS
+       CFG_SYS_POST_MEM_REGIONS
     },
 #endif
 };
index bce77902476d65c4762980d3ea9fcbb4141f35c7..a021c785aeed25fbd90e06f9682c6db1d19bca2c 100644 (file)
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CONFIG_ENV_ADDR
-#  define CONFIG_ENV_ADDR      (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
+#  define CONFIG_ENV_ADDR      (CFG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
 # endif
 # ifndef  CONFIG_ENV_OFFSET
-#  define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
+#  define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_SYS_FLASH_BASE)
 # endif
 # if !defined(CONFIG_ENV_ADDR_REDUND) && defined(CONFIG_ENV_OFFSET_REDUND)
-#  define CONFIG_ENV_ADDR_REDUND       (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET_REDUND)
+#  define CONFIG_ENV_ADDR_REDUND       (CFG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET_REDUND)
 # endif
 # ifndef  CONFIG_ENV_SIZE
 #  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE