Merge with git://www.denx.de/git/u-boot.git

[u-boot] / board / mpl / vcma9 / vcma9.c

diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index cdf6163c8c57a1d872c260f685f11b9537071322..45ab6548f607746554dabbfb213b6eb7054900d7 100644 (file)
--- a/board/mpl/vcma9/vcma9.c
+++ b/board/mpl/vcma9/vcma9.c
@@ -32,7 +32,7 @@
 #include "vcma9.h"
 #include "../common/common_util.h"
 
-/* ------------------------------------------------------------------------- */
+DECLARE_GLOBAL_DATA_PTR;
 
 #define FCLK_SPEED 1
 
@@ -71,7 +71,6 @@ static inline void delay(unsigned long loops)
 
 int board_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
        S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
 
@@ -119,7 +118,7 @@ int board_init(void)
        serial_init();
 
        /* arch number of VCMA9-Board */
-       gd->bd->bi_arch_number = 227;
+       gd->bd->bi_arch_number = MACH_TYPE_MPL_VCMA9;
 
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x30000100;
@@ -133,7 +132,7 @@ int board_init(void)
 /*
  * NAND flash initialization.
  */
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
 extern ulong
 nand_probe(ulong physadr);
 
@@ -190,21 +189,21 @@ nand_init(void)
 static u8 Get_PLD_ID(void)
 {
        VCMA9_PLD * const pld = VCMA9_GetBase_PLD();
-       
+
        return(pld->ID);
 }
 
 static u8 Get_PLD_BOARD(void)
 {
        VCMA9_PLD * const pld = VCMA9_GetBase_PLD();
-       
+
        return(pld->BOARD);
 }
 
 static u8 Get_PLD_SDRAM(void)
 {
        VCMA9_PLD * const pld = VCMA9_GetBase_PLD();
-       
+
        return(pld->SDRAM);
 }
 
@@ -253,7 +252,7 @@ static ulong Get_SDRAM_ChipSize(void)
                case 2: return  8 * (1024*1024);
                case 3: return  8 * (1024*1024);
                default: return 0;
-       }       
+       }
 }
 static const char * Get_SDRAM_ChipGeom(void)
 {
@@ -275,8 +274,6 @@ static void Show_VCMA9_Info(char *board_name, char *serial)
 
 int dram_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = Get_SDRAM_ChipSize() * Get_SDRAM_ChipNr();
 
@@ -327,22 +324,22 @@ int last_stage_init(void)
 /***************************************************************************
  * some helping routines
  */
-
+#if !CONFIG_USB_KEYBOARD
 int overwrite_console(void)
 {
        /* return TRUE if console should be overwritten */
        return 0;
 }
-
+#endif
 
 /************************************************************************
 * Print VCMA9 Info
 ************************************************************************/
 void print_vcma9_info(void)
-{      
+{
        unsigned char s[50];
        int i;
-       
+
        if ((i = getenv_r("serial#", s, 32)) < 0) {
                puts ("### No HW ID - assuming VCMA9");
                printf("i %d", i*24);