From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sat, 05 Nov 2011 11:49:43 +0100
Subject: [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU
In-Reply-To: <1320045986-3282-1-git-send-email-weisserm@arcor.de>
References: <1320045986-3282-1-git-send-email-weisserm@arcor.de>
Message-ID: <4EB514C7.9000503@aribaud.net>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Matthias,

Le 31/10/2011 08:26, 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>
> ---
>   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,12 @@
>   #define CONFIG_USE_ARCH_MEMCPY
>   #define CONFIG_USE_ARCH_MEMSET
>
> +#ifndef MACH_TYPE_JADECPU
> +#define MACH_TYPE_JADECPU	2636
> +#endif

NAK -- remove ifndef/endif around definition. This way, if/when mach 
type reappears in official mach-type.h, we will get a warning about your 
mach-type being defined twice.

> +#define CONFIG_MACH_TYPE MACH_TYPE_JADECPU
> +
>   /*
>    * Environment settings
>    */

Amicalement,
-- 
Albert.