diff options
Diffstat (limited to 'config/u-boot')
8 files changed, 157 insertions, 7 deletions
diff --git a/config/u-boot/amd64coreboot/config/default b/config/u-boot/amd64coreboot/config/default index d44de2d3..7c2a45f0 100644 --- a/config/u-boot/amd64coreboot/config/default +++ b/config/u-boot/amd64coreboot/config/default @@ -4,7 +4,7 @@ # # -# Compiler: gcc (Debian 12.2.0-14) 12.2.0 +# Compiler: gcc (Debian 14.2.0-19) 14.2.0 # CONFIG_CREATE_ARCH_SYMLINK=y CONFIG_SUPPORT_LITTLE_ENDIAN=y @@ -141,7 +141,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set diff --git a/config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch b/config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch index 8a09fa7d..ec033187 100644 --- a/config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch +++ b/config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch @@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 100644 ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100); ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE, - "U-Boot - Boot Menu", NULL); -+ "Libreboot 25.06 Luminous Lemon (U-Boot menu): https://libreboot.org/", NULL); ++ "Libreboot 26.01 Magnanimous Max (U-Boot menu): https://libreboot.org/", NULL); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT); logo = video_get_u_boot_logo(); diff --git a/config/u-boot/default/patches/0008-u-boot-fix-build-error-on-newer-hostcc.patch b/config/u-boot/default/patches/0008-u-boot-fix-build-error-on-newer-hostcc.patch new file mode 100644 index 00000000..8ddf398c --- /dev/null +++ b/config/u-boot/default/patches/0008-u-boot-fix-build-error-on-newer-hostcc.patch @@ -0,0 +1,50 @@ +From d28edbe090d1d239530618a9142c5fee2705855f Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Wed, 1 Apr 2026 07:39:07 +0100 +Subject: [PATCH 1/1] u-boot: fix build error on newer hostcc + +because... they changed a flag. + +because they're gnu. this fixes building +u-boot x86 on arch linux. + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + arch/sandbox/config.mk | 4 ++-- + arch/x86/config.mk | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk +index dd9b7473fa9..d64dde93575 100644 +--- a/arch/sandbox/config.mk ++++ b/arch/sandbox/config.mk +@@ -50,10 +50,10 @@ cmd_u-boot-spl = (cd $(obj) && \ + + ifeq ($(HOST_ARCH),$(HOST_ARCH_X86_64)) + EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_x86_64_efi.lds +-EFI_TARGET := --target=efi-app-x86_64 ++EFI_TARGET := --output-target=efi-app-x86_64 + else ifeq ($(HOST_ARCH),$(HOST_ARCH_X86)) + EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_ia32_efi.lds +-EFI_TARGET := --target=efi-app-ia32 ++EFI_TARGET := --output-target=efi-app-ia32 + else ifeq ($(HOST_ARCH),$(HOST_ARCH_AARCH64)) + EFI_LDS := ${SRCDIR}/../../../arch/arm/lib/elf_aarch64_efi.lds + OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \ +diff --git a/arch/x86/config.mk b/arch/x86/config.mk +index 6d4839dfb38..878fd126243 100644 +--- a/arch/x86/config.mk ++++ b/arch/x86/config.mk +@@ -127,7 +127,7 @@ endif + endif + + ifdef CONFIG_X86_64 +-EFI_TARGET := --target=efi-app-x86_64 ++EFI_TARGET := --output-target=efi-app-x86_64 + else +-EFI_TARGET := --target=efi-app-ia32 ++EFI_TARGET := --output-target=efi-app-ia32 + endif +-- +2.47.3 + diff --git a/config/u-boot/i386coreboot/config/default b/config/u-boot/i386coreboot/config/default index ba4fd18b..32e41bba 100644 --- a/config/u-boot/i386coreboot/config/default +++ b/config/u-boot/i386coreboot/config/default @@ -4,7 +4,7 @@ # # -# Compiler: gcc (Debian 12.2.0-14) 12.2.0 +# Compiler: gcc (Debian 14.2.0-19) 14.2.0 # CONFIG_CREATE_ARCH_SYMLINK=y CONFIG_SUPPORT_LITTLE_ENDIAN=y @@ -118,7 +118,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set diff --git a/config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch b/config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch index 8a09fa7d..ec033187 100644 --- a/config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch +++ b/config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch @@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 100644 ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100); ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE, - "U-Boot - Boot Menu", NULL); -+ "Libreboot 25.06 Luminous Lemon (U-Boot menu): https://libreboot.org/", NULL); ++ "Libreboot 26.01 Magnanimous Max (U-Boot menu): https://libreboot.org/", NULL); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT); logo = video_get_u_boot_logo(); diff --git a/config/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch b/config/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch new file mode 100644 index 00000000..ac34a03d --- /dev/null +++ b/config/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch @@ -0,0 +1,50 @@ +From 236cb1c25735491dcac87acdf5beb3859463b9d4 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Wed, 1 Apr 2026 07:39:07 +0100 +Subject: [PATCH 1/1] u-boot: fix build error on newer hostcc + +because... they changed a flag. + +because they're gnu. this fixes building +u-boot x86 on arch linux. + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + arch/sandbox/config.mk | 4 ++-- + arch/x86/config.mk | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk +index 405843800e9..2ee59817252 100644 +--- a/arch/sandbox/config.mk ++++ b/arch/sandbox/config.mk +@@ -46,10 +46,10 @@ cmd_u-boot-spl = (cd $(obj) && $(CC) -o $(SPL_BIN) -Wl,-T u-boot-spl.lds \ + + ifeq ($(HOST_ARCH),$(HOST_ARCH_X86_64)) + EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_x86_64_efi.lds +-EFI_TARGET := --target=efi-app-x86_64 ++EFI_TARGET := --output-target=efi-app-x86_64 + else ifeq ($(HOST_ARCH),$(HOST_ARCH_X86)) + EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_ia32_efi.lds +-EFI_TARGET := --target=efi-app-ia32 ++EFI_TARGET := --output-target=efi-app-ia32 + else ifeq ($(HOST_ARCH),$(HOST_ARCH_AARCH64)) + EFI_LDS := ${SRCDIR}/../../../arch/arm/lib/elf_aarch64_efi.lds + OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \ +diff --git a/arch/x86/config.mk b/arch/x86/config.mk +index 2e3a7119e79..329632164f7 100644 +--- a/arch/x86/config.mk ++++ b/arch/x86/config.mk +@@ -127,7 +127,7 @@ endif + endif + + ifdef CONFIG_X86_64 +-EFI_TARGET := --target=efi-app-x86_64 ++EFI_TARGET := --output-target=efi-app-x86_64 + else +-EFI_TARGET := --target=efi-app-ia32 ++EFI_TARGET := --output-target=efi-app-ia32 + endif +-- +2.47.3 + diff --git a/config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch b/config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch index 8a09fa7d..ec033187 100644 --- a/config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch +++ b/config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch @@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 100644 ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100); ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE, - "U-Boot - Boot Menu", NULL); -+ "Libreboot 25.06 Luminous Lemon (U-Boot menu): https://libreboot.org/", NULL); ++ "Libreboot 26.01 Magnanimous Max (U-Boot menu): https://libreboot.org/", NULL); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT); logo = video_get_u_boot_logo(); diff --git a/config/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch b/config/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch new file mode 100644 index 00000000..50b9ca0b --- /dev/null +++ b/config/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch @@ -0,0 +1,50 @@ +From 9408a39adcc458b6af7e11f9a4780296e2aa480a Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Wed, 1 Apr 2026 07:39:07 +0100 +Subject: [PATCH 1/1] u-boot: fix build error on newer hostcc + +because... they changed a flag. + +because they're gnu. this fixes building +u-boot x86 on arch linux. + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + arch/sandbox/config.mk | 4 ++-- + arch/x86/config.mk | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk +index 405843800e9..2ee59817252 100644 +--- a/arch/sandbox/config.mk ++++ b/arch/sandbox/config.mk +@@ -46,10 +46,10 @@ cmd_u-boot-spl = (cd $(obj) && $(CC) -o $(SPL_BIN) -Wl,-T u-boot-spl.lds \ + + ifeq ($(HOST_ARCH),$(HOST_ARCH_X86_64)) + EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_x86_64_efi.lds +-EFI_TARGET := --target=efi-app-x86_64 ++EFI_TARGET := --output-target=efi-app-x86_64 + else ifeq ($(HOST_ARCH),$(HOST_ARCH_X86)) + EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_ia32_efi.lds +-EFI_TARGET := --target=efi-app-ia32 ++EFI_TARGET := --output-target=efi-app-ia32 + else ifeq ($(HOST_ARCH),$(HOST_ARCH_AARCH64)) + EFI_LDS := ${SRCDIR}/../../../arch/arm/lib/elf_aarch64_efi.lds + OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \ +diff --git a/arch/x86/config.mk b/arch/x86/config.mk +index 2e3a7119e79..329632164f7 100644 +--- a/arch/x86/config.mk ++++ b/arch/x86/config.mk +@@ -127,7 +127,7 @@ endif + endif + + ifdef CONFIG_X86_64 +-EFI_TARGET := --target=efi-app-x86_64 ++EFI_TARGET := --output-target=efi-app-x86_64 + else +-EFI_TARGET := --target=efi-app-ia32 ++EFI_TARGET := --output-target=efi-app-ia32 + endif +-- +2.47.3 + |