X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fshannon%2Fshannon.c;h=8cd1fc34c63b5f235ed34cfc25948aa039ee38ae;hb=6d8962e814c15807dd6ac5757904be2a02d187b8;hp=c090bde4aab5a3c9793b50395b6b962c0fd46af8;hpb=5f535fe170e2cd90ee65922cbad1a5428d85a9e6;p=u-boot

diff --git a/board/shannon/shannon.c b/board/shannon/shannon.c
index c090bde4aa..8cd1fc34c6 100644
--- a/board/shannon/shannon.c
+++ b/board/shannon/shannon.c
@@ -24,8 +24,7 @@
 
 #include <common.h>
 
-/* ------------------------------------------------------------------------- */
-
+DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * Miscelaneous platform dependent initialisations
@@ -33,8 +32,6 @@
 
 int board_init (void)
 {
-	DECLARE_GLOBAL_DATA_PTR;
-
 	/* memory and cpu-speed are setup before relocation */
 	/* but if we use InfernoLoader, we must do some inits here */
 
@@ -63,7 +60,7 @@ int board_init (void)
 #endif /* CONFIG_INFERNO */
 
 	/* arch number for shannon */
-	gd->bd->bi_arch_number = 97;
+	gd->bd->bi_arch_number = MACH_TYPE_SHANNON;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xc0000100;
@@ -75,7 +72,6 @@ int dram_init (void)
 {
 #if defined(PHYS_SDRAM_1) || defined(PHYS_SDRAM_2) || \
     defined(PHYS_SDRAM_3) || defined(PHYS_SDRAM_4)
-	DECLARE_GLOBAL_DATA_PTR;
 	bd_t *bd = gd->bd;
 #endif