diff options
| author | Julius Werner <jwerner@chromium.org> | 2018-05-21 18:30:17 +0000 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2018-05-22 02:38:26 +0000 |
| commit | 55b3081b89cfe8cf4215047e31d8d89b60eb7c01 (patch) | |
| tree | 8d22739ba834dcde473d7e6ef5020a4bf9d1683c /src | |
| parent | 045cc899c90dfe483897f245bf8ac398ecb9424b (diff) | |
Revert "program_loading: make types a mask, make unknown type a non-zero"
This reverts commit f3d99b6a657fe2bc3cff71956ab4f68fd1f287fe.
Reason for revert: We're now doing this through CBFS types instead, so
this shouldn't be needed anymore.
Change-Id: I9e0d5446365f8ecc045615e4ba1a1313080c9479
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/26448
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/program_loading.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/include/program_loading.h b/src/include/program_loading.h index 2e8364604a..5eeef530d2 100644 --- a/src/include/program_loading.h +++ b/src/include/program_loading.h @@ -26,22 +26,15 @@ enum { SEG_FINAL = 1 << 0, }; -// The prog_type is a bit mask, so that in searches one can find, e.g., -// a file with a given name that is either a payload or a ramstage. -// The PROG_UNKNOWN should not have any bits set that match a valid -// type, and for the sake of sanity, let's keep the high order bit out of it. -// The current value allows for 16 file types. This is a change from before, -// where we could have 2^32-1 different types. On a guess, it seems 16 should -// be enough. We started with 3 and are up to 6 twelve years later. enum prog_type { - PROG_UNKNOWN = 0x7bba0000, - PROG_VERSTAGE = 1 << 0, - PROG_ROMSTAGE = 1 << 1, - PROG_RAMSTAGE = 1 << 2, - PROG_REFCODE = 1 << 3, - PROG_PAYLOAD = 1 << 4, - PROG_BL31 = 1 << 5, - PROG_BL32 = 1 << 6, + PROG_UNKNOWN, + PROG_VERSTAGE, + PROG_ROMSTAGE, + PROG_RAMSTAGE, + PROG_REFCODE, + PROG_PAYLOAD, + PROG_BL31, + PROG_BL32, }; /* |