Merge with /home/wd/git/u-boot/custodian/u-boot-testing

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

diff --git a/board/bc3450/bc3450.c b/board/bc3450/bc3450.c
index a030b8287049bf40ac1f6833a331843a714169ce..05bb7235f8bf4799fe7e7acd490a761f818c6a2a 100644 (file)
--- a/board/bc3450/bc3450.c
+++ b/board/bc3450/bc3450.c
@@ -1,6 +1,4 @@
 /*
- * -- Version 1.1 --
- *
  * (C) Copyright 2003-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
@@ -13,9 +11,6 @@
  * (C) Copyright 2006
  * Stefan Strobl, GERSYS GmbH, stefan.strobl@gersys.de
  *
- * History:
- *     1.1 - improved SM501 init to meet spec timing
- *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
@@ -51,7 +46,7 @@
 
 #ifdef CONFIG_RTC_MPC5200
 #include <rtc.h>
-#endif 
+#endif
 
 #ifdef CONFIG_PS2MULT
 void ps2mult_early_init(void);
@@ -300,7 +295,6 @@ void pci_init_board(void)
 #endif
 
 #if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
-#define GPIO_PSC1_4    0x01000000UL
 
 void init_ide_reset (void)
 {
@@ -316,9 +310,9 @@ void ide_set_reset (int idereset)
        debug ("ide_reset(%d)\n", idereset);
 
        if (idereset) {
-               *(vu_long *) MPC5XXX_WU_GPIO_DATA &= ~GPIO_PSC1_4;
+               *(vu_long *) MPC5XXX_WU_GPIO_DATA_O &= ~GPIO_PSC1_4;
        } else {
-               *(vu_long *) MPC5XXX_WU_GPIO_DATA |=  GPIO_PSC1_4;
+               *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |=  GPIO_PSC1_4;
        }
 }
 #endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
@@ -375,7 +369,7 @@ ulong post_word_load (void)
 int board_early_init_r (void)
 {
 #ifdef CONFIG_RTC_MPC5200
-        struct rtc_time t;
+       struct rtc_time t;
 
        /* set to Wed Dec 31 19:00:00 1969 */
        t.tm_sec = t.tm_min = 0;
@@ -384,7 +378,7 @@ int board_early_init_r (void)
        t.tm_mon = 12;
        t.tm_year = 1969;
        t.tm_wday = 3;
-       
+
        rtc_set(&t);
 #endif /* CONFIG_RTC_MPC5200 */
 
@@ -482,7 +476,7 @@ int last_stage_init (void)
        } else {
                puts ("VGA:   SMI501 (Voyager) with 8 MB\n");
        }
-       /* restore origianl FB content  */
+       /* restore origianl FB content  */
        if (restore) {
                *(volatile u16 *)CFG_CS1_START = save;
                __asm__ volatile ("sync");
@@ -493,8 +487,8 @@ int last_stage_init (void)
 
 #ifdef CONFIG_VIDEO_SM501
 
-#define DISPLAY_WIDTH   640
-#define DISPLAY_HEIGHT  480
+#define DISPLAY_WIDTH  640
+#define DISPLAY_HEIGHT 480
 
 #ifdef CONFIG_VIDEO_SM501_8BPP
 #error CONFIG_VIDEO_SM501_8BPP not supported.
@@ -633,7 +627,7 @@ unsigned int board_video_init (void)
        } else {
            ret = SM501_MMIO_BASE;
        }
-       
+
        if (restore) {
                *(volatile u16 *)CFG_CS1_START = save;
                __asm__ volatile ("sync");