[U-Boot] [PATCH 0/3] arm: add interrupt support

[U-Boot] [PATCH 0/3] arm: add interrupt support

[Georges Savoundararadj]

Hi folks,

I wanted to use interrupt on U-Boot on my Raspberry Pi but I have
found that it did not work properly.

My patches intend to make interrupt work.

Regards,

Georges

[U-Boot] [PATCH 1/3] arm: make .vectors section allocatable

[Georges Savoundararadj]

Before the commit 41623c91, the exception vector was in a .text
section which is allocatable. After this, the .vectors section was
introduced to contain the exception vector without specifying it as a
.text section but only as a executable section ("x").
This fix marks the section .vectors as allocatable as well ("ax") allowing
symbols to be relocated.

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
---
 arch/arm/lib/vectors.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
index 0cb87ce..49238ed 100644
--- a/arch/arm/lib/vectors.S
+++ b/arch/arm/lib/vectors.S
@@ -33,7 +33,7 @@
  *************************************************************************
  */
 
-	.section ".vectors", "x"
+	.section ".vectors", "ax"
 
 /*
  *************************************************************************
-- 
2.1.0

[U-Boot] [PATCH 1/3] arm: make .vectors section allocatable

[Albert ARIBAUD]

Hi Georges,

On Sun, 21 Sep 2014 23:33:48 +0200, Georges Savoundararadj
<savoundg@gmail.com> wrote:

> Before the commit 41623c91, the exception vector was in a .text
> section which is allocatable. After this, the .vectors section was
> introduced to contain the exception vector without specifying it as a
> .text section but only as a executable section ("x").
> This fix marks the section .vectors as allocatable as well ("ax") allowing
> symbols to be relocated.

Could you explain (on the list, not in the commit message, although I
might ask you to do it there too later on) the exact effects of adding
the "a" flag, i.e., what symbol exactly was broken by commit 41623c91,
how it is broken, and how "a" changes this?

On a deeper level, note that many ARM targets around do not have free
rein on where they can put vectors, e.g., they are limited to base
addresses of 0x00000000 or 0xFFFF0000. Thus, in many cases, vector are
relocated along with the rest of the image, but in fact, their base
address will not be their relocated address, and they will require
copying into whatever fixed location the target supports.

If you're going to fix general exception handling files (which I am
quite fine with), I would prefer that you solve the general problem,
i.e. either relocate vectors along with the code and fix VBAR on
plaforms that can use it, or relocate them to the fixed location wher
e the target expects them.

> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> ---
>  arch/arm/lib/vectors.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
> index 0cb87ce..49238ed 100644
> --- a/arch/arm/lib/vectors.S
> +++ b/arch/arm/lib/vectors.S
> @@ -33,7 +33,7 @@
>   *************************************************************************
>   */
>  
> -	.section ".vectors", "x"
> +	.section ".vectors", "ax"
>  
>  /*
>   *************************************************************************


Amicalement,
-- 
Albert.

[U-Boot] [PATCH 1/3] arm: make .vectors section allocatable

[Georges Savoundararadj]

Hi Albert,

Le 24/09/2014 09:34, Albert ARIBAUD a ?crit :
> Hi Georges,
>
> On Sun, 21 Sep 2014 23:33:48 +0200, Georges Savoundararadj
> <savoundg@gmail.com>  <mailto:savoundg@gmail.com>  wrote:
>
>> Before the commit 41623c91, the exception vector was in a .text
>> section which is allocatable. After this, the .vectors section was
>> introduced to contain the exception vector without specifying it as a
>> .text section but only as a executable section ("x").
>> This fix marks the section .vectors as allocatable as well ("ax") allowing
>> symbols to be relocated.
> Could you explain (on the list, not in the commit message, although I
> might ask you to do it there too later on) the exact effects of adding
> the "a" flag, i.e., what symbol exactly was broken by commit 41623c91,
> how it is broken, and how "a" changes this?
According to [1], the .text section has the attributes allocated and 
executable:
"The attributes used are SHF_ALLOC and SHF_EXECINSTR".

Before commit 41623c91, the exception vectors were not defined in a 
specific section.
For instance, see arch/arm/cpu/arm1176/start.S.
I think, if no specific section type is specified, the symbols will be, 
by default, in a .text section.
It is what we observe thanks to arm-none-eabi-objdump -D 
arch/arm/cpu/arm1176/start.o.

And, we notice that the addresses of the symbols of the exception 
vectors are indeed there:
0003328c <__rel_dyn_end-0x4b00>:
    3328c:       00008020        andeq   r8, r0, r0, lsr #32
    33290:       00000017        andeq   r0, r0, r7, lsl r0
    33294:       00008024        andeq   r8, r0, r4, lsr #32
    33298:       00000017        andeq   r0, r0, r7, lsl r0
    3329c:       00008028        andeq   r8, r0, r8, lsr #32
    332a0:       00000017        andeq   r0, r0, r7, lsl r0
    332a4:       0000802c        andeq   r8, r0, ip, lsr #32
8020 is the address of _undefined_instruction, 8024 of 
_software_interrupt, etc., ...

In commit 41623c91, a specific section is created to contain these 
symbols called .vectors
with the attribute executable (SHF_EXECINSTR or "x").

The symbols of the exception vectors are not referenced in .rel.dyn:
000332ac <__rel_dyn_end-0x4ac8>:
    332ac:       00008538        andeq   r8, r0, r8, lsr r5
    332b0:       00000017        andeq   r0, r0, r7, lsl r0
    332b4:       0000853c        andeq   r8, r0, ip, lsr r5
    332b8:       00000017        andeq   r0, r0, r7, lsl r0
    332bc:       00008540        andeq   r8, r0, r0, asr #10
    332c0:       00000017        andeq   r0, r0, r7, lsl r0
    332c4:       00008548        andeq   r8, r0, r8, asr #10
    332c8:       00000017        andeq   r0, r0, r7, lsl r0
    332cc:       0000854c        andeq   r8, r0, ip, asr #10

What has changed between commit 41623c91^ and 41623c91 is the attribute 
of the section where the exception
vectors are.
If we add the lacking attribute (SHF_ALLOC or "a") for the definition of 
the section .vectors, the problem is solved.
According to [1], a allocatable section is "a section [that] occupies 
memory during process execution" which is
the case of .vectors.

To summarize, the issue is to set the section where the symbols 
_undefined_instruction, _software_interrupt,
_prefetch_abort, _data_abort, _not_used, _irq and _fiq are as 
allocatable because the exception vectors
resides in memory during execution.
If we do not mark it as allocatable, these symbols will no be referenced 
for relocation.

[1] http://man7.org/linux/man-pages/man5/elf.5.html

> On a deeper level, note that many ARM targets around do not have free
> rein on where they can put vectors, e.g., they are limited to base
> addresses of 0x00000000 or 0xFFFF0000. Thus, in many cases, vector are
> relocated along with the rest of the image, but in fact, their base
> address will not be their relocated address, and they will require
> copying into whatever fixed location the target supports.
>
> If you're going to fix general exception handling files (which I am
> quite fine with), I would prefer that you solve the general problem,
> i.e. either relocate vectors along with the code and fix VBAR on
> plaforms that can use it, or relocate them to the fixed location wher
> e the target expects them.
I didn't plan to to do that. But, I am ok to propose you a more general 
patch.

Regards,

Georges

>> Signed-off-by: Georges Savoundararadj<savoundg@gmail.com>  <mailto:savoundg@gmail.com>
>> ---
>>   arch/arm/lib/vectors.S | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
>> index 0cb87ce..49238ed 100644
>> --- a/arch/arm/lib/vectors.S
>> +++ b/arch/arm/lib/vectors.S
>> @@ -33,7 +33,7 @@
>>    *************************************************************************
>>    */
>>   
>> -	.section ".vectors", "x"
>> +	.section ".vectors", "ax"
>>   
>>   /*
>>    *************************************************************************
> Amicalement,

[U-Boot] [PATCH 2/3] arm1176: move exception vectors after relocation

[Georges Savoundararadj]

ARM1176 has security extensions which includes the Vector Base Address
Register (VBAR) useful to move the exception vector after relocation.
This fix is similar to what is done for the ARMv7 (f8b9d1d3).

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
---
 arch/arm/cpu/arm1176/start.S | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 0704bdd..1c3dd91 100644
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -131,5 +131,11 @@ skip_tcmdisable:
 
 	.globl	c_runtime_cpu_setup
 c_runtime_cpu_setup:
+/*
+ * Move vector table
+ */
+	/* Set vector address in CP15 VBAR register */
+	ldr     r0, =_start
+	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
 
 	mov	pc, lr
-- 
2.1.0

[U-Boot] [PATCH 3/3] arm: enable_interrupts: set sp in IRQ/FIQ modes

[Georges Savoundararadj]

This commit sets the stack pointers for IRQ and FIQ modes.

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
---
 arch/arm/lib/interrupts.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index f6b7c03..49c1bf3 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -34,6 +34,25 @@ int interrupt_init (void)
 	IRQ_STACK_START_IN = gd->irq_sp + 8;
 	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 
+	__asm__ __volatile__("msr cpsr_c, %0\n"
+			     "mov sp, %1\n"
+			     :
+			     : "r" (IRQ_MODE | I_BIT | F_BIT),
+			       "r" (IRQ_STACK_START)
+			     : "memory");
+
+	__asm__ __volatile__("msr cpsr_c, %0\n"
+			     "mov sp, %1\n"
+			     :
+			     : "r" (FIQ_MODE | I_BIT | F_BIT),
+			       "r" (FIQ_STACK_START)
+			     : "memory");
+
+	__asm__ __volatile__("msr cpsr_c, %0"
+			     :
+			     : "r" (SVC_MODE | I_BIT | F_BIT)
+			     : "memory");
+
 	return arch_interrupt_init();
 }
 
-- 
2.1.0

[U-Boot] [PATCH 0/3] arm: add interrupt support

[Masahiro Yamada]

On Sun, 21 Sep 2014 23:33:47 +0200
Georges Savoundararadj <savoundg@gmail.com> wrote:

> Hi folks,
> 
> I wanted to use interrupt on U-Boot on my Raspberry Pi but I have
> found that it did not work properly.
> 
> My patches intend to make interrupt work.



I am not sure if interrupt feature is necessary for a boot loader.


If context switches happen, do we also need to support
spinlock etc.??


Best Regards
Masahiro Yamada

[U-Boot] [PATCH 0/3] arm: add interrupt support

[Georges Savoundararadj]

Le 22/09/2014 03:35, Masahiro Yamada a ?crit :
> On Sun, 21 Sep 2014 23:33:47 +0200
> Georges Savoundararadj<savoundg@gmail.com>  wrote:
>
>> Hi folks,
>>
>> I wanted to use interrupt on U-Boot on my Raspberry Pi but I have
>> found that it did not work properly.
>>
>> My patches intend to make interrupt work.
>
> I am not sure if interrupt feature is necessary for a boot loader.
Of course, It is not necessary.

But for U-boot, I think it is still important to handle exception 
correctly even if interrupts are not used. Don't you?

For instance, without these patches an undefined instruction or any 
other exception causes an unexpected behavior. It is better to handle 
properly these cases (dump registers and reset CPU, see functions do_* 
in arch/arm/lib/interrupts.c).
My patches should better be considered as *bugfixes*.

I should have explained better what these patches do:

* [PATCH 1/3] arm: make .vectors section allocatable:
This patch makes the symbols in the section .vectors relocatable. If the 
symbols address of undefined_instruction, for instance, is not fixed up 
after relocation, this could lead to an unexpected behavior. It fixes a 
regression introduced in commit 41623c91.

* [PATCH 2/3] arm1176: move exception vectors after relocation:
Without this patch, an exception will jump to the before relocation base 
address  which is clearly a bug.

* [PATCH 3/3] arm: enable_interrupts: set sp in IRQ/FIQ modes:
The init_interrupt function is not complete because it does not 
configure the computed stack pointers. So, why should we compute 
IRQ_STACK_START and FIQ_STACK_START without using them?

I hope I am clear.

Regards,

Georges

[U-Boot] [PATCH 0/3] arm: add interrupt support

[Masahiro YAMADA]

Hi Georges,

2014-09-23 3:24 GMT+09:00 Georges Savoundararadj <savoundg@gmail.com>:
> Le 22/09/2014 03:35, Masahiro Yamada a ?crit :
>>
>> On Sun, 21 Sep 2014 23:33:47 +0200
>> Georges Savoundararadj<savoundg@gmail.com>  wrote:
>>
>>> Hi folks,
>>>
>>> I wanted to use interrupt on U-Boot on my Raspberry Pi but I have
>>> found that it did not work properly.
>>>
>>> My patches intend to make interrupt work.
>>
>>
>> I am not sure if interrupt feature is necessary for a boot loader.
>
> Of course, It is not necessary.
>
> But for U-boot, I think it is still important to handle exception correctly
> even if interrupts are not used. Don't you?
>
> For instance, without these patches an undefined instruction or any other
> exception causes an unexpected behavior. It is better to handle properly
> these cases (dump registers and reset CPU, see functions do_* in
> arch/arm/lib/interrupts.c).
> My patches should better be considered as *bugfixes*.
>

Sorry, totally my misunderstanding.
(I thought you were trying to implement a full interrupt feature.)

As long as they are bug fixes of exception handlers, they are fine.

I should have read your patches more carefully before my response.
Again, my apologies..


Best Regards
Masahiro Yamada



-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH 0/3] arm: add interrupt support

[Albert ARIBAUD]

Hi Masahiro,

On Tue, 23 Sep 2014 12:17:28 +0900, Masahiro YAMADA
<yamada.m@jp.panasonic.com> wrote:

> Hi Georges,
> 
> 2014-09-23 3:24 GMT+09:00 Georges Savoundararadj <savoundg@gmail.com>:
> > Le 22/09/2014 03:35, Masahiro Yamada a ?crit :
> >>
> >> On Sun, 21 Sep 2014 23:33:47 +0200
> >> Georges Savoundararadj<savoundg@gmail.com>  wrote:
> >>
> >>> Hi folks,
> >>>
> >>> I wanted to use interrupt on U-Boot on my Raspberry Pi but I have
> >>> found that it did not work properly.
> >>>
> >>> My patches intend to make interrupt work.
> >>
> >>
> >> I am not sure if interrupt feature is necessary for a boot loader.
> >
> > Of course, It is not necessary.
> >
> > But for U-boot, I think it is still important to handle exception correctly
> > even if interrupts are not used. Don't you?
> >
> > For instance, without these patches an undefined instruction or any other
> > exception causes an unexpected behavior. It is better to handle properly
> > these cases (dump registers and reset CPU, see functions do_* in
> > arch/arm/lib/interrupts.c).
> > My patches should better be considered as *bugfixes*.
> >
> 
> Sorry, totally my misunderstanding.
> (I thought you were trying to implement a full interrupt feature.)
> 
> As long as they are bug fixes of exception handlers, they are fine.
> 
> I should have read your patches more carefully before my response.
> Again, my apologies..

But then, the patch series needs at east to be reworded, since it does
mention interrupts where actually all exceptions are involved.

Note to Georges: I am reading the patches right now and will comment on
them.

> Best Regards
> Masahiro Yamada

Amicalement,
-- 
Albert.

[U-Boot] [PATCH 0/3] arm: add interrupt support

[Albert ARIBAUD]

Hi Georges,

On Sun, 21 Sep 2014 23:33:47 +0200, Georges Savoundararadj
<savoundg@gmail.com> wrote:

> Hi folks,
> 
> I wanted to use interrupt on U-Boot on my Raspberry Pi but I have
> found that it did not work properly.
> 
> My patches intend to make interrupt work.
> 
> Regards,
> 
> Georges

Could you please make the cover letter a summary of the patch series
content, as is the custom here? I suggest using patman, which would
help you managing not only the cover letter generation but also the
change history of your patch series.

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v2 0/3] arm: fix exception handling

[Georges Savoundararadj]

Hi,

This series fixes the exception handling on ARM.

First of all, it makes the symbols of the exception vectors relocatable.
Then, it ensures that the exception vectors are relocated. To do so, we
copy or move the exception vectors depending on the processor
capability.  Also, this series configures correctly the IRQ and the FIQ
stack pointers.

Regards,

Georges

Changes in v2:
- Relocate exception vectors also on processors which do not support
  security extensions
- Reword the commit messages

Georges Savoundararadj (3):
  arm: make .vectors section allocatable
  arm: relocate the exception vectors
  arm: interrupt_init: set sp in IRQ/FIQ modes

 arch/arm/cpu/armv7/start.S |  6 ------
 arch/arm/lib/interrupts.c  | 19 +++++++++++++++++++
 arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
 arch/arm/lib/vectors.S     |  2 +-
 4 files changed, 50 insertions(+), 7 deletions(-)

-- 
2.1.0

[U-Boot] [PATCH v2 1/3] arm: make .vectors section allocatable

[Georges Savoundararadj]

A regression was introduced in commit 41623c91. The consequence of that
is the non-relocation of the section .vectors symbols :
_undefined_instruction, _software_interrupt, _prefetch_abort,
_data_abort, _not_used, _irq and _fiq.

Before commit 41623c91, the exception vectors were in a .text section.
The .text section has the attributes allocatable and executable [1].

In commit 41623c91, a specific section is created, called .vectors, with
the attribute executable only.

What have changed between commit 41623c91^ and 41623c91 is the attribute
of the section which contains the exception vectors.
An allocatable section is "a section [that] occupies memory during
process execution" [1] which is the case of the section .vectors.
Adding the lacking attribute (SHF_ALLOC or "a") for the definition of
the section .vectors fixed the issue.

To summarize, the fix has to mark .vectors as allocatable because the
exception vectors reside in "memory during execution" and they need to
be relocated.

[1] http://man7.org/linux/man-pages/man5/elf.5.html

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Albert Aribeau <albert.u.boot@aribaud.net>

---

Changes in v2:
- Reword the commit message

 arch/arm/lib/vectors.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
index 0cb87ce..49238ed 100644
--- a/arch/arm/lib/vectors.S
+++ b/arch/arm/lib/vectors.S
@@ -33,7 +33,7 @@
  *************************************************************************
  */
 
-	.section ".vectors", "x"
+	.section ".vectors", "ax"
 
 /*
  *************************************************************************
-- 
2.1.0

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Georges Savoundararadj]

This commit relocates the exception vectors.
As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
the other ARM processors, it copies the relocated exception vectors to
the correct address: 0x00000000 or 0xFFFF0000.

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Warren <twarren@nvidia.com>

---
This patch needs some tests because it impacts many boards. I have
tested it with my raspberry pi in the two cases: using VBAR and
using the copied exception vectors.

Changes in v2:
- Relocate exception vectors also on processors which do not support
  security extensions
- Reword the commit message

 arch/arm/cpu/armv7/start.S |  6 ------
 arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index fedd7c8..fdc05b9 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
 	mcr     p15, 0, r0, c7, c10, 4	@ DSB
 	mcr     p15, 0, r0, c7, c5, 4	@ ISB
 #endif
-/*
- * Move vector table
- */
-	/* Set vector address in CP15 VBAR register */
-	ldr     r0, =_start
-	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
 
 	bx	lr
 
diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
index 8035251..88a478e 100644
--- a/arch/arm/lib/relocate.S
+++ b/arch/arm/lib/relocate.S
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#include <asm-offsets.h>
+#include <config.h>
 #include <linux/linkage.h>
 
 /*
@@ -52,6 +54,34 @@ fixnext:
 	cmp	r2, r3
 	blo	fixloop
 
+	/*
+	 * Relocate the exception vectors
+	 */
+#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))
+	/*
+	 * If the ARM processor has the security extensions,
+	 * use VBAR to relocate the exception vectors.
+	 */
+	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
+	mcr     p15, 0, r0, c12, c0, 0  /* Set VBAR */
+#else
+	/*
+	 * Copy the relocated exception vectors to the
+	 * correct address
+	 * CP15 c1 V bit gives us the location of the vectors:
+	 * 0x00000000 or 0xFFFF0000.
+	 */
+	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
+	mrc	p15, 0, r2, c1, c0, 0	/* V bit (bit[13]) in CP15 c1 */
+	ands	r2, r2, #(1 << 13)
+	ldreq	r1, =0x00000000 	/* If V=0 */
+	ldrne	r1, =0xFFFF0000 	/* If V=1 */
+	ldmia	r0!, {r2-r8,r10}
+	stmia	r1!, {r2-r8,r10}
+	ldmia	r0!, {r2-r8,r10}
+	stmia	r1!, {r2-r8,r10}
+#endif
+
 relocate_done:
 
 #ifdef __XSCALE__
-- 
2.1.0

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Albert ARIBAUD]

Hi Georges,

On Sat, 27 Sep 2014 21:48:10 +0200, Georges Savoundararadj
<savoundg@gmail.com> wrote:

> This commit relocates the exception vectors.
> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
> the other ARM processors, it copies the relocated exception vectors to
> the correct address: 0x00000000 or 0xFFFF0000.
> 
> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Tom Warren <twarren@nvidia.com>
> 
> ---
> This patch needs some tests because it impacts many boards. I have
> tested it with my raspberry pi in the two cases: using VBAR and
> using the copied exception vectors.
> 
> Changes in v2:
> - Relocate exception vectors also on processors which do not support
>   security extensions
> - Reword the commit message
> 
>  arch/arm/cpu/armv7/start.S |  6 ------
>  arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
>  2 files changed, 30 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> index fedd7c8..fdc05b9 100644
> --- a/arch/arm/cpu/armv7/start.S
> +++ b/arch/arm/cpu/armv7/start.S
> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
>  	mcr     p15, 0, r0, c7, c10, 4	@ DSB
>  	mcr     p15, 0, r0, c7, c5, 4	@ ISB
>  #endif
> -/*
> - * Move vector table
> - */
> -	/* Set vector address in CP15 VBAR register */
> -	ldr     r0, =_start
> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
>  
>  	bx	lr
>  
> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
> index 8035251..88a478e 100644
> --- a/arch/arm/lib/relocate.S
> +++ b/arch/arm/lib/relocate.S
> @@ -6,6 +6,8 @@
>   * SPDX-License-Identifier:	GPL-2.0+
>   */
>  
> +#include <asm-offsets.h>
> +#include <config.h>
>  #include <linux/linkage.h>
>  
>  /*
> @@ -52,6 +54,34 @@ fixnext:
>  	cmp	r2, r3
>  	blo	fixloop
>  
> +	/*
> +	 * Relocate the exception vectors
> +	 */
> +#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))

I would prefer a single CONFIG_HAS_VBAR symbol defined through
Kconfig.

> +	/*
> +	 * If the ARM processor has the security extensions,
> +	 * use VBAR to relocate the exception vectors.
> +	 */
> +	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
> +	mcr     p15, 0, r0, c12, c0, 0  /* Set VBAR */
> +#else
> +	/*
> +	 * Copy the relocated exception vectors to the
> +	 * correct address
> +	 * CP15 c1 V bit gives us the location of the vectors:
> +	 * 0x00000000 or 0xFFFF0000.
> +	 */
> +	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
> +	mrc	p15, 0, r2, c1, c0, 0	/* V bit (bit[13]) in CP15 c1 */
> +	ands	r2, r2, #(1 << 13)
> +	ldreq	r1, =0x00000000 	/* If V=0 */
> +	ldrne	r1, =0xFFFF0000 	/* If V=1 */
> +	ldmia	r0!, {r2-r8,r10}
> +	stmia	r1!, {r2-r8,r10}
> +	ldmia	r0!, {r2-r8,r10}
> +	stmia	r1!, {r2-r8,r10}
> +#endif
> +
>  relocate_done:
>  
>  #ifdef __XSCALE__


Amicalement,
-- 
Albert.

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Georges Savoundararadj]

Hi Albert,

Hi Masahiro,

As my issue is related to Kconfig, I would like you to give me your 
opinions.


Le 11/10/2014 12:47, Albert ARIBAUD a ?crit :
> Hi Georges,
>
> On Sat, 27 Sep 2014 21:48:10 +0200, Georges Savoundararadj
> <savoundg@gmail.com> wrote:
>
>> This commit relocates the exception vectors.
>> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
>> the other ARM processors, it copies the relocated exception vectors to
>> the correct address: 0x00000000 or 0xFFFF0000.
>>
>> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>> Cc: Tom Warren <twarren@nvidia.com>
>>
>> ---
>> This patch needs some tests because it impacts many boards. I have
>> tested it with my raspberry pi in the two cases: using VBAR and
>> using the copied exception vectors.
>>
>> Changes in v2:
>> - Relocate exception vectors also on processors which do not support
>>    security extensions
>> - Reword the commit message
>>
>>   arch/arm/cpu/armv7/start.S |  6 ------
>>   arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
>>   2 files changed, 30 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
>> index fedd7c8..fdc05b9 100644
>> --- a/arch/arm/cpu/armv7/start.S
>> +++ b/arch/arm/cpu/armv7/start.S
>> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
>>   	mcr     p15, 0, r0, c7, c10, 4	@ DSB
>>   	mcr     p15, 0, r0, c7, c5, 4	@ ISB
>>   #endif
>> -/*
>> - * Move vector table
>> - */
>> -	/* Set vector address in CP15 VBAR register */
>> -	ldr     r0, =_start
>> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
>>   
>>   	bx	lr
>>   
>> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
>> index 8035251..88a478e 100644
>> --- a/arch/arm/lib/relocate.S
>> +++ b/arch/arm/lib/relocate.S
>> @@ -6,6 +6,8 @@
>>    * SPDX-License-Identifier:	GPL-2.0+
>>    */
>>   
>> +#include <asm-offsets.h>
>> +#include <config.h>
>>   #include <linux/linkage.h>
>>   
>>   /*
>> @@ -52,6 +54,34 @@ fixnext:
>>   	cmp	r2, r3
>>   	blo	fixloop
>>   
>> +	/*
>> +	 * Relocate the exception vectors
>> +	 */
>> +#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))
> I would prefer a single CONFIG_HAS_VBAR symbol defined through
> Kconfig.
1)
Actually, there is no Kconfig entry such as "config ARM1176" nor "config 
ARMV7" in U-Boot,
unlike in Linux (arch/arm/mm/Kconfig).

If there were such entries, we would simply do like the following (in 
arch/arm/Kconfig):

config HAS_VBAR
     bool

config ARM1176
     select HAS_VBAR

config ARMV7
     select HAS_VBAR

Should we go in this direction?
It is the cleanest way to use Kconfig but it requires some work in order 
to convert all
"#define CONFIG_<cpu>" into Kconfig entries.

2)
Otherwise, we can insert a "select HAS_VBAR" in all boards that have a 
ARM1176 or a ARMv7
processor in arch/arm/Kconfig. It is not logical but this is what has 
been done with the Kconfig
entry ARM64. And, it does not require much change.

3)
The last thing we can do is as follows:

config HAS_VBAR
         bool
         depends on SYS_CPU = "arm1176" || SYS_CPU = "armv7"
         default y

CONFIG_HAS_VBAR will be defined if SYS_CPU are arm1176 or armv7. It does 
not require much
change as well but, I think, it is bad code.

What do you think is the best way to introduce CONFIG_HAS_VBAR symbol? 
(1, 2 or 3)

>> +	/*
>> +	 * If the ARM processor has the security extensions,
>> +	 * use VBAR to relocate the exception vectors.
>> +	 */
>> +	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
>> +	mcr     p15, 0, r0, c12, c0, 0  /* Set VBAR */
>> +#else
>> +	/*
>> +	 * Copy the relocated exception vectors to the
>> +	 * correct address
>> +	 * CP15 c1 V bit gives us the location of the vectors:
>> +	 * 0x00000000 or 0xFFFF0000.
>> +	 */
>> +	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
>> +	mrc	p15, 0, r2, c1, c0, 0	/* V bit (bit[13]) in CP15 c1 */
>> +	ands	r2, r2, #(1 << 13)
>> +	ldreq	r1, =0x00000000 	/* If V=0 */
>> +	ldrne	r1, =0xFFFF0000 	/* If V=1 */
>> +	ldmia	r0!, {r2-r8,r10}
>> +	stmia	r1!, {r2-r8,r10}
>> +	ldmia	r0!, {r2-r8,r10}
>> +	stmia	r1!, {r2-r8,r10}
>> +#endif
>> +
>>   relocate_done:
>>   
>>   #ifdef __XSCALE__
>
> Amicalement,
Regards,

Georges

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Albert ARIBAUD]

Hi Georges,

On Tue, 14 Oct 2014 22:02:00 +0200, Georges Savoundararadj
<savoundg@gmail.com> wrote:

> Hi Albert,
> 
> Hi Masahiro,

(putting Masahiro in Cc: just in case)

> As my issue is related to Kconfig, I would like you to give me your 
> opinions.
> 
> 
> Le 11/10/2014 12:47, Albert ARIBAUD a ?crit :
> > Hi Georges,
> >
> > On Sat, 27 Sep 2014 21:48:10 +0200, Georges Savoundararadj
> > <savoundg@gmail.com> wrote:
> >
> >> This commit relocates the exception vectors.
> >> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
> >> the other ARM processors, it copies the relocated exception vectors to
> >> the correct address: 0x00000000 or 0xFFFF0000.
> >>
> >> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> >> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> >> Cc: Tom Warren <twarren@nvidia.com>
> >>
> >> ---
> >> This patch needs some tests because it impacts many boards. I have
> >> tested it with my raspberry pi in the two cases: using VBAR and
> >> using the copied exception vectors.
> >>
> >> Changes in v2:
> >> - Relocate exception vectors also on processors which do not support
> >>    security extensions
> >> - Reword the commit message
> >>
> >>   arch/arm/cpu/armv7/start.S |  6 ------
> >>   arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
> >>   2 files changed, 30 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> >> index fedd7c8..fdc05b9 100644
> >> --- a/arch/arm/cpu/armv7/start.S
> >> +++ b/arch/arm/cpu/armv7/start.S
> >> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
> >>   	mcr     p15, 0, r0, c7, c10, 4	@ DSB
> >>   	mcr     p15, 0, r0, c7, c5, 4	@ ISB
> >>   #endif
> >> -/*
> >> - * Move vector table
> >> - */
> >> -	/* Set vector address in CP15 VBAR register */
> >> -	ldr     r0, =_start
> >> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
> >>   
> >>   	bx	lr
> >>   
> >> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
> >> index 8035251..88a478e 100644
> >> --- a/arch/arm/lib/relocate.S
> >> +++ b/arch/arm/lib/relocate.S
> >> @@ -6,6 +6,8 @@
> >>    * SPDX-License-Identifier:	GPL-2.0+
> >>    */
> >>   
> >> +#include <asm-offsets.h>
> >> +#include <config.h>
> >>   #include <linux/linkage.h>
> >>   
> >>   /*
> >> @@ -52,6 +54,34 @@ fixnext:
> >>   	cmp	r2, r3
> >>   	blo	fixloop
> >>   
> >> +	/*
> >> +	 * Relocate the exception vectors
> >> +	 */
> >> +#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))
> > I would prefer a single CONFIG_HAS_VBAR symbol defined through
> > Kconfig.
> 1)
> Actually, there is no Kconfig entry such as "config ARM1176" nor "config 
> ARMV7" in U-Boot,
> unlike in Linux (arch/arm/mm/Kconfig).
> 
> If there were such entries, we would simply do like the following (in 
> arch/arm/Kconfig):
> 
> config HAS_VBAR
>      bool
> 
> config ARM1176
>      select HAS_VBAR
> 
> config ARMV7
>      select HAS_VBAR
> 
> Should we go in this direction?
> It is the cleanest way to use Kconfig but it requires some work in order 
> to convert all
> "#define CONFIG_<cpu>" into Kconfig entries.
> 
> 2)
> Otherwise, we can insert a "select HAS_VBAR" in all boards that have a 
> ARM1176 or a ARMv7
> processor in arch/arm/Kconfig. It is not logical but this is what has 
> been done with the Kconfig
> entry ARM64. And, it does not require much change.
> 
> 3)
> The last thing we can do is as follows:
> 
> config HAS_VBAR
>          bool
>          depends on SYS_CPU = "arm1176" || SYS_CPU = "armv7"
>          default y
> 
> CONFIG_HAS_VBAR will be defined if SYS_CPU are arm1176 or armv7. It does 
> not require much
> change as well but, I think, it is bad code.
> 
> What do you think is the best way to introduce CONFIG_HAS_VBAR symbol? 
> (1, 2 or 3)

I believe you have already sorted the options in order of decreasing
'quality' -- 1 being the best option, and 3 being the worst... Indeed
option 1 would be the best and cleanest, and it could possibly open the
way for other per-CPU options.

We could try and limit the effort to converting only ARM1176 and ARMV7
and leaving other CONFIG_<cpu> #define'd until some later point in the
future, but experience shows that such half-hearted attempts are never
completed.

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Georges Savoundararadj]

Hi Albert,

Le 15/10/2014 00:11, Albert ARIBAUD a ?crit :
> Hi Georges,
>
> On Tue, 14 Oct 2014 22:02:00 +0200, Georges Savoundararadj
> <savoundg@gmail.com> wrote:
>
>> Hi Albert,
>>
>> Hi Masahiro,
> (putting Masahiro in Cc: just in case)
>
>> As my issue is related to Kconfig, I would like you to give me your
>> opinions.
>>
>>
>> Le 11/10/2014 12:47, Albert ARIBAUD a ?crit :
>>> Hi Georges,
>>>
>>> On Sat, 27 Sep 2014 21:48:10 +0200, Georges Savoundararadj
>>> <savoundg@gmail.com> wrote:
>>>
>>>> This commit relocates the exception vectors.
>>>> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
>>>> the other ARM processors, it copies the relocated exception vectors to
>>>> the correct address: 0x00000000 or 0xFFFF0000.
>>>>
>>>> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
>>>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>>>> Cc: Tom Warren <twarren@nvidia.com>
>>>>
>>>> ---
>>>> This patch needs some tests because it impacts many boards. I have
>>>> tested it with my raspberry pi in the two cases: using VBAR and
>>>> using the copied exception vectors.
>>>>
>>>> Changes in v2:
>>>> - Relocate exception vectors also on processors which do not support
>>>>     security extensions
>>>> - Reword the commit message
>>>>
>>>>    arch/arm/cpu/armv7/start.S |  6 ------
>>>>    arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
>>>>    2 files changed, 30 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
>>>> index fedd7c8..fdc05b9 100644
>>>> --- a/arch/arm/cpu/armv7/start.S
>>>> +++ b/arch/arm/cpu/armv7/start.S
>>>> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
>>>>    	mcr     p15, 0, r0, c7, c10, 4	@ DSB
>>>>    	mcr     p15, 0, r0, c7, c5, 4	@ ISB
>>>>    #endif
>>>> -/*
>>>> - * Move vector table
>>>> - */
>>>> -	/* Set vector address in CP15 VBAR register */
>>>> -	ldr     r0, =_start
>>>> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
>>>>    
>>>>    	bx	lr
>>>>    
>>>> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
>>>> index 8035251..88a478e 100644
>>>> --- a/arch/arm/lib/relocate.S
>>>> +++ b/arch/arm/lib/relocate.S
>>>> @@ -6,6 +6,8 @@
>>>>     * SPDX-License-Identifier:	GPL-2.0+
>>>>     */
>>>>    
>>>> +#include <asm-offsets.h>
>>>> +#include <config.h>
>>>>    #include <linux/linkage.h>
>>>>    
>>>>    /*
>>>> @@ -52,6 +54,34 @@ fixnext:
>>>>    	cmp	r2, r3
>>>>    	blo	fixloop
>>>>    
>>>> +	/*
>>>> +	 * Relocate the exception vectors
>>>> +	 */
>>>> +#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))
>>> I would prefer a single CONFIG_HAS_VBAR symbol defined through
>>> Kconfig.
>> 1)
>> Actually, there is no Kconfig entry such as "config ARM1176" nor "config
>> ARMV7" in U-Boot,
>> unlike in Linux (arch/arm/mm/Kconfig).
>>
>> If there were such entries, we would simply do like the following (in
>> arch/arm/Kconfig):
>>
>> config HAS_VBAR
>>       bool
>>
>> config ARM1176
>>       select HAS_VBAR
>>
>> config ARMV7
>>       select HAS_VBAR
>>
>> Should we go in this direction?
>> It is the cleanest way to use Kconfig but it requires some work in order
>> to convert all
>> "#define CONFIG_<cpu>" into Kconfig entries.
>>
>> 2)
>> Otherwise, we can insert a "select HAS_VBAR" in all boards that have a
>> ARM1176 or a ARMv7
>> processor in arch/arm/Kconfig. It is not logical but this is what has
>> been done with the Kconfig
>> entry ARM64. And, it does not require much change.
>>
>> 3)
>> The last thing we can do is as follows:
>>
>> config HAS_VBAR
>>           bool
>>           depends on SYS_CPU = "arm1176" || SYS_CPU = "armv7"
>>           default y
>>
>> CONFIG_HAS_VBAR will be defined if SYS_CPU are arm1176 or armv7. It does
>> not require much
>> change as well but, I think, it is bad code.
>>
>> What do you think is the best way to introduce CONFIG_HAS_VBAR symbol?
>> (1, 2 or 3)
> I believe you have already sorted the options in order of decreasing
> 'quality' -- 1 being the best option, and 3 being the worst... Indeed
> option 1 would be the best and cleanest, and it could possibly open the
> way for other per-CPU options.
>
> We could try and limit the effort to converting only ARM1176 and ARMV7
> and leaving other CONFIG_<cpu> #define'd until some later point in the
> future, but experience shows that such half-hearted attempts are never
> completed.
>
> Amicalement,

