From fc5583d230f8e6efa2a548fde6b2a888aee783ca Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Fri, 3 Jan 2025 16:21:34 -0800 Subject: [PATCH] Update linux makefile to use br2 external tree --- linux/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 1a6a25a98..9f07474bb 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -4,7 +4,6 @@ WALLY := $(shell dirname $(shell pwd)) WALLYLINUX := $(shell pwd) DIS := ${IMAGES}/disassembly BRPACKAGES := $(WALLYLINUX)/buildroot-packages -BR2023 := $(WALLYLINUX)/buildroot-config-src/buildroot-2023.05.1 # set sudo if needed depending on $RISCV ifeq ($(shell mkdir -p $(RISCV)/.test > /dev/null 2>&1 ; echo $$?), 0) @@ -14,8 +13,7 @@ else endif # Buildroot Config Stuff -WALLYBOARDSRC := $(WALLYLINUX)/buildroot-config-src/wally -WALLYBOARD := $(BUILDROOT)/board/wally +BR2_EXTERNAL_TREE := $(WALLYLINUX)/br2-external-tree # Device tree files DTS ?= $(shell find devicetree -type f -regex ".*\.dts" | sort) @@ -105,15 +103,10 @@ $(IMAGES)/busybox: cp $$busyboxDir/busybox $@ ;\ # Generating new Buildroot directories -------------------------------- -download: $(WALLYBOARD) - cd $(BUILDROOT) && make wally_defconfig +download: $(BUILDROOT) + cd $(BUILDROOT) && make wally_defconfig BR2_EXTERNAL=$(BR2_EXTERNAL_TREE) @echo "Buildroot successfully download." -# CONFIG DEPENDENCIES 2023.05.1 --------------------------------------- -$(WALLYBOARD): $(BUILDROOT) - cp -r $(WALLYBOARDSRC) $(BUILDROOT)/board - cp $(WALLYBOARDSRC)/wally_defconfig $(BUILDROOT)/configs/wally_defconfig - $(BUILDROOT): git clone https://github.com/buildroot/buildroot.git $@ cd $@; git checkout 2023.05.x