From 053b0c9f66d89c9290fbef689fb049289952506c Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 19 May 2025 20:38:18 +0100 Subject: [PATCH] boot/xilinx-embeddedsw: remove support for xilinx vendor name This patch removes the support for the microblazeel-xilinx-elf arch tuple. Users will now get an error message telling them to change their configuration to the microblazeel-buildroot-elf arch tuple. Signed-off-by: Neal Frager Signed-off-by: Julien Olivain --- boot/xilinx-embeddedsw/Config.in | 1 - boot/xilinx-embeddedsw/xilinx-embeddedsw.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/boot/xilinx-embeddedsw/Config.in b/boot/xilinx-embeddedsw/Config.in index 31b12baaf2..98d39331fe 100644 --- a/boot/xilinx-embeddedsw/Config.in +++ b/boot/xilinx-embeddedsw/Config.in @@ -1,6 +1,5 @@ comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-buildroot-elf" depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-buildroot-elf" - depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-xilinx-elf" menuconfig BR2_TARGET_XILINX_EMBEDDEDSW bool "xilinx-embeddedsw" diff --git a/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk b/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk index 03acb153d1..abcfee255d 100644 --- a/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk +++ b/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk @@ -20,7 +20,7 @@ XILINX_EMBEDDEDSW_MICROBLAZE_AR = $(XILINX_EMBEDDEDSW_MICROBLAZE_CC)-ar ifeq ($(basename $(notdir $(XILINX_EMBEDDEDSW_MICROBLAZE_CC))),microblazeel-xilinx-elf-gcc) $(warning microblazeel-xilinx-elf in BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is not supported anymore!) -$(warning Replace microblazeel-xilinx-elf with microblazeel-buildroot-elf in BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH) +$(error Replace microblazeel-xilinx-elf with microblazeel-buildroot-elf in BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH) endif # ZYNQMP_PMUFW application allows users to add cflags