From 8b8e334160d9041dee57671869b1bc1f5959fdc7 Mon Sep 17 00:00:00 2001
From: zhangjin1996 <1561494530@qq.com>
Date: Mon, 30 Jun 2025 22:25:33 +0800
Subject: [PATCH] fix conflict

---
 Ubiquitous/XiZi_IIoT/Makefile | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 Ubiquitous/XiZi_IIoT/Makefile

diff --git a/Ubiquitous/XiZi_IIoT/Makefile b/Ubiquitous/XiZi_IIoT/Makefile
old mode 100755
new mode 100644
index c20451f80..d0b1cc736
--- a/Ubiquitous/XiZi_IIoT/Makefile
+++ b/Ubiquitous/XiZi_IIoT/Makefile
@@ -4,12 +4,8 @@ MAKEFLAGS += --no-print-directory
 .PHONY:all clean distclean show_info  menuconfig
 .PHONY:COMPILE_APP COMPILE_KERNEL
 
-
-riscv_support := kd233 maix-go hifive1-rev-B gapuino gd32vf103-rvstar rv32m1-vega aiit-riscv64-board xidatong-riscv64 edu-riscv64 ch32v307vct6 ch32v208rbt6 ch569w
-arm_support += stm32f407-st-discovery stm32f407zgt6 stm32f103-nano nuvoton-m2354 ok1052-c imxrt1176-sbc aiit-arm32-board xidatong-arm32 xiwangtong-arm32 edu-arm32 xishutong-arm32 rzv2l-m33 rzg2ul-m33 imx8mp
-emulator_support += hifive1-emulator k210-emulator cortex-m0-emulator cortex-m3-emulator cortex-m4-emulator cortex-m7-emulator
-
-support := $(riscv_support) $(arm_support) $(emulator_support) 
+# search all board support packages
+support := $(shell find board/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
 SRC_DIR :=
 
 export BOARD ?=kd233
@@ -19,10 +15,7 @@ export KCONFIG_CONFIG ?= .config
 ifeq ($(filter $(BOARD),$(support)),)
 $(warning "You should choose board like this:make BOARD=kd233")
 $(warning "This is what we support:")
-$(warning "RISCV EVB:    $(riscv_support)")
-$(warning "ARM EVB:      $(arm_support)")
-$(warning "EMULATORS:    $(emulator_support)")
-# $(warning "$(support)")
+$(warning "BOARD:  $(support)")
 $(error "break" )
 endif