I am currently trying to implement solution 1. only for ARM1176 and 
ARMV7 but I wonder
if this work worth the effort just for one CPU feature.
Do you expect more CPU feature like HAS_VBAR coming in the future?

I add the following lines in arch/arm/Kconfig:
config HAS_VBAR
        bool

config ARM1176
        bool
        select HAS_VBAR

config ARMV7
         bool
         select HAS_VBAR

config SYS_CPU
        default "arm1176" if ARM1176
        default "armv7" if ARMV7

Then, in the same file, under each "config TARGET_<board>",  I add 
"select ARM1176" or "select ARMV7".
Also, I delete the Kconfig entries "config SYS_CPU" in all Kconfig of 
*all* boards that use ARM1176 and ARMV7.

Actually, I find the change quite big. What do you think about this 
implementation?
Should I continue in this direction?

Regards,

Georges

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Masahiro Yamada]

Hi Georges and Albert,

Sorry for late reply because I was out of office for ELCE2014
and missed this thread.



On Mon, 20 Oct 2014 23:08:30 +0200
Georges Savoundararadj <savoundg@gmail.com> wrote:

> Hi Albert,
> 
> Le 15/10/2014 00:11, Albert ARIBAUD a ecrit :
> > Hi Georges,
> >
> > On Tue, 14 Oct 2014 22:02:00 +0200, Georges Savoundararadj
> > <savoundg@gmail.com> wrote:
> >
> >> Hi Albert,
> >>
> >> Hi Masahiro,
> > (putting Masahiro in Cc: just in case)
> >
> >> As my issue is related to Kconfig, I would like you to give me your
> >> opinions.
> >>
> >>
> >> Le 11/10/2014 12:47, Albert ARIBAUD a ecrit :
> >>> Hi Georges,
> >>>
> >>> On Sat, 27 Sep 2014 21:48:10 +0200, Georges Savoundararadj
> >>> <savoundg@gmail.com> wrote:
> >>>
> >>>> This commit relocates the exception vectors.
> >>>> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
> >>>> the other ARM processors, it copies the relocated exception vectors to
> >>>> the correct address: 0x00000000 or 0xFFFF0000.
> >>>>
> >>>> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> >>>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> >>>> Cc: Tom Warren <twarren@nvidia.com>
> >>>>
> >>>> ---
> >>>> This patch needs some tests because it impacts many boards. I have
> >>>> tested it with my raspberry pi in the two cases: using VBAR and
> >>>> using the copied exception vectors.
> >>>>
> >>>> Changes in v2:
> >>>> - Relocate exception vectors also on processors which do not support
> >>>>     security extensions
> >>>> - Reword the commit message
> >>>>
> >>>>    arch/arm/cpu/armv7/start.S |  6 ------
> >>>>    arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
> >>>>    2 files changed, 30 insertions(+), 6 deletions(-)
> >>>>
> >>>> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> >>>> index fedd7c8..fdc05b9 100644
> >>>> --- a/arch/arm/cpu/armv7/start.S
> >>>> +++ b/arch/arm/cpu/armv7/start.S
> >>>> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
> >>>>    	mcr     p15, 0, r0, c7, c10, 4	@ DSB
> >>>>    	mcr     p15, 0, r0, c7, c5, 4	@ ISB
> >>>>    #endif
> >>>> -/*
> >>>> - * Move vector table
> >>>> - */
> >>>> -	/* Set vector address in CP15 VBAR register */
> >>>> -	ldr     r0, =_start
> >>>> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
> >>>>    >>>>    	bx	lr
> >>>>    >>>> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
> >>>> index 8035251..88a478e 100644
> >>>> --- a/arch/arm/lib/relocate.S
> >>>> +++ b/arch/arm/lib/relocate.S
> >>>> @@ -6,6 +6,8 @@
> >>>>     * SPDX-License-Identifier:	GPL-2.0+
> >>>>     */
> >>>>    >>>> +#include <asm-offsets.h>
> >>>> +#include <config.h>
> >>>>    #include <linux/linkage.h>
> >>>>    >>>>    /*
> >>>> @@ -52,6 +54,34 @@ fixnext:
> >>>>    	cmp	r2, r3
> >>>>    	blo	fixloop
> >>>>    >>>> +	/*
> >>>> +	 * Relocate the exception vectors
> >>>> +	 */
> >>>> +#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))
> >>> I would prefer a single CONFIG_HAS_VBAR symbol defined through
> >>> Kconfig.
> >> 1)
> >> Actually, there is no Kconfig entry such as "config ARM1176" nor "config
> >> ARMV7" in U-Boot,
> >> unlike in Linux (arch/arm/mm/Kconfig).
> >>
> >> If there were such entries, we would simply do like the following (in
> >> arch/arm/Kconfig):
> >>
> >> config HAS_VBAR
> >>       bool
> >>
> >> config ARM1176
> >>       select HAS_VBAR
> >>
> >> config ARMV7
> >>       select HAS_VBAR
> >>
> >> Should we go in this direction?
> >> It is the cleanest way to use Kconfig but it requires some work in order
> >> to convert all
> >> "#define CONFIG_<cpu>" into Kconfig entries.
> >>
> >> 2)
> >> Otherwise, we can insert a "select HAS_VBAR" in all boards that have a
> >> ARM1176 or a ARMv7
> >> processor in arch/arm/Kconfig. It is not logical but this is what has
> >> been done with the Kconfig
> >> entry ARM64. And, it does not require much change.
> >>
> >> 3)
> >> The last thing we can do is as follows:
> >>
> >> config HAS_VBAR
> >>           bool
> >>           depends on SYS_CPU = "arm1176" || SYS_CPU = "armv7"
> >>           default y
> >>
> >> CONFIG_HAS_VBAR will be defined if SYS_CPU are arm1176 or armv7. It does
> >> not require much
> >> change as well but, I think, it is bad code.
> >>
> >> What do you think is the best way to introduce CONFIG_HAS_VBAR symbol?
> >> (1, 2 or 3)
> > I believe you have already sorted the options in order of decreasing
> > 'quality' -- 1 being the best option, and 3 being the worst... Indeed
> > option 1 would be the best and cleanest, and it could possibly open the
> > way for other per-CPU options.
> >
> > We could try and limit the effort to converting only ARM1176 and ARMV7
> > and leaving other CONFIG_<cpu> #define'd until some later point in the
> > future, but experience shows that such half-hearted attempts are never
> > completed.
> >
> > Amicalement,
> 
> I am currently trying to implement solution 1. only for ARM1176 and ARMV7 but I wonder
> if this work worth the effort just for one CPU feature.
> Do you expect more CPU feature like HAS_VBAR coming in the future?
> 
> I add the following lines in arch/arm/Kconfig:
> config HAS_VBAR
>         bool
> 
> config ARM1176
>         bool
>         select HAS_VBAR
> 
> config ARMV7
>          bool
>          select HAS_VBAR
> 
> config SYS_CPU
>         default "arm1176" if ARM1176
>         default "armv7" if ARMV7
> 
> Then, in the same file, under each "config TARGET_<board>",  I add "select ARM1176" or "select ARMV7".
> Also, I delete the Kconfig entries "config SYS_CPU" in all Kconfig of *all* boards that use ARM1176 and ARMV7.
> 
> Actually, I find the change quite big. What do you think about this implementation?
> Should I continue in this direction?
> 

Agreed on 1).

I was thinking about this since I introduced Kconfig at 2014.10-rc1.
It is good to know you're working on this since it can save my time.  :-)

My only request is, can you use CPU_ARM1176, CPU_V7 instead of ARM1176, ARMV7 ?
It looks like arm/arm/mm/Kconfig uses this way and CONFIG_CPU_ prefix makes things clear.


CONFIG_ARM1176 and CONFIG_ARMV7 are never referenced at all.
Also, CONFIG_ARMV7 is only defined in some armv7 boards.
For instance, Zynq boards define it but Tegra boards don't.
It is useless and should be removed someday.



I have a question:

You are covering only arm1176 and armv7.
What about arm1136?

I am not sure, but arm1136 and arm1176 both belong to ARMv6 generation?
If so, does arm1136 have VBAR register, doesn't it?





Best Regards
Masahiro Yamada

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Albert ARIBAUD]

Hi Masahiro,

On Tue, 21 Oct 2014 14:41:14 +0900, Masahiro Yamada
<yamada.m@jp.panasonic.com> wrote:

> I have a question:
> 
> You are covering only arm1176 and armv7.
> What about arm1136?
> 
> I am not sure, but arm1136 and arm1176 both belong to ARMv6 generation?
> If so, does arm1136 have VBAR register, doesn't it?

ARM1136 is ARMv6 but does not have VBAR. Its vectors can only be at
0x00000000 or 0xFFFF0000 (see page 3-65 of the ARM1136 ARM r1p5,
DDI0211K).

> Best Regards
> Masahiro Yamada

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Masahiro Yamada]

Hi Albert,

On Tue, 21 Oct 2014 16:05:25 +0200
Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:

> Hi Masahiro,
> 
> On Tue, 21 Oct 2014 14:41:14 +0900, Masahiro Yamada
> <yamada.m@jp.panasonic.com> wrote:
> 
> > I have a question:
> > 
> > You are covering only arm1176 and armv7.
> > What about arm1136?
> > 
> > I am not sure, but arm1136 and arm1176 both belong to ARMv6 generation?
> > If so, does arm1136 have VBAR register, doesn't it?
> 
> ARM1136 is ARMv6 but does not have VBAR. Its vectors can only be at
> 0x00000000 or 0xFFFF0000 (see page 3-65 of the ARM1136 ARM r1p5,
> DDI0211K).


Sorry, I did not know this. Just disregard my comment, please.


Best Regards
Masahiro Yamada

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Georges Savoundararadj]

Hi Masahiro,

Le 21/10/2014 07:41, Masahiro Yamada a ?crit :
> Hi Georges and Albert,
>
> Sorry for late reply because I was out of office for ELCE2014
> and missed this thread.
>
>
>
> On Mon, 20 Oct 2014 23:08:30 +0200
> Georges Savoundararadj <savoundg@gmail.com> wrote:
>
>> Hi Albert,
>>
>> Le 15/10/2014 00:11, Albert ARIBAUD a ecrit :
>>> Hi Georges,
>>>
>>> On Tue, 14 Oct 2014 22:02:00 +0200, Georges Savoundararadj
>>> <savoundg@gmail.com> wrote:
>>>
>>>> Hi Albert,
>>>>
>>>> Hi Masahiro,
>>> (putting Masahiro in Cc: just in case)
>>>
>>>> As my issue is related to Kconfig, I would like you to give me your
>>>> opinions.
>>>>
>>>>
>>>> Le 11/10/2014 12:47, Albert ARIBAUD a ecrit :
>>>>> Hi Georges,
>>>>>
>>>>> On Sat, 27 Sep 2014 21:48:10 +0200, Georges Savoundararadj
>>>>> <savoundg@gmail.com> wrote:
>>>>>
>>>>>> This commit relocates the exception vectors.
>>>>>> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
>>>>>> the other ARM processors, it copies the relocated exception vectors to
>>>>>> the correct address: 0x00000000 or 0xFFFF0000.
>>>>>>
>>>>>> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
>>>>>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>>>>>> Cc: Tom Warren <twarren@nvidia.com>
>>>>>>
>>>>>> ---
>>>>>> This patch needs some tests because it impacts many boards. I have
>>>>>> tested it with my raspberry pi in the two cases: using VBAR and
>>>>>> using the copied exception vectors.
>>>>>>
>>>>>> Changes in v2:
>>>>>> - Relocate exception vectors also on processors which do not support
>>>>>>      security extensions
>>>>>> - Reword the commit message
>>>>>>
>>>>>>     arch/arm/cpu/armv7/start.S |  6 ------
>>>>>>     arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
>>>>>>     2 files changed, 30 insertions(+), 6 deletions(-)
>>>>>>
>>>>>> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
>>>>>> index fedd7c8..fdc05b9 100644
>>>>>> --- a/arch/arm/cpu/armv7/start.S
>>>>>> +++ b/arch/arm/cpu/armv7/start.S
>>>>>> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
>>>>>>     	mcr     p15, 0, r0, c7, c10, 4	@ DSB
>>>>>>     	mcr     p15, 0, r0, c7, c5, 4	@ ISB
>>>>>>     #endif
>>>>>> -/*
>>>>>> - * Move vector table
>>>>>> - */
>>>>>> -	/* Set vector address in CP15 VBAR register */
>>>>>> -	ldr     r0, =_start
>>>>>> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
>>>>>>     >>>>    	bx	lr
>>>>>>     >>>> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
>>>>>> index 8035251..88a478e 100644
>>>>>> --- a/arch/arm/lib/relocate.S
>>>>>> +++ b/arch/arm/lib/relocate.S
>>>>>> @@ -6,6 +6,8 @@
>>>>>>      * SPDX-License-Identifier:	GPL-2.0+
>>>>>>      */
>>>>>>     >>>> +#include <asm-offsets.h>
>>>>>> +#include <config.h>
>>>>>>     #include <linux/linkage.h>
>>>>>>     >>>>    /*
>>>>>> @@ -52,6 +54,34 @@ fixnext:
>>>>>>     	cmp	r2, r3
>>>>>>     	blo	fixloop
>>>>>>     >>>> +	/*
>>>>>> +	 * Relocate the exception vectors
>>>>>> +	 */
>>>>>> +#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))
>>>>> I would prefer a single CONFIG_HAS_VBAR symbol defined through
>>>>> Kconfig.
>>>> 1)
>>>> Actually, there is no Kconfig entry such as "config ARM1176" nor "config
>>>> ARMV7" in U-Boot,
>>>> unlike in Linux (arch/arm/mm/Kconfig).
>>>>
>>>> If there were such entries, we would simply do like the following (in
>>>> arch/arm/Kconfig):
>>>>
>>>> config HAS_VBAR
>>>>        bool
>>>>
>>>> config ARM1176
>>>>        select HAS_VBAR
>>>>
>>>> config ARMV7
>>>>        select HAS_VBAR
>>>>
>>>> Should we go in this direction?
>>>> It is the cleanest way to use Kconfig but it requires some work in order
>>>> to convert all
>>>> "#define CONFIG_<cpu>" into Kconfig entries.
>>>>
>>>> 2)
>>>> Otherwise, we can insert a "select HAS_VBAR" in all boards that have a
>>>> ARM1176 or a ARMv7
>>>> processor in arch/arm/Kconfig. It is not logical but this is what has
>>>> been done with the Kconfig
>>>> entry ARM64. And, it does not require much change.
>>>>
>>>> 3)
>>>> The last thing we can do is as follows:
>>>>
>>>> config HAS_VBAR
>>>>            bool
>>>>            depends on SYS_CPU = "arm1176" || SYS_CPU = "armv7"
>>>>            default y
>>>>
>>>> CONFIG_HAS_VBAR will be defined if SYS_CPU are arm1176 or armv7. It does
>>>> not require much
>>>> change as well but, I think, it is bad code.
>>>>
>>>> What do you think is the best way to introduce CONFIG_HAS_VBAR symbol?
>>>> (1, 2 or 3)
>>> I believe you have already sorted the options in order of decreasing
>>> 'quality' -- 1 being the best option, and 3 being the worst... Indeed
>>> option 1 would be the best and cleanest, and it could possibly open the
>>> way for other per-CPU options.
>>>
>>> We could try and limit the effort to converting only ARM1176 and ARMV7
>>> and leaving other CONFIG_<cpu> #define'd until some later point in the
>>> future, but experience shows that such half-hearted attempts are never
>>> completed.
>>>
>>> Amicalement,
>> I am currently trying to implement solution 1. only for ARM1176 and ARMV7 but I wonder
>> if this work worth the effort just for one CPU feature.
>> Do you expect more CPU feature like HAS_VBAR coming in the future?
>>
>> I add the following lines in arch/arm/Kconfig:
>> config HAS_VBAR
>>          bool
>>
>> config ARM1176
>>          bool
>>          select HAS_VBAR
>>
>> config ARMV7
>>           bool
>>           select HAS_VBAR
>>
>> config SYS_CPU
>>          default "arm1176" if ARM1176
>>          default "armv7" if ARMV7
>>
>> Then, in the same file, under each "config TARGET_<board>",  I add "select ARM1176" or "select ARMV7".
>> Also, I delete the Kconfig entries "config SYS_CPU" in all Kconfig of *all* boards that use ARM1176 and ARMV7.
>>
>> Actually, I find the change quite big. What do you think about this implementation?
>> Should I continue in this direction?
>>
> Agreed on 1).
>
> I was thinking about this since I introduced Kconfig at 2014.10-rc1.
> It is good to know you're working on this since it can save my time.  :-)
>
> My only request is, can you use CPU_ARM1176, CPU_V7 instead of ARM1176, ARMV7 ?
> It looks like arm/arm/mm/Kconfig uses this way and CONFIG_CPU_ prefix makes things clear.

OK, I will use them.
>
> CONFIG_ARM1176 and CONFIG_ARMV7 are never referenced at all.
> Also, CONFIG_ARMV7 is only defined in some armv7 boards.
> For instance, Zynq boards define it but Tegra boards don't.
> It is useless and should be removed someday.
OK.
>
>
> I have a question:
>
> You are covering only arm1176 and armv7.
> What about arm1136?
>
> I am not sure, but arm1136 and arm1176 both belong to ARMv6 generation?
> If so, does arm1136 have VBAR register, doesn't it?
>
>
>
>
>
> Best Regards
> Masahiro Yamada
>
Thanks,

Georges

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Albert ARIBAUD]

Hi Georges,

On Mon, 20 Oct 2014 23:08:30 +0200, Georges Savoundararadj
<savoundg@gmail.com> wrote:

