diff options
| author | Julius Werner <jwerner@chromium.org> | 2017-02-13 17:53:29 -0800 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2017-03-28 22:18:13 +0200 |
| commit | 58c3938705af5dd96456216a17d579868e0f5b77 (patch) | |
| tree | b1531c163a2679c76395090717e835a851e027ae /src/arch/x86 | |
| parent | 73d042bd90bc8877f9bfd8b846578fe3e12444c3 (diff) | |
| download | coreboot-58c3938705af5dd96456216a17d579868e0f5b77.tar.xz | |
vboot: Move remaining features out of vendorcode/google/chromeos
This patch attempts to finish the separation between CONFIG_VBOOT and
CONFIG_CHROMEOS by moving the remaining options and code (including
image generation code for things like FWID and GBB flags, which are
intrinsic to vboot itself) from src/vendorcode/google/chromeos to
src/vboot. Also taking this opportunity to namespace all VBOOT Kconfig
options, and clean up menuconfig visibility for them (i.e. some options
were visible even though they were tied to the hardware while others
were invisible even though it might make sense to change them).
CQ-DEPEND=CL:459088
Change-Id: I3e2e31150ebf5a96b6fe507ebeb53a41ecf88122
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/18984
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/assembly_entry.S | 2 | ||||
| -rw-r--r-- | src/arch/x86/bootblock_simple.c | 2 | ||||
| -rw-r--r-- | src/arch/x86/car.ld | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/x86/assembly_entry.S b/src/arch/x86/assembly_entry.S index d1f5d61ce7..56a5b630c8 100644 --- a/src/arch/x86/assembly_entry.S +++ b/src/arch/x86/assembly_entry.S @@ -21,7 +21,7 @@ * verstage runs directly after bootblock. */ #define ROMSTAGE_AFTER_VERSTAGE \ - (IS_ENABLED(CONFIG_SEPARATE_VERSTAGE) && \ + (IS_ENABLED(CONFIG_VBOOT_SEPARATE_VERSTAGE) && \ IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK) && ENV_ROMSTAGE) #if IS_ENABLED(CONFIG_C_ENVIRONMENT_BOOTBLOCK) || ROMSTAGE_AFTER_VERSTAGE diff --git a/src/arch/x86/bootblock_simple.c b/src/arch/x86/bootblock_simple.c index 8e44add28e..5df279c370 100644 --- a/src/arch/x86/bootblock_simple.c +++ b/src/arch/x86/bootblock_simple.c @@ -28,7 +28,7 @@ static void main(unsigned long bist) #endif } -#if CONFIG_SEPARATE_VERSTAGE +#if CONFIG_VBOOT_SEPARATE_VERSTAGE const char *target1 = "fallback/verstage"; #else const char *target1 = "fallback/romstage"; diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld index 92360096d1..aa579c3c58 100644 --- a/src/arch/x86/car.ld +++ b/src/arch/x86/car.ld @@ -21,7 +21,7 @@ _car_region_start = . ; /* Vboot work buffer is completely volatile outside of verstage and * romstage. Appropriate code needs to handle the transition. */ -#if IS_ENABLED(CONFIG_SEPARATE_VERSTAGE) +#if IS_ENABLED(CONFIG_VBOOT_SEPARATE_VERSTAGE) VBOOT2_WORK(., 16K) #endif /* Stack for CAR stages. Since it persists across all stages that |