Remove dataflash component, it isn't supported in hardware :(

Author: multiplemonomials

storage/blockdevice/COMPONENT_DATAFLASH/mbed_lib.json

@@ -14,13 +14,5 @@
             "help": "Configure device to use DataFlash address space.",
             "value": "0"
         }
-    },
-    "target_overrides": {
-        "FF_LPC546XX": {
-            "SPI_MOSI": "P0_8",
-            "SPI_MISO": "P0_9",
-            "SPI_CLK":  "P0_6",
-            "SPI_CS":   "P0_7"
-        }
     }
 }

storage/blockdevice/COMPONENT_DATAFLASH/source/DataFlashBlockDevice.cpp

@@ -26,7 +26,8 @@ using namespace mbed;
 #define DATAFLASH_READ_SIZE        1
 #define DATAFLASH_PROG_SIZE        1
 #define DATAFLASH_TIMEOUT          10000
-#define DATAFLASH_ID_MATCH         0x1F20
+#define DATAFLASH_ID_MASK          0xFFE0 // Matches Manufacturer ID and Family Code
+#define DATAFLASH_ID_MATCH         0x1F20 // Matches Adesto/Renesas AT45Dxxx family
 #define DATAFLASH_ID_DENSITY_MASK  0x001F
 #define DATAFLASH_PAGE_SIZE_256    0x0100
 #define DATAFLASH_PAGE_SIZE_264    0x0108
@@ -41,7 +42,7 @@ using namespace mbed;
 
 /* enable debug */
 #ifndef DATAFLASH_DEBUG
-#define DATAFLASH_DEBUG 0
+#define DATAFLASH_DEBUG 1
 #endif /* DATAFLASH_DEBUG */
 
 #if DATAFLASH_DEBUG
@@ -186,13 +187,13 @@ int DataFlashBlockDevice::init()
     /* read ID register to validate model and set dimensions */
     uint16_t id = _get_register(DATAFLASH_OP_ID);
 
-    DEBUG_PRINTF("id: %04X\r\n", id & DATAFLASH_ID_MATCH);
+    DEBUG_PRINTF("id: %04X\r\n", id);
 
     /* get status register to verify the page size mode */
     uint16_t status = _get_register(DATAFLASH_OP_STATUS);
 
     /* manufacture ID match */
-    if ((id & DATAFLASH_ID_MATCH) == DATAFLASH_ID_MATCH) {
+    if ((id & DATAFLASH_ID_MASK) == DATAFLASH_ID_MATCH) {
 
         /* calculate density */
         _device_size = 0x8000 << (id & DATAFLASH_ID_DENSITY_MASK);

storage/blockdevice/tests/TESTS/blockdevice/general_block_device/main.cpp

@@ -855,7 +855,7 @@ void test_deinit_bd()
 
 void test_write_deinit_init()
 {
-    TEST_SKIP_UNLESS_MESSAGE(block_device != NULL, "no block device found.");
+    //TEST_SKIP_UNLESS_MESSAGE(block_device != NULL, "no block device found.");
     // Determine start_address & stop_address
     bd_addr_t addr = sectors_addr[rand() % num_of_sectors];
     bd_size_t erase_size = block_device->get_erase_size(addr);

targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MCU_LPC546XX/TARGET_FF_LPC546XX/PinNames.h

@@ -184,15 +184,6 @@ typedef enum {
     P4_15 = (4 <<  PORT_SHIFT | 15),
     P4_16 = (4 <<  PORT_SHIFT | 16),
 
-
-
-    // mbed original LED naming
-    LED1 = P1_3,
-    LED2 = P1_27,
-    LED3 = P1_26,
-    LED4 = P1_28,
-
-
     // USB Pins
     CONSOLE_TX = P0_30,
     CONSOLE_RX = P0_29,
@@ -233,24 +224,21 @@ typedef enum {
     p29 = P0_0,
     p30 = P0_1,
 
-
-    I2C_SCL2 = P0_27,
-    I2C_SDA2 = P0_26,
-    I2C_SCL7 = P1_30,
-    I2C_SDA7 = P1_29,
-    I2C_SCL  = I2C_SCL2,
-    I2C_SDA  = I2C_SDA2,
-
-
     // Not connected
     NC = (int)0xFFFFFFFF
 } PinName;
 
 #define LED1 P1_3
-#define LED2 P1_26
-#define LED3 P1_27
+#define LED2 P1_27
+#define LED3 P1_22
 #define LED4 P1_28
 
+#define I2C_SCL0 P0_27
+#define I2C_SDA0 P0_26
+
+#define I2C_SCL1 P1_30
+#define I2C_SDA1 P1_29
+
 typedef enum {
     PullNone = 0,
     PullDown = 1,

targets/targets.json5

@@ -5625,7 +5625,7 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
             "PORTINOUT",
             "PORTOUT",
             "SERIAL",
-            //"SLEEP",
+            "SLEEP",
             "SPI",
             "SPISLAVE",
             "FLASH",
@@ -5689,9 +5689,9 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
         "release_versions": [
             "5"
         ],
-        "components_add": [
-            "DATAFLASH"
-        ],
+        // Note: this target has a DataFlash flash on the board, BUT they actually pinned it out wrong:
+        // SCLK is connected to SPI3, while MOSI and MISO are connected to SPI5. So, the flash is
+        // impossible to use, at least without bodge wires!
         "device_name": "LPC54606J512BD100",
         "image_url": "https://os.mbed.com/media/cache/platforms/t17_VBxJMp4.png.250x250_q85.png"
     },