summaryrefslogtreecommitdiff
path: root/src/arch/msp430fr5994lp
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2020-08-31 15:24:50 +0200
committerDaniel Friesel <daniel.friesel@uos.de>2020-08-31 15:24:50 +0200
commitae3acc651a459500bc11ba938607875c6ae21f3a (patch)
tree3a1d74bad3a4f7ebc3b5bb8bf6a021b0c642b092 /src/arch/msp430fr5994lp
parentb85efb34524451b47146badfc2fd25bef8d90926 (diff)
msp430fr: rename spi_b to spi to be consistent with other architectures
Diffstat (limited to 'src/arch/msp430fr5994lp')
-rw-r--r--src/arch/msp430fr5994lp/Kconfig2
-rw-r--r--src/arch/msp430fr5994lp/Makefile.inc16
-rw-r--r--src/arch/msp430fr5994lp/driver/spi.cc (renamed from src/arch/msp430fr5994lp/driver/spi_b.cc)2
3 files changed, 6 insertions, 14 deletions
diff --git a/src/arch/msp430fr5994lp/Kconfig b/src/arch/msp430fr5994lp/Kconfig
index 385b59c..e240c2b 100644
--- a/src/arch/msp430fr5994lp/Kconfig
+++ b/src/arch/msp430fr5994lp/Kconfig
@@ -16,7 +16,7 @@ select meta_driver_i2c
#bool "SPI on eUSCI_A1"
#select meta_driver_spi
-config arch_msp430fr5994lp_driver_spi_b
+config arch_msp430fr5994lp_driver_spi
bool "SPI on eUSCI_B1"
select meta_driver_spi
diff --git a/src/arch/msp430fr5994lp/Makefile.inc b/src/arch/msp430fr5994lp/Makefile.inc
index 9446aeb..68d3894 100644
--- a/src/arch/msp430fr5994lp/Makefile.inc
+++ b/src/arch/msp430fr5994lp/Makefile.inc
@@ -58,12 +58,8 @@ else ifneq ($(findstring i2c,${arch_drivers}), )
CONFIG_arch_msp430fr5994lp_driver_i2c = y
endif
-ifneq ($(findstring spi_a1,${arch_drivers}), )
- CONFIG_arch_msp430fr5994lp_driver_spi_a1 = y
-endif
-
-ifneq ($(findstring spi_b,${arch_drivers}), )
- CONFIG_arch_msp430fr5994lp_driver_spi_b = y
+ifneq ($(findstring spi,${arch_drivers}), )
+ CONFIG_arch_msp430fr5994lp_driver_spi = y
endif
ifneq ($(findstring timer,${arch_drivers}), )
@@ -93,12 +89,8 @@ ifdef CONFIG_arch_msp430fr5994lp_driver_i2c
COMMON_FLAGS += -DDRIVER_I2C
endif
-ifdef CONFIG_arch_msp430fr5994lp_driver_spi_a1
- CXX_TARGETS += src/arch/msp430fr5994lp/driver/spi_a1.cc
-endif
-
-ifdef CONFIG_arch_msp430fr5994lp_driver_spi_b
- CXX_TARGETS += src/arch/msp430fr5994lp/driver/spi_b.cc
+ifdef CONFIG_arch_msp430fr5994lp_driver_spi
+ CXX_TARGETS += src/arch/msp430fr5994lp/driver/spi.cc
endif
ifdef CONFIG_arch_msp430fr5994lp_driver_timer
diff --git a/src/arch/msp430fr5994lp/driver/spi_b.cc b/src/arch/msp430fr5994lp/driver/spi.cc
index 8624a40..543987d 100644
--- a/src/arch/msp430fr5994lp/driver/spi_b.cc
+++ b/src/arch/msp430fr5994lp/driver/spi.cc
@@ -1,4 +1,4 @@
-#include "driver/spi_b.h"
+#include "driver/spi.h"
#include <msp430.h>
#ifndef F_I2C