[coreboot-gerrit] Patch set updated for coreboot: arch/x86/bootblock_normal: Fix failure to build

Martin Roth (martinroth@google.com) gerrit at coreboot.org
Tue Nov 3 23:13:21 CET 2015


Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12315

-gerrit

commit 36e5f9677a5343f5c66282856930c56b1ff111cd
Author: Timothy Pearson <tpearson at raptorengineeringinc.com>
Date:   Tue Nov 3 16:04:56 2015 -0600

    arch/x86/bootblock_normal: Fix failure to build
    
    Fix a function call in the normal path using the original function
    name and arguments in code that was changed in commit 3bfd7cc6
    (drivers/pc80: Rework normal / fallback selector code)
    
    This commit reworked most of the fallback / normal code,
    however the normal code paths were not fully tested by Jenkins,
    so this was missed.
    
    Change-Id: Ied66334977272a13b7a7307ff4d9f34eb22040aa
    Signed-off-by: Timothy Pearson <tpearson at raptorengineeringinc.com>
---
 src/arch/x86/bootblock_normal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arch/x86/bootblock_normal.c b/src/arch/x86/bootblock_normal.c
index bde2535..a4dc3c4 100644
--- a/src/arch/x86/bootblock_normal.c
+++ b/src/arch/x86/bootblock_normal.c
@@ -27,7 +27,7 @@ static void main(unsigned long bist)
 		 * Do not add any other CMOS access in the
 		 * bootblock for AP CPUs.
 		 */
-		boot_mode = last_boot_normal();
+		boot_mode = boot_use_normal(cmos_read(RTC_BOOT_BYTE));
 	}
 
 	char *filenames = (char *)walkcbfs("coreboot-stages");



More information about the coreboot-gerrit mailing list