> Hi Albert,
> 
> Le 15/10/2014 00:11, Albert ARIBAUD a ?crit :
> > Hi Georges,
> >
> > On Tue, 14 Oct 2014 22:02:00 +0200, Georges Savoundararadj
> > <savoundg@gmail.com> wrote:
> >
> >> Hi Albert,
> >>
> >> Hi Masahiro,
> > (putting Masahiro in Cc: just in case)
> >
> >> As my issue is related to Kconfig, I would like you to give me your
> >> opinions.
> >>
> >>
> >> Le 11/10/2014 12:47, Albert ARIBAUD a ?crit :
> >>> Hi Georges,
> >>>
> >>> On Sat, 27 Sep 2014 21:48:10 +0200, Georges Savoundararadj
> >>> <savoundg@gmail.com> wrote:
> >>>
> >>>> This commit relocates the exception vectors.
> >>>> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
> >>>> the other ARM processors, it copies the relocated exception vectors to
> >>>> the correct address: 0x00000000 or 0xFFFF0000.
> >>>>
> >>>> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> >>>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> >>>> Cc: Tom Warren <twarren@nvidia.com>
> >>>>
> >>>> ---
> >>>> This patch needs some tests because it impacts many boards. I have
> >>>> tested it with my raspberry pi in the two cases: using VBAR and
> >>>> using the copied exception vectors.
> >>>>
> >>>> Changes in v2:
> >>>> - Relocate exception vectors also on processors which do not support
> >>>>     security extensions
> >>>> - Reword the commit message
> >>>>
> >>>>    arch/arm/cpu/armv7/start.S |  6 ------
> >>>>    arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
> >>>>    2 files changed, 30 insertions(+), 6 deletions(-)
> >>>>
> >>>> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> >>>> index fedd7c8..fdc05b9 100644
> >>>> --- a/arch/arm/cpu/armv7/start.S
> >>>> +++ b/arch/arm/cpu/armv7/start.S
> >>>> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
> >>>>    	mcr     p15, 0, r0, c7, c10, 4	@ DSB
> >>>>    	mcr     p15, 0, r0, c7, c5, 4	@ ISB
> >>>>    #endif
> >>>> -/*
> >>>> - * Move vector table
> >>>> - */
> >>>> -	/* Set vector address in CP15 VBAR register */
> >>>> -	ldr     r0, =_start
> >>>> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
> >>>>    
> >>>>    	bx	lr
> >>>>    
> >>>> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
> >>>> index 8035251..88a478e 100644
> >>>> --- a/arch/arm/lib/relocate.S
> >>>> +++ b/arch/arm/lib/relocate.S
> >>>> @@ -6,6 +6,8 @@
> >>>>     * SPDX-License-Identifier:	GPL-2.0+
> >>>>     */
> >>>>    
> >>>> +#include <asm-offsets.h>
> >>>> +#include <config.h>
> >>>>    #include <linux/linkage.h>
> >>>>    
> >>>>    /*
> >>>> @@ -52,6 +54,34 @@ fixnext:
> >>>>    	cmp	r2, r3
> >>>>    	blo	fixloop
> >>>>    
> >>>> +	/*
> >>>> +	 * Relocate the exception vectors
> >>>> +	 */
> >>>> +#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))
> >>> I would prefer a single CONFIG_HAS_VBAR symbol defined through
> >>> Kconfig.
> >> 1)
> >> Actually, there is no Kconfig entry such as "config ARM1176" nor "config
> >> ARMV7" in U-Boot,
> >> unlike in Linux (arch/arm/mm/Kconfig).
> >>
> >> If there were such entries, we would simply do like the following (in
> >> arch/arm/Kconfig):
> >>
> >> config HAS_VBAR
> >>       bool
> >>
> >> config ARM1176
> >>       select HAS_VBAR
> >>
> >> config ARMV7
> >>       select HAS_VBAR
> >>
> >> Should we go in this direction?
> >> It is the cleanest way to use Kconfig but it requires some work in order
> >> to convert all
> >> "#define CONFIG_<cpu>" into Kconfig entries.
> >>
> >> 2)
> >> Otherwise, we can insert a "select HAS_VBAR" in all boards that have a
> >> ARM1176 or a ARMv7
> >> processor in arch/arm/Kconfig. It is not logical but this is what has
> >> been done with the Kconfig
> >> entry ARM64. And, it does not require much change.
> >>
> >> 3)
> >> The last thing we can do is as follows:
> >>
> >> config HAS_VBAR
> >>           bool
> >>           depends on SYS_CPU = "arm1176" || SYS_CPU = "armv7"
> >>           default y
> >>
> >> CONFIG_HAS_VBAR will be defined if SYS_CPU are arm1176 or armv7. It does
> >> not require much
> >> change as well but, I think, it is bad code.
> >>
> >> What do you think is the best way to introduce CONFIG_HAS_VBAR symbol?
> >> (1, 2 or 3)
> > I believe you have already sorted the options in order of decreasing
> > 'quality' -- 1 being the best option, and 3 being the worst... Indeed
> > option 1 would be the best and cleanest, and it could possibly open the
> > way for other per-CPU options.
> >
> > We could try and limit the effort to converting only ARM1176 and ARMV7
> > and leaving other CONFIG_<cpu> #define'd until some later point in the
> > future, but experience shows that such half-hearted attempts are never
> > completed.
> >
> > Amicalement,
> 
> I am currently trying to implement solution 1. only for ARM1176 and 
> ARMV7 but I wonder
> if this work worth the effort just for one CPU feature.
> Do you expect more CPU feature like HAS_VBAR coming in the future?
> 
> I add the following lines in arch/arm/Kconfig:
> config HAS_VBAR
>         bool
> 
> config ARM1176
>         bool
>         select HAS_VBAR
> 
> config ARMV7
>          bool
>          select HAS_VBAR
> 
> config SYS_CPU
>         default "arm1176" if ARM1176
>         default "armv7" if ARMV7
> 
> Then, in the same file, under each "config TARGET_<board>",  I add 
> "select ARM1176" or "select ARMV7".
> Also, I delete the Kconfig entries "config SYS_CPU" in all Kconfig of 
> *all* boards that use ARM1176 and ARMV7.
> 
> Actually, I find the change quite big. What do you think about this 
> implementation?
> Should I continue in this direction?

This looks like the right way to me (even if ideally I would prefer
that SYS_CPU be deduced from the SYS_SOC defined in the boards' Kconfig
files rather than added to them).

Hopefully you can devise a sed, awk o perl script to do the change
without too much manual effort?

Incidentally, this raises a question which Masahiro can probably
answer. In arch/arm/Kconfig, every ARM board is referred to twice:

- once in a "config TARGET_<board>" block;

- once in a "source board[/<maker>]/<board>/Kconfig directive.

Would it be possible to move each "TARGET_<board>" block from
arch/arm/Kconfig to the corresponding board[/<maker>]/<board>/Kconfig
and only keep the "source" directives in arch/arm/Kconfig?

(and then, I'd *really* like a way to source all ARM-based boards in a
few lines, e.g. source /board/*/Kconfig + source board/*/*/Kconfig)

It would be nice if all Kconfig settings for a given board were found
in the board's Kconfig.

> Regards,
> 
> Georges

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Masahiro Yamada]

Hi Albert,



On Tue, 21 Oct 2014 15:54:51 +0200
Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:

> Hi Georges,
> 
> On Mon, 20 Oct 2014 23:08:30 +0200, Georges Savoundararadj
> <savoundg@gmail.com> wrote:
> 
> > Hi Albert,
> > 
> > Le 15/10/2014 00:11, Albert ARIBAUD a ecrit :
> > > Hi Georges,
> > >
> > > On Tue, 14 Oct 2014 22:02:00 +0200, Georges Savoundararadj
> > > <savoundg@gmail.com> wrote:
> > >
> > >> Hi Albert,
> > >>
> > >> Hi Masahiro,
> > > (putting Masahiro in Cc: just in case)
> > >
> > >> As my issue is related to Kconfig, I would like you to give me your
> > >> opinions.
> > >>
> > >>
> > >> Le 11/10/2014 12:47, Albert ARIBAUD a ecrit :
> > >>> Hi Georges,
> > >>>
> > >>> On Sat, 27 Sep 2014 21:48:10 +0200, Georges Savoundararadj
> > >>> <savoundg@gmail.com> wrote:
> > >>>
> > >>>> This commit relocates the exception vectors.
> > >>>> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
> > >>>> the other ARM processors, it copies the relocated exception vectors to
> > >>>> the correct address: 0x00000000 or 0xFFFF0000.
> > >>>>
> > >>>> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> > >>>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> > >>>> Cc: Tom Warren <twarren@nvidia.com>
> > >>>>
> > >>>> ---
> > >>>> This patch needs some tests because it impacts many boards. I have
> > >>>> tested it with my raspberry pi in the two cases: using VBAR and
> > >>>> using the copied exception vectors.
> > >>>>
> > >>>> Changes in v2:
> > >>>> - Relocate exception vectors also on processors which do not support
> > >>>>     security extensions
> > >>>> - Reword the commit message
> > >>>>
> > >>>>    arch/arm/cpu/armv7/start.S |  6 ------
> > >>>>    arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
> > >>>>    2 files changed, 30 insertions(+), 6 deletions(-)
> > >>>>
> > >>>> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> > >>>> index fedd7c8..fdc05b9 100644
> > >>>> --- a/arch/arm/cpu/armv7/start.S
> > >>>> +++ b/arch/arm/cpu/armv7/start.S
> > >>>> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
> > >>>>    	mcr     p15, 0, r0, c7, c10, 4	@ DSB
> > >>>>    	mcr     p15, 0, r0, c7, c5, 4	@ ISB
> > >>>>    #endif
> > >>>> -/*
> > >>>> - * Move vector table
> > >>>> - */
> > >>>> -	/* Set vector address in CP15 VBAR register */
> > >>>> -	ldr     r0, =_start
> > >>>> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
> > >>>>    
> > >>>>    	bx	lr
> > >>>>    
> > >>>> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
> > >>>> index 8035251..88a478e 100644
> > >>>> --- a/arch/arm/lib/relocate.S
> > >>>> +++ b/arch/arm/lib/relocate.S
> > >>>> @@ -6,6 +6,8 @@
> > >>>>     * SPDX-License-Identifier:	GPL-2.0+
> > >>>>     */
> > >>>>    
> > >>>> +#include <asm-offsets.h>
> > >>>> +#include <config.h>
> > >>>>    #include <linux/linkage.h>
> > >>>>    
> > >>>>    /*
> > >>>> @@ -52,6 +54,34 @@ fixnext:
> > >>>>    	cmp	r2, r3
> > >>>>    	blo	fixloop
> > >>>>    
> > >>>> +	/*
> > >>>> +	 * Relocate the exception vectors
> > >>>> +	 */
> > >>>> +#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))
> > >>> I would prefer a single CONFIG_HAS_VBAR symbol defined through
> > >>> Kconfig.
> > >> 1)
> > >> Actually, there is no Kconfig entry such as "config ARM1176" nor "config
> > >> ARMV7" in U-Boot,
> > >> unlike in Linux (arch/arm/mm/Kconfig).
> > >>
> > >> If there were such entries, we would simply do like the following (in
> > >> arch/arm/Kconfig):
> > >>
> > >> config HAS_VBAR
> > >>       bool
> > >>
> > >> config ARM1176
> > >>       select HAS_VBAR
> > >>
> > >> config ARMV7
> > >>       select HAS_VBAR
> > >>
> > >> Should we go in this direction?
> > >> It is the cleanest way to use Kconfig but it requires some work in order
> > >> to convert all
> > >> "#define CONFIG_<cpu>" into Kconfig entries.
> > >>
> > >> 2)
> > >> Otherwise, we can insert a "select HAS_VBAR" in all boards that have a
> > >> ARM1176 or a ARMv7
> > >> processor in arch/arm/Kconfig. It is not logical but this is what has
> > >> been done with the Kconfig
> > >> entry ARM64. And, it does not require much change.
> > >>
> > >> 3)
> > >> The last thing we can do is as follows:
> > >>
> > >> config HAS_VBAR
> > >>           bool
> > >>           depends on SYS_CPU = "arm1176" || SYS_CPU = "armv7"
> > >>           default y
> > >>
> > >> CONFIG_HAS_VBAR will be defined if SYS_CPU are arm1176 or armv7. It does
> > >> not require much
> > >> change as well but, I think, it is bad code.
> > >>
> > >> What do you think is the best way to introduce CONFIG_HAS_VBAR symbol?
> > >> (1, 2 or 3)
> > > I believe you have already sorted the options in order of decreasing
> > > 'quality' -- 1 being the best option, and 3 being the worst... Indeed
> > > option 1 would be the best and cleanest, and it could possibly open the
> > > way for other per-CPU options.
> > >
> > > We could try and limit the effort to converting only ARM1176 and ARMV7
> > > and leaving other CONFIG_<cpu> #define'd until some later point in the
> > > future, but experience shows that such half-hearted attempts are never
> > > completed.
> > >
> > > Amicalement,
> > 
> > I am currently trying to implement solution 1. only for ARM1176 and 
> > ARMV7 but I wonder
> > if this work worth the effort just for one CPU feature.
> > Do you expect more CPU feature like HAS_VBAR coming in the future?
> > 
> > I add the following lines in arch/arm/Kconfig:
> > config HAS_VBAR
> >         bool
> > 
> > config ARM1176
> >         bool
> >         select HAS_VBAR
> > 
> > config ARMV7
> >          bool
> >          select HAS_VBAR
> > 
> > config SYS_CPU
> >         default "arm1176" if ARM1176
> >         default "armv7" if ARMV7
> > 
> > Then, in the same file, under each "config TARGET_<board>",  I add 
> > "select ARM1176" or "select ARMV7".
> > Also, I delete the Kconfig entries "config SYS_CPU" in all Kconfig of 
> > *all* boards that use ARM1176 and ARMV7.
> > 
> > Actually, I find the change quite big. What do you think about this 
> > implementation?
> > Should I continue in this direction?
> 
> This looks like the right way to me (even if ideally I would prefer
> that SYS_CPU be deduced from the SYS_SOC defined in the boards' Kconfig
> files rather than added to them).
> 
> Hopefully you can devise a sed, awk o perl script to do the change
> without too much manual effort?
> 
> Incidentally, this raises a question which Masahiro can probably
> answer. In arch/arm/Kconfig, every ARM board is referred to twice:
> 
> - once in a "config TARGET_<board>" block;
> 
> - once in a "source board[/<maker>]/<board>/Kconfig directive.
> 
> Would it be possible to move each "TARGET_<board>" block from
> arch/arm/Kconfig to the corresponding board[/<maker>]/<board>/Kconfig
> and only keep the "source" directives in arch/arm/Kconfig?


I think it is impossible.

The first one appears in "config choice" .. "endchoice"
to select an appropriate board/platform.


> (and then, I'd *really* like a way to source all ARM-based boards in a
> few lines, e.g. source /board/*/Kconfig + source board/*/*/Kconfig)
> 
> It would be nice if all Kconfig settings for a given board were found
> in the board's Kconfig.

I have no idea to achieve this.




Best Regards
Masahiro Yamada

[U-Boot] [PATCH v2 2/3] arm: relocate the exception vectors

[Georges Savoundararadj]

Hi Albert and Masahiro,

Le 22/10/2014 11:54, Masahiro Yamada a ?crit :
> Hi Albert,
>
>
>
> On Tue, 21 Oct 2014 15:54:51 +0200
> Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
>
>> Hi Georges,
>>
>> On Mon, 20 Oct 2014 23:08:30 +0200, Georges Savoundararadj
>> <savoundg@gmail.com> wrote:
>>
>>> Hi Albert,
>>>
>>> Le 15/10/2014 00:11, Albert ARIBAUD a ecrit :
>>>> Hi Georges,
>>>>
>>>> On Tue, 14 Oct 2014 22:02:00 +0200, Georges Savoundararadj
>>>> <savoundg@gmail.com> wrote:
>>>>
>>>>> Hi Albert,
>>>>>
>>>>> Hi Masahiro,
>>>> (putting Masahiro in Cc: just in case)
>>>>
>>>>> As my issue is related to Kconfig, I would like you to give me your
>>>>> opinions.
>>>>>
>>>>>
>>>>> Le 11/10/2014 12:47, Albert ARIBAUD a ecrit :
>>>>>> Hi Georges,
>>>>>>
>>>>>> On Sat, 27 Sep 2014 21:48:10 +0200, Georges Savoundararadj
>>>>>> <savoundg@gmail.com> wrote:
>>>>>>
>>>>>>> This commit relocates the exception vectors.
>>>>>>> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
>>>>>>> the other ARM processors, it copies the relocated exception vectors to
>>>>>>> the correct address: 0x00000000 or 0xFFFF0000.
>>>>>>>
>>>>>>> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
>>>>>>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>>>>>>> Cc: Tom Warren <twarren@nvidia.com>
>>>>>>>
>>>>>>> ---
>>>>>>> This patch needs some tests because it impacts many boards. I have
>>>>>>> tested it with my raspberry pi in the two cases: using VBAR and
>>>>>>> using the copied exception vectors.
>>>>>>>
>>>>>>> Changes in v2:
>>>>>>> - Relocate exception vectors also on processors which do not support
>>>>>>>      security extensions
>>>>>>> - Reword the commit message
>>>>>>>
>>>>>>>     arch/arm/cpu/armv7/start.S |  6 ------
>>>>>>>     arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
>>>>>>>     2 files changed, 30 insertions(+), 6 deletions(-)
>>>>>>>
>>>>>>> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
>>>>>>> index fedd7c8..fdc05b9 100644
>>>>>>> --- a/arch/arm/cpu/armv7/start.S
>>>>>>> +++ b/arch/arm/cpu/armv7/start.S
>>>>>>> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
>>>>>>>     	mcr     p15, 0, r0, c7, c10, 4	@ DSB
>>>>>>>     	mcr     p15, 0, r0, c7, c5, 4	@ ISB
>>>>>>>     #endif
>>>>>>> -/*
>>>>>>> - * Move vector table
>>>>>>> - */
>>>>>>> -	/* Set vector address in CP15 VBAR register */
>>>>>>> -	ldr     r0, =_start
>>>>>>> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
>>>>>>>     
>>>>>>>     	bx	lr
>>>>>>>     
>>>>>>> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
>>>>>>> index 8035251..88a478e 100644
>>>>>>> --- a/arch/arm/lib/relocate.S
>>>>>>> +++ b/arch/arm/lib/relocate.S
>>>>>>> @@ -6,6 +6,8 @@
>>>>>>>      * SPDX-License-Identifier:	GPL-2.0+
>>>>>>>      */
>>>>>>>     
>>>>>>> +#include <asm-offsets.h>
>>>>>>> +#include <config.h>
>>>>>>>     #include <linux/linkage.h>
>>>>>>>     
>>>>>>>     /*
>>>>>>> @@ -52,6 +54,34 @@ fixnext:
>>>>>>>     	cmp	r2, r3
>>>>>>>     	blo	fixloop
>>>>>>>     
>>>>>>> +	/*
>>>>>>> +	 * Relocate the exception vectors
>>>>>>> +	 */
>>>>>>> +#if (defined(CONFIG_ARM1176) || defined(CONFIG_ARMV7))
>>>>>> I would prefer a single CONFIG_HAS_VBAR symbol defined through
>>>>>> Kconfig.
>>>>> 1)
>>>>> Actually, there is no Kconfig entry such as "config ARM1176" nor "config
>>>>> ARMV7" in U-Boot,
>>>>> unlike in Linux (arch/arm/mm/Kconfig).
>>>>>
>>>>> If there were such entries, we would simply do like the following (in
>>>>> arch/arm/Kconfig):
>>>>>
>>>>> config HAS_VBAR
>>>>>        bool
>>>>>
>>>>> config ARM1176
>>>>>        select HAS_VBAR
>>>>>
>>>>> config ARMV7
>>>>>        select HAS_VBAR
>>>>>
>>>>> Should we go in this direction?
>>>>> It is the cleanest way to use Kconfig but it requires some work in order
>>>>> to convert all
>>>>> "#define CONFIG_<cpu>" into Kconfig entries.
>>>>>
>>>>> 2)
>>>>> Otherwise, we can insert a "select HAS_VBAR" in all boards that have a
>>>>> ARM1176 or a ARMv7
>>>>> processor in arch/arm/Kconfig. It is not logical but this is what has
>>>>> been done with the Kconfig
>>>>> entry ARM64. And, it does not require much change.
>>>>>
>>>>> 3)
>>>>> The last thing we can do is as follows:
>>>>>
>>>>> config HAS_VBAR
>>>>>            bool
>>>>>            depends on SYS_CPU = "arm1176" || SYS_CPU = "armv7"
>>>>>            default y
>>>>>
>>>>> CONFIG_HAS_VBAR will be defined if SYS_CPU are arm1176 or armv7. It does
>>>>> not require much
>>>>> change as well but, I think, it is bad code.
>>>>>
>>>>> What do you think is the best way to introduce CONFIG_HAS_VBAR symbol?
>>>>> (1, 2 or 3)
>>>> I believe you have already sorted the options in order of decreasing
>>>> 'quality' -- 1 being the best option, and 3 being the worst... Indeed
>>>> option 1 would be the best and cleanest, and it could possibly open the
>>>> way for other per-CPU options.
>>>>
>>>> We could try and limit the effort to converting only ARM1176 and ARMV7
>>>> and leaving other CONFIG_<cpu> #define'd until some later point in the
>>>> future, but experience shows that such half-hearted attempts are never
>>>> completed.
>>>>
>>>> Amicalement,
>>> I am currently trying to implement solution 1. only for ARM1176 and
>>> ARMV7 but I wonder
>>> if this work worth the effort just for one CPU feature.
>>> Do you expect more CPU feature like HAS_VBAR coming in the future?
>>>
>>> I add the following lines in arch/arm/Kconfig:
>>> config HAS_VBAR
>>>          bool
>>>
>>> config ARM1176
>>>          bool
>>>          select HAS_VBAR
>>>
>>> config ARMV7
>>>           bool
>>>           select HAS_VBAR
>>>
>>> config SYS_CPU
>>>          default "arm1176" if ARM1176
>>>          default "armv7" if ARMV7
>>>
>>> Then, in the same file, under each "config TARGET_<board>",  I add
>>> "select ARM1176" or "select ARMV7".
>>> Also, I delete the Kconfig entries "config SYS_CPU" in all Kconfig of
>>> *all* boards that use ARM1176 and ARMV7.
>>>
>>> Actually, I find the change quite big. What do you think about this
>>> implementation?
>>> Should I continue in this direction?
>> This looks like the right way to me
OK, that's what I wanted to know.
>> (even if ideally I would prefer
>> that SYS_CPU be deduced from the SYS_SOC defined in the boards' Kconfig
>> files rather than added to them).
OK.

