board_f: Drop return value from initdram()

[people/ms/u-boot.git] / board / motionpro / motionpro.c

diff --git a/board/motionpro/motionpro.c b/board/motionpro/motionpro.c
index 4d0ebaab74567008c5718cd082fcfe1e751c5a3d..a2520bc3bc98b94ed251ee822880383405d1ce90 100644 (file)
--- a/board/motionpro/motionpro.c
+++ b/board/motionpro/motionpro.c
@@ -15,9 +15,11 @@
 #include <miiphy.h>
 #include <libfdt.h>
 
-#if defined(CONFIG_STATUS_LED)
+#if defined(CONFIG_LED_STATUS)
 #include <status_led.h>
-#endif /* CONFIG_STATUS_LED */
+#endif /* CONFIG_LED_STATUS */
+
+DECLARE_GLOBAL_DATA_PTR;
 
 /* Kollmorgen DPR initialization data */
 struct init_elem {
@@ -116,7 +118,7 @@ static void sdram_start(int hi_addr)
 /*
  * Initalize SDRAM - configure SDRAM controller, detect memory size.
  */
-phys_size_t initdram(int board_type)
+int initdram(void)
 {
        ulong dramsize = 0;
 #ifndef CONFIG_SYS_RAMBOOT
@@ -172,7 +174,9 @@ phys_size_t initdram(int board_type)
 #endif /* CONFIG_SYS_RAMBOOT */
 
        /* return total ram size */
-       return dramsize;
+       gd->ram_size = dramsize;
+
+       return 0;
 }
 
 
@@ -184,37 +188,56 @@ int checkboard(void)
 }
 
 
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+#ifdef CONFIG_OF_BOARD_SETUP
 int ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup(blob, bd);
 
        return 0;
 }
-#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
+#endif /* CONFIG_OF_BOARD_SETUP */
 
 
-#if defined(CONFIG_STATUS_LED)
-void __led_init(led_id_t regaddr, int state)
+#if defined(CONFIG_LED_STATUS)
+vu_long *regcode_to_regaddr(led_id_t regcode)
+{
+       /* GPT Enable and Mode Select Register address */
+       vu_long *reg_translate[] = {
+                                       (vu_long *)MPC5XXX_GPT6_ENABLE,
+                                       (vu_long *)MPC5XXX_GPT7_ENABLE,
+                                  };
+
+       if (ARRAY_SIZE(reg_translate) <= regcode)
+               return NULL;
+       return reg_translate[regcode];
+}
+
+void __led_init(led_id_t regcode, int state)
 {
-       *((vu_long *) regaddr) |= ENABLE_GPIO_OUT;
+       vu_long *regaddr = regcode_to_regaddr(regcode);
 
-       if (state == STATUS_LED_ON)
+       *regaddr |= ENABLE_GPIO_OUT;
+
+       if (state == CONFIG_LED_STATUS_ON)
                *((vu_long *) regaddr) |= LED_ON;
        else
                *((vu_long *) regaddr) &= ~LED_ON;
 }
 
-void __led_set(led_id_t regaddr, int state)
+void __led_set(led_id_t regcode, int state)
 {
-       if (state == STATUS_LED_ON)
-               *((vu_long *) regaddr) |= LED_ON;
+       vu_long *regaddr = regcode_to_regaddr(regcode);
+
+       if (state == CONFIG_LED_STATUS_ON)
+               *regaddr |= LED_ON;
        else
-               *((vu_long *) regaddr) &= ~LED_ON;
+               *regaddr &= ~LED_ON;
 }
 
-void __led_toggle(led_id_t regaddr)
+void __led_toggle(led_id_t regcode)
 {
-       *((vu_long *) regaddr) ^= LED_ON;
+       vu_long *regaddr = regcode_to_regaddr(regcode);
+
+       *regaddr ^= LED_ON;
 }
-#endif /* CONFIG_STATUS_LED */
+#endif /* CONFIG_LED_STATUS */