Patchwork [U-Boot,v2] arm: jadecpu: Readd MACH_TYPE_JADECPU

login
register
mail settings
Submitter Matthias Weisser
Date Nov. 5, 2011, 12:15 p.m.
Message ID <1320495344-8772-1-git-send-email-weisserm@arcor.de>
Download mbox | patch
Permalink /patch/123837/
State Accepted
Commit b2a7badb5ab13cd26539d401ff638d3f47675b04
Delegated to: Albert ARIBAUD
Headers show

Comments

Matthias Weisser - Nov. 5, 2011, 12:15 p.m.
MACH_TYPE_JADECPU was removed from mach-types.h. Add it to board
config file.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
---
Changes in V2:
  Removed ifdef around MACH_TYPE

 board/syteco/jadecpu/jadecpu.c |    1 -
 include/configs/jadecpu.h      |    6 ++++++
 2 files changed, 6 insertions(+), 1 deletions(-)
Albert ARIBAUD - Nov. 5, 2011, 12:36 p.m.
Hi Matthias,

Le 05/11/2011 13:15, Matthias Weisser a écrit :
> MACH_TYPE_JADECPU was removed from mach-types.h. Add it to board
> config file.
>
> Signed-off-by: Matthias Weisser<weisserm@arcor.de>
> ---
> Changes in V2:
>    Removed ifdef around MACH_TYPE
>
>   board/syteco/jadecpu/jadecpu.c |    1 -
>   include/configs/jadecpu.h      |    6 ++++++
>   2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
> index 63a0d33..72288fe 100644
> --- a/board/syteco/jadecpu/jadecpu.c
> +++ b/board/syteco/jadecpu/jadecpu.c
> @@ -40,7 +40,6 @@ int board_init(void)
>   	writel(0x00000010,&ccnt->cmux_md);
>
>   	gd->flags = 0;
> -	gd->bd->bi_arch_number = MACH_TYPE_JADECPU;
>   	gd->bd->bi_boot_params = PHYS_SDRAM + PHYS_SDRAM_SIZE - 0x10000;
>
>   	icache_enable();
> diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
> index a239efc..42cb858 100644
> --- a/include/configs/jadecpu.h
> +++ b/include/configs/jadecpu.h
> @@ -37,6 +37,10 @@
>   #define CONFIG_USE_ARCH_MEMCPY
>   #define CONFIG_USE_ARCH_MEMSET
>
> +#define MACH_TYPE_JADECPU	2636
> +
> +#define CONFIG_MACH_TYPE MACH_TYPE_JADECPU
> +
>   /*
>    * Environment settings
>    */

Applied to u-boot-arm/master, thanks!

Amicalement,

Patch

diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
index 63a0d33..72288fe 100644
--- a/board/syteco/jadecpu/jadecpu.c
+++ b/board/syteco/jadecpu/jadecpu.c
@@ -40,7 +40,6 @@  int board_init(void)
 	writel(0x00000010, &ccnt->cmux_md);
 
 	gd->flags = 0;
-	gd->bd->bi_arch_number = MACH_TYPE_JADECPU;
 	gd->bd->bi_boot_params = PHYS_SDRAM + PHYS_SDRAM_SIZE - 0x10000;
 
 	icache_enable();
diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index a239efc..42cb858 100644
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -37,6 +37,10 @@ 
 #define CONFIG_USE_ARCH_MEMCPY
 #define CONFIG_USE_ARCH_MEMSET
 
+#define MACH_TYPE_JADECPU	2636
+
+#define CONFIG_MACH_TYPE MACH_TYPE_JADECPU
+
 /*
  * Environment settings
  */