Merge branch 'master' of http://www.denx.de/git/u-boot

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

diff --git a/board/ep7312/ep7312.c b/board/ep7312/ep7312.c
index 4f9e5aca83ec5e6741f70edccdec18081fba41f8..6968a5dbdd11d41404dacfd3ae533e1cd281c7b9 100644 (file)
--- a/board/ep7312/ep7312.c
+++ b/board/ep7312/ep7312.c
@@ -25,8 +25,7 @@
 #include <common.h>
 #include <clps7111.h>
 
-/* ------------------------------------------------------------------------- */
-
+DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * Miscelaneous platform dependent initialisations
@@ -34,13 +33,11 @@
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* Activate LED flasher */
        IO_LEDFLSH = 0x40;
 
        /* arch number MACH_TYPE_EDB7312 */
-       gd->bd->bi_arch_number = 131;
+       gd->bd->bi_arch_number = MACH_TYPE_EDB7312;
 
        /* location of boot parameters */
        gd->bd->bi_boot_params = 0xc0020100;
@@ -50,8 +47,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;