ppc4xx: Fix PMC405DE support

[oweals/u-boot.git] / board / assabet / assabet.c

diff --git a/board/assabet/assabet.c b/board/assabet/assabet.c
index 0958c3389e291bedb4c12160cf9e029cf93ea5d1..6f02db29b80fa7e7179afd66cf35cced6d486c83 100644 (file)
--- a/board/assabet/assabet.c
+++ b/board/assabet/assabet.c
@@ -27,6 +27,8 @@
 #include <common.h>
 #include <SA-1100.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* ------------------------------------------------------------------------- */
 
 /*
@@ -44,7 +46,7 @@
 #define ECSR_PWRDWN            0x04
 #define ECSR_INT               0x02
 #define SMC_IO_SHIFT           2
-#define NCR_0                  (*((volatile u_char *)(0x100000a0)))
+#define NCR_0                  (*((volatile u_char *)(0x100000a0)))
 #define NCR_ENET_OSC_EN                (1<<3)
 
 static inline u8
@@ -99,9 +101,7 @@ neponset_init(void)
 int
 board_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       gd->bd->bi_arch_number = 25;    /* Intel Assabet Board */
+       gd->bd->bi_arch_number = MACH_TYPE_ASSABET;
        gd->bd->bi_boot_params = 0xc0000100;
 
        neponset_init();
@@ -112,8 +112,6 @@ board_init(void)
 int
 dram_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;