From 4d49d9c04c490a85962d4d530c59793609940a76 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 28 Aug 2020 15:38:23 +0200 Subject: Remove arch=msp430fr5994lp-256k, use arch=msp430fr5994lp large_mode=1 instead --- src/arch/msp430fr5994lp/Kconfig | 3 +++ src/arch/msp430fr5994lp/Makefile.inc | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/arch/msp430fr5994lp') diff --git a/src/arch/msp430fr5994lp/Kconfig b/src/arch/msp430fr5994lp/Kconfig index 8831867..d5ff7b8 100644 --- a/src/arch/msp430fr5994lp/Kconfig +++ b/src/arch/msp430fr5994lp/Kconfig @@ -29,3 +29,6 @@ select meta_driver_timer config arch_msp430fr5994lp_driver_uptime bool "Uptime Counter" select meta_driver_uptime + +config arch_msp430fr5994lp_large_mode +bool "Large Memory Model (20bit pointers, 256kB FRAM)" diff --git a/src/arch/msp430fr5994lp/Makefile.inc b/src/arch/msp430fr5994lp/Makefile.inc index 0d2df46..9446aeb 100644 --- a/src/arch/msp430fr5994lp/Makefile.inc +++ b/src/arch/msp430fr5994lp/Makefile.inc @@ -14,6 +14,9 @@ INCLUDES += -I/opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/include COMMON_FLAGS += -mcpu=${CPU} -mmcu=${MCU} -DMULTIPASS_ARCH_msp430fr5994lp COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C +ifdef CONFIG_arch_msp430fr5994lp_large_mode + override msp430_large = 1 +endif ifneq (${msp430_large}, ) COMMON_FLAGS += -mcode-region=either -mlarge -DADDR_20BIT -include int20.h endif @@ -36,7 +39,7 @@ ifeq (${aspectc}, 1) ifeq (${msp430_large}, ) CXX = ag++ -r build/repo.acp -v 0 --c_compiler /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-g++ -p . --Xcompiler else - CXX = ag++ -r build/repo.acp -v 0 --c_compiler /home/derf/var/projects/multipass/src/arch/msp430fr5994lp-256k/g++wrap -p . --Xcompiler + CXX = ag++ -r build/repo.acp -v 0 --c_compiler script/g++wrap -p . --Xcompiler endif endif -- cgit v1.2.3