fix conflict
This commit is contained in:
parent
32b253d3c3
commit
8b8e334160
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue