diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 23:51:17 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 23:51:17 +0000 |
| commit | e79a194755c89fc9330ce74d6af450fa7c18c802 (patch) | |
| tree | 8b4ba416f0d5996b89bb1a342e8b40b84d86b42e /c/src/lib/libbsp/powerpc/shared/bootloader | |
| parent | 2004-11-10 Richard Campbell <richard.campbell@oarcorp.com> (diff) | |
| download | rtems-e79a194755c89fc9330ce74d6af450fa7c18c802.tar.bz2 | |
2004-11-10 Richard Campbell <richard.campbell@oarcorp.com>
* Makefile.am, bootloader/misc.c, bootloader/pci.c, bootloader/pci.h,
console/console.c, console/inch.c, console/reboot.c, console/uart.c,
console/uart.h, irq/irq.c, irq/irq.h, irq/irq_init.c,
motorola/motorola.c, motorola/motorola.h, openpic/openpic.c,
openpic/openpic.h, pci/detect_raven_bridge.c, pci/pci.c,
start/start.S, startup/bspstart.c, vectors/vectors_init.c,
vme/vmeconfig.c: Add MVME2100 BSP and MPC8240 support. There was also
a significant amount of spelling and whitespace cleanup.
* tod/todcfg.c: New file.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/shared/bootloader')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/misc.c | 10 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/pci.c | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/pci.h | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c index 373b13bb45..934c102a56 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c @@ -24,6 +24,7 @@ #include <libcpu/page.h> #include <libcpu/byteorder.h> #include <rtems/bspIo.h> +#include <bsp.h> SPR_RW(DEC) SPR_RO(PVR) @@ -275,8 +276,13 @@ setup_hw(void) /* We check that the keyboard is present and immediately * select the serial console if not. */ +#if defined(BSP_KBD_IOBASE) err = kbdreset(); - if (err) select_console(CONSOLE_SERIAL); + if (err) select_console(CONSOLE_SERIAL); +#else + err = 1; + select_console(CONSOLE_SERIAL); +#endif printk("\nModel: %s\nSerial: %s\n" "Processor/Bus frequencies (Hz): %ld/%ld\n" @@ -288,8 +294,6 @@ setup_hw(void) vpd.ProcessorBusHz, (vpd.TimeBaseDivisor ? vpd.TimeBaseDivisor : 4000), res->TotalMemory); - printk("Original MSR: %lx\nOriginal HID0: %lx\nOriginal R31: %lx\n", - bd->o_msr, bd->o_hid0, bd->o_r31); /* This reconfigures all the PCI subsystem */ pci_init(); diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c index 5ac55e6b3f..2d57b60e0f 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c @@ -23,6 +23,7 @@ #include <libcpu/io.h> #include <libcpu/page.h> #include <bsp/consoleIo.h> +#include <string.h> #include <string.h> diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h index 619497d5b7..bf291cb9ea 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h @@ -497,6 +497,7 @@ #define PCI_VENDOR_ID_MOTOROLA 0x1057 #define PCI_DEVICE_ID_MOTOROLA_MPC105 0x0001 #define PCI_DEVICE_ID_MOTOROLA_MPC106 0x0002 +#define PCI_DEVICE_ID_MOTOROLA_MPC8240 0x0003 #define PCI_DEVICE_ID_MOTOROLA_RAVEN 0x4801 #define PCI_VENDOR_ID_PROMISE 0x105a |