[Buildroot] [PATCH v2 1/1] package/bootgen: bump to xilinx_v2026.1

[Buildroot] [PATCH v2 1/1] package/bootgen: bump to xilinx_v2026.1

[Neal Frager via buildroot]

Bump bootgen to xilinx_v2026.1 release.

The following patches are now included and can be removed:
0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch
0002-flexlexer-use-embedded-win_include-flexlexer.h.patch

bootgen xilinx_v2026.1 now requires C++ version 14, so the build command has
been updated to reflect this.

Add dependency on BR2_TOOLCHAIN_GCC_AT_LEAST_5 as gcc v5 is needed for C++
version 14 support.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V1->V2:
- add dependency on BR2_TOOLCHAIN_GCC_AT_LEAST_5 as gcc v5 is needed for C++
  version 14 support
---
 ...sigs-hss_param.c-add-stdio.h-include.patch | 51 -------------
 ...use-embedded-win_include-flexlexer.h.patch | 76 -------------------
 package/bootgen/Config.in.host                |  4 +
 package/bootgen/bootgen.hash                  |  2 +-
 package/bootgen/bootgen.mk                    |  4 +-
 5 files changed, 7 insertions(+), 130 deletions(-)
 delete mode 100644 package/bootgen/0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch
 delete mode 100644 package/bootgen/0002-flexlexer-use-embedded-win_include-flexlexer.h.patch

