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/include | |
| parent | 73d042bd90bc8877f9bfd8b846578fe3e12444c3 (diff) | |
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/include')
| -rw-r--r-- | src/include/memlayout.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/memlayout.h b/src/include/memlayout.h index b39a8955c9..c9c77cfa5c 100644 --- a/src/include/memlayout.h +++ b/src/include/memlayout.h @@ -154,7 +154,7 @@ INCLUDE "verstage/lib/program.ld" #define OVERLAP_VERSTAGE_ROMSTAGE(addr, size) \ - _ = ASSERT(IS_ENABLED(CONFIG_RETURN_FROM_VERSTAGE) == 1, \ + _ = ASSERT(IS_ENABLED(CONFIG_VBOOT_RETURN_FROM_VERSTAGE) == 1, \ "Must set RETURN_FROM_VERSTAGE to overlap romstage."); \ VERSTAGE(addr, size) #else |