summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscript/g++wrap (renamed from src/arch/msp430fr5994lp-256k/g++wrap)2
-rw-r--r--src/arch/msp430fr5994lp-256k/Kconfig31
-rw-r--r--src/arch/msp430fr5994lp-256k/Makefile.inc5
l---------src/arch/msp430fr5994lp-256k/arch.cc1
l---------src/arch/msp430fr5994lp-256k/driver1
l---------src/arch/msp430fr5994lp-256k/model.py1
-rw-r--r--src/arch/msp430fr5994lp-256k/prompt1
-rw-r--r--src/arch/msp430fr5994lp/Kconfig3
-rw-r--r--src/arch/msp430fr5994lp/Makefile.inc5
9 files changed, 7 insertions, 43 deletions
diff --git a/src/arch/msp430fr5994lp-256k/g++wrap b/script/g++wrap
index df8c7ab..fd0e5d9 100755
--- a/src/arch/msp430fr5994lp-256k/g++wrap
+++ b/script/g++wrap
@@ -1,7 +1,5 @@
#!/bin/zsh
-echo "> $@"
-
for i in {1..$#}; do
if [[ $argv[$i] == *_agxx_* && -f $argv[$i] ]]; then
sed -i 's/inline void \* operator new (unsigned int,/inline void * operator new(__int20 unsigned,/' $argv[$i]
diff --git a/src/arch/msp430fr5994lp-256k/Kconfig b/src/arch/msp430fr5994lp-256k/Kconfig
deleted file mode 100644
index 750ed76..0000000
--- a/src/arch/msp430fr5994lp-256k/Kconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-config arch_msp430fr5994lp_256k_driver_adc
-bool "ADC (Analog-Digital-Converter)"
-select meta_driver_adc
-
-config arch_msp430fr5994lp_256k_driver_counter
-bool "Cycle Counter"
-select meta_driver_counter
-
-config arch_msp430fr5994lp_256k_driver_i2c
-bool "I2C on eUSCI_B1"
-select meta_driver_i2c
-
-config arch_msp430fr5994lp_256k_driver_spi_a1
-bool "SPI on eUSCI_A1"
-select meta_driver_spi
-
-config arch_msp430fr5994lp_256k_driver_spi_b
-bool "SPI on eUSCI_B1"
-select meta_driver_spi
-
-config arch_msp430fr5994lp_256k_driver_stdin
-bool "UART Input"
-select meta_driver_stdin
-
-config arch_msp430fr5994lp_256k_driver_timer
-bool "Timer with Interrupts"
-select meta_driver_timer
-
-config arch_msp430fr5994lp_256k_driver_uptime
-bool "Uptime Counter"
-select meta_driver_uptime
diff --git a/src/arch/msp430fr5994lp-256k/Makefile.inc b/src/arch/msp430fr5994lp-256k/Makefile.inc
deleted file mode 100644
index 894ae03..0000000
--- a/src/arch/msp430fr5994lp-256k/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# vim:ft=make
-
-msp430_large = 1
-
-include src/arch/msp430fr5994lp/Makefile.inc
diff --git a/src/arch/msp430fr5994lp-256k/arch.cc b/src/arch/msp430fr5994lp-256k/arch.cc
deleted file mode 120000
index ed08ee9..0000000
--- a/src/arch/msp430fr5994lp-256k/arch.cc
+++ /dev/null
@@ -1 +0,0 @@
-../msp430fr5994lp/arch.cc \ No newline at end of file
diff --git a/src/arch/msp430fr5994lp-256k/driver b/src/arch/msp430fr5994lp-256k/driver
deleted file mode 120000
index dbf9165..0000000
--- a/src/arch/msp430fr5994lp-256k/driver
+++ /dev/null
@@ -1 +0,0 @@
-../msp430fr5994lp/driver \ No newline at end of file
diff --git a/src/arch/msp430fr5994lp-256k/model.py b/src/arch/msp430fr5994lp-256k/model.py
deleted file mode 120000
index 56bb393..0000000
--- a/src/arch/msp430fr5994lp-256k/model.py
+++ /dev/null
@@ -1 +0,0 @@
-../msp430fr5994lp/model.py \ No newline at end of file
diff --git a/src/arch/msp430fr5994lp-256k/prompt b/src/arch/msp430fr5994lp-256k/prompt
deleted file mode 100644
index 78b169e..0000000
--- a/src/arch/msp430fr5994lp-256k/prompt
+++ /dev/null
@@ -1 +0,0 @@
-MSP430FR5994 Launchpad (Large Memory Model)
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