diff options
| author | Pavel Herrmann <morpheus.ibis@gmail.com> | 2012-10-09 07:06:25 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-17 07:59:09 -0700 |
| commit | 0a4a64c07983be76a2b25242094a19b282b36577 (patch) | |
| tree | d8bc3df5d8192b11f80c9a5d80c4097073383fd4 | |
| parent | 19be2ea2ef41300fd720b229caa764d70de48297 (diff) | |
| download | olio-uboot-2014.01-0a4a64c07983be76a2b25242094a19b282b36577.tar.xz olio-uboot-2014.01-0a4a64c07983be76a2b25242094a19b282b36577.zip | |
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>
| -rw-r--r-- | board/cpc45/cpc45.c | 15 | ||||
| -rw-r--r-- | board/cpc45/ide.c | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c index 1178822db..22008066e 100644 --- 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 7b7237b90..03be59f97 100644 --- 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); +} + |