Patchwork hw: Add lost ARM core again

login
register
mail settings
Submitter Stefan Weil
Date April 14, 2013, 8:52 p.m.
Message ID <1365972770-13777-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/236472/
State Accepted
Headers show

Comments

Stefan Weil - April 14, 2013, 8:52 p.m.
Commit 0434e30afb6175212389811e0b28b948eb3c1e40 accidentally removed
the compilation of arm11mpcore.c.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 default-configs/arm-softmmu.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Paolo Bonzini - April 15, 2013, 9:11 a.m.
Il 14/04/2013 22:52, Stefan Weil ha scritto:
> Commit 0434e30afb6175212389811e0b28b948eb3c1e40 accidentally removed
> the compilation of arm11mpcore.c.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  default-configs/arm-softmmu.mak |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 31725a9..27cbe3d 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -34,8 +34,8 @@ CONFIG_PFLASH_CFI02=y
>  CONFIG_MICRODRIVE=y
>  CONFIG_USB_MUSB=y
>  
> -CONFIG_ARM5MPCORE=y
>  CONFIG_ARM9MPCORE=y
> +CONFIG_ARM11MPCORE=y
>  CONFIG_ARM15MPCORE=y
>  
>  CONFIG_ARM_GIC=y
> 

Thanks, will include in pull request.

Paolo
Stefan Hajnoczi - April 19, 2013, 9:39 a.m.
On Sun, Apr 14, 2013 at 10:52:50PM +0200, Stefan Weil wrote:
> Commit 0434e30afb6175212389811e0b28b948eb3c1e40 accidentally removed
> the compilation of arm11mpcore.c.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  default-configs/arm-softmmu.mak |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 31725a9..27cbe3d 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -34,8 +34,8 @@ CONFIG_PFLASH_CFI02=y
>  CONFIG_MICRODRIVE=y
>  CONFIG_USB_MUSB=y
>  
> -CONFIG_ARM5MPCORE=y
>  CONFIG_ARM9MPCORE=y
> +CONFIG_ARM11MPCORE=y

Did you mean to remove CONFIG_ARM5MPCORE?
Peter Maydell - April 19, 2013, 10:07 a.m.
On 19 April 2013 10:39, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> On Sun, Apr 14, 2013 at 10:52:50PM +0200, Stefan Weil wrote:
>> -CONFIG_ARM5MPCORE=y
>>  CONFIG_ARM9MPCORE=y
>> +CONFIG_ARM11MPCORE=y
>
> Did you mean to remove CONFIG_ARM5MPCORE?

This is correct -- we don't emulate the Cortex-A5.

-- PMM

Patch

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 31725a9..27cbe3d 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -34,8 +34,8 @@  CONFIG_PFLASH_CFI02=y
 CONFIG_MICRODRIVE=y
 CONFIG_USB_MUSB=y
 
-CONFIG_ARM5MPCORE=y
 CONFIG_ARM9MPCORE=y
+CONFIG_ARM11MPCORE=y
 CONFIG_ARM15MPCORE=y
 
 CONFIG_ARM_GIC=y