Patch merged into coreboot/master: arch/x86/bootblock_normal: Update to use fewer registers

the following patch was just integrated into master:
commit 1b304cc23cd4e3a98a42cd72ffb5d1185321afa9
Author: Martin Roth 
Date:   Mon Nov 30 09:49:21 2015 -0700

arch/x86/bootblock_normal: Update to use fewer registers

- Move initialization of entry to later in main.
    - Make boot_mode an unsigned char - no need to use int.
    - Remove unnecessary variable filenames.
    - Only get and try to boot fallback once.

Change-Id: I823092c60dd8c2de0a36ec7fdbba3e68f6b7567a
    Test: compiled.
    Signed-off-by: Martin Roth 
    Reviewed-on: https://review.coreboot.org/12574
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi 
    Tested-by: Raptor Engineering Automated Test Stand 
    Reviewed-by: Stefan Reinauer

See https://review.coreboot.org/12574 for details.

-gerrit