Patch merged into coreboot/master: 56b8309 build system: rename __BOOT_BLOCK__ and __VER_STAGE__

the following patch was just integrated into master:
commit 56b830938af3638538558ba92ac6c168b6a217ef
Author: Patrick Georgi 
Date:   Thu Apr 2 19:44:19 2015 +0200

build system: rename __BOOT_BLOCK__ and __VER_STAGE__

Drop the inner underscore for consistency. Follows the
    commit stated below.

Change-Id: I75cde6e2cd55d2c0fbb5a2d125c359d91e14cf6d
    Signed-off-by: Patrick Georgi 
    Based-on-Change-Id: I6a1f25f7077328a8b5201a79b18fc4c2e22d0b06
    Based-on-Signed-off-by: Julius Werner 
    Based-on-Reviewed-on: https://chromium-review.googlesource.com/219172
    Reviewed-on: http://review.coreboot.org/9290
    Reviewed-by: Aaron Durbin 
    Tested-by: build bot (Jenkins)

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

-gerrit