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 429d1235f58a3d6cf32eac4e62cdf217c586b1b0..5d13128e32c1ffc8e91fd48bfb3d1707771cc268 100644 (file)
--- a/payloads/coreinfo/coreboot_module.c
+++ b/payloads/coreinfo/coreboot_module.c
@@ -20,6 +20,8 @@
 #include <coreboot_tables.h>
 #include "coreinfo.h"
 
+#ifdef CONFIG_MODULE_COREBOOT
+
 #define MAX_MEMORY_COUNT 5
 
 static struct {
@@ -47,30 +49,30 @@ int coreboot_module_redraw(WINDOW *win)
        print_module_title(win, "Coreboot Tables");
 
        if (tables_good) {
-               mvwprintw(win, row++, 2, "No Coreboot tables were found");
+               mvwprintw(win, row++, 1, "No Coreboot tables were found");
                return 0;
        }
 
-       mvwprintw(win, row++, 2, "Vendor: %s", cb_info.vendor);
-       mvwprintw(win, row++, 2, "Part: %s", cb_info.part);
+       mvwprintw(win, row++, 1, "Vendor: %s", cb_info.vendor);
+       mvwprintw(win, row++, 1, "Part: %s", cb_info.part);
 
-       mvwprintw(win, row++, 2, "Version: %s%s",
+       mvwprintw(win, row++, 1, "Version: %s%s",
                  cb_info.strings[CB_TAG_VERSION - 0x4],
                  cb_info.strings[CB_TAG_EXTRA_VERSION - 0x4]);
 
-       mvwprintw(win, row++, 2, "Built: %s (%s@%s.%s)",
+       mvwprintw(win, row++, 1, "Built: %s (%s@%s.%s)",
                  cb_info.strings[CB_TAG_BUILD - 0x4],
                  cb_info.strings[CB_TAG_COMPILE_BY - 0x04],
                  cb_info.strings[CB_TAG_COMPILE_HOST - 0x04],
                  cb_info.strings[CB_TAG_COMPILE_DOMAIN - 0x04]);
 
        if (cb_info.serial.tag != 0x0) {
-               mvwprintw(win, row++, 2, "Serial Port I/O base: 0x%x",
-                         cb_info.serial.ioport);
+               mvwprintw(win, row++, 1, "Serial Port I/O base: 0x%x",
+                         cb_info.serial.baseaddr);
        }
 
        if (cb_info.console.tag != 0x0) {
-               mvwprintw(win, row++, 2, "Default Output Console: ");
+               mvwprintw(win, row++, 1, "Default Output Console: ");
 
                switch (cb_info.console.type) {
                case CB_TAG_CONSOLE_SERIAL8250:
@@ -95,24 +97,24 @@ int coreboot_module_redraw(WINDOW *win)
        }
 
        row++;
-       mvwprintw(win, row++, 2, "-- Memory Map --");
+       mvwprintw(win, row++, 1, "-- Memory Map --");
 
        for (i = 0; i < cb_info.mem_count; i++) {
                switch (cb_info.range[i].type) {
                case CB_MEM_RAM:
-                       mvwprintw(win, row++, 4, "     RAM: ");
+                       mvwprintw(win, row++, 3, "     RAM: ");
                        break;
                case CB_MEM_RESERVED:
-                       mvwprintw(win, row++, 4, "Reserved: ");
+                       mvwprintw(win, row++, 3, "Reserved: ");
                        break;
                case CB_MEM_TABLE:
-                       mvwprintw(win, row++, 4, "   Table: ");
+                       mvwprintw(win, row++, 3, "   Table: ");
                }
 
                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;
@@ -121,7 +123,6 @@ int coreboot_module_redraw(WINDOW *win)
 static void parse_memory(unsigned char *ptr)
 {
        struct cb_memory *mem = (struct cb_memory *)ptr;
-
        int max = (MEM_RANGE_COUNT(mem) > MAX_MEMORY_COUNT)
            ? MAX_MEMORY_COUNT : MEM_RANGE_COUNT(mem);
        int i;
@@ -202,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;
@@ -236,7 +240,7 @@ static int parse_header(void *addr, int len)
        return 1;
 }
 
-int coreboot_module_init(void)
+static int coreboot_module_init(void)
 {
        int ret = parse_header((void *)0x00000, 0x1000);
 
@@ -253,3 +257,10 @@ struct coreinfo_module coreboot_module = {
        .init = coreboot_module_init,
        .redraw = coreboot_module_redraw,
 };
+
+#else
+
+struct coreinfo_module coreboot_module = {
+};
+
+#endif