summaryrefslogtreecommitdiff
path: root/src/arch/msp430fr5969lp
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/msp430fr5969lp')
-rw-r--r--src/arch/msp430fr5969lp/Kconfig2
-rw-r--r--src/arch/msp430fr5969lp/Makefile.inc16
-rw-r--r--src/arch/msp430fr5969lp/driver/spi.cc (renamed from src/arch/msp430fr5969lp/driver/spi_b.cc)2
3 files changed, 6 insertions, 14 deletions
diff --git a/src/arch/msp430fr5969lp/Kconfig b/src/arch/msp430fr5969lp/Kconfig
index 549c54f..6b085ae 100644
--- a/src/arch/msp430fr5969lp/Kconfig
+++ b/src/arch/msp430fr5969lp/Kconfig
@@ -16,7 +16,7 @@ select meta_driver_i2c
#bool "SPI on eUSCI_A1"
#select meta_driver_spi
-config arch_msp430fr5969lp_driver_spi_b
+config arch_msp430fr5969lp_driver_spi
bool "SPI on eUSCI_B0"
select meta_driver_spi
diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc
index 8a48859..af285ac 100644
--- a/src/arch/msp430fr5969lp/Makefile.inc
+++ b/src/arch/msp430fr5969lp/Makefile.inc
@@ -47,12 +47,8 @@ else ifneq ($(findstring i2c,${arch_drivers}), )
CONFIG_arch_msp430fr5969lp_driver_i2c = y
endif
-ifneq ($(findstring spi_a1,${arch_drivers}), )
- CONFIG_arch_msp430fr5969lp_driver_spi_a1 = y
-endif
-
-ifneq ($(findstring spi_b,${arch_drivers}), )
- CONFIG_arch_msp430fr5969lp_driver_spi_b = y
+ifneq ($(findstring spi,${arch_drivers}), )
+ CONFIG_arch_msp430fr5969lp_driver_spi = y
endif
ifneq ($(findstring timer,${arch_drivers}), )
@@ -82,12 +78,8 @@ ifdef CONFIG_arch_msp430fr5969lp_driver_i2c
COMMON_FLAGS += -DDRIVER_I2C
endif
-ifdef CONFIG_arch_msp430fr5969lp_driver_spi_a1
- CXX_TARGETS += src/arch/msp430fr5969lp/driver/spi_a1.cc
-endif
-
-ifdef CONFIG_arch_msp430fr5969lp_driver_spi_b
- CXX_TARGETS += src/arch/msp430fr5969lp/driver/spi_b.cc
+ifdef CONFIG_arch_msp430fr5969lp_driver_spi
+ CXX_TARGETS += src/arch/msp430fr5969lp/driver/spi.cc
endif
ifdef CONFIG_arch_msp430fr5969lp_driver_timer
diff --git a/src/arch/msp430fr5969lp/driver/spi_b.cc b/src/arch/msp430fr5969lp/driver/spi.cc
index 0fa71da..f34a76b 100644
--- a/src/arch/msp430fr5969lp/driver/spi_b.cc
+++ b/src/arch/msp430fr5969lp/driver/spi.cc
@@ -1,4 +1,4 @@
-#include "driver/spi_b.h"
+#include "driver/spi.h"
#include <msp430.h>
#ifndef F_I2C