>> Hopefully you can devise a sed, awk o perl script to do the change
>> without too much manual effort?
Yes, I can try to script.
>> Incidentally, this raises a question which Masahiro can probably
>> answer. In arch/arm/Kconfig, every ARM board is referred to twice:
>>
>> - once in a "config TARGET_<board>" block;
>>
>> - once in a "source board[/<maker>]/<board>/Kconfig directive.
>>
>> Would it be possible to move each "TARGET_<board>" block from
>> arch/arm/Kconfig to the corresponding board[/<maker>]/<board>/Kconfig
>> and only keep the "source" directives in arch/arm/Kconfig?
>
> I think it is impossible.
>
> The first one appears in "config choice" .. "endchoice"
> to select an appropriate board/platform.
>
>
>> (and then, I'd *really* like a way to source all ARM-based boards in a
>> few lines, e.g. source /board/*/Kconfig + source board/*/*/Kconfig)
>>
>> It would be nice if all Kconfig settings for a given board were found
>> in the board's Kconfig.
> I have no idea to achieve this.
>
@Albert: I will see what can I do.

Should I post the Kconfig patch in a separate series ?
>
>
> Best Regards
> Masahiro Yamada
>

Thanks for your advices,

Regards,

Georges

[U-Boot] [PATCH v2 3/3] arm: interrupt_init: set sp in IRQ/FIQ modes

[Georges Savoundararadj]

Before this commit, the stack addresses for IRQ and FIQ modes,
IRQ_STACK_START and FIQ_STACK_START, were computed in interrupt_init but
they were not used.

This commit sets the stack pointers for IRQ and FIQ modes.

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>

---

Changes in v2:
- Reword the commit message

 arch/arm/lib/interrupts.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index f6b7c03..49c1bf3 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -34,6 +34,25 @@ int interrupt_init (void)
 	IRQ_STACK_START_IN = gd->irq_sp + 8;
 	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 
+	__asm__ __volatile__("msr cpsr_c, %0\n"
+			     "mov sp, %1\n"
+			     :
+			     : "r" (IRQ_MODE | I_BIT | F_BIT),
+			       "r" (IRQ_STACK_START)
+			     : "memory");
+
+	__asm__ __volatile__("msr cpsr_c, %0\n"
+			     "mov sp, %1\n"
+			     :
+			     : "r" (FIQ_MODE | I_BIT | F_BIT),
+			       "r" (FIQ_STACK_START)
+			     : "memory");
+
+	__asm__ __volatile__("msr cpsr_c, %0"
+			     :
+			     : "r" (SVC_MODE | I_BIT | F_BIT)
+			     : "memory");
+
 	return arch_interrupt_init();
 }
 
-- 
2.1.0

[U-Boot] [PATCH v3 0/4] arm: fix exception handling

[Georges Savoundararadj]

Hi,

This series fixes the exception handling on ARM.

First of all, it makes the symbols of the exception vectors relocatable.
Then, it ensures that the exception vectors are relocated. To do so, we
copy or move the exception vectors depending on the CPU features.

In order to handle gracefully CPU features, this commit introduces
Kconfig symbols for each ARM processor and it selects through Kconfig
the feature HAS_VBAR for the right CPUs.

Also, this series configures correctly the IRQ and the FIQ stack pointers.

Regards,

Georges

Changes in v3:
- Use the CPU feature HAS_VBAR Kconfig symbol

Changes in v2:
- Relocate exception vectors also on processors which do not support
  security extensions
- Reword the commit messages

Georges Savoundararadj (4):
  kconfig: arm: introduce symbol for ARM CPUs
  arm: make .vectors section allocatable
  arm: relocate the exception vectors
  arm: interrupt_init: set sp in IRQ/FIQ modes

 arch/arm/Kconfig                         | 209 +++++++++++++++++++++++++++++++
 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/start.S               |   6 -
 arch/arm/cpu/armv7/uniphier/Kconfig      |   6 -
 arch/arm/cpu/armv7/zynq/Kconfig          |   3 -
 arch/arm/lib/interrupts.c                |  19 +++
 arch/arm/lib/relocate.S                  |  30 +++++
 arch/arm/lib/vectors.S                   |   2 +-
 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            |   8 --
 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/emk/top9000/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 -
 158 files changed, 259 insertions(+), 515 deletions(-)

-- 
2.1.2

[U-Boot] [PATCH v3 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Georges Savoundararadj]

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>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>

---
This patch needs a little review as it impacts many files.

Changes in v3:
- Add this commit

Changes in v2: None

 arch/arm/Kconfig                         | 209 +++++++++++++++++++++++++++++++
 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            |   8 --
 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/emk/top9000/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 -
 154 files changed, 209 insertions(+), 508 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 109d49f..3cd444e 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_ARM113
+        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,321 +235,427 @@ 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
 
 config TARGET_ZMX25
 	bool "Support zmx25"
+	select CPU_ARM926EJS
 
 config TARGET_APF27
 	bool "Support apf27"
+	select CPU_ARM926EJS
 
 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
 
 config TARGET_XFI3
 	bool "Support xfi3"
+	select CPU_ARM926EJS
 
 config TARGET_M28EVK
 	bool "Support m28evk"
+	select CPU_ARM926EJS
 
 config TARGET_MX23EVK
 	bool "Support mx23evk"
+	select CPU_ARM926EJS
 
 config TARGET_MX28EVK
 	bool "Support mx28evk"
+	select CPU_ARM926EJS
 
 config TARGET_MX23_OLINUXINO
 	bool "Support mx23_olinuxino"
+	select CPU_ARM926EJS
 
 config TARGET_BG0900
 	bool "Support bg0900"
+	select CPU_ARM926EJS
 
 config TARGET_SANSA_FUZE_PLUS
 	bool "Support sansa_fuze_plus"
+	select CPU_ARM926EJS
 
 config TARGET_SC_SPS_1
 	bool "Support sc_sps_1"
+	select CPU_ARM926EJS
 
 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
 
 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
 
 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
 
 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
 
 config TARGET_TSERIES
 	bool "Support tseries"
+	select CPU_V7
 
 config TARGET_CM_T335
 	bool "Support cm_t335"
+	select CPU_V7
 
 config TARGET_PEPPER
 	bool "Support pepper"
+	select CPU_V7
 
 config TARGET_AM335X_IGEP0033
 	bool "Support am335x_igep0033"
+	select CPU_V7
 
 config TARGET_PCM051
 	bool "Support pcm051"
+	select CPU_V7
 
 config TARGET_DRACO
 	bool "Support draco"
+	select CPU_V7
 
 config TARGET_DXR2
 	bool "Support dxr2"
+	select CPU_V7
 
 config TARGET_PXM2
 	bool "Support pxm2"
+	select CPU_V7
 
 config TARGET_RUT
 	bool "Support rut"
+	select CPU_V7
 
 config TARGET_PENGWYN
 	bool "Support pengwyn"
+	select CPU_V7
 
 config TARGET_AM335X_EVM
 	bool "Support am335x_evm"
+	select CPU_V7
 
 config TARGET_AM43XX_EVM
 	bool "Support am43xx_evm"
+	select CPU_V7
 
 config TARGET_TI814X_EVM
 	bool "Support ti814x_evm"
+	select CPU_V7
 
 config TARGET_TI816X_EVM
 	bool "Support ti816x_evm"
+	select CPU_V7
 
 config TARGET_SAMA5D3_XPLAINED
 	bool "Support sama5d3_xplained"
+	select CPU_V7
 
 config TARGET_SAMA5D3XEK
 	bool "Support sama5d3xek"
+	select CPU_V7
 
 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
 
 config TARGET_M53EVK
 	bool "Support m53evk"
+	select CPU_V7
 
 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
 
 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
 
 config OMAP54XX
 	bool "OMAP54XX SoC"
+	select CPU_V7
 
 config RMOBILE
 	bool "Renesas ARM SoCs"
+	select CPU_V7
 
 config TARGET_CM_FX6
 	bool "Support cm_fx6"
+	select CPU_V7
 
 config TARGET_SOCFPGA_CYCLONE5
 	bool "Support socfpga_cyclone5"
+	select CPU_V7
 
 config TARGET_SUN4I
 	bool "Support sun4i"
+	select CPU_V7
 
 config TARGET_SUN5I
 	bool "Support sun5i"
+	select CPU_V7
 
 config TARGET_SUN7I
 	bool "Support sun7i"
+	select CPU_V7
 
 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
 
 config TEGRA
 	bool "NVIDIA Tegra"
@@ -472,6 +664,7 @@ config TEGRA
 
 config TARGET_VEXPRESS_AEMV8A
 	bool "Support vexpress_aemv8a"
+	select CPU_V7
 	select ARM64
 
 config TARGET_LS2085A_EMU
@@ -484,51 +677,67 @@ 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
 
 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
 
 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
 
 endchoice
 
diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/cpu/arm926ejs/davinci/Kconfig
index 4c18ab6..d99bd43 100644
--- a/arch/arm/cpu/arm926ejs/davinci/Kconfig
+++ b/arch/arm/cpu/arm926ejs/davinci/Kconfig
@@ -53,9 +53,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 91ffedf..6c037a1 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 eda51fd..265f336 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 2d0ab2b..5a54262 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 35c16d8..d2e76f4 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 7a0d182..329b856 100644
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -44,9 +44,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 29ff995..0e73c04 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 8249b5e..0f1ca94 100644
--- a/arch/arm/cpu/armv7/keystone/Kconfig
+++ b/arch/arm/cpu/armv7/keystone/Kconfig
@@ -11,9 +11,6 @@ config TARGET_K2E_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 6fae1e5..8733358 100644
--- a/arch/arm/cpu/armv7/omap3/Kconfig
+++ b/arch/arm/cpu/armv7/omap3/Kconfig
@@ -74,9 +74,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 e270895..eccf897 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 2ccf5b9..129982c 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 6c2bb22..c46a0cc 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 2fbbc18..6288134 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 34f5496..524b193 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 d6655a9..f418cd6 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 f9107a9..4beefbf 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 ee510d3..ed48300 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 85d335a..230e64d 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 bb6a7e7..2f43519 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 1448703..7113f2b 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 ee2ec06..4dd49c4 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 33d5157..f674894 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 102c18d..d944816 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 ff19181..6a5a931 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 f859578..fc42185 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 ac35d6d..b8e380e 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 53532bb..65544a8 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 4955313..6153b5d 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 7fa30c6..2e15e0d 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 61db2e2..bad4a37 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 24a645b..fe00ed5 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 301bf1a..d839c1a 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 f8e2b48..311c504 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 d2e191c..1bc086a 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 845cd36..cf1d1a3 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 517f22a..438d300 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 d236b1a..5c5ec61 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 0ca1ec0..0ba8a7b 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 f0dd04a..2a9ed23 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 55a825d..7f8a6a1 100644
--- a/board/bachmann/ot1200/Kconfig
+++ b/board/bachmann/ot1200/Kconfig
@@ -1,23 +1,15 @@
 if TARGET_OT1200
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
-	string
 	default "ot1200"
 
 config SYS_VENDOR
-	string
 	default "bachmann"
 
 config SYS_SOC
-	string
 	default "mx6"
 
 config SYS_CONFIG_NAME
-	string
 	default "ot1200"
 
 endif
diff --git a/board/balloon3/Kconfig b/board/balloon3/Kconfig
index fb1cf3f..53b7a9a 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 56ed7d6..b6f7c85 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 7d1534a..f327fa1 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 1c8f78d..c896c46 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 298c9fd..03b0f6f 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 2e779f0..f1b4e08 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 d627a38..9289288 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 9038f5b..861c559 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 b2528dc..fb5a1a3 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 7fad578..b1de8f8 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 4209b36..7a159dc 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 f063d55..c5f4897 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 a7f3b2f..de87d5b 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 b537e26..99e675b 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 42a8438..508c21f 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 6115976..683efde 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 0774784..0a837bd 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 2255cc9..7b681cd 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 54cb450..76cf343 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 b1c16c7..dd4dc4d 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 5dbb7f8..0696ad7 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 281e43a..c42c734 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 8e39fce..53a39d3 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/emk/top9000/Kconfig b/board/emk/top9000/Kconfig
index 2dbe060..683e29c 100644
--- a/board/emk/top9000/Kconfig
+++ b/board/emk/top9000/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_TOP9000
 
-config SYS_CPU
-	default "arm926ejs"
-
 config SYS_BOARD
 	default "top9000"
 
diff --git a/board/esd/meesc/Kconfig b/board/esd/meesc/Kconfig
index 7d5c3ca..5041041 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 7c5ce90..55a2f70 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 5593689..d73238f 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 53ae917..9bd077b 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 f2b02dc..b69e4c3 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 bfa6207..02c42cb 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 3cee468..119b955 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 312f938..bc50b8d 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 1bbbe2d..51a8f9f 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 a693239..af06b4c 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 cc654bc..39777bd 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 b4ea64b..eeeb6f4 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 68c3880..055545c 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 ca5b40f..021d19e 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 07861a9..f9b69cb 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 566df85..41f46a0 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 d064b10..c226c1c 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 bc44e59..5ca1672 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 62c37d4..1195d33 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 f7f18db..4af33af 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 d0cf355..cc2a140 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 15b65c0..fa6ddb2 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 558aeab..d32da90 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 2a86b68..940983e 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 684ef27..ef091d6 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 82909a8..c233e90 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 87d15a5..355702a 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 0b73955..6f94612 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 75956be..c0e0c1e 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 40e56cb..af9828a 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 4374fb6..3e87c40 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 cf3358d..d3d2025 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 4f3aaf4..e989e4b 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 9c11a13..195bc26 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 24edcc4..42746c1 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 842d1ba..c7de2e3 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 a87fa81..d90f854 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 08b0fa0..a156452 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 fb09309..0b151c9 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 a749c8d..3111295 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 5207490..3eb7198 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 1992970..b5fdb9a 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 f4ed7fd..2cc0d88 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 9d301c2..d7f2368 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 e8b1d47..5448311 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 1a767b2..501d511 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 4a2ca02..a4934c5 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 9512919..339a6ea 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 0c0af96..65fc5c4 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 a320c2b..cbbf5a9 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 94f1e3c..e987b64 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 5e6b0dd..d2157b4 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 99e7379..ab4a292 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 7ff7dbc..68e99ea 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 379e53b..2461d0c 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 80018c5..7b505aa 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 b930a76..d138ece 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 f76ec69..62604ec 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 b7e49da..3371077 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 1fedbd3..c07d244 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 90bfb69..f2e1098 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 a4eb62f..36b7904 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 5b702ce..27360f3 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 b8f5154..0c95fa3 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 150d64f..df17623 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 f03e19e..d562e64 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 620be5f..6a1c5c7 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 7eb9969..0b3a0cc 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 ca25876..909f30d 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 bcd0a55..3522e8c 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -21,9 +21,6 @@ endif
 
 if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN7I
 
-config SYS_CPU
-	default "armv7"
-
 config SYS_BOARD
 	default "sunxi"
 
diff --git a/board/syteco/jadecpu/Kconfig b/board/syteco/jadecpu/Kconfig
index 3965e90..6e9392e 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 260774d..59a415d 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 67be227..3139f9a 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 d8958ef..b9f6bd7 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 47b96bd..8d1c168 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 9bd3d73..2960099 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 c0bdb9e..95973b4 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 aa80d0f..637f20e 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 087356d..e3bd456 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 e4b1a5e..949407a 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 b70cbf0..f8b3d1f 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 9844c69..56b2557 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 4e2271b..cacd2c5 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 a98d0d6..970f39f 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 a046f01..1701b35 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 c862769..3928566 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 6702319..4699526 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 288f24b..519e21f 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 5f7fe1b..c663504 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"
 
