From 06e3dcac453e7011c3c878d63352c30424392d14 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Wed, 6 Mar 2024 13:34:44 -0800 Subject: cbfs: Remove broken remnants of PAYLOAD_INFO feature PAYLOAD_INFO is a very old feature that can add a key/value information section to a payload file. It seems to have only ever been generated by coreinfo and never really read by anything. Since CB:1721 in 2012, the feature has been inadvertently broken in practice since the `.note.pinfo` sections that contain the information get discarded from the payload before cbfstool gets to see them. Since CB:28647 in 2018, support for the section in the SELF loader was (inadvertently?) dropped, so if someone actually fed cbfstool a payload ELF that did have a `.note.pinfo` section, modern coreboot would refuse to boot the payload entirely (which is probably not a good state to leave things in). This patch removes the code to generate PAYLOAD_INFO entries entirely, but leaves the support to parse and extract those sections from old payloads in place in cbfstool. Change-Id: I40d8e9b76a171ebcdaa2eae02d54a1ca5e592c85 Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/c/coreboot/+/81087 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/commonlib') diff --git a/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h b/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h index cebaf8395e..b6a7baa20e 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h +++ b/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h @@ -198,8 +198,10 @@ enum cbfs_payload_segment_type { PAYLOAD_SEGMENT_CODE = 0x434F4445, /* BE: 'CODE' */ PAYLOAD_SEGMENT_DATA = 0x44415441, /* BE: 'DATA' */ PAYLOAD_SEGMENT_BSS = 0x42535320, /* BE: 'BSS ' */ - PAYLOAD_SEGMENT_PARAMS = 0x50415241, /* BE: 'PARA' */ PAYLOAD_SEGMENT_ENTRY = 0x454E5452, /* BE: 'ENTR' */ + + /* PARAMS for PAYLOAD_INFO feature. Broken since 2012, removed 2024. */ + PAYLOAD_SEGMENT_DEPRECATED_PARAMS = 0x50415241, /* BE: 'PARA' */ }; struct cbfs_optionrom { -- cgit v1.2.3