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 2f631b7..bc68eb3 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 9040a09..9e9e600 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 64e5215..7559c1d 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 d20d881..6303c1e 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 561e47f..c2c67cc 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 3aaebf2..d3ee133 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 00780d0..bdd2239 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 cb97434..c55571c 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 816d982..78ee2b5 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 90badd3..c1105df 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 86fecd1..4eda91e 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 56bb464..43ec38f 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           */