-- 
2.1.2

[U-Boot] [PATCH v3 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Masahiro YAMADA]

Hi Georges,

This patch is really appreciated, but I found some mistakes.
Please see below:



2014-10-27 7:25 GMT+09:00 Georges Savoundararadj <savoundg@gmail.com>:

> +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_ARM113
> +        default "arm1176" if CPU_ARM1176
> +        default "armv7" if CPU_V7
> +        default "pxa" if CPU_PXA
> +        default "sa1100" if CPU_SA1100
> +


[1] Typo.

s/CPU_ARM113/CPU_ARM1136/


> @@ -472,6 +664,7 @@ config TEGRA
>
>  config TARGET_VEXPRESS_AEMV8A
>         bool "Support vexpress_aemv8a"
> +       select CPU_V7
>         select ARM64
>

[2]
Your are changing this board from "armv8" to "armv7".
Please remove "select CPU_V7".



[3]
I thought you were trying to add only CPU_V7 and CPU_ARM1176
but it is very nice to make extra efforts for our community.
One problem is, if you add "CPU_PXA", you need to fix "common/lcd.c".
Otherwise, you will get a new warning for such boards as palmld, palmtc,
because CONFIG_CPU_PXA is defined and used in common/lcd.c,

  #if defined(CONFIG_CPU_PXA25X) || defined(CONFIG_CPU_PXA27X) || \
          defined(CONFIG_CPU_MONAHANS)
  #define CONFIG_CPU_PXA                   <------ remove
  #include <asm/byteorder.h>
  #endif

I think this change will *probably* produce the same output
although I have not checked it closely yet.





[4]
This patch is not applicable on the current master
(commit d0796defbe8eff6fc3c27c893dcbc47af59d4764)
You also need to add "select CPU_V7" to
the new entry "TARGET_SUN6I" in arch/arm/Kconfig.




Could you fix [1] thru [4], please?


Before sending it, please do a quick test at least;
it's very easy.


  1.  Check out master branch
  2.  Run "tools/genboardscfg.py"
  3.  Run "mv  boards.cfg   boards.cfg.org"
  4.  Apply your patch
  5.  Run  "tools/genboardscfg.py" again
  6.  Run  "diff  boards.cfg.org  boards.cfg"

If you get code diff,  something is wrong with your patch.
You will easily see which board is corrupted.




Tom and Albert,

If Georges fixes those problems, is it possible to apply it shortly on
the mainline?
(directly u-boot/master? or via u-boot-arm/master?)

Since this patch easily causes conflicts, it should not get stuck for
a long time.



-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH v3 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Albert ARIBAUD]

Hello Masahiro,

On Tue, 28 Oct 2014 01:50:31 +0900, Masahiro YAMADA
<yamada.m@jp.panasonic.com> wrote:
> Hi Georges,
> 
> This patch is really appreciated, but I found some mistakes.
> Please see below:
> 
> 
> 
> 2014-10-27 7:25 GMT+09:00 Georges Savoundararadj <savoundg@gmail.com>:
> 
> > +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_ARM113
> > +        default "arm1176" if CPU_ARM1176
> > +        default "armv7" if CPU_V7
> > +        default "pxa" if CPU_PXA
> > +        default "sa1100" if CPU_SA1100
> > +
> 
> 
> [1] Typo.
> 
> s/CPU_ARM113/CPU_ARM1136/
> 
> 
> > @@ -472,6 +664,7 @@ config TEGRA
> >
> >  config TARGET_VEXPRESS_AEMV8A
> >         bool "Support vexpress_aemv8a"
> > +       select CPU_V7
> >         select ARM64
> >
> 
> [2]
> Your are changing this board from "armv8" to "armv7".
> Please remove "select CPU_V7".
> 
> 
> 
> [3]
> I thought you were trying to add only CPU_V7 and CPU_ARM1176
> but it is very nice to make extra efforts for our community.
> One problem is, if you add "CPU_PXA", you need to fix "common/lcd.c".
> Otherwise, you will get a new warning for such boards as palmld, palmtc,
> because CONFIG_CPU_PXA is defined and used in common/lcd.c,
> 
>   #if defined(CONFIG_CPU_PXA25X) || defined(CONFIG_CPU_PXA27X) || \
>           defined(CONFIG_CPU_MONAHANS)
>   #define CONFIG_CPU_PXA                   <------ remove
>   #include <asm/byteorder.h>
>   #endif
> 
> I think this change will *probably* produce the same output
> although I have not checked it closely yet.
> 
> 
> 
> 
> 
> [4]
> This patch is not applicable on the current master
> (commit d0796defbe8eff6fc3c27c893dcbc47af59d4764)
> You also need to add "select CPU_V7" to
> the new entry "TARGET_SUN6I" in arch/arm/Kconfig.
> 
> 
> 
> 
> Could you fix [1] thru [4], please?
> 
> 
> Before sending it, please do a quick test at least;
> it's very easy.
> 
> 
>   1.  Check out master branch
>   2.  Run "tools/genboardscfg.py"
>   3.  Run "mv  boards.cfg   boards.cfg.org"
>   4.  Apply your patch
>   5.  Run  "tools/genboardscfg.py" again
>   6.  Run  "diff  boards.cfg.org  boards.cfg"
> 
> If you get code diff,  something is wrong with your patch.
> You will easily see which board is corrupted.
> 
> 
> 
> 
> Tom and Albert,
> 
> If Georges fixes those problems, is it possible to apply it shortly on
> the mainline?
> (directly u-boot/master? or via u-boot-arm/master?)

I'm ok with this patch going in (through either tree). However:

> Since this patch easily causes conflicts, it should not get stuck for
> a long time.

I'm not sure I'm getting this right. Do yo mean that once the patch is
in, it should be easy to detect and iron out issues because if some
boards are broken, their users will react promptly?

> Best Regards
> Masahiro Yamada

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v3 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Masahiro YAMADA]

Hi Albert,


2014-10-28 2:09 GMT+09:00 Albert ARIBAUD <albert.u.boot@aribaud.net>:
>> Tom and Albert,
>>
>> If Georges fixes those problems, is it possible to apply it shortly on
>> the mainline?
>> (directly u-boot/master? or via u-boot-arm/master?)
>
> I'm ok with this patch going in (through either tree). However:
>
>> Since this patch easily causes conflicts, it should not get stuck for
>> a long time.
>
> I'm not sure I'm getting this right. Do yo mean that once the patch is
> in, it should be easy to detect and iron out issues because if some
> boards are broken, their users will react promptly?

Yes.

If some conflicts happen, CONFIG_SYS_CPU will not be set correctly
and those boards will fail to build.
User will notice the issue soon.



-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH v3 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Albert ARIBAUD]

Hello Masahiro,

On Tue, 28 Oct 2014 02:23:42 +0900, Masahiro YAMADA
<yamada.m@jp.panasonic.com> wrote:
> Hi Albert,
> 
> 
> 2014-10-28 2:09 GMT+09:00 Albert ARIBAUD <albert.u.boot@aribaud.net>:
> >> Tom and Albert,
> >>
> >> If Georges fixes those problems, is it possible to apply it shortly on
> >> the mainline?
> >> (directly u-boot/master? or via u-boot-arm/master?)
> >
> > I'm ok with this patch going in (through either tree). However:
> >
> >> Since this patch easily causes conflicts, it should not get stuck for
> >> a long time.
> >
> > I'm not sure I'm getting this right. Do yo mean that once the patch is
> > in, it should be easy to detect and iron out issues because if some
> > boards are broken, their users will react promptly?
> 
> Yes.
> 
> If some conflicts happen, CONFIG_SYS_CPU will not be set correctly
> and those boards will fail to build.
> User will notice the issue soon.

I often run 'buildman ... aarch64 arm' as a measure of the cleanliness
of the ARM repo. Would just applying this patch automatically cause lots
of ARM boards to fail building?

> Best Regards
> Masahiro Yamada

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v3 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Masahiro YAMADA]

Hi Albert,



2014-10-28 16:01 GMT+09:00 Albert ARIBAUD <albert.u.boot@aribaud.net>:
> Hello Masahiro,
>
> On Tue, 28 Oct 2014 02:23:42 +0900, Masahiro YAMADA
> <yamada.m@jp.panasonic.com> wrote:
>> Hi Albert,
>>
>>
>> 2014-10-28 2:09 GMT+09:00 Albert ARIBAUD <albert.u.boot@aribaud.net>:
>> >> Tom and Albert,
>> >>
>> >> If Georges fixes those problems, is it possible to apply it shortly on
>> >> the mainline?
>> >> (directly u-boot/master? or via u-boot-arm/master?)
>> >
>> > I'm ok with this patch going in (through either tree). However:
>> >
>> >> Since this patch easily causes conflicts, it should not get stuck for
>> >> a long time.
>> >
>> > I'm not sure I'm getting this right. Do yo mean that once the patch is
>> > in, it should be easy to detect and iron out issues because if some
>> > boards are broken, their users will react promptly?
>>
>> Yes.
>>
>> If some conflicts happen, CONFIG_SYS_CPU will not be set correctly
>> and those boards will fail to build.
>> User will notice the issue soon.
>
> I often run 'buildman ... aarch64 arm' as a measure of the cleanliness
> of the ARM repo. Would just applying this patch automatically cause lots
> of ARM boards to fail building?


If some conflicts happen after merging this patch and something goes wrong,
I think you can _probably_ detect it by buildman, but I am not 100% sure.


 How about moving forward like this?

  1. Georges will update his patch.

  2. I will test it asap.
     (guarantee the correctness by comparing MD5SUM for all the ARM boards.)

  3. Tom will immediately apply it to u-boot/master.

  4. Announce every custodian should get his repo synced with the upstream.

  5. We may still have some conflicts, so we will need to fix them carefully.
     (This fix won't be so difficult.  We just have to focus on some
new boards.)


In this way, I think we have only a couple of conflicts even if we have.

-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH v3 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Masahiro YAMADA]

Hi Georges,


I have another one I'd like you to fix.


[5]
Please fix Tegra too.


 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -668,6 +668,8 @@ config TEGRA
         bool "NVIDIA Tegra"
         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"
 diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig
b/arch/arm/cpu/armv7/tegra-common/Kconfig
 index 3ea6d76..1446452 100644
 --- a/arch/arm/cpu/armv7/tegra-common/Kconfig
 +++ b/arch/arm/cpu/armv7/tegra-common/Kconfig
 @@ -20,10 +20,6 @@ endchoice
  config USE_PRIVATE_LIBGCC
         default y if SPL_BUILD

 -config SYS_CPU
 -       default "arm720t" if SPL_BUILD
 -       default "armv7" if !SPL_BUILD
 -





I more closely tested
commit 3664816ffda  +  your patch   + fix [1] - [5].

I built all the ARM boards and compared MD5SUM to confirm the correctness.


With [1]-[5] fixed, your patch looks OK.

I am looking forward to see your updated version.



-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH v3 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Georges Savoundararadj]

Hi Masahiro,



Le 28/10/2014 16:57, Masahiro YAMADA a ?crit :
> Hi Georges,
>
>
> I have another one I'd like you to fix.
>
>
> [5]
> Please fix Tegra too.
>
>
>   --- a/arch/arm/Kconfig
>   +++ b/arch/arm/Kconfig
>   @@ -668,6 +668,8 @@ config TEGRA
>           bool "NVIDIA Tegra"
>           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"
>   diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig
> b/arch/arm/cpu/armv7/tegra-common/Kconfig
>   index 3ea6d76..1446452 100644
>   --- a/arch/arm/cpu/armv7/tegra-common/Kconfig
>   +++ b/arch/arm/cpu/armv7/tegra-common/Kconfig
>   @@ -20,10 +20,6 @@ endchoice
>    config USE_PRIVATE_LIBGCC
>           default y if SPL_BUILD
>
>   -config SYS_CPU
>   -       default "arm720t" if SPL_BUILD
>   -       default "armv7" if !SPL_BUILD
>   -
>
>
>
>
>
> I more closely tested
> commit 3664816ffda  +  your patch   + fix [1] - [5].
>
> I built all the ARM boards and compared MD5SUM to confirm the correctness.
>
>
> With [1]-[5] fixed, your patch looks OK.
>
> I am looking forward to see your updated version.
>
>
>
Thanks for your comments.

I am working on it.

Regards,

Georges

[U-Boot] [PATCH v3 2/4] arm: make .vectors section allocatable

[Georges Savoundararadj]

A regression was introduced in commit 41623c91. The consequence of that
is the non-relocation of the section .vectors symbols :
_undefined_instruction, _software_interrupt, _prefetch_abort,
_data_abort, _not_used, _irq and _fiq.

Before commit 41623c91, the exception vectors were in a .text section.
The .text section has the attributes allocatable and executable [1].

In commit 41623c91, a specific section is created, called .vectors, with
the attribute executable only.

What have changed between commit 41623c91^ and 41623c91 is the attribute
of the section which contains the exception vectors.
An allocatable section is "a section [that] occupies memory during
process execution" [1] which is the case of the section .vectors.
Adding the lacking attribute (SHF_ALLOC or "a") for the definition of
the section .vectors fixed the issue.

To summarize, the fix has to mark .vectors as allocatable because the
exception vectors reside in "memory during execution" and they need to
be relocated.

[1] http://man7.org/linux/man-pages/man5/elf.5.html

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Albert Aribeau <albert.u.boot@aribaud.net>

---

Changes in v3:
- None

Changes in v2:
- Reword the commit message

 arch/arm/lib/vectors.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
index 0cb87ce..49238ed 100644
--- a/arch/arm/lib/vectors.S
+++ b/arch/arm/lib/vectors.S
@@ -33,7 +33,7 @@
  *************************************************************************
  */
 
-	.section ".vectors", "x"
+	.section ".vectors", "ax"
 
 /*
  *************************************************************************
-- 
2.1.2

[U-Boot] [PATCH v3 2/4] arm: make .vectors section allocatable

[Albert ARIBAUD]

Hello Georges,

On Sun, 26 Oct 2014 23:25:24 +0100, Georges Savoundararadj
<savoundg@gmail.com> wrote:
> A regression was introduced in commit 41623c91. The consequence of
> that is the non-relocation of the section .vectors symbols :
> _undefined_instruction, _software_interrupt, _prefetch_abort,
> _data_abort, _not_used, _irq and _fiq.
> 
> Before commit 41623c91, the exception vectors were in a .text section.
> The .text section has the attributes allocatable and executable [1].
> 
> In commit 41623c91, a specific section is created, called .vectors,
> with the attribute executable only.
> 
> What have changed between commit 41623c91^ and 41623c91 is the
> attribute of the section which contains the exception vectors.
> An allocatable section is "a section [that] occupies memory during
> process execution" [1] which is the case of the section .vectors.
> Adding the lacking attribute (SHF_ALLOC or "a") for the definition of
> the section .vectors fixed the issue.
> 
> To summarize, the fix has to mark .vectors as allocatable because the
> exception vectors reside in "memory during execution" and they need to
> be relocated.
> 
> [1] http://man7.org/linux/man-pages/man5/elf.5.html
> 
> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> Cc: Albert Aribeau <albert.u.boot@aribaud.net>
> 
> ---
> 
> Changes in v3:
> - None
> 
> Changes in v2:
> - Reword the commit message
> 
>  arch/arm/lib/vectors.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
> index 0cb87ce..49238ed 100644
> --- a/arch/arm/lib/vectors.S
> +++ b/arch/arm/lib/vectors.S
> @@ -33,7 +33,7 @@
>   *************************************************************************
>   */
>  
> -	.section ".vectors", "x"
> +	.section ".vectors", "ax"
>  
>  /*
>   *************************************************************************
> -- 
> 2.1.2
> 

Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v3 3/4] arm: relocate the exception vectors

[Georges Savoundararadj]

This commit relocates the exception vectors.
As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
the other ARM processors, it copies the relocated exception vectors to
the correct address: 0x00000000 or 0xFFFF0000.

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Warren <twarren@nvidia.com>

---
This patch needs some tests because it impacts many boards. I have
tested it with my raspberry pi in the two cases: using VBAR and
using the copied exception vectors.

Changes in v3:
- Use the CPU feature HAS_VBAR Kconfig symbol

Changes in v2:
- Relocate exception vectors also on processors which do not support
  security extensions
- Reword the commit message

 arch/arm/cpu/armv7/start.S |  6 ------
 arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index fedd7c8..fdc05b9 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
 	mcr     p15, 0, r0, c7, c10, 4	@ DSB
 	mcr     p15, 0, r0, c7, c5, 4	@ ISB
 #endif
-/*
- * Move vector table
- */
-	/* Set vector address in CP15 VBAR register */
-	ldr     r0, =_start
-	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
 
 	bx	lr
 
diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
index 8035251..b4a258c 100644
--- a/arch/arm/lib/relocate.S
+++ b/arch/arm/lib/relocate.S
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#include <asm-offsets.h>
+#include <config.h>
 #include <linux/linkage.h>
 
 /*
@@ -52,6 +54,34 @@ fixnext:
 	cmp	r2, r3
 	blo	fixloop
 
+	/*
+	 * Relocate the exception vectors
+	 */
+#ifdef CONFIG_HAS_VBAR
+	/*
+	 * If the ARM processor has the security extensions,
+	 * use VBAR to relocate the exception vectors.
+	 */
+	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
+	mcr     p15, 0, r0, c12, c0, 0  /* Set VBAR */
+#else
+	/*
+	 * Copy the relocated exception vectors to the
+	 * correct address
+	 * CP15 c1 V bit gives us the location of the vectors:
+	 * 0x00000000 or 0xFFFF0000.
+	 */
+	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
+	mrc	p15, 0, r2, c1, c0, 0	/* V bit (bit[13]) in CP15 c1 */
+	ands	r2, r2, #(1 << 13)
+	ldreq	r1, =0x00000000 	/* If V=0 */
+	ldrne	r1, =0xFFFF0000 	/* If V=1 */
+	ldmia	r0!, {r2-r8,r10}
+	stmia	r1!, {r2-r8,r10}
+	ldmia	r0!, {r2-r8,r10}
+	stmia	r1!, {r2-r8,r10}
+#endif
+
 relocate_done:
 
 #ifdef __XSCALE__
-- 
2.1.2

[U-Boot] [PATCH v3 4/4] arm: interrupt_init: set sp in IRQ/FIQ modes

[Georges Savoundararadj]

Before this commit, the stack addresses for IRQ and FIQ modes,
IRQ_STACK_START and FIQ_STACK_START, were computed in interrupt_init but
they were not used.

This commit sets the stack pointers for IRQ and FIQ modes.

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>

---

