Merge branch 'mpc86xx'

[u-boot] / board / csb226 / csb226.c

diff --git a/board/csb226/csb226.c b/board/csb226/csb226.c
index bf9b4f840d2b42da546756d50d870d2b1ce12437..80caf8b464e17e5bda816760a9248a799845454b 100644 (file)
--- a/board/csb226/csb226.c
+++ b/board/csb226/csb226.c
@@ -26,6 +26,8 @@
 #include <common.h>
 #include <asm/arch/pxa-regs.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #ifdef CONFIG_SHOW_BOOT_PROGRESS
 # define SHOW_BOOT_PROGRESS(arg)        show_boot_progress(arg)
 #else
@@ -65,13 +67,11 @@ int misc_init_r(void)
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* memory and cpu-speed are setup before relocation */
        /* so we do _nothing_ here */
 
        /* arch number of CSB226 board */
-       gd->bd->bi_arch_number = 216;
+       gd->bd->bi_arch_number = MACH_TYPE_CSB226;
 
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0xa0000100;
@@ -88,8 +88,6 @@ int 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;