mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-25 19:40:35 -09:00
Code Issues Packages Projects Releases Wiki Activity

boot/xilinx-embeddedsw: rename toolchain vendor to buildroot

Browse Source 
This patch renames the bare-metal toolchain vendor used by the
xilinx-embeddedsw package from Xilinx to Buildroot to be consistent with all
other toolchains built by Buildroot.

To build the Microblaze applications available with the xilinx-embeddedsw
package, the following config is now needed:

BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf"

This change keeps backwards compatibility for users already using the
following architecture tuple:

BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"

Either vendor name is now valid, but there is a warning message to use the
Buildroot vendor name, and the support for the "microblazeel-xilinx-elf"
tuple will be removed once all zynqmp and versal defconfigs have migrated.

Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Neal Frager
2025-05-19 20:38:15 +01:00
committed by Julien Olivain
parent 526522a021
commit 8ef4703687
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
boot/xilinx-embeddedsw/Config.in
View File

@@ -1,4 +1,5 @@
comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-xilinx-elf"
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

29
boot/xilinx-embeddedsw/xilinx-embeddedsw.mk
View File

@@ -12,6 +12,17 @@ XILINX_EMBEDDEDSW_INSTALL_TARGET = NO
XILINX_EMBEDDEDSW_INSTALL_IMAGES = YES
XILINX_EMBEDDEDSW_DEPENDENCIES = toolchain-bare-metal-buildroot
XILINX_EMBEDDEDSW_MICROBLAZE_CC = $(call qstrip, \
$(if $(wildcard $(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc), \
$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc, \
$(HOST_DIR)/bin/microblazeel-buildroot-elf-gcc))
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)
endif
# ZYNQMP_PMUFW application allows users to add cflags
XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS = \
$(call qstrip,$(BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS))
@@ -23,9 +34,9 @@ XILINX_EMBEDDEDSW_CFLAGS = "-Os -flto -ffat-lto-objects"
ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM),y)
define XILINX_EMBEDDEDSW_BUILD_VERSAL_PLM
$(MAKE) -C $(@D)/lib/sw_apps/versal_plm/src/versal \
COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \
CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \
ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \
CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \
CFLAGS=$(XILINX_EMBEDDEDSW_CFLAGS)
endef
@@ -38,9 +49,9 @@ endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM
ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW),y)
define XILINX_EMBEDDEDSW_BUILD_VERSAL_PSMFW
$(MAKE) -C $(@D)/lib/sw_apps/versal_psmfw/src/versal \
COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \
CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \
ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \
CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \
CFLAGS=$(XILINX_EMBEDDEDSW_CFLAGS)
endef
@@ -53,9 +64,9 @@ endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW
ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW),y)
define XILINX_EMBEDDEDSW_BUILD_ZYNQMP_PMUFW
$(MAKE) -C $(@D)/lib/sw_apps/zynqmp_pmufw/src \
COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \
CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \
ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \
CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \
CFLAGS=$(XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_CFLAGS)
endef