Changes in v3:
- None

Changes in v2:
- Reword the commit message

 arch/arm/lib/interrupts.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index f6b7c03..49c1bf3 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -34,6 +34,25 @@ int interrupt_init (void)
 	IRQ_STACK_START_IN = gd->irq_sp + 8;
 	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 
+	__asm__ __volatile__("msr cpsr_c, %0\n"
+			     "mov sp, %1\n"
+			     :
+			     : "r" (IRQ_MODE | I_BIT | F_BIT),
+			       "r" (IRQ_STACK_START)
+			     : "memory");
+
+	__asm__ __volatile__("msr cpsr_c, %0\n"
+			     "mov sp, %1\n"
+			     :
+			     : "r" (FIQ_MODE | I_BIT | F_BIT),
+			       "r" (FIQ_STACK_START)
+			     : "memory");
+
+	__asm__ __volatile__("msr cpsr_c, %0"
+			     :
+			     : "r" (SVC_MODE | I_BIT | F_BIT)
+			     : "memory");
+
 	return arch_interrupt_init();
 }
 
-- 
2.1.2

[U-Boot] [PATCH v3 4/4] arm: interrupt_init: set sp in IRQ/FIQ modes

[Albert ARIBAUD]

Hello Georges,

On Sun, 26 Oct 2014 23:25:26 +0100, Georges Savoundararadj
<savoundg@gmail.com> wrote:
> Before this commit, the stack addresses for IRQ and FIQ modes,
> IRQ_STACK_START and FIQ_STACK_START, were computed in interrupt_init
> but they were not used.
> 
> This commit sets the stack pointers for IRQ and FIQ modes.
> 
> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> 
> ---
> 
> Changes in v3:
> - None
> 
> Changes in v2:
> - Reword the commit message
> 
>  arch/arm/lib/interrupts.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
> index f6b7c03..49c1bf3 100644
> --- a/arch/arm/lib/interrupts.c
> +++ b/arch/arm/lib/interrupts.c
> @@ -34,6 +34,25 @@ int interrupt_init (void)
>  	IRQ_STACK_START_IN = gd->irq_sp + 8;
>  	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
>  
> +	__asm__ __volatile__("msr cpsr_c, %0\n"
> +			     "mov sp, %1\n"
> +			     :
> +			     : "r" (IRQ_MODE | I_BIT | F_BIT),
> +			       "r" (IRQ_STACK_START)
> +			     : "memory");
> +
> +	__asm__ __volatile__("msr cpsr_c, %0\n"
> +			     "mov sp, %1\n"
> +			     :
> +			     : "r" (FIQ_MODE | I_BIT | F_BIT),
> +			       "r" (FIQ_STACK_START)
> +			     : "memory");
> +
> +	__asm__ __volatile__("msr cpsr_c, %0"
> +			     :
> +			     : "r" (SVC_MODE | I_BIT | F_BIT)
> +			     : "memory");

This sequence is trashing bits in CPSR which are unrelated to its
goal, including reserved bits which, as per ARM documentation, are to
be preserved. The sequence should initial CPSR and only change the
mode, I and F bits.

>  	return arch_interrupt_init();
>  }
>  
> -- 
> 2.1.2

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v3 4/4] arm: interrupt_init: set sp in IRQ/FIQ modes

[Albert ARIBAUD]

On Mon, 27 Oct 2014 00:16:46 +0100, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> be preserved. The sequence should initial CPSR and only change the
> mode, I and F bits.

(grmbl) "... should *read the* initial CPSR and..."

Apologies.


Amicalement,
-- 
Albert.

[U-Boot] [PATCH v4 0/4] arm: fix exception handling

[Georges Savoundararadj]

Hi,

This series fixes the exception handling on ARM.

First of all, it makes the symbols of the exception vectors relocatable.
Then, it ensures that the exception vectors are relocated. To do so, we
copy or move the exception vectors depending on the CPU features.

In order to handle gracefully CPU features, this commit introduces
Kconfig symbols for each ARM processor and it selects through Kconfig
the feature HAS_VBAR for the right CPUs.
I have taken into account all Masahiro's remarks and I checked this patch
with tools/genboardscfg.py.

Also, this series configures correctly the IRQ and the FIQ stack pointers.

Regards,

Georges

Changes in v4:
- Take into account all Masahiro's remarks for the Kconfig patch
- Restore initial CPSR value after configuring SP in IRQ and FIQ modes
- Rebase to master

Changes in v3:
- Use the CPU feature HAS_VBAR Kconfig symbol

Changes in v2:
- Relocate exception vectors also on processors which do not support
  security extensions
- Reword the commit messages

Georges Savoundararadj (4):
  kconfig: arm: introduce symbol for ARM CPUs
  arm: make .vectors section allocatable
  arm: relocate the exception vectors
  arm: interrupt_init: set sp in IRQ/FIQ modes

 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/start.S               |   6 -
 arch/arm/cpu/armv7/uniphier/Kconfig      |   6 -
 arch/arm/cpu/armv7/zynq/Kconfig          |   3 -
 arch/arm/lib/interrupts.c                |  27 ++++
 arch/arm/lib/relocate.S                  |  30 +++++
 arch/arm/lib/vectors.S                   |   2 +-
 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/emk/top9000/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 -
 159 files changed, 270 insertions(+), 511 deletions(-)

-- 
2.1.2

[U-Boot] [PATCH v4 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Georges Savoundararadj]

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>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>

---
This patch needs a little review as it impacts many files.

Changes in v4:
- s/ARM113/ARM1136
- Remove bad CPU select on TARGET_VEXPRESS_AEMV8A
- As it introduces CONFIG_CPU_PXA, remove the define in common/lcd.c
- Rebase to master
- Add "select CPU_V7" to TARGET_SUN6I
- Add "select CPU_ARM720T/CPU_V7" depending on SPL_BUILD for TEGRA

Changes in v3:
- Add this commit

Changes in v2: None

 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/emk/top9000/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 -
 155 files changed, 212 insertions(+), 504 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3415927..7aab6ab 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 1791cef..613f04d 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 91ffedf..6c037a1 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 eda51fd..265f336 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 2d0ab2b..5a54262 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 35c16d8..d2e76f4 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 b895223..090be93 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 29ff995..0e73c04 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 393885f..134ae87 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 53c0d24..c215404 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 e270895..eccf897 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 2ccf5b9..129982c 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 6c2bb22..c46a0cc 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 2fbbc18..6288134 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 34f5496..524b193 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 d6655a9..f418cd6 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 f9107a9..4beefbf 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 ee510d3..ed48300 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 85d335a..230e64d 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 bb6a7e7..2f43519 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 1448703..7113f2b 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 ee2ec06..4dd49c4 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 33d5157..f674894 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 102c18d..d944816 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 ff19181..6a5a931 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 f859578..fc42185 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 ac35d6d..b8e380e 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 53532bb..65544a8 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 4955313..6153b5d 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 7fa30c6..2e15e0d 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 61db2e2..bad4a37 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 24a645b..fe00ed5 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 301bf1a..d839c1a 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 f8e2b48..311c504 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 d2e191c..1bc086a 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 845cd36..cf1d1a3 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 517f22a..438d300 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 d236b1a..5c5ec61 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 0ca1ec0..0ba8a7b 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 f0dd04a..2a9ed23 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 6cf2573..7f8a6a1 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 fb1cf3f..53b7a9a 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 56ed7d6..b6f7c85 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 7d1534a..f327fa1 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 1c8f78d..c896c46 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 298c9fd..03b0f6f 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 2e779f0..f1b4e08 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 d627a38..9289288 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 9038f5b..861c559 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 b2528dc..fb5a1a3 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 7fad578..b1de8f8 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 4209b36..7a159dc 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 f063d55..c5f4897 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 a7f3b2f..de87d5b 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 b537e26..99e675b 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 42a8438..508c21f 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 6115976..683efde 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 0774784..0a837bd 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 2255cc9..7b681cd 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 54cb450..76cf343 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 b1c16c7..dd4dc4d 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 5dbb7f8..0696ad7 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 281e43a..c42c734 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 8e39fce..53a39d3 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/emk/top9000/Kconfig b/board/emk/top9000/Kconfig
index 2dbe060..683e29c 100644
--- a/board/emk/top9000/Kconfig
+++ b/board/emk/top9000/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_TOP9000
 
-config SYS_CPU
-	default "arm926ejs"
-
 config SYS_BOARD
 	default "top9000"
 
diff --git a/board/esd/meesc/Kconfig b/board/esd/meesc/Kconfig
index 7d5c3ca..5041041 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 7c5ce90..55a2f70 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 5593689..d73238f 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 53ae917..9bd077b 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 f2b02dc..b69e4c3 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 bfa6207..02c42cb 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 3cee468..119b955 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 312f938..bc50b8d 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 1bbbe2d..51a8f9f 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 a693239..af06b4c 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 cc654bc..39777bd 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 b4ea64b..eeeb6f4 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 68c3880..055545c 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 ca5b40f..021d19e 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 07861a9..f9b69cb 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 566df85..41f46a0 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 d064b10..c226c1c 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 bc44e59..5ca1672 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 62c37d4..1195d33 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 f7f18db..4af33af 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 d0cf355..cc2a140 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 15b65c0..fa6ddb2 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 558aeab..d32da90 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 2a86b68..940983e 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 684ef27..ef091d6 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 82909a8..c233e90 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 87d15a5..355702a 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 0b73955..6f94612 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 75956be..c0e0c1e 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 40e56cb..af9828a 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 4374fb6..3e87c40 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 cf3358d..d3d2025 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 4f3aaf4..e989e4b 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 9c11a13..195bc26 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 24edcc4..42746c1 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 842d1ba..c7de2e3 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 a87fa81..d90f854 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 08b0fa0..a156452 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 fb09309..0b151c9 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 a749c8d..3111295 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 5207490..3eb7198 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 1992970..b5fdb9a 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 f4ed7fd..2cc0d88 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 9d301c2..d7f2368 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 e8b1d47..5448311 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 1a767b2..501d511 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 4a2ca02..a4934c5 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 9512919..339a6ea 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 0c0af96..65fc5c4 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 a320c2b..cbbf5a9 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 94f1e3c..e987b64 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 5e6b0dd..d2157b4 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 99e7379..ab4a292 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 7ff7dbc..68e99ea 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 379e53b..2461d0c 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 80018c5..7b505aa 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 b930a76..d138ece 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 f76ec69..62604ec 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 b7e49da..3371077 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 1fedbd3..c07d244 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 90bfb69..f2e1098 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 a4eb62f..36b7904 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 5b702ce..27360f3 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 b8f5154..0c95fa3 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 150d64f..df17623 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 f03e19e..d562e64 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 620be5f..6a1c5c7 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 7eb9969..0b3a0cc 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 ca25876..909f30d 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 31a1503..28df187 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 3965e90..6e9392e 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 260774d..59a415d 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 67be227..3139f9a 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 d8958ef..b9f6bd7 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 47b96bd..8d1c168 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 9bd3d73..2960099 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 c0bdb9e..95973b4 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 aa80d0f..637f20e 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 087356d..e3bd456 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 e4b1a5e..949407a 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 b70cbf0..f8b3d1f 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 9844c69..56b2557 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 4e2271b..cacd2c5 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 a98d0d6..970f39f 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 a046f01..1701b35 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 c862769..3928566 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 6702319..4699526 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 288f24b..519e21f 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 5f7fe1b..c663504 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 689d30e..787d80e 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.1.2

[U-Boot] [PATCH v4 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Masahiro Yamada]

Hi Georges (and Tom),

On Tue, 28 Oct 2014 23:16:09 +0100
Georges Savoundararadj <savoundg@gmail.com> wrote:

> 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>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> 
> ---
> This patch needs a little review as it impacts many files.
> 
> Changes in v4:
> - s/ARM113/ARM1136
> - Remove bad CPU select on TARGET_VEXPRESS_AEMV8A
> - As it introduces CONFIG_CPU_PXA, remove the define in common/lcd.c
> - Rebase to master
> - Add "select CPU_V7" to TARGET_SUN6I
> - Add "select CPU_ARM720T/CPU_V7" depending on SPL_BUILD for TEGRA




>  board/emk/top9000/Kconfig                |   3 -

This file was deleted by commit d58a9451e.

This patch is not cleanly applicable on the current master
but it is really easy to resolve this conflict.


I applied this patch on commit d58a9451e
resolving the conflict and tested it.

I built all the ARM boards and checked MD5SUM
with/without this patch.  I believe this patch is good.
Thanks!

Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Masahiro Yamada <yamada.m@jp.panasonic.com>


I think this patch should go into Tom's repo asap
because it becomes out-of-dated soon.

Tom, 
Could you get this in shortly?


Best Regards
Masahiro Yamada

[U-Boot] [PATCH v4 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Tom Rini]

On Wed, Oct 29, 2014 at 05:07:23PM +0900, Masahiro Yamada wrote:
> Hi Georges (and Tom),
> 
> On Tue, 28 Oct 2014 23:16:09 +0100
> Georges Savoundararadj <savoundg@gmail.com> wrote:
> 
> > 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>
> > Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> > Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > 
> > ---
> > This patch needs a little review as it impacts many files.
> > 
> > Changes in v4:
> > - s/ARM113/ARM1136
> > - Remove bad CPU select on TARGET_VEXPRESS_AEMV8A
> > - As it introduces CONFIG_CPU_PXA, remove the define in common/lcd.c
> > - Rebase to master
> > - Add "select CPU_V7" to TARGET_SUN6I
> > - Add "select CPU_ARM720T/CPU_V7" depending on SPL_BUILD for TEGRA
> 
> 
> 
> 
> >  board/emk/top9000/Kconfig                |   3 -
> 
> This file was deleted by commit d58a9451e.
> 
> This patch is not cleanly applicable on the current master
> but it is really easy to resolve this conflict.
> 
> 
> I applied this patch on commit d58a9451e
> resolving the conflict and tested it.
> 
> I built all the ARM boards and checked MD5SUM
> with/without this patch.  I believe this patch is good.
> Thanks!
> 
> Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Acked-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> 
> 
> I think this patch should go into Tom's repo asap
> because it becomes out-of-dated soon.
> 
> Tom, 
> Could you get this in shortly?

Albert, can you ack the parts of this that you haven't yet and then I'll
grab it?  Or, of course, request further changes :)  Thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141029/1fd3b526/attachment.pgp>

[U-Boot] [PATCH v4 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Albert ARIBAUD]

Hello Georges,

On Tue, 28 Oct 2014 23:16:09 +0100, Georges Savoundararadj <savoundg@gmail.com> wrote:
> 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>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> 
> ---
> This patch needs a little review as it impacts many files.
> 
> Changes in v4:
> - s/ARM113/ARM1136
> - Remove bad CPU select on TARGET_VEXPRESS_AEMV8A
> - As it introduces CONFIG_CPU_PXA, remove the define in common/lcd.c
> - Rebase to master
> - Add "select CPU_V7" to TARGET_SUN6I
> - Add "select CPU_ARM720T/CPU_V7" depending on SPL_BUILD for TEGRA
> 
> Changes in v3:
> - Add this commit
> 
> Changes in v2: None
> 
>  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/emk/top9000/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 -
>  155 files changed, 212 insertions(+), 504 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 3415927..7aab6ab 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 1791cef..613f04d 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 91ffedf..6c037a1 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 eda51fd..265f336 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 2d0ab2b..5a54262 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 35c16d8..d2e76f4 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 b895223..090be93 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 29ff995..0e73c04 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 393885f..134ae87 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 53c0d24..c215404 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 e270895..eccf897 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 2ccf5b9..129982c 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 6c2bb22..c46a0cc 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 2fbbc18..6288134 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 34f5496..524b193 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 d6655a9..f418cd6 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 f9107a9..4beefbf 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 ee510d3..ed48300 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 85d335a..230e64d 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 bb6a7e7..2f43519 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 1448703..7113f2b 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 ee2ec06..4dd49c4 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 33d5157..f674894 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 102c18d..d944816 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 ff19181..6a5a931 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 f859578..fc42185 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 ac35d6d..b8e380e 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 53532bb..65544a8 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 4955313..6153b5d 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 7fa30c6..2e15e0d 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 61db2e2..bad4a37 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 24a645b..fe00ed5 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 301bf1a..d839c1a 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 f8e2b48..311c504 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 d2e191c..1bc086a 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 845cd36..cf1d1a3 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 517f22a..438d300 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 d236b1a..5c5ec61 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 0ca1ec0..0ba8a7b 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 f0dd04a..2a9ed23 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 6cf2573..7f8a6a1 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 fb1cf3f..53b7a9a 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 56ed7d6..b6f7c85 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 7d1534a..f327fa1 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 1c8f78d..c896c46 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 298c9fd..03b0f6f 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 2e779f0..f1b4e08 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 d627a38..9289288 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 9038f5b..861c559 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 b2528dc..fb5a1a3 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 7fad578..b1de8f8 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 4209b36..7a159dc 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 f063d55..c5f4897 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 a7f3b2f..de87d5b 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 b537e26..99e675b 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 42a8438..508c21f 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 6115976..683efde 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 0774784..0a837bd 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 2255cc9..7b681cd 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 54cb450..76cf343 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 b1c16c7..dd4dc4d 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 5dbb7f8..0696ad7 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 281e43a..c42c734 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 8e39fce..53a39d3 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/emk/top9000/Kconfig b/board/emk/top9000/Kconfig
> index 2dbe060..683e29c 100644
> --- a/board/emk/top9000/Kconfig
> +++ b/board/emk/top9000/Kconfig
> @@ -1,8 +1,5 @@
>  if TARGET_TOP9000
>  
> -config SYS_CPU
> -	default "arm926ejs"
> -
>  config SYS_BOARD
>  	default "top9000"
>  
> diff --git a/board/esd/meesc/Kconfig b/board/esd/meesc/Kconfig
> index 7d5c3ca..5041041 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 7c5ce90..55a2f70 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 5593689..d73238f 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 53ae917..9bd077b 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 f2b02dc..b69e4c3 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 bfa6207..02c42cb 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 3cee468..119b955 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 312f938..bc50b8d 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 1bbbe2d..51a8f9f 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 a693239..af06b4c 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 cc654bc..39777bd 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 b4ea64b..eeeb6f4 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 68c3880..055545c 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 ca5b40f..021d19e 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 07861a9..f9b69cb 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 566df85..41f46a0 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 d064b10..c226c1c 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 bc44e59..5ca1672 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 62c37d4..1195d33 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 f7f18db..4af33af 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 d0cf355..cc2a140 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 15b65c0..fa6ddb2 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 558aeab..d32da90 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 2a86b68..940983e 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 684ef27..ef091d6 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 82909a8..c233e90 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 87d15a5..355702a 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 0b73955..6f94612 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 75956be..c0e0c1e 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 40e56cb..af9828a 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 4374fb6..3e87c40 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 cf3358d..d3d2025 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 4f3aaf4..e989e4b 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 9c11a13..195bc26 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 24edcc4..42746c1 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 842d1ba..c7de2e3 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 a87fa81..d90f854 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 08b0fa0..a156452 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 fb09309..0b151c9 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 a749c8d..3111295 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 5207490..3eb7198 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 1992970..b5fdb9a 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 f4ed7fd..2cc0d88 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 9d301c2..d7f2368 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 e8b1d47..5448311 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 1a767b2..501d511 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 4a2ca02..a4934c5 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 9512919..339a6ea 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 0c0af96..65fc5c4 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 a320c2b..cbbf5a9 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 94f1e3c..e987b64 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 5e6b0dd..d2157b4 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 99e7379..ab4a292 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 7ff7dbc..68e99ea 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 379e53b..2461d0c 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 80018c5..7b505aa 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 b930a76..d138ece 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 f76ec69..62604ec 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 b7e49da..3371077 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 1fedbd3..c07d244 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 90bfb69..f2e1098 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 a4eb62f..36b7904 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 5b702ce..27360f3 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 b8f5154..0c95fa3 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 150d64f..df17623 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 f03e19e..d562e64 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 620be5f..6a1c5c7 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 7eb9969..0b3a0cc 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 ca25876..909f30d 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 31a1503..28df187 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 3965e90..6e9392e 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 260774d..59a415d 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 67be227..3139f9a 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 d8958ef..b9f6bd7 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 47b96bd..8d1c168 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 9bd3d73..2960099 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 c0bdb9e..95973b4 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 aa80d0f..637f20e 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 087356d..e3bd456 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 e4b1a5e..949407a 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 b70cbf0..f8b3d1f 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 9844c69..56b2557 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 4e2271b..cacd2c5 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 a98d0d6..970f39f 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 a046f01..1701b35 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 c862769..3928566 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 6702319..4699526 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 288f24b..519e21f 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 5f7fe1b..c663504 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 689d30e..787d80e 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.1.2
> 

Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v4 1/4] kconfig: arm: introduce symbol for ARM CPUs

