move CPC45 ide_led to the same file as other IDE hooks

Keep all IDE-related hooks and overrides in a single file, to avoid confusion

Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>

diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c
index 1178822db36586e753648c5ee42876125be79ce4..22008066e6b723ecc22868603be601c135379b61 100644 (file)
--- a/board/cpc45/cpc45.c
+++ b/board/cpc45/cpc45.c
@@ -260,21 +260,6 @@ int pcmcia_init(void)
 
 #endif
 
-# ifdef CONFIG_IDE_LED
-void ide_led (uchar led, uchar status)
-{
-       u_char  val;
-       /* We have one PCMCIA slot and use LED H4 for the IDE Interface */
-       val = readb(BCSR_BASE + 0x04);
-       if (status) {                           /* led on */
-               val |= B_CTRL_LED0;
-       } else {
-               val &= ~B_CTRL_LED0;
-       }
-       writeb(val, BCSR_BASE + 0x04);
-}
-# endif
-
 int board_eth_init(bd_t *bis)
 {
        return pci_eth_init(bis);

diff --git a/board/cpc45/ide.c b/board/cpc45/ide.c
index 7b7237b908d19337e1ab7c883aaba008ee017cb1..03be59f9740ec379aca1f1df990c0fdafb31beac 100644 (file)
--- a/board/cpc45/ide.c
+++ b/board/cpc45/ide.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <ide.h>
 #include <ata.h>
+#include <asm/io.h>
 
 #define EIEIO          __asm__ volatile ("eieio")
 #define SYNC           __asm__ volatile ("sync")
@@ -128,3 +129,17 @@ void ide_output_data_shorts(int dev, ushort *sect_buf, int shorts)
                *pbuf_odd = *dbuf++;
        }
 }
+
+void ide_led(uchar led, uchar status)
+{
+       u_char  val;
+       /* We have one PCMCIA slot and use LED H4 for the IDE Interface */
+       val = readb(BCSR_BASE + 0x04);
+       if (status)                             /* led on */
+               val |= B_CTRL_LED0;
+       else
+               val &= ~B_CTRL_LED0;
+
+       writeb(val, BCSR_BASE + 0x04);
+}
+