diff --git a/package/bootgen/0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch b/package/bootgen/0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch
deleted file mode 100644
index 738887e26b..0000000000
--- a/package/bootgen/0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1675ec9d76b32400f612b1c542be6dbf77dea986 Mon Sep 17 00:00:00 2001
-From: Neal Frager <neal.frager@amd.com>
-Date: Tue, 25 Nov 2025 12:54:48 +0000
-Subject: [PATCH] lms-hash-sigs/hss_param.c: add stdio.h include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The lms-hash-sigs/hss_param.c is missing an include of stdio.h. Without it,
-the following build error can occur:
-
-hss_param.c: In function ‘hss_get_parameter_set’:
-hss_param.c:157:13: error: implicit declaration of function ‘printf’ [-Wimplicit-function-declaration]
-  157 |             printf("Private key expired\n");
-      |             ^~~~~~
-hss_param.c:7:1: note: include ‘<stdio.h>’ or provide a declaration of ‘printf’
-    6 | #include "lm_common.h"
-  +++ |+#include <stdio.h>
-    7 |
-hss_param.c:157:13: warning: incompatible implicit declaration of built-in function ‘printf’ [-Wbuiltin-declaration-mismatch]
-  157 |             printf("Private key expired\n");
-      |             ^~~~~~
-hss_param.c:157:13: note: include ‘<stdio.h>’ or provide a declaration of ‘printf’
-make[3]: *** [Makefile:38: hss_param.o] Error 1
-make[3]: *** Waiting for unfinished jobs....
-make[2]: *** [Makefile:84: build/bin/bootgen] Error 2
-
-The above error was reported on Debian 13 / gcc 14.2.0.
-
-Reported-by: Peter Korsgaard <peter@korsgaard.com>
-Signed-off-by: Neal Frager <neal.frager@amd.com>
-Upstream: submitted to Xilinx bootgen repo with CR-1256741
----
- lms-hash-sigs/hss_param.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lms-hash-sigs/hss_param.c b/lms-hash-sigs/hss_param.c
-index 7a2abd6..6b2b950 100755
---- a/lms-hash-sigs/hss_param.c
-+++ b/lms-hash-sigs/hss_param.c
-@@ -4,6 +4,7 @@
- #include "endian.h"
- #include "hss_zeroize.h"
- #include "lm_common.h"
-+#include <stdio.h>
- 
- static struct map_structure {
-     param_set_t public;
--- 
-2.25.1
-
diff --git a/package/bootgen/0002-flexlexer-use-embedded-win_include-flexlexer.h.patch b/package/bootgen/0002-flexlexer-use-embedded-win_include-flexlexer.h.patch
deleted file mode 100644
index 1de9a91223..0000000000
--- a/package/bootgen/0002-flexlexer-use-embedded-win_include-flexlexer.h.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From dfe45e10791a171c3c79699257d3d3a978ec30eb Mon Sep 17 00:00:00 2001
-From: Neal Frager <neal.frager@amd.com>
-Date: Wed, 18 Mar 2026 09:51:58 +0000
-Subject: [PATCH] flexlexer: use embedded win_include/flexlexer.h
-
-bootgen embeds an old version of flex. If the host machine has a newer version
-of flex, the bootgen binary that is built will have errors such as the
-following, if the wrong version of flexlexer.h is used.
-
-$ output/host/bin/bootgen
-
-****** Bootgen v2025.1-Merged
-  **** Build date : Mar 18 2026-07:08:01
-    ** Copyright 1986-2022 Xilinx, Inc. All Rights Reserved.
-    ** Copyright 2022-2025 Advanced Micro Devices, Inc. All Rights Reserved.
-
-ERROR: syntax error
--h
-
-Running the bootgen binary should print the help menu by default and should
-not have a syntax error.
-
-Correct the path to the flexlexer.h header files, such that no host version
-of these files can cause a silent build failure.
-
-Upstream: CR to AMD jira
-
-Signed-off-by: Neal Frager <neal.frager@amd.com>
----
- common/include/bifscanner.h        | 2 +-
- common/include/cmdoptionsscanner.h | 2 +-
- common/include/reginitscanner.h    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/include/bifscanner.h b/common/include/bifscanner.h
-index 9683416..9aa72a5 100755
---- a/common/include/bifscanner.h
-+++ b/common/include/bifscanner.h
-@@ -29,7 +29,7 @@
- #if ! defined(yyFlexLexerOnce)
- #undef yyFlexLexer
- #define yyFlexLexer bifFlexLexer
--#include "FlexLexer.h"
-+#include "../../win_include/FlexLexer.h"
- #endif
- 
- // Override the interface for yylex since we namespaced it
-diff --git a/common/include/cmdoptionsscanner.h b/common/include/cmdoptionsscanner.h
-index aa2f474..78fa7cf 100755
---- a/common/include/cmdoptionsscanner.h
-+++ b/common/include/cmdoptionsscanner.h
-@@ -30,7 +30,7 @@
- 
- #undef yyFlexLexer
- #define yyFlexLexer reginitFlexLexer
--#include "FlexLexer.h"
-+#include "../../win_include/FlexLexer.h"
- #endif
- 
- // Override the interface for yylex since we namespaced it
-diff --git a/common/include/reginitscanner.h b/common/include/reginitscanner.h
-index 74463e6..d8152a6 100755
---- a/common/include/reginitscanner.h
-+++ b/common/include/reginitscanner.h
-@@ -30,7 +30,7 @@
- 
- #undef yyFlexLexer
- #define yyFlexLexer reginitFlexLexer
--#include "FlexLexer.h"
-+#include "../../win_include/FlexLexer.h"
- #endif
- 
- // Override the interface for yylex since we namespaced it
--- 
-2.25.1
-
diff --git a/package/bootgen/Config.in.host b/package/bootgen/Config.in.host
index 0acb58dee0..151d6ae0a2 100644
--- a/package/bootgen/Config.in.host
+++ b/package/bootgen/Config.in.host
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HOST_BOOTGEN
 	bool "host bootgen"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14
 	help
 	  bootgen is a tool to generate a boot.bin firmware
 	  for Xilinx versal, zynqmp and zynq product families.
@@ -8,3 +9,6 @@ config BR2_PACKAGE_HOST_BOOTGEN
 	  what is included with u-boot mkimage.
 
 	  https://github.com/Xilinx/bootgen
+
+comment "host-bootgen needs a host gcc >= 5"
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5
diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash
index 995074c591..007cecfa45 100644
--- a/package/bootgen/bootgen.hash
+++ b/package/bootgen/bootgen.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  c92d9be48fabc943c4addd9b12beced6671f5547b4f6dc01e7ccf0f274dbef66  bootgen-xilinx_v2025.2.tar.gz
+sha256  23529d4922efd79d201d6b4a3cdaefe5cc9384b55dd56ef916a56f2a0ed7340c  bootgen-xilinx_v2026.1.tar.gz
 sha256  36e278ff2cc9ef95154a923bf4a9450414f358779045ae4f863c8d77fb18dbdb  LICENSE
diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk
index e5cfee18d9..2e14c625fa 100644
--- a/package/bootgen/bootgen.mk
+++ b/package/bootgen/bootgen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BOOTGEN_VERSION = xilinx_v2025.2
+BOOTGEN_VERSION = xilinx_v2026.1
 BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION))
 HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf
 BOOTGEN_LICENSE = Apache-2.0