[Tom Rini]

On Tue, Oct 28, 2014 at 11:16:09PM +0100, Georges Savoundararadj wrote:

> 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>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> 

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141029/51737e8f/attachment.pgp>

[U-Boot] [PATCH v4 2/4] arm: make .vectors section allocatable

[Georges Savoundararadj]

A regression was introduced in commit 41623c91. The consequence of that
is the non-relocation of the section .vectors symbols :
_undefined_instruction, _software_interrupt, _prefetch_abort,
_data_abort, _not_used, _irq and _fiq.

Before commit 41623c91, the exception vectors were in a .text section.
The .text section has the attributes allocatable and executable [1].

In commit 41623c91, a specific section is created, called .vectors, with
the attribute executable only.

What have changed between commit 41623c91^ and 41623c91 is the attribute
of the section which contains the exception vectors.
An allocatable section is "a section [that] occupies memory during
process execution" [1] which is the case of the section .vectors.
Adding the lacking attribute (SHF_ALLOC or "a") for the definition of
the section .vectors fixed the issue.

To summarize, the fix has to mark .vectors as allocatable because the
exception vectors reside in "memory during execution" and they need to
be relocated.

[1] http://man7.org/linux/man-pages/man5/elf.5.html

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Albert Aribeau <albert.u.boot@aribaud.net>
Acked-by: Albert ARIBEAU <albert.u.boot@aribaud.net>

---

Changes in v4:
- Add Acked-by from Albert

Changes in v3:
- None

Changes in v2:
- Reword the commit message

 arch/arm/lib/vectors.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
index 0cb87ce..49238ed 100644
--- a/arch/arm/lib/vectors.S
+++ b/arch/arm/lib/vectors.S
@@ -33,7 +33,7 @@
  *************************************************************************
  */
 
-	.section ".vectors", "x"
+	.section ".vectors", "ax"
 
 /*
  *************************************************************************
-- 
2.1.2

[U-Boot] [PATCH v4 2/4] arm: make .vectors section allocatable

[Albert ARIBAUD]

Hello Georges,

On Tue, 28 Oct 2014 23:16:10 +0100, Georges Savoundararadj <savoundg@gmail.com> wrote:
> A regression was introduced in commit 41623c91. The consequence of that
> is the non-relocation of the section .vectors symbols :
> _undefined_instruction, _software_interrupt, _prefetch_abort,
> _data_abort, _not_used, _irq and _fiq.
> 
> Before commit 41623c91, the exception vectors were in a .text section.
> The .text section has the attributes allocatable and executable [1].
> 
> In commit 41623c91, a specific section is created, called .vectors, with
> the attribute executable only.
> 
> What have changed between commit 41623c91^ and 41623c91 is the attribute
> of the section which contains the exception vectors.
> An allocatable section is "a section [that] occupies memory during
> process execution" [1] which is the case of the section .vectors.
> Adding the lacking attribute (SHF_ALLOC or "a") for the definition of
> the section .vectors fixed the issue.
> 
> To summarize, the fix has to mark .vectors as allocatable because the
> exception vectors reside in "memory during execution" and they need to
> be relocated.
> 
> [1] http://man7.org/linux/man-pages/man5/elf.5.html
> 
> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> Cc: Albert Aribeau <albert.u.boot@aribaud.net>
> Acked-by: Albert ARIBEAU <albert.u.boot@aribaud.net>
> 
> ---
> 
> Changes in v4:
> - Add Acked-by from Albert
> 
> Changes in v3:
> - None
> 
> Changes in v2:
> - Reword the commit message
> 
>  arch/arm/lib/vectors.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
> index 0cb87ce..49238ed 100644
> --- a/arch/arm/lib/vectors.S
> +++ b/arch/arm/lib/vectors.S
> @@ -33,7 +33,7 @@
>   *************************************************************************
>   */
>  
> -	.section ".vectors", "x"
> +	.section ".vectors", "ax"
>  
>  /*
>   *************************************************************************
> -- 
> 2.1.2
> 

Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v4 2/4] arm: make .vectors section allocatable

[Tom Rini]

On Tue, Oct 28, 2014 at 11:16:10PM +0100, Georges Savoundararadj wrote:

> A regression was introduced in commit 41623c91. The consequence of that
> is the non-relocation of the section .vectors symbols :
> _undefined_instruction, _software_interrupt, _prefetch_abort,
> _data_abort, _not_used, _irq and _fiq.
> 
> Before commit 41623c91, the exception vectors were in a .text section.
> The .text section has the attributes allocatable and executable [1].
> 
> In commit 41623c91, a specific section is created, called .vectors, with
> the attribute executable only.
> 
> What have changed between commit 41623c91^ and 41623c91 is the attribute
> of the section which contains the exception vectors.
> An allocatable section is "a section [that] occupies memory during
> process execution" [1] which is the case of the section .vectors.
> Adding the lacking attribute (SHF_ALLOC or "a") for the definition of
> the section .vectors fixed the issue.
> 
> To summarize, the fix has to mark .vectors as allocatable because the
> exception vectors reside in "memory during execution" and they need to
> be relocated.
> 
> [1] http://man7.org/linux/man-pages/man5/elf.5.html
> 
> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> Cc: Albert Aribeau <albert.u.boot@aribaud.net>
> Acked-by: Albert ARIBEAU <albert.u.boot@aribaud.net>
> 

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141029/c872217d/attachment.pgp>

[U-Boot] [PATCH v4 3/4] arm: relocate the exception vectors

[Georges Savoundararadj]

This commit relocates the exception vectors.
As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
the other ARM processors, it copies the relocated exception vectors to
the correct address: 0x00000000 or 0xFFFF0000.

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Warren <twarren@nvidia.com>

---
This patch needs some tests because it impacts many boards. I have
tested it with my raspberry pi in the two cases: using VBAR and
using the copied exception vectors.

Changes in v4: None
Changes in v3:
- Use the CPU feature HAS_VBAR Kconfig symbol

Changes in v2:
- Relocate exception vectors also on processors which do not support
  security extensions
- Reword the commit message

 arch/arm/cpu/armv7/start.S |  6 ------
 arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index fedd7c8..fdc05b9 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
 	mcr     p15, 0, r0, c7, c10, 4	@ DSB
 	mcr     p15, 0, r0, c7, c5, 4	@ ISB
 #endif
-/*
- * Move vector table
- */
-	/* Set vector address in CP15 VBAR register */
-	ldr     r0, =_start
-	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
 
 	bx	lr
 
diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
index 8035251..b4a258c 100644
--- a/arch/arm/lib/relocate.S
+++ b/arch/arm/lib/relocate.S
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#include <asm-offsets.h>
+#include <config.h>
 #include <linux/linkage.h>
 
 /*
@@ -52,6 +54,34 @@ fixnext:
 	cmp	r2, r3
 	blo	fixloop
 
+	/*
+	 * Relocate the exception vectors
+	 */
+#ifdef CONFIG_HAS_VBAR
+	/*
+	 * If the ARM processor has the security extensions,
+	 * use VBAR to relocate the exception vectors.
+	 */
+	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
+	mcr     p15, 0, r0, c12, c0, 0  /* Set VBAR */
+#else
+	/*
+	 * Copy the relocated exception vectors to the
+	 * correct address
+	 * CP15 c1 V bit gives us the location of the vectors:
+	 * 0x00000000 or 0xFFFF0000.
+	 */
+	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
+	mrc	p15, 0, r2, c1, c0, 0	/* V bit (bit[13]) in CP15 c1 */
+	ands	r2, r2, #(1 << 13)
+	ldreq	r1, =0x00000000 	/* If V=0 */
+	ldrne	r1, =0xFFFF0000 	/* If V=1 */
+	ldmia	r0!, {r2-r8,r10}
+	stmia	r1!, {r2-r8,r10}
+	ldmia	r0!, {r2-r8,r10}
+	stmia	r1!, {r2-r8,r10}
+#endif
+
 relocate_done:
 
 #ifdef __XSCALE__
-- 
2.1.2

[U-Boot] [PATCH v4 3/4] arm: relocate the exception vectors

[Albert ARIBAUD]

Hello Georges,

On Tue, 28 Oct 2014 23:16:11 +0100, Georges Savoundararadj <savoundg@gmail.com> wrote:
> This commit relocates the exception vectors.
> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
> the other ARM processors, it copies the relocated exception vectors to
> the correct address: 0x00000000 or 0xFFFF0000.
> 
> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Tom Warren <twarren@nvidia.com>
> 
> ---
> This patch needs some tests because it impacts many boards. I have
> tested it with my raspberry pi in the two cases: using VBAR and
> using the copied exception vectors.
> 
> Changes in v4: None
> Changes in v3:
> - Use the CPU feature HAS_VBAR Kconfig symbol
> 
> Changes in v2:
> - Relocate exception vectors also on processors which do not support
>   security extensions
> - Reword the commit message
> 
>  arch/arm/cpu/armv7/start.S |  6 ------
>  arch/arm/lib/relocate.S    | 30 ++++++++++++++++++++++++++++++
>  2 files changed, 30 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> index fedd7c8..fdc05b9 100644
> --- a/arch/arm/cpu/armv7/start.S
> +++ b/arch/arm/cpu/armv7/start.S
> @@ -81,12 +81,6 @@ ENTRY(c_runtime_cpu_setup)
>  	mcr     p15, 0, r0, c7, c10, 4	@ DSB
>  	mcr     p15, 0, r0, c7, c5, 4	@ ISB
>  #endif
> -/*
> - * Move vector table
> - */
> -	/* Set vector address in CP15 VBAR register */
> -	ldr     r0, =_start
> -	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
>  
>  	bx	lr
>  
> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
> index 8035251..b4a258c 100644
> --- a/arch/arm/lib/relocate.S
> +++ b/arch/arm/lib/relocate.S
> @@ -6,6 +6,8 @@
>   * SPDX-License-Identifier:	GPL-2.0+
>   */
>  
> +#include <asm-offsets.h>
> +#include <config.h>
>  #include <linux/linkage.h>
>  
>  /*
> @@ -52,6 +54,34 @@ fixnext:
>  	cmp	r2, r3
>  	blo	fixloop
>  
> +	/*
> +	 * Relocate the exception vectors
> +	 */
> +#ifdef CONFIG_HAS_VBAR
> +	/*
> +	 * If the ARM processor has the security extensions,
> +	 * use VBAR to relocate the exception vectors.
> +	 */
> +	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
> +	mcr     p15, 0, r0, c12, c0, 0  /* Set VBAR */
> +#else
> +	/*
> +	 * Copy the relocated exception vectors to the
> +	 * correct address
> +	 * CP15 c1 V bit gives us the location of the vectors:
> +	 * 0x00000000 or 0xFFFF0000.
> +	 */
> +	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
> +	mrc	p15, 0, r2, c1, c0, 0	/* V bit (bit[13]) in CP15 c1 */
> +	ands	r2, r2, #(1 << 13)
> +	ldreq	r1, =0x00000000 	/* If V=0 */
> +	ldrne	r1, =0xFFFF0000 	/* If V=1 */
> +	ldmia	r0!, {r2-r8,r10}
> +	stmia	r1!, {r2-r8,r10}
> +	ldmia	r0!, {r2-r8,r10}
> +	stmia	r1!, {r2-r8,r10}
> +#endif
> +
>  relocate_done:
>  
>  #ifdef __XSCALE__
> -- 
> 2.1.2
> 

Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v4 3/4] arm: relocate the exception vectors

[Tom Rini]

On Tue, Oct 28, 2014 at 11:16:11PM +0100, Georges Savoundararadj wrote:

> This commit relocates the exception vectors.
> As ARM1176 and ARMv7 have the security extensions, it uses VBAR.  For
> the other ARM processors, it copies the relocated exception vectors to
> the correct address: 0x00000000 or 0xFFFF0000.
> 
> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Tom Warren <twarren@nvidia.com>
> 

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141029/c679385b/attachment.pgp>

[U-Boot] [PATCH v4 4/4] arm: interrupt_init: set sp in IRQ/FIQ modes

[Georges Savoundararadj]

Before this commit, the stack addresses for IRQ and FIQ modes,
IRQ_STACK_START and FIQ_STACK_START, were computed in interrupt_init but
they were not used.

This commit sets the stack pointers for IRQ and FIQ modes.

Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>

---

Changes in v4:
- Restore initial CPSR value after configuring SP in IRQ and FIQ modes

Changes in v3: None
Changes in v2:
- Reword the commit message

 arch/arm/lib/interrupts.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index 9019736..4dacfd9 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -28,6 +28,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_USE_IRQ
 int interrupt_init (void)
 {
+	unsigned long cpsr;
+
 	/*
 	 * setup up stacks if necessary
 	 */
@@ -35,6 +37,31 @@ int interrupt_init (void)
 	IRQ_STACK_START_IN = gd->irq_sp + 8;
 	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 
+
+	__asm__ __volatile__("mrs %0, cpsr\n"
+			     : "=r" (cpsr)
+			     :
+			     : "memory");
+
+	__asm__ __volatile__("msr cpsr_c, %0\n"
+			     "mov sp, %1\n"
+			     :
+			     : "r" (IRQ_MODE | I_BIT | F_BIT | (cpsr & ~FIQ_MODE)),
+			       "r" (IRQ_STACK_START)
+			     : "memory");
+
+	__asm__ __volatile__("msr cpsr_c, %0\n"
+			     "mov sp, %1\n"
+			     :
+			     : "r" (FIQ_MODE | I_BIT | F_BIT | (cpsr & ~IRQ_MODE)),
+			       "r" (FIQ_STACK_START)
+			     : "memory");
+
+	__asm__ __volatile__("msr cpsr_c, %0"
+			     :
+			     : "r" (cpsr)
+			     : "memory");
+
 	return arch_interrupt_init();
 }
 
-- 
2.1.2

[U-Boot] [PATCH v4 4/4] arm: interrupt_init: set sp in IRQ/FIQ modes

[Albert ARIBAUD]

Hello Georges,

On Tue, 28 Oct 2014 23:16:12 +0100, Georges Savoundararadj <savoundg@gmail.com> wrote:
> Before this commit, the stack addresses for IRQ and FIQ modes,
> IRQ_STACK_START and FIQ_STACK_START, were computed in interrupt_init but
> they were not used.
> 
> This commit sets the stack pointers for IRQ and FIQ modes.
> 
> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> 
> ---
> 
> Changes in v4:
> - Restore initial CPSR value after configuring SP in IRQ and FIQ modes
> 
> Changes in v3: None
> Changes in v2:
> - Reword the commit message
> 
>  arch/arm/lib/interrupts.c | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
> 
> diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
> index 9019736..4dacfd9 100644
> --- a/arch/arm/lib/interrupts.c
> +++ b/arch/arm/lib/interrupts.c
> @@ -28,6 +28,8 @@ DECLARE_GLOBAL_DATA_PTR;
>  #ifdef CONFIG_USE_IRQ
>  int interrupt_init (void)
>  {
> +	unsigned long cpsr;
> +
>  	/*
>  	 * setup up stacks if necessary
>  	 */
> @@ -35,6 +37,31 @@ int interrupt_init (void)
>  	IRQ_STACK_START_IN = gd->irq_sp + 8;
>  	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
>  
> +
> +	__asm__ __volatile__("mrs %0, cpsr\n"
> +			     : "=r" (cpsr)
> +			     :
> +			     : "memory");
> +
> +	__asm__ __volatile__("msr cpsr_c, %0\n"
> +			     "mov sp, %1\n"
> +			     :
> +			     : "r" (IRQ_MODE | I_BIT | F_BIT | (cpsr & ~FIQ_MODE)),
> +			       "r" (IRQ_STACK_START)
> +			     : "memory");
> +
> +	__asm__ __volatile__("msr cpsr_c, %0\n"
> +			     "mov sp, %1\n"
> +			     :
> +			     : "r" (FIQ_MODE | I_BIT | F_BIT | (cpsr & ~IRQ_MODE)),
> +			       "r" (FIQ_STACK_START)
> +			     : "memory");
> +
> +	__asm__ __volatile__("msr cpsr_c, %0"
> +			     :
> +			     : "r" (cpsr)
> +			     : "memory");
> +
>  	return arch_interrupt_init();
>  }
>  
> -- 
> 2.1.2
> 

Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v4 4/4] arm: interrupt_init: set sp in IRQ/FIQ modes

[Tom Rini]

On Tue, Oct 28, 2014 at 11:16:12PM +0100, Georges Savoundararadj wrote:

> Before this commit, the stack addresses for IRQ and FIQ modes,
> IRQ_STACK_START and FIQ_STACK_START, were computed in interrupt_init but
> they were not used.
> 
> This commit sets the stack pointers for IRQ and FIQ modes.
> 
> Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> 

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141029/b215c23d/attachment.pgp>