Mbed CE support for FF_LPC546XX

Author: multiplemonomials

TESTS/configs/greentea_full.json5

@@ -9,7 +9,7 @@
         // Allow lots of reboots so that we don't get in a situation where the MCU refuses to boot
         // after crashing and being reflashed (since some MCUs/flash tools don't reset the
         // crash data RAM)
-        "platform.error-reboot-max": 2147483648,
+        "platform.error-reboot-max": 2147483647,
 
         // Emit a KV pair when an assert fail or hardfault occurs
         "platform.mbed-error-emit-greentea-kv": true,

hal/include/hal/pinmap.h

@@ -74,7 +74,6 @@ uint32_t pinmap_find_function(PinName pin, const PinMap *map);
  * {
  *     int per = spi_master_cs_pinmap()->peripheral;
  *     const PinList *pins_ff = pinmap_ff_default_pins();
- *     const PinList *pins_avoid = pinmap_restricted_pins();
  *     PinName mosi = NC;
  *     PinName miso = NC;
  *     PinName sclk = NC;
@@ -138,22 +137,6 @@ bool pinmap_list_has_pin(const PinList *list, PinName pin);
  */
 bool pinmap_list_has_peripheral(const PeripheralList *list, int peripheral);
 
-/**
- * Get the pin list of pins to avoid during testing
- *
- * The restricted pin list is used to indicate to testing
- * that a pin should be skipped due to some caveat about it.
- * For example, using CONSOLE_RX and CONSOLE_TX during tests will interfere
- * with the test runner and should be avoided.
- *
- * Targets should override the weak implementation of this
- * function if they have additional pins which should be
- * skipped during testing.
- *
- * @return Pointer to a pin list of pins to avoid
- */
-const PinList *pinmap_restricted_pins(void);
-
 /**
  * Get the pin list of peripherals per interface to avoid during testing
  *

hal/source/mbed_pinmap_default.cpp

@@ -66,19 +66,6 @@ const char *pinmap_ff_arduino_uno_pin_to_string(PinName pin)
 
 #endif // defined (TARGET_FF_ARDUINO) || (TARGET_FF_ARDUINO_UNO)
 
-//*** Default restricted pins ***
-MBED_WEAK const PinList *pinmap_restricted_pins()
-{
-    static const PinName pins[] = {
-        CONSOLE_TX, CONSOLE_RX
-    };
-    static const PinList pin_list = {
-        sizeof(pins) / sizeof(pins[0]),
-        pins
-    };
-    return &pin_list;
-}
-
 //*** Default restricted gpio pins ***
 // GPIO pins are special case because there are no pin-maps for GPIO
 MBED_WEAK const PinList *pinmap_gpio_restricted_pins()

hal/source/mpu/mbed_mpu_v7m.c

@@ -59,7 +59,7 @@ void mbed_mpu_init()
     MBED_ASSERT(regions >= 4);
 #endif
 
-    // Disable the MCU
+    // Disable the MPU
     MPU->CTRL = 0;
 
     // Reset all mapping

platform/mbed_lib.json

@@ -253,6 +253,9 @@
         },
         "MIMXRT105X": {
             "crash-capture-enabled": true
+        },
+        "MCU_LPC546XX": {
+            "crash-capture-enabled": true
         }
     }
 }

platform/tests/TESTS/host_tests/crash_reporting.py

@@ -40,6 +40,10 @@ def __init__(self):
     def setup(self):
         self.register_callback(MSG_KEY_DEVICE_READY, self.cb_device_ready)
 
+        # Disable the default behavior of ending the test when the target experiences a fatal error.
+        # In this test, we intentionally generate a fatal error!
+        self.register_callback("mbed_error", lambda key, value, timestamp: None)
+
     def cb_device_ready(self, key, value, timestamp):
         """Acknowledge device rebooted correctly and feed the test execution
         """
@@ -68,7 +72,7 @@ def test_steps(self):
 
         system_reset = yield
         if self.reset == False:
-            raise RuntimeError('Platform did not auto-reboot as expected.')
+            raise RuntimeError('Platform did not auto-reboot as expected. This is likely due to failing to auto-reboot after a reset, or failing to preserve the contents of crash data RAM across resets.')
 
         # The sequence is correct -- test passed.
         yield True

storage/blockdevice/COMPONENT_DATAFLASH/mbed_lib.json

@@ -14,5 +14,13 @@
             "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

@@ -656,7 +656,7 @@ int DataFlashBlockDevice::_sync(void)
             /* wait the typical write period before trying again */
         } else {
             DEBUG_PRINTF("sleep_for: %d\r\n", DATAFLASH_TIMING_ERASE_PROGRAM_PAGE);
-            rtos::ThisThread::sleep_for(DATAFLASH_TIMING_ERASE_PROGRAM_PAGE);
+            rtos::ThisThread::sleep_for(std::chrono::milliseconds(DATAFLASH_TIMING_ERASE_PROGRAM_PAGE));
         }
     }
 

storage/blockdevice/COMPONENT_SPIF/mbed_lib.json

@@ -50,7 +50,7 @@
              "SPI_CS":   "PB_12",
              "SPI_FREQ": "20000000"
        },
-         "UHURU_RAVEN": {
+       "UHURU_RAVEN": {
              "SPI_MOSI": "PE_14",
              "SPI_MISO": "PE_13",
              "SPI_CLK":  "PE_12",
@@ -68,8 +68,8 @@
            "SPI_CLK":  "SPI3_SCK",
            "SPI_CS":   "SPI_CS1"
        },
-      "ARDUINO_NICLA_SENSE_ME": {
+       "ARDUINO_NICLA_SENSE_ME": {
           "SPI_CS":   "CS_FLASH"
-      }
+       }
     }
 }

targets/TARGET_NUVOTON/TARGET_M460/pinmap.c

@@ -84,27 +84,6 @@ void pin_mode(PinName pin, PinMode mode)
      */
 }
 
-/* List of pins excluded from testing */
-const PinList *pinmap_restricted_pins()
-{
-    static const PinName pins[] = {
-        CONSOLE_TX, CONSOLE_RX,     // Dedicated to USB VCOM
-#if MBED_CONF_TARGET_EXCLUDE_UNO_SPI_FROM_FPGA_CI_TEST_SHIELD_TEST
-        ARDUINO_UNO_D8,             // Dedicated to on-board SPI flash
-        ARDUINO_UNO_D9,
-        ARDUINO_UNO_D10,
-        ARDUINO_UNO_D11,
-        ARDUINO_UNO_D12,
-        ARDUINO_UNO_D13,
-#endif
-    };
-    static const PinList pin_list = {
-        sizeof(pins) / sizeof(pins[0]),
-        pins
-    };
-    return &pin_list;
-}
-
 /* List of UART peripherals excluded from testing */
 #if DEVICE_SERIAL
 const PeripheralList *pinmap_uart_restricted_peripherals()