Replace UNPACK_CB64 macro with inline

[coreboot.git] / payloads / coreinfo / coreboot_module.c

diff --git a/payloads/coreinfo/coreboot_module.c b/payloads/coreinfo/coreboot_module.c
index 16a63c544df74ee975b075459ba716cdd2004ee8..5d13128e32c1ffc8e91fd48bfb3d1707771cc268 100644 (file)
--- a/payloads/coreinfo/coreboot_module.c
+++ b/payloads/coreinfo/coreboot_module.c
@@ -68,7 +68,7 @@ int coreboot_module_redraw(WINDOW *win)
 
        if (cb_info.serial.tag != 0x0) {
                mvwprintw(win, row++, 1, "Serial Port I/O base: 0x%x",
-                         cb_info.serial.ioport);
+                         cb_info.serial.baseaddr);
        }
 
        if (cb_info.console.tag != 0x0) {
@@ -112,9 +112,9 @@ int coreboot_module_redraw(WINDOW *win)
                }
 
                wprintw(win, "%16.16llx - %16.16llx",
-                       UNPACK_CB64(cb_info.range[i].start),
-                       UNPACK_CB64(cb_info.range[i].start) +
-                       UNPACK_CB64(cb_info.range[i].size) - 1);
+                       cb_unpack64(cb_info.range[i].start),
+                       cb_unpack64(cb_info.range[i].start) +
+                       cb_unpack64(cb_info.range[i].size) - 1);
        }
 
        return 0;
@@ -203,6 +203,9 @@ static int parse_header(void *addr, int len)
                struct cb_record *rec = (struct cb_record *)ptr;
 
                switch (rec->tag) {
+               case CB_TAG_FORWARD:
+                       return parse_header((void *)(unsigned long)((struct cb_forward *)rec)->forward, 1);
+                       break;
                case CB_TAG_MEMORY:
                        parse_memory(ptr);
                        break;