From 2e07c249a67e055db294818ff063d502d15db0f8 Mon Sep 17 00:00:00 2001 From: Georges Savoundararadj <savoundg@gmail.com> Date: Tue, 28 Oct 2014 23:16:09 +0100 Subject: [PATCH] kconfig: arm: introduce symbol for ARM CPUs This commit introduces a Kconfig symbol for each ARM CPU: CPU_ARM720T, CPU_ARM920T, CPU_ARM926EJS, CPU_ARM946ES, CPU_ARM1136, CPU_ARM1176, CPU_V7, CPU_PXA, CPU_SA1100. Also, it adds the CPU feature Kconfig symbol HAS_VBAR which is selected for CPU_ARM1176 and CPU_V7. For each target, the corresponding CPU is selected and the definition of SYS_CPU in the corresponding Kconfig file is removed. Also, it removes redundant "string" type in some Kconfig files. Signed-off-by: Georges Savoundararadj <savoundg@gmail.com> Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> --- arch/arm/Kconfig | 212 +++++++++++++++++++++++ arch/arm/cpu/arm926ejs/davinci/Kconfig | 3 - arch/arm/cpu/arm926ejs/kirkwood/Kconfig | 3 - arch/arm/cpu/arm926ejs/nomadik/Kconfig | 3 - arch/arm/cpu/arm926ejs/orion5x/Kconfig | 3 - arch/arm/cpu/arm926ejs/versatile/Kconfig | 3 - arch/arm/cpu/armv7/exynos/Kconfig | 3 - arch/arm/cpu/armv7/highbank/Kconfig | 3 - arch/arm/cpu/armv7/keystone/Kconfig | 3 - arch/arm/cpu/armv7/omap3/Kconfig | 3 - arch/arm/cpu/armv7/omap4/Kconfig | 3 - arch/arm/cpu/armv7/omap5/Kconfig | 3 - arch/arm/cpu/armv7/rmobile/Kconfig | 3 - arch/arm/cpu/armv7/s5pc1xx/Kconfig | 3 - arch/arm/cpu/armv7/uniphier/Kconfig | 6 - arch/arm/cpu/armv7/zynq/Kconfig | 3 - board/BuR/kwb/Kconfig | 3 - board/BuR/tseries/Kconfig | 3 - board/BuS/eb_cpux9k2/Kconfig | 3 - board/BuS/vl_ma2sc/Kconfig | 3 - board/CarMediaLab/flea3/Kconfig | 3 - board/Marvell/aspenite/Kconfig | 3 - board/Marvell/dkb/Kconfig | 3 - board/Marvell/gplugd/Kconfig | 3 - board/afeb9260/Kconfig | 3 - board/altera/socfpga/Kconfig | 3 - board/aristainetos/Kconfig | 3 - board/armadeus/apf27/Kconfig | 3 - board/armltd/integrator/Kconfig | 24 --- board/armltd/vexpress/Kconfig | 9 - board/atmel/at91rm9200ek/Kconfig | 3 - board/atmel/at91sam9260ek/Kconfig | 3 - board/atmel/at91sam9261ek/Kconfig | 3 - board/atmel/at91sam9263ek/Kconfig | 3 - board/atmel/at91sam9m10g45ek/Kconfig | 3 - board/atmel/at91sam9n12ek/Kconfig | 3 - board/atmel/at91sam9rlek/Kconfig | 3 - board/atmel/at91sam9x5ek/Kconfig | 3 - board/atmel/sama5d3_xplained/Kconfig | 3 - board/atmel/sama5d3xek/Kconfig | 3 - board/bachmann/ot1200/Kconfig | 3 - board/balloon3/Kconfig | 3 - board/barco/titanium/Kconfig | 3 - board/bluegiga/apx4devkit/Kconfig | 3 - board/bluewater/snapper9260/Kconfig | 3 - board/boundary/nitrogen6x/Kconfig | 3 - board/broadcom/bcm28155_ap/Kconfig | 3 - board/broadcom/bcm958300k/Kconfig | 3 - board/broadcom/bcm958622hr/Kconfig | 3 - board/calao/sbc35_a9g20/Kconfig | 3 - board/calao/tny_a9260/Kconfig | 3 - board/calao/usb_a9263/Kconfig | 3 - board/cirrus/edb93xx/Kconfig | 3 - board/cm4008/Kconfig | 3 - board/cm41xx/Kconfig | 3 - board/compulab/cm_fx6/Kconfig | 8 - board/compulab/cm_t335/Kconfig | 3 - board/congatec/cgtqmx6eval/Kconfig | 3 - board/creative/xfi3/Kconfig | 3 - board/davedenx/qong/Kconfig | 3 - board/denx/m28evk/Kconfig | 3 - board/denx/m53evk/Kconfig | 3 - board/egnite/ethernut5/Kconfig | 3 - board/embest/mx6boards/Kconfig | 3 - board/esd/meesc/Kconfig | 3 - board/esd/otc570/Kconfig | 3 - board/esg/ima3-mx53/Kconfig | 3 - board/eukrea/cpu9260/Kconfig | 3 - board/eukrea/cpuat91/Kconfig | 3 - board/faraday/a320evb/Kconfig | 3 - board/freescale/ls1021aqds/Kconfig | 3 - board/freescale/ls1021atwr/Kconfig | 3 - board/freescale/mx23evk/Kconfig | 3 - board/freescale/mx25pdk/Kconfig | 3 - board/freescale/mx28evk/Kconfig | 3 - board/freescale/mx31ads/Kconfig | 3 - board/freescale/mx31pdk/Kconfig | 3 - board/freescale/mx35pdk/Kconfig | 3 - board/freescale/mx51evk/Kconfig | 3 - board/freescale/mx53ard/Kconfig | 3 - board/freescale/mx53evk/Kconfig | 3 - board/freescale/mx53loco/Kconfig | 3 - board/freescale/mx53smd/Kconfig | 3 - board/freescale/mx6qarm2/Kconfig | 3 - board/freescale/mx6qsabreauto/Kconfig | 3 - board/freescale/mx6sabresd/Kconfig | 3 - board/freescale/mx6slevk/Kconfig | 3 - board/freescale/mx6sxsabresd/Kconfig | 3 - board/freescale/vf610twr/Kconfig | 3 - board/gateworks/gw_ventana/Kconfig | 3 - board/genesi/mx51_efikamx/Kconfig | 3 - board/gumstix/pepper/Kconfig | 3 - board/h2200/Kconfig | 3 - board/hale/tt01/Kconfig | 3 - board/icpdas/lp8x4x/Kconfig | 3 - board/imx31_phycore/Kconfig | 3 - board/isee/igep0033/Kconfig | 3 - board/jornada/Kconfig | 3 - board/karo/tx25/Kconfig | 3 - board/logicpd/imx27lite/Kconfig | 6 - board/logicpd/imx31_litekit/Kconfig | 3 - board/mpl/vcma9/Kconfig | 3 - board/olimex/mx23_olinuxino/Kconfig | 3 - board/palmld/Kconfig | 3 - board/palmtc/Kconfig | 3 - board/palmtreo680/Kconfig | 3 - board/phytec/pcm051/Kconfig | 3 - board/ppcag/bg0900/Kconfig | 3 - board/pxa255_idp/Kconfig | 3 - board/raspberrypi/rpi_b/Kconfig | 3 - board/ronetix/pm9261/Kconfig | 3 - board/ronetix/pm9263/Kconfig | 3 - board/ronetix/pm9g45/Kconfig | 3 - board/samsung/goni/Kconfig | 3 - board/samsung/smdk2410/Kconfig | 3 - board/samsung/smdkc100/Kconfig | 3 - board/sandisk/sansa_fuze_plus/Kconfig | 3 - board/scb9328/Kconfig | 3 - board/schulercontrol/sc_sps_1/Kconfig | 3 - board/siemens/corvus/Kconfig | 3 - board/siemens/draco/Kconfig | 6 - board/siemens/pxm2/Kconfig | 3 - board/siemens/rut/Kconfig | 3 - board/siemens/taurus/Kconfig | 3 - board/silica/pengwyn/Kconfig | 3 - board/solidrun/hummingboard/Kconfig | 3 - board/spear/spear300/Kconfig | 3 - board/spear/spear310/Kconfig | 3 - board/spear/spear320/Kconfig | 3 - board/spear/spear600/Kconfig | 3 - board/spear/x600/Kconfig | 3 - board/st-ericsson/snowball/Kconfig | 3 - board/st-ericsson/u8500/Kconfig | 3 - board/sunxi/Kconfig | 3 - board/syteco/jadecpu/Kconfig | 3 - board/syteco/zmx25/Kconfig | 3 - board/taskit/stamp9g20/Kconfig | 3 - board/ti/am335x/Kconfig | 3 - board/ti/am43xx/Kconfig | 3 - board/ti/ti814x/Kconfig | 3 - board/ti/ti816x/Kconfig | 3 - board/ti/tnetv107xevm/Kconfig | 3 - board/timll/devkit3250/Kconfig | 3 - board/toradex/colibri_pxa270/Kconfig | 3 - board/tqc/tqma6/Kconfig | 3 - board/trizepsiv/Kconfig | 3 - board/ttcontrol/vision2/Kconfig | 3 - board/udoo/Kconfig | 3 - board/vpac270/Kconfig | 3 - board/wandboard/Kconfig | 3 - board/woodburn/Kconfig | 6 - board/xaeniax/Kconfig | 3 - board/zipitz2/Kconfig | 3 - common/lcd.c | 1 - 154 files changed, 212 insertions(+), 501 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7b20fab407..171ad03429 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -7,139 +7,225 @@ config SYS_ARCH config ARM64 bool +config HAS_VBAR + bool + +config CPU_ARM720T + bool + +config CPU_ARM920T + bool + +config CPU_ARM926EJS + bool + +config CPU_ARM946ES + bool + +config CPU_ARM1136 + bool + +config CPU_ARM1176 + bool + select HAS_VBAR + +config CPU_V7 + bool + select HAS_VBAR + +config CPU_PXA + bool + +config CPU_SA1100 + bool + +config SYS_CPU + default "arm720t" if CPU_ARM720T + default "arm920t" if CPU_ARM920T + default "arm926ejs" if CPU_ARM926EJS + default "arm946es" if CPU_ARM946ES + default "arm1136" if CPU_ARM1136 + default "arm1176" if CPU_ARM1176 + default "armv7" if CPU_V7 + default "pxa" if CPU_PXA + default "sa1100" if CPU_SA1100 + choice prompt "Target select" config TARGET_INTEGRATORAP_CM720T bool "Support integratorap_cm720t" + select CPU_ARM720T config TARGET_INTEGRATORAP_CM920T bool "Support integratorap_cm920t" + select CPU_ARM920T config TARGET_INTEGRATORCP_CM920T bool "Support integratorcp_cm920t" + select CPU_ARM920T config TARGET_A320EVB bool "Support a320evb" + select CPU_ARM920T config TARGET_AT91RM9200EK bool "Support at91rm9200ek" + select CPU_ARM920T config TARGET_EB_CPUX9K2 bool "Support eb_cpux9k2" + select CPU_ARM920T config TARGET_CPUAT91 bool "Support cpuat91" + select CPU_ARM920T config TARGET_EDB93XX bool "Support edb93xx" + select CPU_ARM920T config TARGET_SCB9328 bool "Support scb9328" + select CPU_ARM920T config TARGET_CM4008 bool "Support cm4008" + select CPU_ARM920T config TARGET_CM41XX bool "Support cm41xx" + select CPU_ARM920T config TARGET_VCMA9 bool "Support VCMA9" + select CPU_ARM920T config TARGET_SMDK2410 bool "Support smdk2410" + select CPU_ARM920T config TARGET_INTEGRATORAP_CM926EJS bool "Support integratorap_cm926ejs" + select CPU_ARM926EJS config TARGET_INTEGRATORCP_CM926EJS bool "Support integratorcp_cm926ejs" + select CPU_ARM926EJS config TARGET_ASPENITE bool "Support aspenite" + select CPU_ARM926EJS config TARGET_GPLUGD bool "Support gplugd" + select CPU_ARM926EJS config TARGET_AFEB9260 bool "Support afeb9260" + select CPU_ARM926EJS config TARGET_AT91SAM9260EK bool "Support at91sam9260ek" + select CPU_ARM926EJS config TARGET_AT91SAM9261EK bool "Support at91sam9261ek" + select CPU_ARM926EJS config TARGET_AT91SAM9263EK bool "Support at91sam9263ek" + select CPU_ARM926EJS config TARGET_AT91SAM9M10G45EK bool "Support at91sam9m10g45ek" + select CPU_ARM926EJS config TARGET_AT91SAM9N12EK bool "Support at91sam9n12ek" + select CPU_ARM926EJS config TARGET_AT91SAM9RLEK bool "Support at91sam9rlek" + select CPU_ARM926EJS config TARGET_AT91SAM9X5EK bool "Support at91sam9x5ek" + select CPU_ARM926EJS config TARGET_SNAPPER9260 bool "Support snapper9260" + select CPU_ARM926EJS config TARGET_VL_MA2SC bool "Support vl_ma2sc" + select CPU_ARM926EJS config TARGET_SBC35_A9G20 bool "Support sbc35_a9g20" + select CPU_ARM926EJS config TARGET_TNY_A9260 bool "Support tny_a9260" + select CPU_ARM926EJS config TARGET_USB_A9263 bool "Support usb_a9263" + select CPU_ARM926EJS config TARGET_ETHERNUT5 bool "Support ethernut5" + select CPU_ARM926EJS config TARGET_TOP9000 bool "Support top9000" + select CPU_ARM926EJS config TARGET_MEESC bool "Support meesc" + select CPU_ARM926EJS config TARGET_OTC570 bool "Support otc570" + select CPU_ARM926EJS config TARGET_CPU9260 bool "Support cpu9260" + select CPU_ARM926EJS config TARGET_PM9261 bool "Support pm9261" + select CPU_ARM926EJS config TARGET_PM9263 bool "Support pm9263" + select CPU_ARM926EJS config TARGET_PM9G45 bool "Support pm9g45" + select CPU_ARM926EJS config TARGET_CORVUS bool "Support corvus" + select CPU_ARM926EJS config TARGET_TAURUS bool "Support taurus" + select CPU_ARM926EJS config TARGET_STAMP9G20 bool "Support stamp9g20" + select CPU_ARM926EJS config ARCH_DAVINCI bool "TI DaVinci" + select CPU_ARM926EJS help Support for TI's DaVinci platform. config KIRKWOOD bool "Marvell Kirkwood" + select CPU_ARM926EJS config TARGET_DB_MV784MP_GP bool "Support db-mv784mp-gp" @@ -149,370 +235,478 @@ config TARGET_MAXBCM config TARGET_DEVKIT3250 bool "Support devkit3250" + select CPU_ARM926EJS config TARGET_JADECPU bool "Support jadecpu" + select CPU_ARM926EJS config TARGET_MX25PDK bool "Support mx25pdk" + select CPU_ARM926EJS config TARGET_TX25 bool "Support tx25" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_ZMX25 bool "Support zmx25" + select CPU_ARM926EJS config TARGET_APF27 bool "Support apf27" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_IMX27LITE bool "Support imx27lite" + select CPU_ARM926EJS config TARGET_MAGNESIUM bool "Support magnesium" + select CPU_ARM926EJS config TARGET_APX4DEVKIT bool "Support apx4devkit" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_XFI3 bool "Support xfi3" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_M28EVK bool "Support m28evk" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_MX23EVK bool "Support mx23evk" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_MX28EVK bool "Support mx28evk" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_MX23_OLINUXINO bool "Support mx23_olinuxino" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_BG0900 bool "Support bg0900" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_SANSA_FUZE_PLUS bool "Support sansa_fuze_plus" + select CPU_ARM926EJS select SUPPORT_SPL config TARGET_SC_SPS_1 bool "Support sc_sps_1" + select CPU_ARM926EJS select SUPPORT_SPL config ARCH_NOMADIK bool "ST-Ericsson Nomadik" + select CPU_ARM926EJS config ORION5X bool "Marvell Orion" + select CPU_ARM926EJS config TARGET_DKB bool "Support dkb" + select CPU_ARM926EJS config TARGET_SPEAR300 bool "Support spear300" + select CPU_ARM926EJS config TARGET_SPEAR310 bool "Support spear310" + select CPU_ARM926EJS config TARGET_SPEAR320 bool "Support spear320" + select CPU_ARM926EJS config TARGET_SPEAR600 bool "Support spear600" + select CPU_ARM926EJS config TARGET_X600 bool "Support x600" + select CPU_ARM926EJS select SUPPORT_SPL config ARCH_VERSATILE bool "ARM Ltd. Versatile family" + select CPU_ARM926EJS config TARGET_INTEGRATORCP_CM1136 bool "Support integratorcp_cm1136" + select CPU_ARM1136 config TARGET_IMX31_PHYCORE bool "Support imx31_phycore" + select CPU_ARM1136 config TARGET_QONG bool "Support qong" + select CPU_ARM1136 config TARGET_MX31ADS bool "Support mx31ads" + select CPU_ARM1136 config TARGET_MX31PDK bool "Support mx31pdk" + select CPU_ARM1136 select SUPPORT_SPL config TARGET_TT01 bool "Support tt01" + select CPU_ARM1136 config TARGET_IMX31_LITEKIT bool "Support imx31_litekit" + select CPU_ARM1136 config TARGET_WOODBURN bool "Support woodburn" + select CPU_ARM1136 config TARGET_WOODBURN_SD bool "Support woodburn_sd" + select CPU_ARM1136 select SUPPORT_SPL config TARGET_FLEA3 bool "Support flea3" + select CPU_ARM1136 config TARGET_MX35PDK bool "Support mx35pdk" + select CPU_ARM1136 config TARGET_RPI_B bool "Support rpi_b" + select CPU_ARM1176 config TARGET_TNETV107X_EVM bool "Support tnetv107x_evm" + select CPU_ARM1176 config TARGET_INTEGRATORAP_CM946ES bool "Support integratorap_cm946es" + select CPU_ARM946ES config TARGET_INTEGRATORCP_CM946ES bool "Support integratorcp_cm946es" + select CPU_ARM946ES config TARGET_VEXPRESS_CA15_TC2 bool "Support vexpress_ca15_tc2" + select CPU_V7 config TARGET_VEXPRESS_CA5X2 bool "Support vexpress_ca5x2" + select CPU_V7 config TARGET_VEXPRESS_CA9X4 bool "Support vexpress_ca9x4" + select CPU_V7 config TARGET_KWB bool "Support kwb" + select CPU_V7 select SUPPORT_SPL config TARGET_TSERIES bool "Support tseries" + select CPU_V7 select SUPPORT_SPL config TARGET_CM_T335 bool "Support cm_t335" + select CPU_V7 select SUPPORT_SPL config TARGET_PEPPER bool "Support pepper" + select CPU_V7 select SUPPORT_SPL config TARGET_AM335X_IGEP0033 bool "Support am335x_igep0033" + select CPU_V7 select SUPPORT_SPL config TARGET_PCM051 bool "Support pcm051" + select CPU_V7 select SUPPORT_SPL config TARGET_DRACO bool "Support draco" + select CPU_V7 select SUPPORT_SPL config TARGET_DXR2 bool "Support dxr2" + select CPU_V7 select SUPPORT_SPL config TARGET_PXM2 bool "Support pxm2" + select CPU_V7 select SUPPORT_SPL config TARGET_RUT bool "Support rut" + select CPU_V7 select SUPPORT_SPL config TARGET_PENGWYN bool "Support pengwyn" + select CPU_V7 select SUPPORT_SPL config TARGET_AM335X_EVM bool "Support am335x_evm" + select CPU_V7 select SUPPORT_SPL config TARGET_AM43XX_EVM bool "Support am43xx_evm" + select CPU_V7 select SUPPORT_SPL config TARGET_TI814X_EVM bool "Support ti814x_evm" + select CPU_V7 select SUPPORT_SPL config TARGET_TI816X_EVM bool "Support ti816x_evm" + select CPU_V7 select SUPPORT_SPL config TARGET_SAMA5D3_XPLAINED bool "Support sama5d3_xplained" + select CPU_V7 select SUPPORT_SPL config TARGET_SAMA5D3XEK bool "Support sama5d3xek" + select CPU_V7 select SUPPORT_SPL config TARGET_BCM28155_AP bool "Support bcm28155_ap" + select CPU_V7 config TARGET_BCM958300K bool "Support bcm958300k" + select CPU_V7 config TARGET_BCM958622HR bool "Support bcm958622hr" + select CPU_V7 config ARCH_EXYNOS bool "Samsung EXYNOS" + select CPU_V7 config ARCH_S5PC1XX bool "Samsung S5PC1XX" + select CPU_V7 config ARCH_HIGHBANK bool "Calxeda Highbank" + select CPU_V7 config ARCH_KEYSTONE bool "TI Keystone" + select CPU_V7 select SUPPORT_SPL config TARGET_M53EVK bool "Support m53evk" + select CPU_V7 select SUPPORT_SPL config TARGET_IMA3_MX53 bool "Support ima3-mx53" + select CPU_V7 config TARGET_MX51EVK bool "Support mx51evk" + select CPU_V7 config TARGET_MX53ARD bool "Support mx53ard" + select CPU_V7 config TARGET_MX53EVK bool "Support mx53evk" + select CPU_V7 config TARGET_MX53LOCO bool "Support mx53loco" + select CPU_V7 config TARGET_MX53SMD bool "Support mx53smd" + select CPU_V7 config TARGET_MX51_EFIKAMX bool "Support mx51_efikamx" + select CPU_V7 config TARGET_VISION2 bool "Support vision2" + select CPU_V7 config TARGET_UDOO bool "Support udoo" + select CPU_V7 config TARGET_WANDBOARD bool "Support wandboard" + select CPU_V7 config TARGET_TITANIUM bool "Support titanium" + select CPU_V7 config TARGET_NITROGEN6X bool "Support nitrogen6x" + select CPU_V7 config TARGET_CGTQMX6EVAL bool "Support cgtqmx6eval" + select CPU_V7 config TARGET_EMBESTMX6BOARDS bool "Support embestmx6boards" + select CPU_V7 config TARGET_ARISTAINETOS bool "Support aristainetos" + select CPU_V7 config TARGET_MX6QARM2 bool "Support mx6qarm2" + select CPU_V7 config TARGET_MX6QSABREAUTO bool "Support mx6qsabreauto" + select CPU_V7 config TARGET_MX6SABRESD bool "Support mx6sabresd" + select CPU_V7 config TARGET_MX6SLEVK bool "Support mx6slevk" + select CPU_V7 config TARGET_MX6SXSABRESD bool "Support mx6sxsabresd" + select CPU_V7 config TARGET_GW_VENTANA bool "Support gw_ventana" + select CPU_V7 select SUPPORT_SPL config TARGET_HUMMINGBOARD bool "Support hummingboard" + select CPU_V7 config TARGET_TQMA6 bool "TQ Systems TQMa6 board" + select CPU_V7 config TARGET_OT1200 bool "Bachmann OT1200" + select CPU_V7 config OMAP34XX bool "OMAP34XX SoC" + select CPU_V7 config OMAP44XX bool "OMAP44XX SoC" + select CPU_V7 select SUPPORT_SPL config OMAP54XX bool "OMAP54XX SoC" + select CPU_V7 select SUPPORT_SPL config RMOBILE bool "Renesas ARM SoCs" + select CPU_V7 config TARGET_CM_FX6 bool "Support cm_fx6" + select CPU_V7 select SUPPORT_SPL config TARGET_SOCFPGA_CYCLONE5 bool "Support socfpga_cyclone5" + select CPU_V7 select SUPPORT_SPL config TARGET_SUN4I bool "Support sun4i" + select CPU_V7 select SUPPORT_SPL config TARGET_SUN5I bool "Support sun5i" + select CPU_V7 select SUPPORT_SPL config TARGET_SUN6I bool "Support sun6i" + select CPU_V7 select SUPPORT_SPL config TARGET_SUN7I bool "Support sun7i" + select CPU_V7 select SUPPORT_SPL config TARGET_SUN8I bool "Support sun8i" + select CPU_V7 select SUPPORT_SPL config TARGET_SNOWBALL bool "Support snowball" + select CPU_V7 config TARGET_U8500_HREF bool "Support u8500_href" + select CPU_V7 config TARGET_VF610TWR bool "Support vf610twr" + select CPU_V7 config ZYNQ bool "Xilinx Zynq Platform" + select CPU_V7 select SUPPORT_SPL config TEGRA @@ -520,6 +714,8 @@ config TEGRA select SUPPORT_SPL select SPL select OF_CONTROL if !SPL_BUILD + select CPU_ARM720T if SPL_BUILD + select CPU_V7 if !SPL_BUILD config TARGET_VEXPRESS_AEMV8A bool "Support vexpress_aemv8a" @@ -535,53 +731,69 @@ config TARGET_LS2085A_SIMU config TARGET_LS1021AQDS bool "Support ls1021aqds_nor" + select CPU_V7 config TARGET_LS1021ATWR bool "Support ls1021atwr_nor" + select CPU_V7 config TARGET_BALLOON3 bool "Support balloon3" + select CPU_PXA config TARGET_H2200 bool "Support h2200" + select CPU_PXA config TARGET_PALMLD bool "Support palmld" + select CPU_PXA config TARGET_PALMTC bool "Support palmtc" + select CPU_PXA config TARGET_PALMTREO680 bool "Support palmtreo680" + select CPU_PXA select SUPPORT_SPL config TARGET_PXA255_IDP bool "Support pxa255_idp" + select CPU_PXA config TARGET_TRIZEPSIV bool "Support trizepsiv" + select CPU_PXA config TARGET_VPAC270 bool "Support vpac270" + select CPU_PXA select SUPPORT_SPL config TARGET_XAENIAX bool "Support xaeniax" + select CPU_PXA config TARGET_ZIPITZ2 bool "Support zipitz2" + select CPU_PXA config TARGET_LP8X4X bool "Support lp8x4x" + select CPU_PXA config TARGET_COLIBRI_PXA270 bool "Support colibri_pxa270" + select CPU_PXA config TARGET_JORNADA bool "Support jornada" + select CPU_SA1100 config ARCH_UNIPHIER bool "Panasonic UniPhier platform" + select CPU_V7 select SUPPORT_SPL endchoice diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/cpu/arm926ejs/davinci/Kconfig index 1791cefa2f..613f04d8b0 100644 --- a/arch/arm/cpu/arm926ejs/davinci/Kconfig +++ b/arch/arm/cpu/arm926ejs/davinci/Kconfig @@ -57,9 +57,6 @@ config TARGET_CALIMAIN endchoice -config SYS_CPU - default "arm926ejs" - config SYS_SOC default "davinci" diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig index 91ffedf732..6c037a16c9 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig +++ b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig @@ -59,9 +59,6 @@ config TARGET_GOFLEXHOME endchoice -config SYS_CPU - default "arm926ejs" - config SYS_SOC default "kirkwood" diff --git a/arch/arm/cpu/arm926ejs/nomadik/Kconfig b/arch/arm/cpu/arm926ejs/nomadik/Kconfig index eda51fdc37..265f336469 100644 --- a/arch/arm/cpu/arm926ejs/nomadik/Kconfig +++ b/arch/arm/cpu/arm926ejs/nomadik/Kconfig @@ -8,9 +8,6 @@ config NOMADIK_NHK8815 endchoice -config SYS_CPU - default "arm926ejs" - config SYS_SOC default "nomadik" diff --git a/arch/arm/cpu/arm926ejs/orion5x/Kconfig b/arch/arm/cpu/arm926ejs/orion5x/Kconfig index 2d0ab2be17..5a542629c7 100644 --- a/arch/arm/cpu/arm926ejs/orion5x/Kconfig +++ b/arch/arm/cpu/arm926ejs/orion5x/Kconfig @@ -8,9 +8,6 @@ config TARGET_EDMINIV2 endchoice -config SYS_CPU - default "arm926ejs" - config SYS_SOC default "orion5x" diff --git a/arch/arm/cpu/arm926ejs/versatile/Kconfig b/arch/arm/cpu/arm926ejs/versatile/Kconfig index 35c16d876c..d2e76f4afc 100644 --- a/arch/arm/cpu/arm926ejs/versatile/Kconfig +++ b/arch/arm/cpu/arm926ejs/versatile/Kconfig @@ -1,8 +1,5 @@ if ARCH_VERSATILE -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "versatile" diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig index b895223523..090be9383f 100644 --- a/arch/arm/cpu/armv7/exynos/Kconfig +++ b/arch/arm/cpu/armv7/exynos/Kconfig @@ -51,9 +51,6 @@ config TARGET_PEACH_PIT endchoice -config SYS_CPU - default "armv7" - config SYS_SOC default "exynos" diff --git a/arch/arm/cpu/armv7/highbank/Kconfig b/arch/arm/cpu/armv7/highbank/Kconfig index 29ff99511c..0e73c04142 100644 --- a/arch/arm/cpu/armv7/highbank/Kconfig +++ b/arch/arm/cpu/armv7/highbank/Kconfig @@ -1,8 +1,5 @@ if ARCH_HIGHBANK -config SYS_CPU - default "armv7" - config SYS_BOARD default "highbank" diff --git a/arch/arm/cpu/armv7/keystone/Kconfig b/arch/arm/cpu/armv7/keystone/Kconfig index 393885f710..134ae87fe1 100644 --- a/arch/arm/cpu/armv7/keystone/Kconfig +++ b/arch/arm/cpu/armv7/keystone/Kconfig @@ -14,9 +14,6 @@ config TARGET_K2L_EVM endchoice -config SYS_CPU - default "armv7" - config SYS_SOC default "keystone" diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig index 53c0d24005..c215404469 100644 --- a/arch/arm/cpu/armv7/omap3/Kconfig +++ b/arch/arm/cpu/armv7/omap3/Kconfig @@ -90,9 +90,6 @@ config TARGET_TWISTER endchoice -config SYS_CPU - default "armv7" - config SYS_SOC default "omap3" diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig index e270895135..eccf897258 100644 --- a/arch/arm/cpu/armv7/omap4/Kconfig +++ b/arch/arm/cpu/armv7/omap4/Kconfig @@ -14,9 +14,6 @@ config TARGET_OMAP4_SDP4430 endchoice -config SYS_CPU - default "armv7" - config SYS_SOC default "omap4" diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig index 2ccf5b919d..129982caca 100644 --- a/arch/arm/cpu/armv7/omap5/Kconfig +++ b/arch/arm/cpu/armv7/omap5/Kconfig @@ -14,9 +14,6 @@ config TARGET_DRA7XX_EVM endchoice -config SYS_CPU - default "armv7" - config SYS_SOC default "omap5" diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig index 6c2bb22a85..c46a0cc9b8 100644 --- a/arch/arm/cpu/armv7/rmobile/Kconfig +++ b/arch/arm/cpu/armv7/rmobile/Kconfig @@ -20,9 +20,6 @@ config TARGET_ALT endchoice -config SYS_CPU - default "armv7" - config SYS_SOC default "rmobile" diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig b/arch/arm/cpu/armv7/s5pc1xx/Kconfig index 2fbbc18203..628813423f 100644 --- a/arch/arm/cpu/armv7/s5pc1xx/Kconfig +++ b/arch/arm/cpu/armv7/s5pc1xx/Kconfig @@ -13,9 +13,6 @@ config TARGET_SMDKC100 endchoice -config SYS_CPU - default "armv7" - config SYS_SOC default "s5pc1xx" diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig index 34f5496c8c..524b193e58 100644 --- a/arch/arm/cpu/armv7/uniphier/Kconfig +++ b/arch/arm/cpu/armv7/uniphier/Kconfig @@ -1,16 +1,10 @@ menu "Panasonic UniPhier platform" depends on ARCH_UNIPHIER -config SYS_CPU - string - default "armv7" - config SYS_SOC - string default "uniphier" config SYS_CONFIG_NAME - string default "ph1_pro4" if MACH_PH1_PRO4 default "ph1_ld4" if MACH_PH1_LD4 default "ph1_sld8" if MACH_PH1_SLD8 diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig index d6655a972b..f418cd6d99 100644 --- a/arch/arm/cpu/armv7/zynq/Kconfig +++ b/arch/arm/cpu/armv7/zynq/Kconfig @@ -17,9 +17,6 @@ config TARGET_ZYNQ_ZC770 endchoice -config SYS_CPU - default "armv7" - config SYS_BOARD default "zynq" diff --git a/board/BuR/kwb/Kconfig b/board/BuR/kwb/Kconfig index f9107a9a4b..4beefbf771 100644 --- a/board/BuR/kwb/Kconfig +++ b/board/BuR/kwb/Kconfig @@ -1,8 +1,5 @@ if TARGET_KWB -config SYS_CPU - default "armv7" - config SYS_BOARD default "kwb" diff --git a/board/BuR/tseries/Kconfig b/board/BuR/tseries/Kconfig index ee510d3480..ed48300c0a 100644 --- a/board/BuR/tseries/Kconfig +++ b/board/BuR/tseries/Kconfig @@ -1,8 +1,5 @@ if TARGET_TSERIES -config SYS_CPU - default "armv7" - config SYS_BOARD default "tseries" diff --git a/board/BuS/eb_cpux9k2/Kconfig b/board/BuS/eb_cpux9k2/Kconfig index 85d335a0e5..230e64d8fc 100644 --- a/board/BuS/eb_cpux9k2/Kconfig +++ b/board/BuS/eb_cpux9k2/Kconfig @@ -1,8 +1,5 @@ if TARGET_EB_CPUX9K2 -config SYS_CPU - default "arm920t" - config SYS_BOARD default "eb_cpux9k2" diff --git a/board/BuS/vl_ma2sc/Kconfig b/board/BuS/vl_ma2sc/Kconfig index bb6a7e787d..2f43519089 100644 --- a/board/BuS/vl_ma2sc/Kconfig +++ b/board/BuS/vl_ma2sc/Kconfig @@ -1,8 +1,5 @@ if TARGET_VL_MA2SC -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "vl_ma2sc" diff --git a/board/CarMediaLab/flea3/Kconfig b/board/CarMediaLab/flea3/Kconfig index 1448703dc1..7113f2b51f 100644 --- a/board/CarMediaLab/flea3/Kconfig +++ b/board/CarMediaLab/flea3/Kconfig @@ -1,8 +1,5 @@ if TARGET_FLEA3 -config SYS_CPU - default "arm1136" - config SYS_BOARD default "flea3" diff --git a/board/Marvell/aspenite/Kconfig b/board/Marvell/aspenite/Kconfig index ee2ec06f1e..4dd49c4452 100644 --- a/board/Marvell/aspenite/Kconfig +++ b/board/Marvell/aspenite/Kconfig @@ -1,8 +1,5 @@ if TARGET_ASPENITE -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "aspenite" diff --git a/board/Marvell/dkb/Kconfig b/board/Marvell/dkb/Kconfig index 33d5157bc3..f6748941c6 100644 --- a/board/Marvell/dkb/Kconfig +++ b/board/Marvell/dkb/Kconfig @@ -1,8 +1,5 @@ if TARGET_DKB -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "dkb" diff --git a/board/Marvell/gplugd/Kconfig b/board/Marvell/gplugd/Kconfig index 102c18d30d..d944816509 100644 --- a/board/Marvell/gplugd/Kconfig +++ b/board/Marvell/gplugd/Kconfig @@ -1,8 +1,5 @@ if TARGET_GPLUGD -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "gplugd" diff --git a/board/afeb9260/Kconfig b/board/afeb9260/Kconfig index ff191811ba..6a5a93139d 100644 --- a/board/afeb9260/Kconfig +++ b/board/afeb9260/Kconfig @@ -1,8 +1,5 @@ if TARGET_AFEB9260 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "afeb9260" diff --git a/board/altera/socfpga/Kconfig b/board/altera/socfpga/Kconfig index f8595781d9..fc42185a83 100644 --- a/board/altera/socfpga/Kconfig +++ b/board/altera/socfpga/Kconfig @@ -1,8 +1,5 @@ if TARGET_SOCFPGA_CYCLONE5 -config SYS_CPU - default "armv7" - config SYS_BOARD default "socfpga" diff --git a/board/aristainetos/Kconfig b/board/aristainetos/Kconfig index ac35d6de6f..b8e380eb84 100644 --- a/board/aristainetos/Kconfig +++ b/board/aristainetos/Kconfig @@ -1,8 +1,5 @@ if TARGET_ARISTAINETOS -config SYS_CPU - default "armv7" - config SYS_BOARD default "aristainetos" diff --git a/board/armadeus/apf27/Kconfig b/board/armadeus/apf27/Kconfig index 53532bba58..65544a8448 100644 --- a/board/armadeus/apf27/Kconfig +++ b/board/armadeus/apf27/Kconfig @@ -1,8 +1,5 @@ if TARGET_APF27 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "apf27" diff --git a/board/armltd/integrator/Kconfig b/board/armltd/integrator/Kconfig index 49553131b9..6153b5dd7d 100644 --- a/board/armltd/integrator/Kconfig +++ b/board/armltd/integrator/Kconfig @@ -1,8 +1,5 @@ if TARGET_INTEGRATORAP_CM720T -config SYS_CPU - default "arm720t" - config SYS_BOARD default "integrator" @@ -16,9 +13,6 @@ endif if TARGET_INTEGRATORAP_CM920T -config SYS_CPU - default "arm920t" - config SYS_BOARD default "integrator" @@ -32,9 +26,6 @@ endif if TARGET_INTEGRATORCP_CM920T -config SYS_CPU - default "arm920t" - config SYS_BOARD default "integrator" @@ -48,9 +39,6 @@ endif if TARGET_INTEGRATORAP_CM926EJS -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "integrator" @@ -64,9 +52,6 @@ endif if TARGET_INTEGRATORCP_CM926EJS -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "integrator" @@ -80,9 +65,6 @@ endif if TARGET_INTEGRATORCP_CM1136 -config SYS_CPU - default "arm1136" - config SYS_BOARD default "integrator" @@ -96,9 +78,6 @@ endif if TARGET_INTEGRATORAP_CM946ES -config SYS_CPU - default "arm946es" - config SYS_BOARD default "integrator" @@ -112,9 +91,6 @@ endif if TARGET_INTEGRATORCP_CM946ES -config SYS_CPU - default "arm946es" - config SYS_BOARD default "integrator" diff --git a/board/armltd/vexpress/Kconfig b/board/armltd/vexpress/Kconfig index 7fa30c65f9..2e15e0d497 100644 --- a/board/armltd/vexpress/Kconfig +++ b/board/armltd/vexpress/Kconfig @@ -1,8 +1,5 @@ if TARGET_VEXPRESS_CA15_TC2 -config SYS_CPU - default "armv7" - config SYS_BOARD default "vexpress" @@ -16,9 +13,6 @@ endif if TARGET_VEXPRESS_CA5X2 -config SYS_CPU - default "armv7" - config SYS_BOARD default "vexpress" @@ -32,9 +26,6 @@ endif if TARGET_VEXPRESS_CA9X4 -config SYS_CPU - default "armv7" - config SYS_BOARD default "vexpress" diff --git a/board/atmel/at91rm9200ek/Kconfig b/board/atmel/at91rm9200ek/Kconfig index 61db2e2d40..bad4a37da0 100644 --- a/board/atmel/at91rm9200ek/Kconfig +++ b/board/atmel/at91rm9200ek/Kconfig @@ -1,8 +1,5 @@ if TARGET_AT91RM9200EK -config SYS_CPU - default "arm920t" - config SYS_BOARD default "at91rm9200ek" diff --git a/board/atmel/at91sam9260ek/Kconfig b/board/atmel/at91sam9260ek/Kconfig index 24a645bc94..fe00ed5e60 100644 --- a/board/atmel/at91sam9260ek/Kconfig +++ b/board/atmel/at91sam9260ek/Kconfig @@ -1,8 +1,5 @@ if TARGET_AT91SAM9260EK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "at91sam9260ek" diff --git a/board/atmel/at91sam9261ek/Kconfig b/board/atmel/at91sam9261ek/Kconfig index 301bf1a61c..d839c1a632 100644 --- a/board/atmel/at91sam9261ek/Kconfig +++ b/board/atmel/at91sam9261ek/Kconfig @@ -1,8 +1,5 @@ if TARGET_AT91SAM9261EK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "at91sam9261ek" diff --git a/board/atmel/at91sam9263ek/Kconfig b/board/atmel/at91sam9263ek/Kconfig index f8e2b48149..311c504da2 100644 --- a/board/atmel/at91sam9263ek/Kconfig +++ b/board/atmel/at91sam9263ek/Kconfig @@ -1,8 +1,5 @@ if TARGET_AT91SAM9263EK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "at91sam9263ek" diff --git a/board/atmel/at91sam9m10g45ek/Kconfig b/board/atmel/at91sam9m10g45ek/Kconfig index d2e191c141..1bc086a483 100644 --- a/board/atmel/at91sam9m10g45ek/Kconfig +++ b/board/atmel/at91sam9m10g45ek/Kconfig @@ -1,8 +1,5 @@ if TARGET_AT91SAM9M10G45EK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "at91sam9m10g45ek" diff --git a/board/atmel/at91sam9n12ek/Kconfig b/board/atmel/at91sam9n12ek/Kconfig index 845cd36442..cf1d1a3670 100644 --- a/board/atmel/at91sam9n12ek/Kconfig +++ b/board/atmel/at91sam9n12ek/Kconfig @@ -1,8 +1,5 @@ if TARGET_AT91SAM9N12EK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "at91sam9n12ek" diff --git a/board/atmel/at91sam9rlek/Kconfig b/board/atmel/at91sam9rlek/Kconfig index 517f22a8a9..438d300421 100644 --- a/board/atmel/at91sam9rlek/Kconfig +++ b/board/atmel/at91sam9rlek/Kconfig @@ -1,8 +1,5 @@ if TARGET_AT91SAM9RLEK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "at91sam9rlek" diff --git a/board/atmel/at91sam9x5ek/Kconfig b/board/atmel/at91sam9x5ek/Kconfig index d236b1ad66..5c5ec61577 100644 --- a/board/atmel/at91sam9x5ek/Kconfig +++ b/board/atmel/at91sam9x5ek/Kconfig @@ -1,8 +1,5 @@ if TARGET_AT91SAM9X5EK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "at91sam9x5ek" diff --git a/board/atmel/sama5d3_xplained/Kconfig b/board/atmel/sama5d3_xplained/Kconfig index 0ca1ec006a..0ba8a7bf93 100644 --- a/board/atmel/sama5d3_xplained/Kconfig +++ b/board/atmel/sama5d3_xplained/Kconfig @@ -1,8 +1,5 @@ if TARGET_SAMA5D3_XPLAINED -config SYS_CPU - default "armv7" - config SYS_BOARD default "sama5d3_xplained" diff --git a/board/atmel/sama5d3xek/Kconfig b/board/atmel/sama5d3xek/Kconfig index f0dd04a06e..2a9ed23ecf 100644 --- a/board/atmel/sama5d3xek/Kconfig +++ b/board/atmel/sama5d3xek/Kconfig @@ -1,8 +1,5 @@ if TARGET_SAMA5D3XEK -config SYS_CPU - default "armv7" - config SYS_BOARD default "sama5d3xek" diff --git a/board/bachmann/ot1200/Kconfig b/board/bachmann/ot1200/Kconfig index 6cf2573221..7f8a6a1abc 100644 --- a/board/bachmann/ot1200/Kconfig +++ b/board/bachmann/ot1200/Kconfig @@ -1,8 +1,5 @@ if TARGET_OT1200 -config SYS_CPU - default "armv7" - config SYS_BOARD default "ot1200" diff --git a/board/balloon3/Kconfig b/board/balloon3/Kconfig index fb1cf3f0ef..53b7a9a5c7 100644 --- a/board/balloon3/Kconfig +++ b/board/balloon3/Kconfig @@ -1,8 +1,5 @@ if TARGET_BALLOON3 -config SYS_CPU - default "pxa" - config SYS_BOARD default "balloon3" diff --git a/board/barco/titanium/Kconfig b/board/barco/titanium/Kconfig index 56ed7d670b..b6f7c855b5 100644 --- a/board/barco/titanium/Kconfig +++ b/board/barco/titanium/Kconfig @@ -1,8 +1,5 @@ if TARGET_TITANIUM -config SYS_CPU - default "armv7" - config SYS_BOARD default "titanium" diff --git a/board/bluegiga/apx4devkit/Kconfig b/board/bluegiga/apx4devkit/Kconfig index 7d1534a647..f327fa15cf 100644 --- a/board/bluegiga/apx4devkit/Kconfig +++ b/board/bluegiga/apx4devkit/Kconfig @@ -1,8 +1,5 @@ if TARGET_APX4DEVKIT -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "apx4devkit" diff --git a/board/bluewater/snapper9260/Kconfig b/board/bluewater/snapper9260/Kconfig index 1c8f78dee2..c896c46895 100644 --- a/board/bluewater/snapper9260/Kconfig +++ b/board/bluewater/snapper9260/Kconfig @@ -1,8 +1,5 @@ if TARGET_SNAPPER9260 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "snapper9260" diff --git a/board/boundary/nitrogen6x/Kconfig b/board/boundary/nitrogen6x/Kconfig index 298c9fdb8c..03b0f6f278 100644 --- a/board/boundary/nitrogen6x/Kconfig +++ b/board/boundary/nitrogen6x/Kconfig @@ -1,8 +1,5 @@ if TARGET_NITROGEN6X -config SYS_CPU - default "armv7" - config SYS_BOARD default "nitrogen6x" diff --git a/board/broadcom/bcm28155_ap/Kconfig b/board/broadcom/bcm28155_ap/Kconfig index 2e779f0174..f1b4e08941 100644 --- a/board/broadcom/bcm28155_ap/Kconfig +++ b/board/broadcom/bcm28155_ap/Kconfig @@ -1,8 +1,5 @@ if TARGET_BCM28155_AP -config SYS_CPU - default "armv7" - config SYS_BOARD default "bcm28155_ap" diff --git a/board/broadcom/bcm958300k/Kconfig b/board/broadcom/bcm958300k/Kconfig index d627a3885f..92892881af 100644 --- a/board/broadcom/bcm958300k/Kconfig +++ b/board/broadcom/bcm958300k/Kconfig @@ -1,8 +1,5 @@ if TARGET_BCM958300K -config SYS_CPU - default "armv7" - config SYS_BOARD default "bcm_ep" diff --git a/board/broadcom/bcm958622hr/Kconfig b/board/broadcom/bcm958622hr/Kconfig index 9038f5b0a3..861c55909b 100644 --- a/board/broadcom/bcm958622hr/Kconfig +++ b/board/broadcom/bcm958622hr/Kconfig @@ -1,8 +1,5 @@ if TARGET_BCM958622HR -config SYS_CPU - default "armv7" - config SYS_BOARD default "bcm_ep" diff --git a/board/calao/sbc35_a9g20/Kconfig b/board/calao/sbc35_a9g20/Kconfig index b2528dcd26..fb5a1a3f42 100644 --- a/board/calao/sbc35_a9g20/Kconfig +++ b/board/calao/sbc35_a9g20/Kconfig @@ -1,8 +1,5 @@ if TARGET_SBC35_A9G20 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "sbc35_a9g20" diff --git a/board/calao/tny_a9260/Kconfig b/board/calao/tny_a9260/Kconfig index 7fad578d5c..b1de8f8ba8 100644 --- a/board/calao/tny_a9260/Kconfig +++ b/board/calao/tny_a9260/Kconfig @@ -1,8 +1,5 @@ if TARGET_TNY_A9260 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "tny_a9260" diff --git a/board/calao/usb_a9263/Kconfig b/board/calao/usb_a9263/Kconfig index 4209b36136..7a159dc3ba 100644 --- a/board/calao/usb_a9263/Kconfig +++ b/board/calao/usb_a9263/Kconfig @@ -1,8 +1,5 @@ if TARGET_USB_A9263 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "usb_a9263" diff --git a/board/cirrus/edb93xx/Kconfig b/board/cirrus/edb93xx/Kconfig index f063d55708..c5f4897f8a 100644 --- a/board/cirrus/edb93xx/Kconfig +++ b/board/cirrus/edb93xx/Kconfig @@ -1,8 +1,5 @@ if TARGET_EDB93XX -config SYS_CPU - default "arm920t" - config SYS_BOARD default "edb93xx" diff --git a/board/cm4008/Kconfig b/board/cm4008/Kconfig index a7f3b2f812..de87d5bc12 100644 --- a/board/cm4008/Kconfig +++ b/board/cm4008/Kconfig @@ -1,8 +1,5 @@ if TARGET_CM4008 -config SYS_CPU - default "arm920t" - config SYS_BOARD default "cm4008" diff --git a/board/cm41xx/Kconfig b/board/cm41xx/Kconfig index b537e2674c..99e675b12d 100644 --- a/board/cm41xx/Kconfig +++ b/board/cm41xx/Kconfig @@ -1,8 +1,5 @@ if TARGET_CM41XX -config SYS_CPU - default "arm920t" - config SYS_BOARD default "cm41xx" diff --git a/board/compulab/cm_fx6/Kconfig b/board/compulab/cm_fx6/Kconfig index 42a84380f2..508c21f58b 100644 --- a/board/compulab/cm_fx6/Kconfig +++ b/board/compulab/cm_fx6/Kconfig @@ -1,23 +1,15 @@ if TARGET_CM_FX6 -config SYS_CPU - string - default "armv7" - config SYS_BOARD - string default "cm_fx6" config SYS_VENDOR - string default "compulab" config SYS_SOC - string default "mx6" config SYS_CONFIG_NAME - string default "cm_fx6" endif diff --git a/board/compulab/cm_t335/Kconfig b/board/compulab/cm_t335/Kconfig index 61159765ab..683efde764 100644 --- a/board/compulab/cm_t335/Kconfig +++ b/board/compulab/cm_t335/Kconfig @@ -1,8 +1,5 @@ if TARGET_CM_T335 -config SYS_CPU - default "armv7" - config SYS_BOARD default "cm_t335" diff --git a/board/congatec/cgtqmx6eval/Kconfig b/board/congatec/cgtqmx6eval/Kconfig index 0774784f78..0a837bde0e 100644 --- a/board/congatec/cgtqmx6eval/Kconfig +++ b/board/congatec/cgtqmx6eval/Kconfig @@ -1,8 +1,5 @@ if TARGET_CGTQMX6EVAL -config SYS_CPU - default "armv7" - config SYS_BOARD default "cgtqmx6eval" diff --git a/board/creative/xfi3/Kconfig b/board/creative/xfi3/Kconfig index 2255cc98bc..7b681cd81b 100644 --- a/board/creative/xfi3/Kconfig +++ b/board/creative/xfi3/Kconfig @@ -1,8 +1,5 @@ if TARGET_XFI3 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "xfi3" diff --git a/board/davedenx/qong/Kconfig b/board/davedenx/qong/Kconfig index 54cb4502f0..76cf343ded 100644 --- a/board/davedenx/qong/Kconfig +++ b/board/davedenx/qong/Kconfig @@ -1,8 +1,5 @@ if TARGET_QONG -config SYS_CPU - default "arm1136" - config SYS_BOARD default "qong" diff --git a/board/denx/m28evk/Kconfig b/board/denx/m28evk/Kconfig index b1c16c702b..dd4dc4d096 100644 --- a/board/denx/m28evk/Kconfig +++ b/board/denx/m28evk/Kconfig @@ -1,8 +1,5 @@ if TARGET_M28EVK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "m28evk" diff --git a/board/denx/m53evk/Kconfig b/board/denx/m53evk/Kconfig index 5dbb7f8d5f..0696ad7ffb 100644 --- a/board/denx/m53evk/Kconfig +++ b/board/denx/m53evk/Kconfig @@ -1,8 +1,5 @@ if TARGET_M53EVK -config SYS_CPU - default "armv7" - config SYS_BOARD default "m53evk" diff --git a/board/egnite/ethernut5/Kconfig b/board/egnite/ethernut5/Kconfig index 281e43a17f..c42c734f1f 100644 --- a/board/egnite/ethernut5/Kconfig +++ b/board/egnite/ethernut5/Kconfig @@ -1,8 +1,5 @@ if TARGET_ETHERNUT5 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "ethernut5" diff --git a/board/embest/mx6boards/Kconfig b/board/embest/mx6boards/Kconfig index 8e39fce6fe..53a39d31dd 100644 --- a/board/embest/mx6boards/Kconfig +++ b/board/embest/mx6boards/Kconfig @@ -1,8 +1,5 @@ if TARGET_EMBESTMX6BOARDS -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx6boards" diff --git a/board/esd/meesc/Kconfig b/board/esd/meesc/Kconfig index 7d5c3ca980..5041041dd2 100644 --- a/board/esd/meesc/Kconfig +++ b/board/esd/meesc/Kconfig @@ -1,8 +1,5 @@ if TARGET_MEESC -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "meesc" diff --git a/board/esd/otc570/Kconfig b/board/esd/otc570/Kconfig index 7c5ce90a7d..55a2f70f40 100644 --- a/board/esd/otc570/Kconfig +++ b/board/esd/otc570/Kconfig @@ -1,8 +1,5 @@ if TARGET_OTC570 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "otc570" diff --git a/board/esg/ima3-mx53/Kconfig b/board/esg/ima3-mx53/Kconfig index 5593689e72..d73238f9a9 100644 --- a/board/esg/ima3-mx53/Kconfig +++ b/board/esg/ima3-mx53/Kconfig @@ -1,8 +1,5 @@ if TARGET_IMA3_MX53 -config SYS_CPU - default "armv7" - config SYS_BOARD default "ima3-mx53" diff --git a/board/eukrea/cpu9260/Kconfig b/board/eukrea/cpu9260/Kconfig index 53ae917c76..9bd077b1ff 100644 --- a/board/eukrea/cpu9260/Kconfig +++ b/board/eukrea/cpu9260/Kconfig @@ -1,8 +1,5 @@ if TARGET_CPU9260 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "cpu9260" diff --git a/board/eukrea/cpuat91/Kconfig b/board/eukrea/cpuat91/Kconfig index f2b02dc1c2..b69e4c3f82 100644 --- a/board/eukrea/cpuat91/Kconfig +++ b/board/eukrea/cpuat91/Kconfig @@ -1,8 +1,5 @@ if TARGET_CPUAT91 -config SYS_CPU - default "arm920t" - config SYS_BOARD default "cpuat91" diff --git a/board/faraday/a320evb/Kconfig b/board/faraday/a320evb/Kconfig index bfa620708d..02c42cb0a2 100644 --- a/board/faraday/a320evb/Kconfig +++ b/board/faraday/a320evb/Kconfig @@ -1,8 +1,5 @@ if TARGET_A320EVB -config SYS_CPU - default "arm920t" - config SYS_BOARD default "a320evb" diff --git a/board/freescale/ls1021aqds/Kconfig b/board/freescale/ls1021aqds/Kconfig index 3cee468a3d..119b955041 100644 --- a/board/freescale/ls1021aqds/Kconfig +++ b/board/freescale/ls1021aqds/Kconfig @@ -1,8 +1,5 @@ if TARGET_LS1021AQDS -config SYS_CPU - default "armv7" - config SYS_BOARD default "ls1021aqds" diff --git a/board/freescale/ls1021atwr/Kconfig b/board/freescale/ls1021atwr/Kconfig index 312f9388fc..bc50b8d966 100644 --- a/board/freescale/ls1021atwr/Kconfig +++ b/board/freescale/ls1021atwr/Kconfig @@ -1,8 +1,5 @@ if TARGET_LS1021ATWR -config SYS_CPU - default "armv7" - config SYS_BOARD default "ls1021atwr" diff --git a/board/freescale/mx23evk/Kconfig b/board/freescale/mx23evk/Kconfig index 1bbbe2d5f5..51a8f9f773 100644 --- a/board/freescale/mx23evk/Kconfig +++ b/board/freescale/mx23evk/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX23EVK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "mx23evk" diff --git a/board/freescale/mx25pdk/Kconfig b/board/freescale/mx25pdk/Kconfig index a693239701..af06b4c827 100644 --- a/board/freescale/mx25pdk/Kconfig +++ b/board/freescale/mx25pdk/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX25PDK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "mx25pdk" diff --git a/board/freescale/mx28evk/Kconfig b/board/freescale/mx28evk/Kconfig index cc654bcfa5..39777bd70f 100644 --- a/board/freescale/mx28evk/Kconfig +++ b/board/freescale/mx28evk/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX28EVK -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "mx28evk" diff --git a/board/freescale/mx31ads/Kconfig b/board/freescale/mx31ads/Kconfig index b4ea64b405..eeeb6f490f 100644 --- a/board/freescale/mx31ads/Kconfig +++ b/board/freescale/mx31ads/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX31ADS -config SYS_CPU - default "arm1136" - config SYS_BOARD default "mx31ads" diff --git a/board/freescale/mx31pdk/Kconfig b/board/freescale/mx31pdk/Kconfig index 68c3880638..055545c930 100644 --- a/board/freescale/mx31pdk/Kconfig +++ b/board/freescale/mx31pdk/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX31PDK -config SYS_CPU - default "arm1136" - config SYS_BOARD default "mx31pdk" diff --git a/board/freescale/mx35pdk/Kconfig b/board/freescale/mx35pdk/Kconfig index ca5b40f07d..021d19e551 100644 --- a/board/freescale/mx35pdk/Kconfig +++ b/board/freescale/mx35pdk/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX35PDK -config SYS_CPU - default "arm1136" - config SYS_BOARD default "mx35pdk" diff --git a/board/freescale/mx51evk/Kconfig b/board/freescale/mx51evk/Kconfig index 07861a9706..f9b69cbd66 100644 --- a/board/freescale/mx51evk/Kconfig +++ b/board/freescale/mx51evk/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX51EVK -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx51evk" diff --git a/board/freescale/mx53ard/Kconfig b/board/freescale/mx53ard/Kconfig index 566df85985..41f46a04ac 100644 --- a/board/freescale/mx53ard/Kconfig +++ b/board/freescale/mx53ard/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX53ARD -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx53ard" diff --git a/board/freescale/mx53evk/Kconfig b/board/freescale/mx53evk/Kconfig index d064b104dc..c226c1ca06 100644 --- a/board/freescale/mx53evk/Kconfig +++ b/board/freescale/mx53evk/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX53EVK -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx53evk" diff --git a/board/freescale/mx53loco/Kconfig b/board/freescale/mx53loco/Kconfig index bc44e59bfc..5ca1672bf7 100644 --- a/board/freescale/mx53loco/Kconfig +++ b/board/freescale/mx53loco/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX53LOCO -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx53loco" diff --git a/board/freescale/mx53smd/Kconfig b/board/freescale/mx53smd/Kconfig index 62c37d4e0c..1195d33d06 100644 --- a/board/freescale/mx53smd/Kconfig +++ b/board/freescale/mx53smd/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX53SMD -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx53smd" diff --git a/board/freescale/mx6qarm2/Kconfig b/board/freescale/mx6qarm2/Kconfig index f7f18db9fc..4af33af185 100644 --- a/board/freescale/mx6qarm2/Kconfig +++ b/board/freescale/mx6qarm2/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX6QARM2 -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx6qarm2" diff --git a/board/freescale/mx6qsabreauto/Kconfig b/board/freescale/mx6qsabreauto/Kconfig index d0cf355bc1..cc2a140c52 100644 --- a/board/freescale/mx6qsabreauto/Kconfig +++ b/board/freescale/mx6qsabreauto/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX6QSABREAUTO -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx6qsabreauto" diff --git a/board/freescale/mx6sabresd/Kconfig b/board/freescale/mx6sabresd/Kconfig index 15b65c09f1..fa6ddb2292 100644 --- a/board/freescale/mx6sabresd/Kconfig +++ b/board/freescale/mx6sabresd/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX6SABRESD -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx6sabresd" diff --git a/board/freescale/mx6slevk/Kconfig b/board/freescale/mx6slevk/Kconfig index 558aeab0e3..d32da900a3 100644 --- a/board/freescale/mx6slevk/Kconfig +++ b/board/freescale/mx6slevk/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX6SLEVK -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx6slevk" diff --git a/board/freescale/mx6sxsabresd/Kconfig b/board/freescale/mx6sxsabresd/Kconfig index 2a86b68afc..940983e932 100644 --- a/board/freescale/mx6sxsabresd/Kconfig +++ b/board/freescale/mx6sxsabresd/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX6SXSABRESD -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx6sxsabresd" diff --git a/board/freescale/vf610twr/Kconfig b/board/freescale/vf610twr/Kconfig index 684ef279c3..ef091d6b2b 100644 --- a/board/freescale/vf610twr/Kconfig +++ b/board/freescale/vf610twr/Kconfig @@ -1,8 +1,5 @@ if TARGET_VF610TWR -config SYS_CPU - default "armv7" - config SYS_BOARD default "vf610twr" diff --git a/board/gateworks/gw_ventana/Kconfig b/board/gateworks/gw_ventana/Kconfig index 82909a80a3..c233e90c65 100644 --- a/board/gateworks/gw_ventana/Kconfig +++ b/board/gateworks/gw_ventana/Kconfig @@ -1,8 +1,5 @@ if TARGET_GW_VENTANA -config SYS_CPU - default "armv7" - config SYS_BOARD default "gw_ventana" diff --git a/board/genesi/mx51_efikamx/Kconfig b/board/genesi/mx51_efikamx/Kconfig index 87d15a59d4..355702a4b6 100644 --- a/board/genesi/mx51_efikamx/Kconfig +++ b/board/genesi/mx51_efikamx/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX51_EFIKAMX -config SYS_CPU - default "armv7" - config SYS_BOARD default "mx51_efikamx" diff --git a/board/gumstix/pepper/Kconfig b/board/gumstix/pepper/Kconfig index 0b73955167..6f94612fe2 100644 --- a/board/gumstix/pepper/Kconfig +++ b/board/gumstix/pepper/Kconfig @@ -1,8 +1,5 @@ if TARGET_PEPPER -config SYS_CPU - default "armv7" - config SYS_BOARD default "pepper" diff --git a/board/h2200/Kconfig b/board/h2200/Kconfig index 75956be823..c0e0c1e763 100644 --- a/board/h2200/Kconfig +++ b/board/h2200/Kconfig @@ -1,8 +1,5 @@ if TARGET_H2200 -config SYS_CPU - default "pxa" - config SYS_BOARD default "h2200" diff --git a/board/hale/tt01/Kconfig b/board/hale/tt01/Kconfig index 40e56cb11f..af9828a4bf 100644 --- a/board/hale/tt01/Kconfig +++ b/board/hale/tt01/Kconfig @@ -1,8 +1,5 @@ if TARGET_TT01 -config SYS_CPU - default "arm1136" - config SYS_BOARD default "tt01" diff --git a/board/icpdas/lp8x4x/Kconfig b/board/icpdas/lp8x4x/Kconfig index 4374fb654f..3e87c4016b 100644 --- a/board/icpdas/lp8x4x/Kconfig +++ b/board/icpdas/lp8x4x/Kconfig @@ -1,8 +1,5 @@ if TARGET_LP8X4X -config SYS_CPU - default "pxa" - config SYS_BOARD default "lp8x4x" diff --git a/board/imx31_phycore/Kconfig b/board/imx31_phycore/Kconfig index cf3358dfe0..d3d202556d 100644 --- a/board/imx31_phycore/Kconfig +++ b/board/imx31_phycore/Kconfig @@ -1,8 +1,5 @@ if TARGET_IMX31_PHYCORE -config SYS_CPU - default "arm1136" - config SYS_BOARD default "imx31_phycore" diff --git a/board/isee/igep0033/Kconfig b/board/isee/igep0033/Kconfig index 4f3aaf481b..e989e4b15c 100644 --- a/board/isee/igep0033/Kconfig +++ b/board/isee/igep0033/Kconfig @@ -1,8 +1,5 @@ if TARGET_AM335X_IGEP0033 -config SYS_CPU - default "armv7" - config SYS_BOARD default "igep0033" diff --git a/board/jornada/Kconfig b/board/jornada/Kconfig index 9c11a13651..195bc26f9e 100644 --- a/board/jornada/Kconfig +++ b/board/jornada/Kconfig @@ -1,8 +1,5 @@ if TARGET_JORNADA -config SYS_CPU - default "sa1100" - config SYS_BOARD default "jornada" diff --git a/board/karo/tx25/Kconfig b/board/karo/tx25/Kconfig index 24edcc43bc..42746c1c0f 100644 --- a/board/karo/tx25/Kconfig +++ b/board/karo/tx25/Kconfig @@ -1,8 +1,5 @@ if TARGET_TX25 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "tx25" diff --git a/board/logicpd/imx27lite/Kconfig b/board/logicpd/imx27lite/Kconfig index 842d1baa47..c7de2e3814 100644 --- a/board/logicpd/imx27lite/Kconfig +++ b/board/logicpd/imx27lite/Kconfig @@ -1,8 +1,5 @@ if TARGET_IMX27LITE -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "imx27lite" @@ -19,9 +16,6 @@ endif if TARGET_MAGNESIUM -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "imx27lite" diff --git a/board/logicpd/imx31_litekit/Kconfig b/board/logicpd/imx31_litekit/Kconfig index a87fa81d82..d90f854a18 100644 --- a/board/logicpd/imx31_litekit/Kconfig +++ b/board/logicpd/imx31_litekit/Kconfig @@ -1,8 +1,5 @@ if TARGET_IMX31_LITEKIT -config SYS_CPU - default "arm1136" - config SYS_BOARD default "imx31_litekit" diff --git a/board/mpl/vcma9/Kconfig b/board/mpl/vcma9/Kconfig index 08b0fa0184..a1564521b2 100644 --- a/board/mpl/vcma9/Kconfig +++ b/board/mpl/vcma9/Kconfig @@ -1,8 +1,5 @@ if TARGET_VCMA9 -config SYS_CPU - default "arm920t" - config SYS_BOARD default "vcma9" diff --git a/board/olimex/mx23_olinuxino/Kconfig b/board/olimex/mx23_olinuxino/Kconfig index fb09309285..0b151c9bb8 100644 --- a/board/olimex/mx23_olinuxino/Kconfig +++ b/board/olimex/mx23_olinuxino/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX23_OLINUXINO -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "mx23_olinuxino" diff --git a/board/palmld/Kconfig b/board/palmld/Kconfig index a749c8d2bb..3111295719 100644 --- a/board/palmld/Kconfig +++ b/board/palmld/Kconfig @@ -1,8 +1,5 @@ if TARGET_PALMLD -config SYS_CPU - default "pxa" - config SYS_BOARD default "palmld" diff --git a/board/palmtc/Kconfig b/board/palmtc/Kconfig index 5207490e88..3eb7198837 100644 --- a/board/palmtc/Kconfig +++ b/board/palmtc/Kconfig @@ -1,8 +1,5 @@ if TARGET_PALMTC -config SYS_CPU - default "pxa" - config SYS_BOARD default "palmtc" diff --git a/board/palmtreo680/Kconfig b/board/palmtreo680/Kconfig index 1992970aed..b5fdb9a361 100644 --- a/board/palmtreo680/Kconfig +++ b/board/palmtreo680/Kconfig @@ -1,8 +1,5 @@ if TARGET_PALMTREO680 -config SYS_CPU - default "pxa" - config SYS_BOARD default "palmtreo680" diff --git a/board/phytec/pcm051/Kconfig b/board/phytec/pcm051/Kconfig index f4ed7fdbac..2cc0d8872d 100644 --- a/board/phytec/pcm051/Kconfig +++ b/board/phytec/pcm051/Kconfig @@ -1,8 +1,5 @@ if TARGET_PCM051 -config SYS_CPU - default "armv7" - config SYS_BOARD default "pcm051" diff --git a/board/ppcag/bg0900/Kconfig b/board/ppcag/bg0900/Kconfig index 9d301c2926..d7f2368a23 100644 --- a/board/ppcag/bg0900/Kconfig +++ b/board/ppcag/bg0900/Kconfig @@ -1,8 +1,5 @@ if TARGET_BG0900 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "bg0900" diff --git a/board/pxa255_idp/Kconfig b/board/pxa255_idp/Kconfig index e8b1d47fcf..544831199d 100644 --- a/board/pxa255_idp/Kconfig +++ b/board/pxa255_idp/Kconfig @@ -1,8 +1,5 @@ if TARGET_PXA255_IDP -config SYS_CPU - default "pxa" - config SYS_BOARD default "pxa255_idp" diff --git a/board/raspberrypi/rpi_b/Kconfig b/board/raspberrypi/rpi_b/Kconfig index 1a767b2871..501d511f59 100644 --- a/board/raspberrypi/rpi_b/Kconfig +++ b/board/raspberrypi/rpi_b/Kconfig @@ -1,8 +1,5 @@ if TARGET_RPI_B -config SYS_CPU - default "arm1176" - config SYS_BOARD default "rpi_b" diff --git a/board/ronetix/pm9261/Kconfig b/board/ronetix/pm9261/Kconfig index 4a2ca02c67..a4934c582e 100644 --- a/board/ronetix/pm9261/Kconfig +++ b/board/ronetix/pm9261/Kconfig @@ -1,8 +1,5 @@ if TARGET_PM9261 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "pm9261" diff --git a/board/ronetix/pm9263/Kconfig b/board/ronetix/pm9263/Kconfig index 95129190fd..339a6ea169 100644 --- a/board/ronetix/pm9263/Kconfig +++ b/board/ronetix/pm9263/Kconfig @@ -1,8 +1,5 @@ if TARGET_PM9263 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "pm9263" diff --git a/board/ronetix/pm9g45/Kconfig b/board/ronetix/pm9g45/Kconfig index 0c0af962d4..65fc5c4838 100644 --- a/board/ronetix/pm9g45/Kconfig +++ b/board/ronetix/pm9g45/Kconfig @@ -1,8 +1,5 @@ if TARGET_PM9G45 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "pm9g45" diff --git a/board/samsung/goni/Kconfig b/board/samsung/goni/Kconfig index a320c2bcb5..cbbf5a9315 100644 --- a/board/samsung/goni/Kconfig +++ b/board/samsung/goni/Kconfig @@ -1,8 +1,5 @@ if TARGET_S5P_GONI -config SYS_CPU - default "armv7" - config SYS_BOARD default "goni" diff --git a/board/samsung/smdk2410/Kconfig b/board/samsung/smdk2410/Kconfig index 94f1e3c4cc..e987b6496f 100644 --- a/board/samsung/smdk2410/Kconfig +++ b/board/samsung/smdk2410/Kconfig @@ -1,8 +1,5 @@ if TARGET_SMDK2410 -config SYS_CPU - default "arm920t" - config SYS_BOARD default "smdk2410" diff --git a/board/samsung/smdkc100/Kconfig b/board/samsung/smdkc100/Kconfig index 5e6b0ddcda..d2157b4d05 100644 --- a/board/samsung/smdkc100/Kconfig +++ b/board/samsung/smdkc100/Kconfig @@ -1,8 +1,5 @@ if TARGET_SMDKC100 -config SYS_CPU - default "armv7" - config SYS_BOARD default "smdkc100" diff --git a/board/sandisk/sansa_fuze_plus/Kconfig b/board/sandisk/sansa_fuze_plus/Kconfig index 99e7379cd2..ab4a29255c 100644 --- a/board/sandisk/sansa_fuze_plus/Kconfig +++ b/board/sandisk/sansa_fuze_plus/Kconfig @@ -1,8 +1,5 @@ if TARGET_SANSA_FUZE_PLUS -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "sansa_fuze_plus" diff --git a/board/scb9328/Kconfig b/board/scb9328/Kconfig index 7ff7dbc4a5..68e99ea2e3 100644 --- a/board/scb9328/Kconfig +++ b/board/scb9328/Kconfig @@ -1,8 +1,5 @@ if TARGET_SCB9328 -config SYS_CPU - default "arm920t" - config SYS_BOARD default "scb9328" diff --git a/board/schulercontrol/sc_sps_1/Kconfig b/board/schulercontrol/sc_sps_1/Kconfig index 379e53b556..2461d0cc50 100644 --- a/board/schulercontrol/sc_sps_1/Kconfig +++ b/board/schulercontrol/sc_sps_1/Kconfig @@ -1,8 +1,5 @@ if TARGET_SC_SPS_1 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "sc_sps_1" diff --git a/board/siemens/corvus/Kconfig b/board/siemens/corvus/Kconfig index 80018c51b5..7b505aac36 100644 --- a/board/siemens/corvus/Kconfig +++ b/board/siemens/corvus/Kconfig @@ -1,8 +1,5 @@ if TARGET_CORVUS -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "corvus" diff --git a/board/siemens/draco/Kconfig b/board/siemens/draco/Kconfig index b930a76fa9..d138ecea9d 100644 --- a/board/siemens/draco/Kconfig +++ b/board/siemens/draco/Kconfig @@ -1,8 +1,5 @@ if TARGET_DRACO -config SYS_CPU - default "armv7" - config SYS_BOARD default "draco" @@ -19,9 +16,6 @@ endif if TARGET_DXR2 -config SYS_CPU - default "armv7" - config SYS_BOARD default "draco" diff --git a/board/siemens/pxm2/Kconfig b/board/siemens/pxm2/Kconfig index f76ec69bba..62604ecb39 100644 --- a/board/siemens/pxm2/Kconfig +++ b/board/siemens/pxm2/Kconfig @@ -1,8 +1,5 @@ if TARGET_PXM2 -config SYS_CPU - default "armv7" - config SYS_BOARD default "pxm2" diff --git a/board/siemens/rut/Kconfig b/board/siemens/rut/Kconfig index b7e49dac26..3371077662 100644 --- a/board/siemens/rut/Kconfig +++ b/board/siemens/rut/Kconfig @@ -1,8 +1,5 @@ if TARGET_RUT -config SYS_CPU - default "armv7" - config SYS_BOARD default "rut" diff --git a/board/siemens/taurus/Kconfig b/board/siemens/taurus/Kconfig index 1fedbd36bc..c07d244bc3 100644 --- a/board/siemens/taurus/Kconfig +++ b/board/siemens/taurus/Kconfig @@ -1,8 +1,5 @@ if TARGET_TAURUS -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "taurus" diff --git a/board/silica/pengwyn/Kconfig b/board/silica/pengwyn/Kconfig index 90bfb69e5e..f2e1098f62 100644 --- a/board/silica/pengwyn/Kconfig +++ b/board/silica/pengwyn/Kconfig @@ -1,8 +1,5 @@ if TARGET_PENGWYN -config SYS_CPU - default "armv7" - config SYS_BOARD default "pengwyn" diff --git a/board/solidrun/hummingboard/Kconfig b/board/solidrun/hummingboard/Kconfig index a4eb62fcef..36b79045bc 100644 --- a/board/solidrun/hummingboard/Kconfig +++ b/board/solidrun/hummingboard/Kconfig @@ -1,8 +1,5 @@ if TARGET_HUMMINGBOARD -config SYS_CPU - default "armv7" - config SYS_BOARD default "hummingboard" diff --git a/board/spear/spear300/Kconfig b/board/spear/spear300/Kconfig index 5b702ced69..27360f32e4 100644 --- a/board/spear/spear300/Kconfig +++ b/board/spear/spear300/Kconfig @@ -1,8 +1,5 @@ if TARGET_SPEAR300 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "spear300" diff --git a/board/spear/spear310/Kconfig b/board/spear/spear310/Kconfig index b8f5154733..0c95fa35a0 100644 --- a/board/spear/spear310/Kconfig +++ b/board/spear/spear310/Kconfig @@ -1,8 +1,5 @@ if TARGET_SPEAR310 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "spear310" diff --git a/board/spear/spear320/Kconfig b/board/spear/spear320/Kconfig index 150d64ff98..df176230f4 100644 --- a/board/spear/spear320/Kconfig +++ b/board/spear/spear320/Kconfig @@ -1,8 +1,5 @@ if TARGET_SPEAR320 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "spear320" diff --git a/board/spear/spear600/Kconfig b/board/spear/spear600/Kconfig index f03e19ebd3..d562e64f07 100644 --- a/board/spear/spear600/Kconfig +++ b/board/spear/spear600/Kconfig @@ -1,8 +1,5 @@ if TARGET_SPEAR600 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "spear600" diff --git a/board/spear/x600/Kconfig b/board/spear/x600/Kconfig index 620be5f56e..6a1c5c7b40 100644 --- a/board/spear/x600/Kconfig +++ b/board/spear/x600/Kconfig @@ -1,8 +1,5 @@ if TARGET_X600 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "x600" diff --git a/board/st-ericsson/snowball/Kconfig b/board/st-ericsson/snowball/Kconfig index 7eb99697d5..0b3a0cca6c 100644 --- a/board/st-ericsson/snowball/Kconfig +++ b/board/st-ericsson/snowball/Kconfig @@ -1,8 +1,5 @@ if TARGET_SNOWBALL -config SYS_CPU - default "armv7" - config SYS_BOARD default "snowball" diff --git a/board/st-ericsson/u8500/Kconfig b/board/st-ericsson/u8500/Kconfig index ca25876269..909f30db4b 100644 --- a/board/st-ericsson/u8500/Kconfig +++ b/board/st-ericsson/u8500/Kconfig @@ -1,8 +1,5 @@ if TARGET_U8500_HREF -config SYS_CPU - default "armv7" - config SYS_BOARD default "u8500" diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 31a15037d0..28df187840 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -8,9 +8,6 @@ config SYS_CONFIG_NAME default "sun7i" if TARGET_SUN7I default "sun8i" if TARGET_SUN8I -config SYS_CPU - default "armv7" - config SYS_BOARD default "sunxi" diff --git a/board/syteco/jadecpu/Kconfig b/board/syteco/jadecpu/Kconfig index 3965e90ad9..6e9392e21f 100644 --- a/board/syteco/jadecpu/Kconfig +++ b/board/syteco/jadecpu/Kconfig @@ -1,8 +1,5 @@ if TARGET_JADECPU -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "jadecpu" diff --git a/board/syteco/zmx25/Kconfig b/board/syteco/zmx25/Kconfig index 260774dced..59a415d65f 100644 --- a/board/syteco/zmx25/Kconfig +++ b/board/syteco/zmx25/Kconfig @@ -1,8 +1,5 @@ if TARGET_ZMX25 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "zmx25" diff --git a/board/taskit/stamp9g20/Kconfig b/board/taskit/stamp9g20/Kconfig index 67be227b72..3139f9af86 100644 --- a/board/taskit/stamp9g20/Kconfig +++ b/board/taskit/stamp9g20/Kconfig @@ -1,8 +1,5 @@ if TARGET_STAMP9G20 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "stamp9g20" diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig index d8958ef0b8..b9f6bd7122 100644 --- a/board/ti/am335x/Kconfig +++ b/board/ti/am335x/Kconfig @@ -1,8 +1,5 @@ if TARGET_AM335X_EVM -config SYS_CPU - default "armv7" - config SYS_BOARD default "am335x" diff --git a/board/ti/am43xx/Kconfig b/board/ti/am43xx/Kconfig index 47b96bd7ed..8d1c16883d 100644 --- a/board/ti/am43xx/Kconfig +++ b/board/ti/am43xx/Kconfig @@ -1,8 +1,5 @@ if TARGET_AM43XX_EVM -config SYS_CPU - default "armv7" - config SYS_BOARD default "am43xx" diff --git a/board/ti/ti814x/Kconfig b/board/ti/ti814x/Kconfig index 9bd3d73427..2960099a8e 100644 --- a/board/ti/ti814x/Kconfig +++ b/board/ti/ti814x/Kconfig @@ -1,8 +1,5 @@ if TARGET_TI814X_EVM -config SYS_CPU - default "armv7" - config SYS_BOARD default "ti814x" diff --git a/board/ti/ti816x/Kconfig b/board/ti/ti816x/Kconfig index c0bdb9eac3..95973b47f1 100644 --- a/board/ti/ti816x/Kconfig +++ b/board/ti/ti816x/Kconfig @@ -1,8 +1,5 @@ if TARGET_TI816X_EVM -config SYS_CPU - default "armv7" - config SYS_BOARD default "ti816x" diff --git a/board/ti/tnetv107xevm/Kconfig b/board/ti/tnetv107xevm/Kconfig index aa80d0f41a..637f20e847 100644 --- a/board/ti/tnetv107xevm/Kconfig +++ b/board/ti/tnetv107xevm/Kconfig @@ -1,8 +1,5 @@ if TARGET_TNETV107X_EVM -config SYS_CPU - default "arm1176" - config SYS_BOARD default "tnetv107xevm" diff --git a/board/timll/devkit3250/Kconfig b/board/timll/devkit3250/Kconfig index 087356d4ba..e3bd4569d6 100644 --- a/board/timll/devkit3250/Kconfig +++ b/board/timll/devkit3250/Kconfig @@ -1,8 +1,5 @@ if TARGET_DEVKIT3250 -config SYS_CPU - default "arm926ejs" - config SYS_BOARD default "devkit3250" diff --git a/board/toradex/colibri_pxa270/Kconfig b/board/toradex/colibri_pxa270/Kconfig index e4b1a5e508..949407a042 100644 --- a/board/toradex/colibri_pxa270/Kconfig +++ b/board/toradex/colibri_pxa270/Kconfig @@ -1,8 +1,5 @@ if TARGET_COLIBRI_PXA270 -config SYS_CPU - default "pxa" - config SYS_BOARD default "colibri_pxa270" diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index b70cbf09df..f8b3d1fd40 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -1,8 +1,5 @@ if TARGET_TQMA6 -config SYS_CPU - default "armv7" - config SYS_BOARD default "tqma6" diff --git a/board/trizepsiv/Kconfig b/board/trizepsiv/Kconfig index 9844c692a1..56b255709a 100644 --- a/board/trizepsiv/Kconfig +++ b/board/trizepsiv/Kconfig @@ -1,8 +1,5 @@ if TARGET_TRIZEPSIV -config SYS_CPU - default "pxa" - config SYS_BOARD default "trizepsiv" diff --git a/board/ttcontrol/vision2/Kconfig b/board/ttcontrol/vision2/Kconfig index 4e2271bdad..cacd2c5dfe 100644 --- a/board/ttcontrol/vision2/Kconfig +++ b/board/ttcontrol/vision2/Kconfig @@ -1,8 +1,5 @@ if TARGET_VISION2 -config SYS_CPU - default "armv7" - config SYS_BOARD default "vision2" diff --git a/board/udoo/Kconfig b/board/udoo/Kconfig index a98d0d6a4c..970f39f0f7 100644 --- a/board/udoo/Kconfig +++ b/board/udoo/Kconfig @@ -1,8 +1,5 @@ if TARGET_UDOO -config SYS_CPU - default "armv7" - config SYS_BOARD default "udoo" diff --git a/board/vpac270/Kconfig b/board/vpac270/Kconfig index a046f01f6d..1701b35d12 100644 --- a/board/vpac270/Kconfig +++ b/board/vpac270/Kconfig @@ -1,8 +1,5 @@ if TARGET_VPAC270 -config SYS_CPU - default "pxa" - config SYS_BOARD default "vpac270" diff --git a/board/wandboard/Kconfig b/board/wandboard/Kconfig index c8627693f2..3928566715 100644 --- a/board/wandboard/Kconfig +++ b/board/wandboard/Kconfig @@ -1,8 +1,5 @@ if TARGET_WANDBOARD -config SYS_CPU - default "armv7" - config SYS_BOARD default "wandboard" diff --git a/board/woodburn/Kconfig b/board/woodburn/Kconfig index 67023199b6..4699526cfd 100644 --- a/board/woodburn/Kconfig +++ b/board/woodburn/Kconfig @@ -1,8 +1,5 @@ if TARGET_WOODBURN -config SYS_CPU - default "arm1136" - config SYS_BOARD default "woodburn" @@ -16,9 +13,6 @@ endif if TARGET_WOODBURN_SD -config SYS_CPU - default "arm1136" - config SYS_BOARD default "woodburn" diff --git a/board/xaeniax/Kconfig b/board/xaeniax/Kconfig index 288f24b227..519e21fb9a 100644 --- a/board/xaeniax/Kconfig +++ b/board/xaeniax/Kconfig @@ -1,8 +1,5 @@ if TARGET_XAENIAX -config SYS_CPU - default "pxa" - config SYS_BOARD default "xaeniax" diff --git a/board/zipitz2/Kconfig b/board/zipitz2/Kconfig index 5f7fe1b23d..c6635040a3 100644 --- a/board/zipitz2/Kconfig +++ b/board/zipitz2/Kconfig @@ -1,8 +1,5 @@ if TARGET_ZIPITZ2 -config SYS_CPU - default "pxa" - config SYS_BOARD default "zipitz2" diff --git a/common/lcd.c b/common/lcd.c index 689d30eb25..787d80e3cb 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -33,7 +33,6 @@ #if defined(CONFIG_CPU_PXA25X) || defined(CONFIG_CPU_PXA27X) || \ defined(CONFIG_CPU_MONAHANS) -#define CONFIG_CPU_PXA #include <asm/byteorder.h> #endif -- 2.39.5