diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 12:37:01 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 16:28:04 +0200 |
| commit | 89fd7e44dbe754366354cee37395f7fc11cce50e (patch) | |
| tree | 4eb451caf7f2f789ae9e381b48b012d61c6407c5 /arch/arm/cpu | |
| parent | 064fdcec9f72fa6616dc4d3bcf340705f27e5fe1 (diff) | |
| parent | 7286acab6715691c1262b320e9d22a480804ba49 (diff) | |
| download | barebox-89fd7e44dbe754366354cee37395f7fc11cce50e.tar.gz barebox-89fd7e44dbe754366354cee37395f7fc11cce50e.tar.xz | |
Merge branch 'for-next/marvell'
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig index 86bc174101..aed4cb7c63 100644 --- a/arch/arm/cpu/Kconfig +++ b/arch/arm/cpu/Kconfig @@ -39,6 +39,14 @@ config CPU_ARM926T Say Y if you want support for the ARM926T processor. Otherwise, say N. +# Feroceon +config CPU_FEROCEON + bool + select CPU_32v5 + help + This is a Marvell implementation of an ARMv5TE compatible + ARM core, used in the Marvell Kirkwood SoC family. + # ARMv6 config CPU_V6 bool |