From 90e0708012b9574f1cef4f02e77851a0c9077009 Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Tue, 21 Nov 2023 20:29:21 -0800 Subject: [PATCH] update devices_setup_test makefile --- sw/test_code/devices_setup_test/Makefile | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sw/test_code/devices_setup_test/Makefile b/sw/test_code/devices_setup_test/Makefile index 6d86205..8443644 100644 --- a/sw/test_code/devices_setup_test/Makefile +++ b/sw/test_code/devices_setup_test/Makefile @@ -5,25 +5,21 @@ LDFLAGS=-C link.ld -m $(NAME).map NAME=devices_setup_test -DEVICES=../../kernel/devices +DEVICES=$(REPO_TOP)/sw/kernel/devices BIN=$(NAME).bin HEX=$(NAME).hex LISTS=lists -KERNEL_SRCS=rtc.s interrupt_controller.s -# KERNEL_OBJS=$(patsubst %.s,%.o,$(filter %s,$(KERNEL_SRCS))) - -SRCS=$(wildcard *.s) $(wildcard *.c) +SRCS=$(wildcard *.s) $(wildcard *.c) +SRCS+=$(DEVICES)/rtc.s $(DEVICES)/interrupt_controller.s SRCS+=$(wildcard **/*.s) $(wildcard **/*.c) OBJS+=$(patsubst %.s,%.o,$(filter %s,$(SRCS))) OBJS+=$(patsubst %.c,%.o,$(filter %c,$(SRCS))) # Make sure the kernel linked to correct address, no relocation! -all: $(KERNEL_SRCS) $(HEX) - rm rtc.s - rm interrupt_controller.s +all: $(HEX) $(HEX): $(BIN) objcopy --input-target=binary --output-target=verilog $(BIN) $(HEX) @@ -40,15 +36,7 @@ $(BIN): $(OBJS) $(LISTS): mkdir -p $(addprefix $(LISTS)/,$(sort $(dir $(SRCS)))) -rtc.s: $(DEVICES)/rtc.s - cp $(DEVICES)/rtc.s . - -interrupt_controller.s: $(DEVICES)/interrupt_controller.s - cp $(DEVICES)/interrupt_controller.s . - .PHONY: clean clean: rm -rf $(OBJS) $(BIN) $(HEX) $(LISTS) $(NAME).map - rm -rf $(KERNEL_SRCS) - rm -rf $(KERNEL_OBJS)