Skip to contentSkip to conversation

ARM: define CONFIG_MACH_TYPE for all ronetix boards

PATCH New Asen Chavdarov Dimov 3 participants 3 messages Oct 31, 2011 – Nov 8, 2011

lore
Share & tools
lore

Asen Chavdarov Dimov

author
#0 lore raw

PATCH 1/1 ARM: define CONFIG_MACH_TYPE for all ronetix boards

Signed-off-by Asen Chavdarov Dimov <[email protected]>
---
 board/ronetix/pm9261/pm9261.c |    3 ---
 board/ronetix/pm9263/pm9263.c |    3 ---
 board/ronetix/pm9g45/pm9g45.c |    2 --
 include/configs/pm9261.h      |    3 +++
 include/configs/pm9263.h      |    3 +++
 include/configs/pm9g45.h      |    3 +++
 6 files changed, 9 insertions(+), 8 deletions(-)
board/ronetix/pm9261/pm9261.c +0 -3
index 871b94a..b26e33a 100644
@@ -248,9 +248,6 @@ int board_init(void)
 		1 << ATMEL_ID_PIOC,
 		&pmc->pcer);
 
-	/* arch number of PM9261-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PM9261;
-
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
board/ronetix/pm9263/pm9263.c +0 -3
index cfc9847..b0f7ea6 100644
@@ -349,9 +349,6 @@ int board_init(void)
 		(1 << ATMEL_ID_PIOB),
 		&pmc->pcer);
 
-	/* arch number of AT91SAM9263EK-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PM9263;
-
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
board/ronetix/pm9g45/pm9g45.c +0 -2
index f3374a4..961d193 100644
@@ -139,8 +139,6 @@ int board_init(void)
 		(1 << ATMEL_ID_PIOC) |
 		(1 << ATMEL_ID_PIODE), &pmc->pcer);
 
-	/* arch number of AT91SAM9M10G45EK-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PM9G45;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
include/configs/pm9261.h +3 -0
index 89e17b8..55455e7 100644
@@ -52,6 +52,9 @@
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 #define CONFIG_SYS_TEXT_BASE	0
 
+#define MACH_TYPE_PM9261	1187
+#define CONFIG_MACH_TYPE	MACH_TYPE_PM9261
+
 /* clocks */
 /* CKGR_MOR - enable main osc. */
 #define CONFIG_SYS_MOR_VAL						\
include/configs/pm9263.h +3 -0
index 1f7543c..43104a3 100644
@@ -52,6 +52,9 @@
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 #define CONFIG_SYS_TEXT_BASE	0
 
+#define MACH_TYPE_PM9263	1475
+#define CONFIG_MACH_TYPE	MACH_TYPE_PM9263
+
 /* clocks */
 #define CONFIG_SYS_MOR_VAL						\
 		(AT91_PMC_MOR_MOSCEN |					\
include/configs/pm9g45.h +3 -0
index acc1204..d3beaf3 100644
@@ -41,6 +41,9 @@
 #define CONFIG_PM9G45		1	/* It's an Ronetix PM9G45 */
 #define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9G45"
 
+#define MACH_TYPE_PM9G45	2672
+#define CONFIG_MACH_TYPE	MACH_TYPE_PM9G45
+
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000 /* from 12 MHz crystal */
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
Signature · 1 line
1.7.4.4
#2 lore raw

PATCH 1/1 ARM: define CONFIG_MACH_TYPE for all ronetix boards

In reply to Asen Chavdarov Dimov

Hi Asen,

Le 31/10/2011 19:54, Asen Chavdarov Dimov a ?crit :

Quoted 85 lines
Signed-off-by Asen Chavdarov Dimov<[email protected]>
---
  board/ronetix/pm9261/pm9261.c |    3 ---
  board/ronetix/pm9263/pm9263.c |    3 ---
  board/ronetix/pm9g45/pm9g45.c |    2 --
  include/configs/pm9261.h      |    3 +++
  include/configs/pm9263.h      |    3 +++
  include/configs/pm9g45.h      |    3 +++
  6 files changed, 9 insertions(+), 8 deletions(-)
board/ronetix/pm9261/pm9261.c +0 -3
index 871b94a..b26e33a 100644
@@ -248,9 +248,6 @@ int board_init(void)
  		1<<  ATMEL_ID_PIOC,
  		&pmc->pcer);
 
-	/* arch number of PM9261-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PM9261;
-
  	/* adress of boot parameters */
  	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
board/ronetix/pm9263/pm9263.c +0 -3
index cfc9847..b0f7ea6 100644
@@ -349,9 +349,6 @@ int board_init(void)
  		(1<<  ATMEL_ID_PIOB),
  		&pmc->pcer);
 
-	/* arch number of AT91SAM9263EK-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PM9263;
-
  	/* adress of boot parameters */
  	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
board/ronetix/pm9g45/pm9g45.c +0 -2
index f3374a4..961d193 100644
@@ -139,8 +139,6 @@ int board_init(void)
  		(1<<  ATMEL_ID_PIOC) |
  		(1<<  ATMEL_ID_PIODE),&pmc->pcer);
 
-	/* arch number of AT91SAM9M10G45EK-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PM9G45;
  	/* adress of boot parameters */
  	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
include/configs/pm9261.h +3 -0
index 89e17b8..55455e7 100644
@@ -52,6 +52,9 @@
  #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
  #define CONFIG_SYS_TEXT_BASE	0
 
+#define MACH_TYPE_PM9261	1187
+#define CONFIG_MACH_TYPE	MACH_TYPE_PM9261
+
  /* clocks */
  /* CKGR_MOR - enable main osc. */
  #define CONFIG_SYS_MOR_VAL						\
include/configs/pm9263.h +3 -0
index 1f7543c..43104a3 100644
@@ -52,6 +52,9 @@
  #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
  #define CONFIG_SYS_TEXT_BASE	0
 
+#define MACH_TYPE_PM9263	1475
+#define CONFIG_MACH_TYPE	MACH_TYPE_PM9263
+
  /* clocks */
  #define CONFIG_SYS_MOR_VAL						\
  		(AT91_PMC_MOR_MOSCEN |					\
include/configs/pm9g45.h +0 -0
index acc1204..d3beaf3 100644

include/configs/pm9g45.h line 49

Quoted 9 lines
include/configs/pm9g45.h +3 -0
@@ -41,6 +41,9 @@
  #define CONFIG_PM9G45		1	/* It's an Ronetix PM9G45 */
  #define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9G45"
 
+#define MACH_TYPE_PM9G45	2672
+#define CONFIG_MACH_TYPE	MACH_TYPE_PM9G45
+
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000 /* from 12 MHz crystal */
  #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */

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

Amicalement,

Signature · 1 line
Albert.