| Message ID | 1320134223-26485-1-git-send-email-valentin.longchamp@keymile.com |
|---|---|
| State | Accepted |
| Commit | 8620ca2a1f42e33da93d7115c0cf8a9ea4846b64 |
| Headers | show |
> -----Original Message----- > From: u-boot-bounces@lists.denx.de [mailto:u-boot- > bounces@lists.denx.de] On Behalf Of Valentin Longchamp > Sent: Tuesday, November 01, 2011 1:27 PM > To: u-boot@lists.denx.de > Cc: Holger Brunck; Valentin Longchamp > Subject: [U-Boot] [PATCH v2] ARM: Reintroduce > MACH_TYPE_KM_KIRKWOOD for keymile ARM boards > > We got dropped from Linux mach-types.h because of a lack of > mainline > support and this is needed since the last Linux/u-boot mach- > types > synchro. > > This patch also defines CONFIG_MACH_TYPE for all keymile > boards, as > this is a mandatory CONFIG for ARM boards now. The > initialization > of gd->bd->bi_arch_number is removed form km_arm.c, our board > file. > > Signed-off-by: Valentin Longchamp > <valentin.longchamp@keymile.com> > Signed-off-by: Holger Brunck <holger.brunck@keymile.com> > --- > board/keymile/km_arm/km_arm.c | 5 ----- > include/configs/km/km_arm.h | 5 +++++ > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/board/keymile/km_arm/km_arm.c > b/board/keymile/km_arm/km_arm.c > index 6ef5e5d..46f82f9 100644 > --- a/board/keymile/km_arm/km_arm.c > +++ b/board/keymile/km_arm/km_arm.c > @@ -264,11 +264,6 @@ int board_early_init_f(void) > > int board_init(void) > { > - /* > - * arch number of board > - */ > - gd->bd->bi_arch_number = MACH_TYPE_KM_KIRKWOOD; > - > /* address of boot parameters */ > gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; > > diff --git a/include/configs/km/km_arm.h > b/include/configs/km/km_arm.h > index c117943..f30088d 100644 > --- a/include/configs/km/km_arm.h > +++ b/include/configs/km/km_arm.h > @@ -36,6 +36,9 @@ > #ifndef _CONFIG_KM_ARM_H > #define _CONFIG_KM_ARM_H > > +/* We got removed from Linux mach-types.h */ > +#define MACH_TYPE_KM_KIRKWOOD 2255 > + > /* > * High Level Configuration Options (easy to change) > */ > @@ -45,6 +48,8 @@ > #define CONFIG_KW88F6281 /* SOC Name */ > #define CONFIG_MACH_KM_KIRKWOOD /* Machine type */ > > +#define CONFIG_MACH_TYPE MACH_TYPE_KM_KIRKWOOD > + > /* include common defines/options for all Keymile boards */ > #include "keymile-common.h" > > -- > 1.7.1 > Applied to u-boot-marvell.git master branch Regards.. Prafulla . . .
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 6ef5e5d..46f82f9 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -264,11 +264,6 @@ int board_early_init_f(void) int board_init(void) { - /* - * arch number of board - */ - gd->bd->bi_arch_number = MACH_TYPE_KM_KIRKWOOD; - /* address of boot parameters */ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index c117943..f30088d 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -36,6 +36,9 @@ #ifndef _CONFIG_KM_ARM_H #define _CONFIG_KM_ARM_H +/* We got removed from Linux mach-types.h */ +#define MACH_TYPE_KM_KIRKWOOD 2255 + /* * High Level Configuration Options (easy to change) */ @@ -45,6 +48,8 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_MACH_KM_KIRKWOOD /* Machine type */ +#define CONFIG_MACH_TYPE MACH_TYPE_KM_KIRKWOOD + /* include common defines/options for all Keymile boards */ #include "keymile-common.h"