[coreboot-gerrit] Patch merged into coreboot/master: 015f0ae Add predefined __ROMSTAGE__ and __RAMSTAGE__ macros

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 015f0aea5dc0cd391ddc34c1db6591d93d08e8a9
Author: Julius Werner <jwerner at chromium.org>
Date:   Mon Sep 15 22:10:33 2014 -0700

    Add predefined __ROMSTAGE__ and __RAMSTAGE__ macros
    
    This patch adds the macros __ROMSTAGE__ and __RAMSTAGE__ which get
    predefined in their respective stages by make, so that we have one
    specific macro for every stage. It also renames __BOOT_BLOCK__ and
    __VER_STAGE__ to __BOOTBLOCK__ and __VERSTAGE__ for consistency.
    
    This change is intended to provide finer control and clearer
    communication of intent after we added a new (optional) stage that falls
    under __PRE_RAM__, and will hopefully provide some robustness for the
    future (we don't want to end up always checking for romstage with #if
    defined(__PRE_RAM__) && !defined(__BOOT_BLOCK__) &&
    !defined(__VER_STAGE__) && !defined(__YET_ANOTHER_PRERAM_STAGE__)). The
    __PRE_RAM__ macro stays as it is since many features do in fact need to
    differentiate on whether RAM is available. (Some also depend on whether
    RAM is available at the end of a stage, in which case #if
    !defined(__PRE_RAM__) || defined(__ROMSTAGE__) should now be
    authoritative.)
    
    It's unfeasable to change all existing occurences of __PRE_RAM__ that
    would be better described with __ROMSTAGE__, so this patch only
    demonstratively changes a few obvious ones in core code.
    
    BUG=None
    TEST=None (tested together with dependent patch).
    
    Change-Id: I6a06d0f42c27a2feeb778a4acd35dd14bb53f744
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: a4ad042746c1d3a7a3bfda422d26e0d3b9f9ae42
    Original-Change-Id: I6a1f25f7077328a8b5201a79b18fc4c2e22d0b06
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/219172
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Reviewed-on: http://review.coreboot.org/9304
    Reviewed-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
    Tested-by: build bot (Jenkins)


See http://review.coreboot.org/9304 for details.

-gerrit