x86: zimage: Add a little more logging

Add logging for each part of the boot process, using a new

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index a00964cc8d9c719b50d809479865c2d88e36c296..7418c9a5fed0845475c99295c1a7702ba398e456 100644 (file)
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -12,10 +12,13 @@
  * linux/Documentation/i386/boot.txt
  */
 
+#define LOG_CATEGORY   LOGC_BOOT
+
 #include <common.h>
 #include <command.h>
 #include <env.h>
 #include <irq_func.h>
+#include <log.h>
 #include <malloc.h>
 #include <acpi/acpi_table.h>
 #include <asm/io.h>
@@ -292,6 +295,7 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
        struct setup_header *hdr = &setup_base->hdr;
        int bootproto = get_boot_protocol(hdr, false);
 
+       log_debug("Setup E820 entries\n");
        setup_base->e820_entries = install_e820_map(
                ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map);
 
@@ -317,6 +321,7 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
        }
 
        if (cmd_line) {
+               log_debug("Setup cmdline\n");
                if (bootproto >= 0x0202) {
                        hdr->cmd_line_ptr = (uintptr_t)cmd_line;
                } else if (bootproto >= 0x0200) {
@@ -340,6 +345,7 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
        if (IS_ENABLED(CONFIG_GENERATE_ACPI_TABLE))
                setup_base->acpi_rsdp_addr = acpi_get_rsdp_addr();
 
+       log_debug("Setup devicetree\n");
        setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0));
        setup_video(&setup_base->screen_info);
 

diff --git a/common/log.c b/common/log.c
index 4b6f3fcd04a57efde2f7ae643c95c4d6a7c89924..ce39918e045a249679d117bc07327945722ef184 100644 (file)
--- a/common/log.c
+++ b/common/log.c
@@ -26,6 +26,7 @@ static const char *const log_cat_name[] = {
        "bloblist",
        "devres",
        "acpi",
+       "boot",
 };
 
 _Static_assert(ARRAY_SIZE(log_cat_name) == LOGC_COUNT - LOGC_NONE,

diff --git a/include/log.h b/include/log.h
index 4d0692f155d3bb72597ee1a5c602e65eceef7ade..29f18a82dcf8c19c6da9bee111f0a5455102eadf 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -96,6 +96,7 @@ enum log_category_t {
        LOGC_DEVRES,
        /** @LOGC_ACPI: Advanced Configuration and Power Interface (ACPI) */
        LOGC_ACPI,
+       LOGC_BOOT,      /* Related to boot process / boot image processing */
 
        /** @LOGC_COUNT: Number of log categories */
        LOGC_COUNT,