Merge pull request IObundle#133 from JDLopes/build-lib

fix setup and clean targets for build-dir
jjts · Sep 2, 2022 · d0d2db3 · d0d2db3
2 parents 70a9d61 + 802b36d
commit d0d2db3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/config_setup.mk b/config_setup.mk
@@ -3,5 +3,5 @@ SETUP_SIM=1
 SETUP_FPGA=0
 SETUP_DOC=0
 
-# path to core from LIB
-UART_DIR=../..
+# path to core
+UART_DIR=.
diff --git a/hardware/hardware.mk b/hardware/hardware.mk
@@ -11,6 +11,7 @@ ifeq ($(filter UART, $(HW_MODULES)),)
 HW_MODULES+=UART
 
 #import lib hardware
+include $(LIB_DIR)/hardware/include/hardware.mk
 include $(LIB_DIR)/hardware/iob_reg/hardware.mk
 
 UART_INC_DIR:=$(UART_DIR)/hardware/include

diff --git a/software/software.mk b/software/software.mk
@@ -24,7 +24,7 @@ $(BUILD_SW_SRC_DIR)/iob_uart_swreg_emb.c: iob_uart_swreg_emb.c
 	cp $< $@
 
 iob_uart_swreg.h iob_uart_swreg_emb.c: $(UART_DIR)/mkregs.conf
-	./software/python/mkregs.py $(NAME) $(UART_DIR) SW
+	$(LIB_DIR)/software/python/mkregs.py $(NAME) $(UART_DIR) SW
 
 # PC emul sources
 SRC+=$(BUILD_SW_SRC_DIR)/iob_uart_swreg_pc_emul.c

diff --git a/submodules/LIB b/submodules/LIB