| Message ID | 20220511071946.1185665-1-peter@korsgaard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | boot/shim: big endian arm/aarch64 variants are not supported | expand |
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > Fixes: > http://autobuild.buildroot.net/results/a6c7dd171529e2a7b7a26af8d99bec53117a7a02/ > Commit fd5842a1dd03642b2ea084439 (boot/shim: add > BR2_PACKAGE_SHIM_ARCH_SUPPORTS) added explicit support for big/little endian > arm/aarch64, but the shim code is hard coded for little endian: > head -n 1 elf_{arm,aarch64}_efi.lds > ==> elf_arm_efi.lds <== > OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") > ==> elf_aarch64_efi.lds <== > OUTPUT_FORMAT("elf64-littleaarch64", "elf64-littleaarch64", "elf64-littleaarch64") > So drop the support for the big endian variants. > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Committed, thanks.
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > Fixes: > http://autobuild.buildroot.net/results/a6c7dd171529e2a7b7a26af8d99bec53117a7a02/ > Commit fd5842a1dd03642b2ea084439 (boot/shim: add > BR2_PACKAGE_SHIM_ARCH_SUPPORTS) added explicit support for big/little endian > arm/aarch64, but the shim code is hard coded for little endian: > head -n 1 elf_{arm,aarch64}_efi.lds > ==> elf_arm_efi.lds <== > OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") > ==> elf_aarch64_efi.lds <== > OUTPUT_FORMAT("elf64-littleaarch64", "elf64-littleaarch64", "elf64-littleaarch64") > So drop the support for the big endian variants. > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Committed to 2022.02.x, thanks.
diff --git a/boot/shim/Config.in b/boot/shim/Config.in index c4f1a9f317..462ef12d62 100644 --- a/boot/shim/Config.in +++ b/boot/shim/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_SHIM_ARCH_SUPPORTS bool - default y if BR2_aarch64 || BR2_aarch64_be - default y if BR2_arm || BR2_armeb + default y if BR2_aarch64 + default y if BR2_arm default y if BR2_i386 default y if BR2_x86_64 # it includes gnu-efi
Fixes: http://autobuild.buildroot.net/results/a6c7dd171529e2a7b7a26af8d99bec53117a7a02/ Commit fd5842a1dd03642b2ea084439 (boot/shim: add BR2_PACKAGE_SHIM_ARCH_SUPPORTS) added explicit support for big/little endian arm/aarch64, but the shim code is hard coded for little endian: head -n 1 elf_{arm,aarch64}_efi.lds ==> elf_arm_efi.lds <== OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") ==> elf_aarch64_efi.lds <== OUTPUT_FORMAT("elf64-littleaarch64", "elf64-littleaarch64", "elf64-littleaarch64") So drop the support for the big endian variants. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- boot/shim/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)