diff options
Diffstat (limited to 'src/arch/ppc/lib')
| -rw-r--r-- | src/arch/ppc/lib/pci_dev.c | 24 | ||||
| -rw-r--r-- | src/arch/ppc/lib/printk_init.c | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/arch/ppc/lib/pci_dev.c b/src/arch/ppc/lib/pci_dev.c index adb047e3fe..d821f17c77 100644 --- a/src/arch/ppc/lib/pci_dev.c +++ b/src/arch/ppc/lib/pci_dev.c @@ -9,8 +9,8 @@ uint8_t pci_ppc_read_config8(unsigned char bus, int devfn, int where) { uint8_t res; - out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); - res = in_8((unsigned char *)PCIC0_CFGDATA + (where & 3)); + out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); + res = in_8((unsigned char *)CONFIG_PCIC0_CFGDATA + (where & 3)); return res; } @@ -18,8 +18,8 @@ uint16_t pci_ppc_read_config16(unsigned char bus, int devfn, int where) { uint16_t res; - out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); - res = in_le16((unsigned short *)PCIC0_CFGDATA + (where & 2)); + out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); + res = in_le16((unsigned short *)CONFIG_PCIC0_CFGDATA + (where & 2)); return res; } @@ -27,28 +27,28 @@ uint32_t pci_ppc_read_config32(unsigned char bus, int devfn, int where) { uint32_t res; - out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); - res = in_le32((unsigned *)PCIC0_CFGDATA); + out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); + res = in_le32((unsigned *)CONFIG_PCIC0_CFGDATA); return res; } int pci_ppc_write_config8(unsigned char bus, int devfn, int where, uint8_t data) { - out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); - out_8((unsigned char *)PCIC0_CFGDATA + (where & 3), data); + out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); + out_8((unsigned char *)CONFIG_PCIC0_CFGDATA + (where & 3), data); return 0; } int pci_ppc_write_config16(unsigned char bus, int devfn, int where, uint16_t data) { - out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); - out_le16((unsigned short *)PCIC0_CFGDATA + (where & 2), data); + out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); + out_le16((unsigned short *)CONFIG_PCIC0_CFGDATA + (where & 2), data); return 0; } int pci_ppc_write_config32(unsigned char bus, int devfn, int where, uint32_t data) { - out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); - out_le32((unsigned *)PCIC0_CFGDATA, data); + out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where)); + out_le32((unsigned *)CONFIG_PCIC0_CFGDATA, data); return 0; } diff --git a/src/arch/ppc/lib/printk_init.c b/src/arch/ppc/lib/printk_init.c index 401d271391..98d78b3fc4 100644 --- a/src/arch/ppc/lib/printk_init.c +++ b/src/arch/ppc/lib/printk_init.c @@ -12,7 +12,7 @@ /* Keep together for sysctl support */ -int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; +int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; extern int vtxprintf(void (*)(unsigned char), const char *, va_list); extern void uart8250_tx_byte(unsigned, unsigned char); @@ -20,8 +20,8 @@ extern void uart8250_tx_byte(unsigned, unsigned char); void console_tx_byte(unsigned char byte) { if (byte == '\n') - uart8250_tx_byte(TTYS0_BASE, '\r'); - uart8250_tx_byte(TTYS0_BASE, byte); + uart8250_tx_byte(CONFIG_TTYS0_BASE, '\r'); + uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); } int do_printk(int msg_level, const char *fmt, ...) |