[coreboot] New patch to review for coreboot: dd8d472 libpayload: If there's no IO space, complain if the serial claims to use it

[stefan.reina...@coreboot.org]

Stefan Reinauer (stefan.reina...@coreboot.org) just uploaded a new patch set to 
gerrit, which you can find at http://review.coreboot.org/2659

-gerrit

commit dd8d472e74753b90b77115dc23b25aeecc37f588
Author: Gabe Black <gabebl...@google.com>
Date:   Fri Jan 18 18:24:46 2013 -0800

    libpayload: If there's no IO space, complain if the serial claims to use it
    
    Change-Id: I36c750d520ff034c9ca9b9af46bd99bd49af7355
    Signed-off-by: Gabe Black <gabebl...@google.com>
---
 payloads/libpayload/drivers/serial.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/payloads/libpayload/drivers/serial.c 
b/payloads/libpayload/drivers/serial.c
index 0d26750..4ae3e26 100644
--- a/payloads/libpayload/drivers/serial.c
+++ b/payloads/libpayload/drivers/serial.c
@@ -97,11 +97,19 @@ void serial_init(void)
        serial_is_mem_mapped =
                (lib_sysinfo.serial->type == CB_SERIAL_TYPE_MEMORY_MAPPED);
 
-       if (!serial_is_mem_mapped && (inb(IOBASE + 0x05) == 0xFF) &&
-                       (inb(IOBASE + 0x06) == 0xFF)) {
+       if (!serial_is_mem_mapped) {
+#ifdef CONFIG_IO_ADDRESS_SPACE
+               if ((inb(IOBASE + 0x05) == 0xFF) &&
+                               (inb(IOBASE + 0x06) == 0xFF)) {
+                       return;
+               }
+#else
+               printf("IO space mapped serial not supported.");
                return;
+#endif
        }
 
+
        serial_hardware_is_present = 1;
 
 #ifdef CONFIG_SERIAL_SET_SPEED

-- 
coreboot mailing list: coreboot@coreboot.org
http://www.coreboot.org/mailman/listinfo/coreboot