diff --git a/makefile b/makefile index 0ab9e8d7dad0b31060572a4d2771cc51a827fc11..54c381488b048652c16890c42c2c96bb1d5e5e36 100644 --- a/makefile +++ b/makefile @@ -9,7 +9,7 @@ # # Copyright (C) 2021-3, SoC Labs (www.soclabs.org) #----------------------------------------------------------------------------- -include $(SOCLABS_NANOSOC_TECH_DIR)/nanosoc.config +include $(SOCLABS_PROJECT_DIR)/nanosoc.config #------------------------------------- # - Commonly Overloaded Variables diff --git a/nanosoc.config b/nanosoc.config deleted file mode 100644 index f28efadd92ac416f19f9bc71385c8654d91d2ad0..0000000000000000000000000000000000000000 --- a/nanosoc.config +++ /dev/null @@ -1,31 +0,0 @@ -#----------------------------------------------------------------------------- -# NanoSoC Configuration file -# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license. -# -# Copyright (C) 2021-3, SoC Labs (www.soclabs.org) -#----------------------------------------------------------------------------- - -#### IP Configuration -# !!EDIT this to point to the relevant logical directories of IP -ARM_CORSTONE_101_DIR ?= $(ARM_IP_LIBRARY_PATH)/latest/Corstone-101/logical -ARM_CORTEX_M0_DIR ?= $(ARM_IP_LIBRARY_PATH)/latest/Cortex-M0/logical - -# DMA_xxx_INCLUDE (yes or leave blank) -DMA_0_PL230_INCLUDE := yes -DMA_1_PL230_INCLUDE := -DMA_DMA350_INCLUDE := - -# DMA 350 options set to yes for one of them -# !! MAKE sure you run the correct configuration in the SLDMA350 directory -# Small configuration of DMA, 2 channels, no stream interface, no extended features -# Default configuration of DMA, 2 channels, stream interface, extended features -# Big configuration of DMA, 3 channels, stream interface, extended features -DMA350_SMALL := -DMA350_DEFAULT := -DMA350_BIG := - -# ADC Include (yes or leave blank) -ADC_0_INCLUDE:= -ADC_1_INCLUDE:= -ADC_2_INCLUDE:= -ADC_3_INCLUDE:= \ No newline at end of file diff --git a/nanosoc/sldma350_tech b/nanosoc/sldma350_tech index a69e001167fc5d075728988e2ca1c047e66f3c14..a188b6d7dd75c849bf37dc5447a110e73061fbfb 160000 --- a/nanosoc/sldma350_tech +++ b/nanosoc/sldma350_tech @@ -1 +1 @@ -Subproject commit a69e001167fc5d075728988e2ca1c047e66f3c14 +Subproject commit a188b6d7dd75c849bf37dc5447a110e73061fbfb