Skip to content

Commit

Permalink
kconfig: arm: introduce symbol for ARM CPUs
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Acked-by: Albert ARIBAUD <[email protected]>
Cc: Masahiro Yamada <[email protected]>
  • Loading branch information
@manoj23 @trini
manoj23 authored and trini committed Oct 29, 2014
1 parent 678398b commit 2e07c24
Show file tree
Hide file tree
Showing 154 changed files with 212 additions and 501 deletions.
212 changes: 212 additions & 0 deletions arch/arm/Kconfig
View file

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions arch/arm/cpu/arm926ejs/davinci/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ config TARGET_CALIMAIN

endchoice

config SYS_CPU
default "arm926ejs"

config SYS_SOC
default "davinci"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/arm926ejs/kirkwood/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ config TARGET_GOFLEXHOME

endchoice

config SYS_CPU
default "arm926ejs"

config SYS_SOC
default "kirkwood"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/arm926ejs/nomadik/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ config NOMADIK_NHK8815

endchoice

config SYS_CPU
default "arm926ejs"

config SYS_SOC
default "nomadik"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/arm926ejs/orion5x/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ config TARGET_EDMINIV2

endchoice

config SYS_CPU
default "arm926ejs"

config SYS_SOC
default "orion5x"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/arm926ejs/versatile/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if ARCH_VERSATILE

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "versatile"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/armv7/exynos/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ config TARGET_PEACH_PIT

endchoice

config SYS_CPU
default "armv7"

config SYS_SOC
default "exynos"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/armv7/highbank/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if ARCH_HIGHBANK

config SYS_CPU
default "armv7"

config SYS_BOARD
default "highbank"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/armv7/keystone/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ config TARGET_K2L_EVM

endchoice

config SYS_CPU
default "armv7"

config SYS_SOC
default "keystone"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/armv7/omap3/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ config TARGET_TWISTER

endchoice

config SYS_CPU
default "armv7"

config SYS_SOC
default "omap3"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/armv7/omap4/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ config TARGET_OMAP4_SDP4430

endchoice

config SYS_CPU
default "armv7"

config SYS_SOC
default "omap4"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/armv7/omap5/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ config TARGET_DRA7XX_EVM

endchoice

config SYS_CPU
default "armv7"

config SYS_SOC
default "omap5"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/armv7/rmobile/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ config TARGET_ALT

endchoice

config SYS_CPU
default "armv7"

config SYS_SOC
default "rmobile"

Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/armv7/s5pc1xx/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ config TARGET_SMDKC100

endchoice

config SYS_CPU
default "armv7"

config SYS_SOC
default "s5pc1xx"

Expand Down
6 changes: 0 additions & 6 deletions arch/arm/cpu/armv7/uniphier/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/cpu/armv7/zynq/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ config TARGET_ZYNQ_ZC770

endchoice

config SYS_CPU
default "armv7"

config SYS_BOARD
default "zynq"

Expand Down
3 changes: 0 additions & 3 deletions board/BuR/kwb/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_KWB

config SYS_CPU
default "armv7"

config SYS_BOARD
default "kwb"

Expand Down
3 changes: 0 additions & 3 deletions board/BuR/tseries/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_TSERIES

config SYS_CPU
default "armv7"

config SYS_BOARD
default "tseries"

Expand Down
3 changes: 0 additions & 3 deletions board/BuS/eb_cpux9k2/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_EB_CPUX9K2

config SYS_CPU
default "arm920t"

config SYS_BOARD
default "eb_cpux9k2"

Expand Down
3 changes: 0 additions & 3 deletions board/BuS/vl_ma2sc/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_VL_MA2SC

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "vl_ma2sc"

Expand Down
3 changes: 0 additions & 3 deletions board/CarMediaLab/flea3/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_FLEA3

config SYS_CPU
default "arm1136"

config SYS_BOARD
default "flea3"

Expand Down
3 changes: 0 additions & 3 deletions board/Marvell/aspenite/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_ASPENITE

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "aspenite"

Expand Down
3 changes: 0 additions & 3 deletions board/Marvell/dkb/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_DKB

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "dkb"

Expand Down
3 changes: 0 additions & 3 deletions board/Marvell/gplugd/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_GPLUGD

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "gplugd"

Expand Down
3 changes: 0 additions & 3 deletions board/afeb9260/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_AFEB9260

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "afeb9260"

Expand Down
3 changes: 0 additions & 3 deletions board/altera/socfpga/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_SOCFPGA_CYCLONE5

config SYS_CPU
default "armv7"

config SYS_BOARD
default "socfpga"

Expand Down
3 changes: 0 additions & 3 deletions board/aristainetos/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_ARISTAINETOS

config SYS_CPU
default "armv7"

config SYS_BOARD
default "aristainetos"

Expand Down
3 changes: 0 additions & 3 deletions board/armadeus/apf27/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_APF27

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "apf27"

Expand Down
24 changes: 0 additions & 24 deletions board/armltd/integrator/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_INTEGRATORAP_CM720T

config SYS_CPU
default "arm720t"

config SYS_BOARD
default "integrator"

Expand All @@ -16,9 +13,6 @@ endif

if TARGET_INTEGRATORAP_CM920T

config SYS_CPU
default "arm920t"

config SYS_BOARD
default "integrator"

Expand All @@ -32,9 +26,6 @@ endif

if TARGET_INTEGRATORCP_CM920T

config SYS_CPU
default "arm920t"

config SYS_BOARD
default "integrator"

Expand All @@ -48,9 +39,6 @@ endif

if TARGET_INTEGRATORAP_CM926EJS

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "integrator"

Expand All @@ -64,9 +52,6 @@ endif

if TARGET_INTEGRATORCP_CM926EJS

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "integrator"

Expand All @@ -80,9 +65,6 @@ endif

if TARGET_INTEGRATORCP_CM1136

config SYS_CPU
default "arm1136"

config SYS_BOARD
default "integrator"

Expand All @@ -96,9 +78,6 @@ endif

if TARGET_INTEGRATORAP_CM946ES

config SYS_CPU
default "arm946es"

config SYS_BOARD
default "integrator"

Expand All @@ -112,9 +91,6 @@ endif

if TARGET_INTEGRATORCP_CM946ES

config SYS_CPU
default "arm946es"

config SYS_BOARD
default "integrator"

Expand Down
9 changes: 0 additions & 9 deletions board/armltd/vexpress/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_VEXPRESS_CA15_TC2

config SYS_CPU
default "armv7"

config SYS_BOARD
default "vexpress"

Expand All @@ -16,9 +13,6 @@ endif

if TARGET_VEXPRESS_CA5X2

config SYS_CPU
default "armv7"

config SYS_BOARD
default "vexpress"

Expand All @@ -32,9 +26,6 @@ endif

if TARGET_VEXPRESS_CA9X4

config SYS_CPU
default "armv7"

config SYS_BOARD
default "vexpress"

Expand Down
3 changes: 0 additions & 3 deletions board/atmel/at91rm9200ek/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_AT91RM9200EK

config SYS_CPU
default "arm920t"

config SYS_BOARD
default "at91rm9200ek"

Expand Down
3 changes: 0 additions & 3 deletions board/atmel/at91sam9260ek/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_AT91SAM9260EK

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "at91sam9260ek"

Expand Down
3 changes: 0 additions & 3 deletions board/atmel/at91sam9261ek/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if TARGET_AT91SAM9261EK

config SYS_CPU
default "arm926ejs"

config SYS_BOARD
default "at91sam9261ek"

Expand Down
Loading

0 comments on commit 2e07c24

Please sign in to comment.