Compare commits

...
2 Commits
3 changed files with 26 additions and 20 deletions
+12 -12
View File
@@ -30,16 +30,16 @@ else
endif
ifndef PROJECT
$(error "PROJECT variable needs to be set")
@$(error "PROJECT variable needs to be set")
endif
ifndef PLATFORM
$(error "PLATFORM variable needs to be set")
@$(error "PLATFORM variable needs to be set")
endif
ifndef BUILD_DIR
$(error "BUILD_DIR variable needs to be set")
@$(error "BUILD_DIR variable needs to be set")
endif
ifndef CONFIG_FILE
$(error "CONFIG_FILE variable needs to be set")
@$(error "CONFIG_FILE variable needs to be set")
endif
ifndef SCRIPT_DIR
CURRENT_FILE := $(lastword $(MAKEFILE_LIST))
@@ -66,15 +66,15 @@ endif
PHONY += all
ifneq ($(wildcard $(BUILD_LOCK)),)
all:
$(call print_build_type,$(PLATFORM))
@$(call print_build_type,$(PLATFORM))
$(MAKE) --no-print-directory build
$(call print,Done ($(notdir $(BUILD_DIR))))
@$(call print,Done ($(notdir $(BUILD_DIR))))
else
all:
$(call print_build_type,$(PLATFORM))
@$(call print_build_type,$(PLATFORM))
$(MAKE) --no-print-directory project
$(MAKE) --no-print-directory build
$(call print,Done ($(notdir $(BUILD_DIR))))
@$(call print,Done ($(notdir $(BUILD_DIR))))
endif
project: $(PLATFORM)_project
@@ -93,18 +93,18 @@ sdkopen: $(PLATFORM)_sdkopen
PHONY += clean
ifneq ($(wildcard $(BUILD_LOCK)),)
clean:
$(call print,Cleaning sdk build uploaded to board)
@$(call print,Cleaning sdk build uploaded to board)
$(MAKE) --no-print-directory $(PLATFORM)_sdkclean
else
clean:
$(call print,No project found, cleaning dummy files)
@$(call print,No project found, cleaning dummy files)
$(MAKE) --no-print-directory reset
endif
# Remove the whole build directory
PHONY += reset
reset: $(PLATFORM)_reset
$(call print,[Delete] $(BUILD_DIR))
$(call remove_dir,$(BUILD_DIR))
@$(call print,[Delete] $(BUILD_DIR))
@$(call remove_dir,$(BUILD_DIR))
.PHONY: $(PHONY)
+8
View File
@@ -268,6 +268,13 @@ proc _create_app {app_name app_config platform_name is_vitis} {
# Configure BSP/Domain for application
if {[dict exists $app_config bsp] && [dict get $app_config bsp] ne ""} {
set bsp_name [dict get $app_config bsp]
if {![dict exists $::config bsps]} {
_error "BSP configuration missing" "The 'bsps' section is not found in the configuration."
} elseif {![dict exists [dict get $::config bsps] $bsp_name]} {
_error "BSP configuration missing" "No configuration found for BSP '$bsp_name' in the 'bsps' section."
} else {
_info "Configuring BSP '$bsp_name' for application '$app_name'."
}
} else {
set bsp_config [dict create]
set bsp_config [dict set bsp_config target_cpu $cpu]
@@ -280,6 +287,7 @@ proc _create_app {app_name app_config platform_name is_vitis} {
set bsp_cfg [dict get $app_config bsp_config]
set bsp_config [dict merge $bsp_config [dict create config $bsp_cfg]]
}
_info "Creating BSP $bsp_name for Application $app_name ..."
_configure_bsp $bsp_name $bsp_config $platform_name $is_vitis
}
+6 -8
View File
@@ -8,7 +8,7 @@ define tcl_util
endef
xilinx_sdkopen:
$(call print,Launching IDE...)
@$(call print,Launching IDE...)
@if [ "$(call check_command,vitis)" = "y" ]; then \
if [ "$(XILINX_VITIS_CLASSIC)" = "y" ]; then \
vitis -classic -workspace=$(BUILD_DIR); \
@@ -23,20 +23,18 @@ xilinx_sdkopen:
PHONY += xilinx_sdkbuild
xilinx_sdkbuild:
$(call print,[Build] SDK projects in $(BUILD_DIR))
@$(call print,[Build] SDK projects in $(BUILD_DIR))
$(call tcl_util, build) $(HIDE)
PHONY += xilinx_sdkclean
xilinx_sdkclean:
$(call print,[Delete] SDK artefacts from $(BUILD_DIR))
@$(call print,[Delete] SDK artefacts from $(BUILD_DIR))
$(call tcl_util, clean_project) $(HIDE)
xilinx_project:
@$(call print,Creating and configuring the IDE project)
$(call mk_dir,$(BUILD_DIR))
$(call print,Creating and configuring the IDE project)
$(call tcl_util, create_project) $(HIDE)
xilinx_reset: xilinx_clean_all
xilinx_clean_all:
$(call remove_dir,.Xil) $(HIDE)
xilinx_reset:
$(call remove_dir,.Xil) $(HIDE)