From 48c467f6027702c2c61f5d8a21c43201a4158ee7 Mon Sep 17 00:00:00 2001
From: Karl Schwabe <ksschwabe@gmail.com>
Date: Sun, 8 Nov 2015 14:39:19 +0100
Subject: [PATCH] Remove CONFIG_ARCH_BOARD #ifdef dependencies from mtd

Since mtd already checks whether CONFIG_MTD_RAMTRON is set in
defconfig use this define to check whether to call ramtron_attach()
or at24xxx_attach() in the main function, instead of checking
CONFIG_ARCH_BOARD_PX4FMU-V1.

Also instead of using #ifdef CONFIG_ARCH_BOARD_AEROCORE to determine
whether to start mtd on spi 2 or 4, rather use a new board define
PX4_SPI_BUS_RAMTRON in the board_config.h file.
---
 src/drivers/boards/aerocore/board_config.h  |  3 +++
 src/drivers/boards/px4fmu-v2/board_config.h |  1 +
 src/systemcmds/mtd/mtd.c                    | 15 ++++++---------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/drivers/boards/aerocore/board_config.h b/src/drivers/boards/aerocore/board_config.h
index 0b52ca48ff..155173db5f 100644
--- a/src/drivers/boards/aerocore/board_config.h
+++ b/src/drivers/boards/aerocore/board_config.h
@@ -82,6 +82,9 @@ __BEGIN_DECLS
 #define GPIO_SPI_CS_GYRO	(GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN3)
 #define GPIO_SPI_CS_BARO	(GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN4)
 
+/* SPI4--Ramtron */
+#define PX4_SPI_BUS_RAMTRON	4
+
 /* Nominal chip selects for devices on SPI bus #3 */
 #define PX4_SPIDEV_ACCEL_MAG	0
 #define PX4_SPIDEV_GYRO		1
diff --git a/src/drivers/boards/px4fmu-v2/board_config.h b/src/drivers/boards/px4fmu-v2/board_config.h
index 0f1f2fd4a2..ea60df9100 100644
--- a/src/drivers/boards/px4fmu-v2/board_config.h
+++ b/src/drivers/boards/px4fmu-v2/board_config.h
@@ -113,6 +113,7 @@ __BEGIN_DECLS
 #define GPIO_SPI_CS_EXT3	(GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN13)
 
 #define PX4_SPI_BUS_SENSORS	1
+#define PX4_SPI_BUS_RAMTRON	2
 #define PX4_SPI_BUS_EXT		4
 
 /* Use these in place of the spi_dev_e enumeration to select a specific SPI device on SPI1 */
diff --git a/src/systemcmds/mtd/mtd.c b/src/systemcmds/mtd/mtd.c
index 0f54c9c4c3..b38504c623 100644
--- a/src/systemcmds/mtd/mtd.c
+++ b/src/systemcmds/mtd/mtd.c
@@ -176,12 +176,9 @@ struct mtd_dev_s *mtd_partition(FAR struct mtd_dev_s *mtd,
 static void
 ramtron_attach(void)
 {
-	/* find the right spi */
-#ifdef CONFIG_ARCH_BOARD_AEROCORE
-	struct spi_dev_s *spi = up_spiinitialize(4);
-#else
-	struct spi_dev_s *spi = up_spiinitialize(2);
-#endif
+	/* initialize the right spi */
+	struct spi_dev_s *spi = up_spiinitialize(PX4_SPI_BUS_RAMTRON);
+
 	/* this resets the spi bus, set correct bus speed again */
 	SPI_SETFREQUENCY(spi, 10 * 1000 * 1000);
 	SPI_SETBITS(spi, 8);
@@ -269,10 +266,10 @@ mtd_start(char *partition_names[], unsigned n_partitions)
 	}
 
 	if (!attached) {
-#ifdef CONFIG_ARCH_BOARD_PX4FMU_V1
-		at24xxx_attach();
-#else
+#ifdef CONFIG_MTD_RAMTRON
 		ramtron_attach();
+#else
+		at24xxx_attach();
 #endif
 	}