Skip to contentSkip to conversation

ARM: dig297: Define MACH_TYPE_OMAP3_CPS for DIG297 board

PATCH New Luca Ceresoli 2 participants 4 messages Nov 2, 2011 – Nov 4, 2011

lore
Share & tools
lore

Luca Ceresoli

author
#0 lore raw

PATCH 1/1 ARM: dig297: Define MACH_TYPE_OMAP3_CPS for DIG297 board

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

Signed-off-by Luca Ceresoli <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Albert Aribaud <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 include/configs/dig297.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
include/configs/dig297.h +7 -0
index 3a05c82..e1e308c 100644
@@ -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
  */
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 ARM: dig297: define CONFIG_MACH_TYPE

Signed-off-by Luca Ceresoli <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Albert Aribaud <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 board/comelit/dig297/dig297.c |    2 --
 include/configs/dig297.h      |    1 +
 2 files changed, 1 insertions(+), 2 deletions(-)
board/comelit/dig297/dig297.c +0 -2
index c81ce58..6548281 100644
@@ -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);
include/configs/dig297.h +1 -0
index e1e308c..9baf415 100644
@@ -38,6 +38,7 @@
 #else
 #define MACH_TYPE_OMAP3_CPS 2751
 #endif
+#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CPS
 
 /*
  * High Level Configuration Options
Signature · 1 line
1.7.5.4
#2 lore raw

PATCH 1/1 ARM: dig297: Define MACH_TYPE_OMAP3_CPS for DIG297 board

In reply to Luca Ceresoli

Hi Luca,

Quoted 16 lines · Luca Ceresoli

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

Signed-off-by Luca Ceresoli <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Albert Aribaud <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 include/configs/dig297.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
include/configs/dig297.h +0 -0
index 3a05c82..e1e308c 100644

include/configs/dig297.h line 40

Quoted 9 lines
include/configs/dig297.h +6 -0
@@ -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.

Signature · 2 lines
Regards,
Igor.
author
#3 lore raw

PATCH v2 1/1 ARM: dig297: Define MACH_TYPE_OMAP3_CPS and CONFIG_MACH_TYPE

In reply to 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 <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Albert Aribaud <[email protected]>
Cc Wolfgang Denk <[email protected]>
CC Tom Rini <[email protected]>

---

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(-)
board/comelit/dig297/dig297.c +0 -2
index c81ce58..6548281 100644
@@ -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);
include/configs/dig297.h +8 -0
index 3a05c82..9baf415 100644
@@ -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
  */
Signature · 1 line
1.7.5.4