IXP: Fix missing MACH_TYPE_{ACTUX?,PNB3,DVLHOST}

These symbols are no longer defined in Linux-ARM's mach-types files. Replace
these with CONFIG_MACH_TYPE instead.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Bryan Hundven <bryanhundven@gmail.com>
Cc: Michael Schwingen <rincewind@discworld.dascon.de>

diff --git a/board/actux1/actux1.c b/board/actux1/actux1.c
index 2f631b70853996e021f44530b7cd3b4a1e867f92..bc68eb3d0425c20ebc7c7d97e4dfa2fbbc04a8ab 100644 (file)
--- a/board/actux1/actux1.c
+++ b/board/actux1/actux1.c
@@ -59,8 +59,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-       gd->bd->bi_arch_number = MACH_TYPE_ACTUX1;
-
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x00000100;
 

diff --git a/board/actux2/actux2.c b/board/actux2/actux2.c
index 9040a098deb0b33c113899200cdd107e1502c6fd..9e9e60051433f49aefabd172ee1a64310ef5c647 100644 (file)
--- a/board/actux2/actux2.c
+++ b/board/actux2/actux2.c
@@ -59,8 +59,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-       gd->bd->bi_arch_number = MACH_TYPE_ACTUX2;
-
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x00000100;
 

diff --git a/board/actux3/actux3.c b/board/actux3/actux3.c
index 64e5215f36446ebe7fac5b4ce59c1c32cae0876c..7559c1d43587853b8706cb2037e83ea9da20e67a 100644 (file)
--- a/board/actux3/actux3.c
+++ b/board/actux3/actux3.c
@@ -57,8 +57,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-       gd->bd->bi_arch_number = MACH_TYPE_ACTUX3;
-
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x00000100;
 

diff --git a/board/actux4/actux4.c b/board/actux4/actux4.c
index d20d881eaf377f4be636b6fc82c90729c9c3753d..6303c1e5efabcbaabd83f8b293dbb35715b2b1b6 100644 (file)
--- a/board/actux4/actux4.c
+++ b/board/actux4/actux4.c
@@ -54,8 +54,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-       gd->bd->bi_arch_number = MACH_TYPE_ACTUX4;
-
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x00000100;
 

diff --git a/board/dvlhost/dvlhost.c b/board/dvlhost/dvlhost.c
index 561e47f9354ec3b4aa07604c597e43ad6d201438..c2c67cc444b4137fa5280418b07fff9adbe38c2d 100644 (file)
--- a/board/dvlhost/dvlhost.c
+++ b/board/dvlhost/dvlhost.c
@@ -46,8 +46,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-       gd->bd->bi_arch_number = MACH_TYPE_DVLHOST;
-
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x00000100;
 

diff --git a/board/prodrive/pdnb3/pdnb3.c b/board/prodrive/pdnb3/pdnb3.c
index 3aaebf24396ef894cb3fe6bbb07a38ab346afc3b..d3ee13376b42b3354e4e3253789394e13036b95b 100644 (file)
--- a/board/prodrive/pdnb3/pdnb3.c
+++ b/board/prodrive/pdnb3/pdnb3.c
@@ -46,9 +46,6 @@ static unsigned long old_val = 0;
  */
 int board_init(void)
 {
-       /* arch number of PDNB3 */
-       gd->bd->bi_arch_number = MACH_TYPE_PDNB3;
-
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x00000100;
 

diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index 00780d0d8b3416c077a3392d725c0ad9de6bd80a..bdd2239d8e23c4128020da342e71622fef6b4941 100644 (file)
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -29,6 +29,8 @@
 #define CONFIG_IXP425                  1
 #define CONFIG_ACTUX1                  1
 
+#define        CONFIG_MACH_TYPE                1479
+
 #define CONFIG_DISPLAY_CPUINFO         1
 #define CONFIG_DISPLAY_BOARDINFO       1
 

diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index cb97434c3ef6de8147be3cb0e663576cd107942a..c55571c1285f73c668ca5d01dd49895c194358a4 100644 (file)
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -29,6 +29,8 @@
 #define CONFIG_IXP425                  1
 #define CONFIG_ACTUX2                  1
 
+#define        CONFIG_MACH_TYPE                1480
+
 #define CONFIG_DISPLAY_CPUINFO         1
 #define CONFIG_DISPLAY_BOARDINFO       1
 

diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index 816d982a31732b5bb2933fd6fceadfe94e23be82..78ee2b598f63fcb2e2edde31c0c32dd3a9b7f364 100644 (file)
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -29,6 +29,8 @@
 #define CONFIG_IXP425                  1
 #define CONFIG_ACTUX3                  1
 
+#define        CONFIG_MACH_TYPE                1481
+
 #define CONFIG_DISPLAY_CPUINFO         1
 #define CONFIG_DISPLAY_BOARDINFO       1
 

diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index 90badd39c5984d528846e8c5c326dd5a19a8f34f..c1105df59560ae99512e7509f23edcafaf368c27 100644 (file)
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -29,6 +29,8 @@
 #define CONFIG_IXP425                  1
 #define CONFIG_ACTUX4                  1
 
+#define        CONFIG_MACH_TYPE                1532
+
 #define CONFIG_DISPLAY_CPUINFO         1
 #define CONFIG_DISPLAY_BOARDINFO       1
 

diff --git a/include/configs/dvlhost.h b/include/configs/dvlhost.h
index 86fecd15a685f11d5c95568b11ac2aa9dcc02f90..4eda91e7f40dfb4e8a889153635880e30273f0d6 100644 (file)
--- a/include/configs/dvlhost.h
+++ b/include/configs/dvlhost.h
@@ -30,6 +30,8 @@
 #define CONFIG_IXP425                  1
 #define CONFIG_DVLHOST                 1
 
+#define        CONFIG_MACH_TYPE                1343
+
 #define CONFIG_DISPLAY_CPUINFO         1
 #define CONFIG_DISPLAY_BOARDINFO       1
 

diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index 56bb4641fca84a9d846214508f77f68f80c94bb1..43ec38f5d4eaece374a3c890c3cf47b435883e30 100644 (file)
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -33,6 +33,8 @@
 #define CONFIG_IXP425          1       /* This is an IXP425 CPU        */
 #define CONFIG_PDNB3           1       /* on an PDNB3 board            */
 
+#define        CONFIG_MACH_TYPE        1002
+
 #define CONFIG_DISPLAY_CPUINFO 1       /* display cpu info (and speed) */
 #define CONFIG_DISPLAY_BOARDINFO 1     /* display board info           */