Move platform-dependent tinysys settings to variant.mk
Bug: 270514777
Test: Compile tinysys
Change-Id: Ia232f93726a7ecf7ec2257988088c7b0aba72932
diff --git a/build/variant/aosp_riscv_tinysys.mk b/build/variant/aosp_riscv_tinysys.mk
index 206a191..00bbb32 100644
--- a/build/variant/aosp_riscv_tinysys.mk
+++ b/build/variant/aosp_riscv_tinysys.mk
@@ -24,12 +24,6 @@
# Macros #######################################################################
-# tinysys
-TARGET_CFLAGS += -D__riscv
-TARGET_CFLAGS += -DP_MODE_0
-TARGET_CFLAGS += -DMRV55
-TARGET_CFLAGS += -D_LIBCPP_HAS_NO_LONG_LONG
-TARGET_CFLAGS += -DCFG_AMP_CORE1_EN
# Word size for this architecture
TARGET_CFLAGS += -DCHRE_32_BIT_WORD_SIZE
@@ -37,7 +31,6 @@
TARGET_CFLAGS += -DCHRE_FIRST_SUPPORTED_API_VERSION=CHRE_API_VERSION_1_7
# TODO(b/254121302): Needs to confirm with MTK about the max message size below
TARGET_CFLAGS += -DCHRE_MESSAGE_TO_HOST_MAX_SIZE=4096
-TARGET_CFLAGS += -DCHRE_FREERTOS_TASK_PRIORITY=2
# TODO(b/255828039): Enabling buffered logging incurs linking error
# TARGET_CFLAGS += -DCHRE_USE_BUFFERED_LOGGING
# TODO(b/256870101): create mutex on heap for now
@@ -64,10 +57,6 @@
TARGET_CFLAGS += $(DSO_SUPPORT_LIB_CFLAGS)
endif
-TARGET_CFLAGS += --target=riscv32-unknown-elf
-TARGET_CFLAGS += -march=rv32imafcv
-TARGET_CFLAGS += -mcpu=MRV55E03
-
# Other makefiles ##############################################################
include $(CHRE_PREFIX)/build/arch/riscv.mk
diff --git a/platform/platform.mk b/platform/platform.mk
index be03ada..3b4a906 100644
--- a/platform/platform.mk
+++ b/platform/platform.mk
@@ -516,28 +516,6 @@
TINYSYS_CFLAGS += -I$(CHRE_PREFIX)/platform/freertos/include
TINYSYS_CFLAGS += -I$(CHRE_PREFIX)/platform/shared/include/chre/platform/shared/libc
-# Tinysys include paths
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/kernel/FreeRTOS_v10.1.0.1/FreeRTOS/Source/include
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/kernel/FreeRTOS_v10.1.0.1/FreeRTOS/Source/portable/LLVM/RV55
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/drivers/dma/v3/inc
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/drivers/irq/v3/inc
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/drivers/mbox/v2/inc
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/include
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/middleware/MemMang/inc
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/RV55_A/$(TINYSYS_PLATFORM)/dma
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/RV55_A/$(TINYSYS_PLATFORM)/intc/inc
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/RV55_A/$(TINYSYS_PLATFORM)/mbox
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/common/dma/inc
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/common/dram_region_mgmt
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/common/xgpt/inc
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/middleware/sensorhub/include
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/project/RV55_A/$(TINYSYS_PLATFORM)/platform/inc
-TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/project/RV55_A/common/platform/inc
-
-# Clang include paths
-TINYSYS_CFLAGS += -I$(RISCV_TOOLCHAIN_PATH)/lib/clang/9.0.1/include
-TINYSYS_CFLAGS += -I$(RISCV_TOOLCHAIN_PATH)/dkwlib/MRV55E03v/include
-
TINYSYS_CFLAGS += $(FLATBUFFERS_CFLAGS)
TINYSYS_CFLAGS += -DCFG_DRAM_HEAP_SUPPORT
diff --git a/variant/tinysys/variant.mk b/variant/tinysys/variant.mk
index 2d1ba89..59e6f7c 100644
--- a/variant/tinysys/variant.mk
+++ b/variant/tinysys/variant.mk
@@ -16,6 +16,44 @@
COMMON_CFLAGS += -DCHRE_VERSION_STRING="\"chre=tinysys@$(COMMIT_HASH)\""
+# Platform-specific Settings ###################################################
+
+TINYSYS_CFLAGS += -D__riscv
+TINYSYS_CFLAGS += -DP_MODE_0
+TINYSYS_CFLAGS += -DMRV55
+TINYSYS_CFLAGS += -D_LIBCPP_HAS_NO_LONG_LONG
+TINYSYS_CFLAGS += -DCFG_AMP_CORE1_EN
+
+TINYSYS_CFLAGS += --target=riscv32-unknown-elf
+TINYSYS_CFLAGS += -march=rv32imafcv
+TINYSYS_CFLAGS += -mcpu=MRV55E03
+
+TINYSYS_CFLAGS += -DCHRE_FREERTOS_TASK_PRIORITY=2
+
+# Platform-specific Includes ###################################################
+
+# Tinysys include paths
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/kernel/FreeRTOS_v10.1.0.1/FreeRTOS/Source/include
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/kernel/FreeRTOS_v10.1.0.1/FreeRTOS/Source/portable/LLVM/RV55
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/drivers/dma/v3/inc
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/drivers/irq/v3/inc
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/drivers/mbox/v2/inc
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/include
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/common/middleware/MemMang/inc
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/RV55_A/$(TINYSYS_PLATFORM)/dma
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/RV55_A/$(TINYSYS_PLATFORM)/intc/inc
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/RV55_A/$(TINYSYS_PLATFORM)/mbox
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/common/dma/inc
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/common/dram_region_mgmt
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/drivers/common/xgpt/inc
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/middleware/sensorhub/include
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/project/RV55_A/$(TINYSYS_PLATFORM)/platform/inc
+TINYSYS_CFLAGS += -I$(RISCV_TINYSYS_PREFIX)/scp/project/RV55_A/common/platform/inc
+
+# Clang include paths
+TINYSYS_CFLAGS += -I$(RISCV_TOOLCHAIN_PATH)/lib/clang/9.0.1/include
+TINYSYS_CFLAGS += -I$(RISCV_TOOLCHAIN_PATH)/dkwlib/MRV55E03v/include
+
# Common Compiler Flags ########################################################
# Supply a symbol to indicate that the build variant supplies the static
