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>
This commit is contained in:
Marek Vasut 2012-03-06 00:45:35 +01:00 committed by Albert ARIBAUD
parent 696df71b5f
commit 8e807ec3aa
12 changed files with 12 additions and 13 deletions

View file

@ -59,8 +59,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
gd->bd->bi_arch_number = MACH_TYPE_ACTUX1;
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;

View file

@ -59,8 +59,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
gd->bd->bi_arch_number = MACH_TYPE_ACTUX2;
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;

View file

@ -57,8 +57,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
gd->bd->bi_arch_number = MACH_TYPE_ACTUX3;
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;

View file

@ -54,8 +54,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
gd->bd->bi_arch_number = MACH_TYPE_ACTUX4;
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;

View file

@ -46,8 +46,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
gd->bd->bi_arch_number = MACH_TYPE_DVLHOST;
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;

View file

@ -46,9 +46,6 @@ static unsigned long old_val = 0;
*/ */
int board_init(void) int board_init(void)
{ {
/* arch number of PDNB3 */
gd->bd->bi_arch_number = MACH_TYPE_PDNB3;
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;

View file

@ -29,6 +29,8 @@
#define CONFIG_IXP425 1 #define CONFIG_IXP425 1
#define CONFIG_ACTUX1 1 #define CONFIG_ACTUX1 1
#define CONFIG_MACH_TYPE 1479
#define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1

View file

@ -29,6 +29,8 @@
#define CONFIG_IXP425 1 #define CONFIG_IXP425 1
#define CONFIG_ACTUX2 1 #define CONFIG_ACTUX2 1
#define CONFIG_MACH_TYPE 1480
#define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1

View file

@ -29,6 +29,8 @@
#define CONFIG_IXP425 1 #define CONFIG_IXP425 1
#define CONFIG_ACTUX3 1 #define CONFIG_ACTUX3 1
#define CONFIG_MACH_TYPE 1481
#define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1

View file

@ -29,6 +29,8 @@
#define CONFIG_IXP425 1 #define CONFIG_IXP425 1
#define CONFIG_ACTUX4 1 #define CONFIG_ACTUX4 1
#define CONFIG_MACH_TYPE 1532
#define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1

View file

@ -30,6 +30,8 @@
#define CONFIG_IXP425 1 #define CONFIG_IXP425 1
#define CONFIG_DVLHOST 1 #define CONFIG_DVLHOST 1
#define CONFIG_MACH_TYPE 1343
#define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1

View file

@ -33,6 +33,8 @@
#define CONFIG_IXP425 1 /* This is an IXP425 CPU */ #define CONFIG_IXP425 1 /* This is an IXP425 CPU */
#define CONFIG_PDNB3 1 /* on an PDNB3 board */ #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_CPUINFO 1 /* display cpu info (and speed) */
#define CONFIG_DISPLAY_BOARDINFO 1 /* display board info */ #define CONFIG_DISPLAY_BOARDINFO 1 /* display board info */