ARM: define CONFIG_MACH_TYPE for all ronetix boards

Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at> Acked-by: Igor Grinberg <grinberg@compulab.co.il>

ARM: define CONFIG_MACH_TYPE for all ronetix boards
Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Asen Dimov · Albert ARIBAUD
1 parent b79df8f8f8
Showing 6 changed files with 9 additions and 8 deletions Side-by-side Diff
board/ronetix/pm9261/pm9261.c
board/ronetix/pm9263/pm9263.c
board/ronetix/pm9g45/pm9g45.c
include/configs/pm9261.h
include/configs/pm9263.h
include/configs/pm9g45.h
@@ -248,9 +248,6 @@
 		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;
  
@@ -349,9 +349,6 @@
 		(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;
  
@@ -139,8 +139,6 @@
 		(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;
  
@@ -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						\
@@ -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 |					\
@@ -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 */
...	...	@@ -248,9 +248,6 @@
248	248	1 << ATMEL_ID_PIOC,
249	249	&pmc->pcer);
250	250
251		- /* arch number of PM9261-Board */
252		- gd->bd->bi_arch_number = MACH_TYPE_PM9261;
253		-
254	251	/* adress of boot parameters */
255	252	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
256	253
...	...	@@ -349,9 +349,6 @@
349	349	(1 << ATMEL_ID_PIOB),
350	350	&pmc->pcer);
351	351
352		- /* arch number of AT91SAM9263EK-Board */
353		- gd->bd->bi_arch_number = MACH_TYPE_PM9263;
354		-
355	352	/* adress of boot parameters */
356	353	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
357	354
...	...	@@ -139,8 +139,6 @@
139	139	(1 << ATMEL_ID_PIOC) \|
140	140	(1 << ATMEL_ID_PIODE), &pmc->pcer);
141	141
142		- /* arch number of AT91SAM9M10G45EK-Board */
143		- gd->bd->bi_arch_number = MACH_TYPE_PM9G45;
144	142	/* adress of boot parameters */
145	143	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
146	144
...	...	@@ -52,6 +52,9 @@
52	52	#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
53	53	#define CONFIG_SYS_TEXT_BASE 0
54	54
	55	+#define MACH_TYPE_PM9261 1187
	56	+#define CONFIG_MACH_TYPE MACH_TYPE_PM9261
	57	+
55	58	/* clocks */
56	59	/* CKGR_MOR - enable main osc. */
57	60	#define CONFIG_SYS_MOR_VAL \
...	...	@@ -41,6 +41,9 @@
41	41	#define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */
42	42	#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"
43	43
	44	+#define MACH_TYPE_PM9G45 2672
	45	+#define CONFIG_MACH_TYPE MACH_TYPE_PM9G45
	46	+
44	47	/* ARM asynchronous clock */
45	48	#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
46	49	#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */