[U-Boot] [PATCH] ARM: dig297: Define MACH_TYPE_OMAP3_CPS for DIG297 board

[U-Boot] [PATCH] ARM: dig297: Define MACH_TYPE_OMAP3_CPS for DIG297 board

[Luca Ceresoli]

This was dropped in the latest mach-types sync (47af6f61bcd9) because it is
not mainlined in Linux.

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Wolfgang Denk <wd@denx.de>
---
 include/configs/dig297.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 3a05c82..e1e308c 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -32,6 +32,13 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_OMAP3_CPS
+#error "MACH_TYPE_OMAP3_CPS has been defined properly, please remove this."
+#else
+#define MACH_TYPE_OMAP3_CPS 2751
+#endif
+
 /*
  * High Level Configuration Options
  */
-- 
1.7.5.4

[U-Boot] [PATCH 2/2] ARM: dig297: define CONFIG_MACH_TYPE

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Wolfgang Denk <wd@denx.de>
---
 board/comelit/dig297/dig297.c |    2 --
 include/configs/dig297.h      |    1 +
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/board/comelit/dig297/dig297.c b/board/comelit/dig297/dig297.c
index c81ce58..6548281 100644
--- a/board/comelit/dig297/dig297.c
+++ b/board/comelit/dig297/dig297.c
@@ -91,8 +91,6 @@ static const u32 gpmc_lan_config[] = {
 int board_init(void)
 {
 	gpmc_init();		/* in SRAM or SDRAM, finish GPMC */
-	/* board id for Linux */
-	gd->bd->bi_arch_number = MACH_TYPE_OMAP3_CPS;
 	/* boot param addr */
 	gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
 
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index e1e308c..9baf415 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -38,6 +38,7 @@
 #else
 #define MACH_TYPE_OMAP3_CPS 2751
 #endif
+#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CPS
 
 /*
  * High Level Configuration Options
-- 
1.7.5.4

[U-Boot] [PATCH] ARM: dig297: Define MACH_TYPE_OMAP3_CPS for DIG297 board

[Igor Grinberg]

Hi Luca,

On 11/02/11 11:40, Luca Ceresoli wrote:
> This was dropped in the latest mach-types sync (47af6f61bcd9) because it is
> not mainlined in Linux.
> 
> Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
> Cc: Sandeep Paulraj <s-paulraj@ti.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
>  include/configs/dig297.h |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/include/configs/dig297.h b/include/configs/dig297.h
> index 3a05c82..e1e308c 100644
> --- a/include/configs/dig297.h
> +++ b/include/configs/dig297.h
> @@ -32,6 +32,13 @@
>  #ifndef __CONFIG_H
>  #define __CONFIG_H
>  
> +#include <asm/mach-types.h>
> +#ifdef MACH_TYPE_OMAP3_CPS
> +#error "MACH_TYPE_OMAP3_CPS has been defined properly, please remove this."
> +#else
> +#define MACH_TYPE_OMAP3_CPS 2751
> +#endif

It will be a good thing to use CONFIG_MACH_TYPE, while you are at this.


-- 
Regards,
Igor.

[U-Boot] [PATCH v2] ARM: dig297: Define MACH_TYPE_OMAP3_CPS and CONFIG_MACH_TYPE

[Luca Ceresoli]

MACH_TYPE_OMAP3_CPS was dropped in the latest mach-types sync (47af6f61bcd9)
because it is not mainlined in Linux.

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Wolfgang Denk <wd@denx.de>
CC: Tom Rini <tom.rini@gmail.com>
---

Changed in v2: squashed the two previously separated patches as requested
by Tom Rini.

 board/comelit/dig297/dig297.c |    2 --
 include/configs/dig297.h      |    8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/board/comelit/dig297/dig297.c b/board/comelit/dig297/dig297.c
index c81ce58..6548281 100644
--- a/board/comelit/dig297/dig297.c
+++ b/board/comelit/dig297/dig297.c
@@ -91,8 +91,6 @@ static const u32 gpmc_lan_config[] = {
 int board_init(void)
 {
 	gpmc_init();		/* in SRAM or SDRAM, finish GPMC */
-	/* board id for Linux */
-	gd->bd->bi_arch_number = MACH_TYPE_OMAP3_CPS;
 	/* boot param addr */
 	gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
 
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 3a05c82..9baf415 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -32,6 +32,14 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_OMAP3_CPS
+#error "MACH_TYPE_OMAP3_CPS has been defined properly, please remove this."
+#else
+#define MACH_TYPE_OMAP3_CPS 2751
+#endif
+#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CPS
+
 /*
  * High Level Configuration Options
  */
-- 
1.7.5.4