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

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

diff --git a/board/csb226/csb226.c b/board/csb226/csb226.c
index a79d168e044cf9189827cb6eac0b18ab10d9772e..80caf8b464e17e5bda816760a9248a799845454b 100644 (file)
--- a/board/csb226/csb226.c
+++ b/board/csb226/csb226.c
@@ -26,21 +26,23 @@
 #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
 # define SHOW_BOOT_PROGRESS(arg)
 #endif
 
-/** 
+/**
  * misc_init_r: - misc initialisation routines
  */
 
 int misc_init_r(void)
 {
-#if 0  
+#if 0
        uchar *str;
-       
+
        /* determine if the software update key is pressed during startup */
        /* not ported yet... */
        if (GPLR0 & 0x00000800) {
@@ -52,26 +54,24 @@ int misc_init_r(void)
        }
 
        setenv("bootcmd",str);
-#endif 
+#endif
        return 0;
-}      
+}
 
 
-/** 
+/**
  * board_init: - setup some data structures
  *
- * @return: 0 in case of success       
+ * @return: 0 in case of success
  */
 
 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;
@@ -80,7 +80,7 @@ int board_init (void)
 }
 
 
-/** 
+/**
  * dram_init: - setup dynamic RAM
  *
  * @return: 0 in case of success
@@ -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;
 
@@ -97,7 +95,7 @@ int dram_init (void)
 }
 
 
-/** 
+/**
  * csb226_set_led: - switch LEDs on or off
  *
  * @param led:   LED to switch (0,1,2)
@@ -108,26 +106,26 @@ void csb226_set_led(int led, int state)
 {
        switch(led) {
 
-               case 0: if (state==1) { 
-                               GPCR0 |= CSB226_USER_LED0; 
+               case 0: if (state==1) {
+                               GPCR0 |= CSB226_USER_LED0;
                        } else if (state==0) {
                                GPSR0 |= CSB226_USER_LED0;
                        }
                        break;
 
                case 1: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED1;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED1;
-                        }
-                        break;
+                               GPCR0 |= CSB226_USER_LED1;
+                       } else if (state==0) {
+                               GPSR0 |= CSB226_USER_LED1;
+                       }
+                       break;
 
                case 2: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED2;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED2;
-                        }
-                        break;
+                               GPCR0 |= CSB226_USER_LED2;
+                       } else if (state==0) {
+                               GPSR0 |= CSB226_USER_LED2;
+                       }
+                       break;
        }
 
        return;
@@ -137,10 +135,10 @@ void csb226_set_led(int led, int state)
 /**
  * show_boot_progress: - indicate state of the boot process
  *
- * @param status: Status number - see README for details. 
+ * @param status: Status number - see README for details.
  *
- * The CSB226 does only have 3 LEDs, so we switch them on at the most 
- * important states (1, 5, 15).  
+ * The CSB226 does only have 3 LEDs, so we switch them on at the most
+ * important states (1, 5, 15).
  */
 
 void show_boot_progress (int status)
@@ -153,4 +151,3 @@ void show_boot_progress (int status)
 
        return;
 }
-