diff --git a/flash_scripts/flash_m548x_etos.bdm b/flash_scripts/flash_m548x_etos.bdm index aae9ffc..c53b527 100755 --- a/flash_scripts/flash_m548x_etos.bdm +++ b/flash_scripts/flash_m548x_etos.bdm @@ -63,4 +63,4 @@ erase 0xe0000000 37 erase 0xe0000000 38 erase 0xe0000000 39 -load ../../emutos/emutos-m548xbas.elf +load ../../emutos/emutos-m548x-bas.elf diff --git a/radeon/radeon_base.c b/radeon/radeon_base.c index 8a59385..8b6bb61 100644 --- a/radeon/radeon_base.c +++ b/radeon/radeon_base.c @@ -2185,14 +2185,14 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent) rinfo->big_endian = 1; /* radeon make swapping intel -> motorola */ dbg("host bridge is little endian\r\n"); } - +#if 0 xprintf("framebuffer dump:\r\n"); hexdump((uint8_t *) rinfo->fb_base_phys, 0x10); xprintf("change framebuffer contents\r\n"); * (uint32_t *) rinfo->fb_base_phys = 0x01234567; * (uint32_t *) (rinfo->fb_base_phys + 8) = 0x89abcdef; hexdump((uint8_t *) rinfo->fb_base_phys, 0x10); - +#endif } else if ((pci_rsc_desc->length >= RADEON_REGSIZE) && (pci_rsc_desc->length < 0x100000)) { @@ -2213,9 +2213,10 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent) { dbg("rinfo->bios_seg[0] (%p) was %x (expected 0xaa55)\r\n", rinfo->bios_seg_phys, * (uint16_t *) rinfo->bios_seg_phys); +#if 0 xprintf("bios_seg_phys dump:\r\n"); hexdump((uint8_t *) rinfo->bios_seg_phys, 0x100); - +#endif rinfo->bios_seg_phys = 0; } } @@ -2226,9 +2227,10 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent) { rinfo->mmio_base = (void *)(pci_rsc_desc->offset + pci_rsc_desc->start); rinfo->mmio_base_phys = pci_rsc_desc->start; - +#if 0 xprintf("mmio_base dump:\r\n"); hexdump((uint8_t *) rinfo->mmio_base_phys, 0x100); +#endif } } } @@ -2239,9 +2241,10 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent) { rinfo->io_base = (void *)(pci_rsc_desc->offset + pci_rsc_desc->start); rinfo->io_base_phys = pci_rsc_desc->start; - +#if 0 xprintf("io_base dump:\r\n"); hexdump((uint8_t *) rinfo->io_base_phys, 0x100); +#endif } } flags = pci_rsc_desc->flags; diff --git a/video/video.c b/video/video.c index b714db2..1b043c6 100644 --- a/video/video.c +++ b/video/video.c @@ -344,13 +344,19 @@ void video_init(void) radeon_found = true; dbg("matched\r\n"); - if (radeonfb_pci_register(handle, board) >= 0) + + xprintf("not registering RADEON card\r\n"); + + if (0) { - xprintf("RADEON video card found and registered\r\n"); - } - else - { - dbg("failed to register RADEON PCI video card\r\n"); + if (radeonfb_pci_register(handle, board) >= 0) + { + xprintf("RADEON video card found and registered\r\n"); + } + else + { + dbg("failed to register RADEON PCI video card\r\n"); + } } return; }