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

[platform/kernel/u-boot.git] / board / gcplus / gcplus.c

diff --git a/board/gcplus/gcplus.c b/board/gcplus/gcplus.c
index 06b6098..829b597 100644 (file)
--- a/board/gcplus/gcplus.c
+++ b/board/gcplus/gcplus.c
@@ -26,7 +26,8 @@
 
 #include <common.h>
 #include <SA-1100.h>
-/* ------------------------------------------------------------------------- */
+
+DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * Miscelaneous platform dependent initialisations
@@ -35,9 +36,7 @@
 int
 board_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       gd->bd->bi_arch_number = 29;    /* ADS GraphicsClientPlus Board */
+       gd->bd->bi_arch_number = MACH_TYPE_GRAPHICSCLIENT;
 
        gd->bd->bi_boot_params = 0xc000003c; /* Weird address? */
 
@@ -62,8 +61,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;
        gd->bd->bi_dram[1].start = PHYS_SDRAM_2;