summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2008-09-07 07:08:42 +1000
committerWolfgang Denk <wd@denx.de>2008-09-09 11:48:53 +0200
commit3ef96ded38a8d33b58b9fab9cd879d51ddac4cbd (patch)
treeb40a0685df1836f251fab53f4a767bb7287e0d03 /board
parent5608692104efa8d56df803dc79ea41ac3607eee5 (diff)
downloadtalos-obmc-uboot-3ef96ded38a8d33b58b9fab9cd879d51ddac4cbd.tar.gz
talos-obmc-uboot-3ef96ded38a8d33b58b9fab9cd879d51ddac4cbd.zip
Update i386 code (sc520_cdp)
Attempt to bring i386 / sc520 inline with master Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'board')
-rw-r--r--board/sc520_cdp/sc520_cdp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/board/sc520_cdp/sc520_cdp.c b/board/sc520_cdp/sc520_cdp.c
index f21c73002f..99debde50e 100644
--- a/board/sc520_cdp/sc520_cdp.c
+++ b/board/sc520_cdp/sc520_cdp.c
@@ -114,7 +114,7 @@ static void irq_init(void)
}
-
+#ifdef CONFIG_PCI
/* PCI stuff */
static void pci_sc520_cdp_fixup_irq(struct pci_controller *hose, pci_dev_t dev)
{
@@ -129,7 +129,7 @@ static void pci_sc520_cdp_fixup_irq(struct pci_controller *hose, pci_dev_t dev)
};
static int next_irq_index=0;
- char tmp_pin;
+ uchar tmp_pin;
int pin;
pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_PIN, &tmp_pin);
@@ -193,7 +193,7 @@ void pci_init_board(void)
{
pci_sc520_init(&sc520_cdp_hose);
}
-
+#endif
static void silence_uart(int port)
{
@@ -563,12 +563,12 @@ void spi_eeprom_probe(int x)
{
}
-int spi_eeprom_read(int x, int offset, char *buffer, int len)
+int spi_eeprom_read(int x, int offset, uchar *buffer, int len)
{
return 0;
}
-int spi_eeprom_write(int x, int offset, char *buffer, int len)
+int spi_eeprom_write(int x, int offset, uchar *buffer, int len)
{
return 0;
}
OpenPOWER on IntegriCloud