From 8ea9c11a1a8a563c950cd149191ca9f8955aed56 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 17 Mar 2025 18:40:23 +0100 Subject: [PATCH] boot/xilinx-embeddedsw: fix menuconfig visualization Due to how menuconfig works, a 'comment' entry following a 'config' entry prevents correct indentation of items depending on the 'config' entry. xilinx-embeddedsw currently shows as: [*] xilinx-embeddedsw *** xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-xilinx-elf *** (xilinx_v2024.2) xilinx-embeddedsw version (NEW) [ ] versal plm (NEW) [ ] versal psmfw (NEW) [ ] zynqmp pmufw (NEW) [ ] xilinx-prebuilt So the 'versal *' and 'zynqmp pmufw' items are not indented even though they should be. Do like most other Config.in files which have the 'comment' before the 'config' entry, makeing it render as expected: *** xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-xilinx-elf *** [*] xilinx-embeddedsw (xilinx_v2024.2) xilinx-embeddedsw version (NEW) [ ] versal plm (NEW) [ ] versal psmfw (NEW) [ ] zynqmp pmufw (NEW) [ ] xilinx-prebuilt Signed-off-by: Luca Ceresoli Reviewed-by: Neal Frager Signed-off-by: Julien Olivain (cherry picked from commit 088808ccc74323dc78439c6980e9760b5be1dee2) --- boot/xilinx-embeddedsw/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/xilinx-embeddedsw/Config.in b/boot/xilinx-embeddedsw/Config.in index b0691d7e7b..007b24e668 100644 --- a/boot/xilinx-embeddedsw/Config.in +++ b/boot/xilinx-embeddedsw/Config.in @@ -1,3 +1,6 @@ +comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-xilinx-elf" + depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-xilinx-elf" + config BR2_TARGET_XILINX_EMBEDDEDSW bool "xilinx-embeddedsw" depends on BR2_aarch64 @@ -14,9 +17,6 @@ config BR2_TARGET_XILINX_EMBEDDEDSW Applications can be found on the Xilinx embeddedsw repo: https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps -comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-xilinx-elf" - depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-xilinx-elf" - if BR2_TARGET_XILINX_EMBEDDEDSW config BR2_TARGET_XILINX_EMBEDDEDSW_VERSION