@@ -14,7 +14,7 @@ define HOST_BOOTGEN_BUILD_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) \
 		LIBS="`$(HOST_MAKE_ENV) $(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" \
 		INCLUDE_USER="`$(HOST_MAKE_ENV) $(PKG_CONFIG_HOST_BINARY) --cflags libssl libcrypto`" \
-		CXXFLAGS="$(HOST_CXXFLAGS) -std=c++0x" \
+		CXXFLAGS="$(HOST_CXXFLAGS) -std=c++14" \
 		-C $(@D)
 endef
 
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/bootgen: bump to xilinx_v2026.1

[Baruch Siach]

Hi Neal,

On Wed, Jun 17 2026, Neal Frager via buildroot wrote:
> Bump bootgen to xilinx_v2026.1 release.
>
> The following patches are now included and can be removed:
> 0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch
> 0002-flexlexer-use-embedded-win_include-flexlexer.h.patch
>
> bootgen xilinx_v2026.1 now requires C++ version 14, so the build command has
> been updated to reflect this.
>
> Add dependency on BR2_TOOLCHAIN_GCC_AT_LEAST_5 as gcc v5 is needed for C++
> version 14 support.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> ---

[...]

> diff --git a/package/bootgen/Config.in.host b/package/bootgen/Config.in.host
> index 0acb58dee0..151d6ae0a2 100644
> --- a/package/bootgen/Config.in.host
> +++ b/package/bootgen/Config.in.host
> @@ -1,5 +1,6 @@
>  config BR2_PACKAGE_HOST_BOOTGEN
>  	bool "host bootgen"
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14

This is a host package. I think you need BR2_HOST_GCC_AT_LEAST_5 here.

>  	help
>  	  bootgen is a tool to generate a boot.bin firmware
>  	  for Xilinx versal, zynqmp and zynq product families.
> @@ -8,3 +9,6 @@ config BR2_PACKAGE_HOST_BOOTGEN
>  	  what is included with u-boot mkimage.
>  
>  	  https://github.com/Xilinx/bootgen
> +
> +comment "host-bootgen needs a host gcc >= 5"
> +	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5

Comment is not needed for host dependencies. See manual section 18.2.4
(Dependencies on target and toolchain options).

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/bootgen: bump to xilinx_v2026.1

[Frager, Neal via buildroot]

AMD General

Hi Baruch,

> Hi Neal,

> Bump bootgen to xilinx_v2026.1 release.
>
> The following patches are now included and can be removed:
> 0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch
> 0002-flexlexer-use-embedded-win_include-flexlexer.h.patch
>
> bootgen xilinx_v2026.1 now requires C++ version 14, so the build command has
> been updated to reflect this.
>
> Add dependency on BR2_TOOLCHAIN_GCC_AT_LEAST_5 as gcc v5 is needed for C++
> version 14 support.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> ---

> [...]

> diff --git a/package/bootgen/Config.in.host b/package/bootgen/Config.in.host
> index 0acb58dee0..151d6ae0a2 100644
> --- a/package/bootgen/Config.in.host
> +++ b/package/bootgen/Config.in.host
> @@ -1,5 +1,6 @@
>  config BR2_PACKAGE_HOST_BOOTGEN
>       bool "host bootgen"
> +     depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14

> This is a host package. I think you need BR2_HOST_GCC_AT_LEAST_5 here.

Yes, you are right. My mistake.

>       help
>         bootgen is a tool to generate a boot.bin firmware
>         for Xilinx versal, zynqmp and zynq product families.
> @@ -8,3 +9,6 @@ config BR2_PACKAGE_HOST_BOOTGEN
>         what is included with u-boot mkimage.
>
>         https://github.com/Xilinx/bootgen
> +
> +comment "host-bootgen needs a host gcc >= 5"
> +     depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5

> Comment is not needed for host dependencies. See manual section 18.2.4
> (Dependencies on target and toolchain options).

Ok. I will remove the comment.

Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot