Merge pull request #52 from bcmi-labs/conf_debug

Serial debug and LED feedback improvements

Author: pennam

app/target.cpp

@@ -51,52 +51,19 @@ volatile uint8_t ledTargetValue = 20;
 volatile int8_t ledDirection = 1;
 volatile int divisor = 0;
 
+DigitalOut red(PK_5, 1);
 DigitalOut green(PK_6, 1);
 DigitalOut blue(PK_7, 1);
 
+DigitalIn boot_sel(PI_8,PullDown);
+
 Ticker swap_ticker;
-int mcuboot_swap_index = -1;
 
-static inline void swap_feedback() {
+bool debug_enabled = false;
 
-  static int blink_idx = 0;
-  static int blink_state = 0;
-
-  if(mcuboot_swap_index >= 0){
-    switch(blink_state) {
-      case 0: {
-        if(blink_idx < mcuboot_swap_index) {
-          if(blue == 0){
-            blue = 1;
-          } else {
-            blue = 0;
-            blink_idx++;
-          }
-        } else {
-          blink_idx = 0;
-          blink_state = 1;
-        }
-        green = 1;
-      }
-      break;
-
-      case 1: {
-        if(blink_idx < (15 - mcuboot_swap_index)) {
-          if(green == 0){
-            green = 1;
-          } else {
-            green = 0;
-            blink_idx++;
-          }
-        } else {
-          blink_idx = 0;
-          blink_state = 0;
-        }
-        blue = 1;
-      }
-      break;
-    }
-  }
+static inline void swap_feedback() {
+  blue = !blue;
+  red = !red;
 }
 
 static inline void LED_pulse(DigitalOut* led)
@@ -137,7 +104,6 @@ static bool valid_application() {
 
 }
 
-
 static bool empty_keys() {
   unsigned int i;
   extern const unsigned char enc_priv_key[];
@@ -158,20 +124,29 @@ static bool empty_keys() {
   return true;
 }
 
+int target_debug_init(void) {
+  RTCInit();
+  debug_enabled = ((RTCGetBKPRegister(RTC_BKP_DR7) & 0x00000001) || boot_sel);
+  return 0;
+}
+
+int target_led_off(void) {
+  swap_ticker.detach();
+  red = 1;
+  green = 1;
+  blue = 1;
+  return 0;
+}
 
 int target_init(void) {
-  DigitalIn boot_sel(PI_8,PullDown);
-
   int magic = RTCGetBKPRegister(RTC_BKP_DR0);
-  BOOT_LOG_DBG("Envie magic 0x%x", magic);
 
   // in case we have been reset let's wait 500 ms to see if user is trying to stay in bootloader
   if (ResetReason::get() == RESET_REASON_PIN_RESET) {
     // now that we've been reset let's set magic. resetting with this set will
     // flag we need to stay in bootloader.
     RTCSetBKPRegister(RTC_BKP_DR0, 0xDF59);
     HAL_Delay(500);
-    BOOT_LOG_DBG("Envie magic set 0x%x", RTCGetBKPRegister( RTC_BKP_DR0));
   }
 
   DigitalOut usb_reset(PJ_4, 0);
@@ -263,25 +238,19 @@ int target_init(void) {
 
   HAL_Delay(10);
 
-  if (magic != 0xDF59 && magic != 0x07AA && boot_sel==0) {
+  if (magic != 0xDF59 && magic != 0x07AA) {
     RTCSetBKPRegister(RTC_BKP_DR0, 0);
     HAL_FLASH_Lock();
     if(valid_application() && empty_keys()) {
-      BOOT_LOG_INF("MCUBoot not configured, but valid image found.");
+      BOOT_LOG_INF("MCUboot not configured, but valid image found.");
       BOOT_LOG_INF("Booting firmware image at 0x%x\n", USBD_DFU_APP_DEFAULT_ADD);
       mbed_start_application(USBD_DFU_APP_DEFAULT_ADD);
     }
-    BOOT_LOG_DBG("Envie app magic 0x%x", RTCGetBKPRegister(RTC_BKP_DR0));
     swap_ticker.attach(&swap_feedback, 250ms);
     return 0;
 
   } else {
-    BOOT_LOG_DBG("Envie loop magic 0x%x", RTCGetBKPRegister(RTC_BKP_DR0));
-    if(boot_sel) {
-      return 1;
-    } else  {
-      return 2;
-    }
+    return 1;
   }
 }
 
@@ -301,6 +270,8 @@ int target_loop(void) {
   SetSysClock_PLL_HSE(1, false);
   SystemCoreClockUpdate();
 
+  target_led_off();
+
   //turnDownEthernet();
 
 #if MCUBOOT_APPLICATION_DFU

app/target.h

@@ -71,7 +71,9 @@
 #define BOARD_EXTCLOCK       25
 #endif
 
-int target_init(void);
+int target_debug_init(void);
 int target_loop(void);
+int target_debug(void);
+int target_led_off(void);
 
 #endif /* __TARGET_INIT_H */

generate_lib.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 rm -rf BUILD/PORTENTA_H7_M7/GCC_ARM/
-mbed compile -m PORTENTA_H7_M7 -t GCC_ARM 
+mbed compile -m PORTENTA_H7_M7 -t GCC_ARM --app=mbed_app_log_off.json
 cd BUILD/PORTENTA_H7_M7/GCC_ARM/
 rm -rf mbed-os/
 find . -name "*.o" | xargs arm-none-eabi-ar -csr libbootutil.a

mbed_app_log_off.json

@@ -0,0 +1,81 @@
+{
+    "requires": ["bare-metal", "mbedtls", "mcuboot", "flashiap-block-device", "spif-driver", "qspif", "mbed-trace", "filesystem", "fat_chan", "littlefs", "rtos", "cmsis-cmsis5-rtos2", "events"],
+    "macros": ["MBED_FAULT_HANDLER_DISABLED", "USE_USB_HS", "LOWSPEED=1", "MBEDTLS_USER_CONFIG_FILE=\"mbedtls_config.h\""],
+    "config": {
+        "serial-bootloader-enable": {
+            "help": "Build bootloader with serial update support",
+            "value": 0
+        }
+    },
+    "target_overrides": {
+        "*": {
+            "target.restrict_size": "0x20000",
+            "target.c_lib": "small",
+            "mcuboot.log-level": "MCUBOOT_LOG_LEVEL_OFF",
+            "mbed-trace.enable": false,
+            "mbed-trace.fea-ipv6": false
+        },
+        "NRF52840_DK": {
+            "target.features_remove": ["CRYPTOCELL310"],
+            "target.macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"],
+            "mcuboot.primary-slot-address": "0x20000",
+            "mcuboot.slot-size": "0xC0000",
+            "mcuboot.scratch-address": "0xE0000",
+            "mcuboot.scratch-size": "0x20000",
+            "mcuboot.max-img-sectors": "0x180",
+            "mcuboot.read-granularity": 4,
+            "qspif.QSPI_MIN_PROG_SIZE": 4
+        },
+        "EP_AGORA": {
+            "target.features_remove": ["CRYPTOCELL310"],
+            "target.macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"],
+            "mcuboot.primary-slot-address": "0x20000",
+            "mcuboot.slot-size": "0xC0000",
+            "mcuboot.scratch-address": "0xE0000",
+            "mcuboot.scratch-size": "0x20000",
+            "mcuboot.max-img-sectors": "0x180",
+            "mcuboot.read-granularity": 4,
+            "qspif.QSPI_MIN_PROG_SIZE": 4
+        },
+        "DISCO_L475VG_IOT01A": {
+            "mcuboot.primary-slot-address": "0x8020000",
+            "mcuboot.slot-size": "0xC0000",
+            "mcuboot.scratch-address": "0x80E0000",
+            "mcuboot.scratch-size": "0x20000",
+            "mcuboot.max-img-sectors": "0x180",
+            "mcuboot.read-granularity": 1,
+            "qspif.QSPI_MIN_PROG_SIZE": 1
+        },
+        "PORTENTA_H7_M7": {
+            "target.clock_source": "USE_PLL_HSE_EXTC",
+            "target.use-mpu": false,
+            "target.components_remove" : ["WHD", "4343W_FS", "CYW43XXX"],
+            "target.extra_labels_remove" : ["CORDIO"],
+            "target.features_remove" : ["BLE"],
+            "target.device_has_remove": ["USBDEVICE", "EMAC", "CAN", "SPI_ASYNCH", "SPISLAVE", "SPI","SERIAL_FC", "PWMOUT", "ANALOGIN", "ANALOGOUT", "I2CSLAVE", "I2C_ASYNC", "OSPI", "TRNG", "DAC", "CRC", "WATCHDOG", "RTC", "LPTICKER", "SLEEP"],
+            "target.printf_lib": "minimal-printf",
+            "target.i2c_timing_value_algo": false,
+            "platform.minimal-printf-enable-floating-point": false,
+            "platform.minimal-printf-enable-64-bit": false,
+            "platform.stdio-flush-at-exit": false,
+            "platform.stdio-baud-rate": 115200,
+            "fat_chan.ff_use_mkfs": 0,
+            "fat_chan.ff_use_lfn": 0,
+            "fat_chan.ff_fs_rpath": 0,
+            "mcuboot.primary-slot-address": "0x8020000",
+            "mcuboot.slot-size": "0x1E0000",
+            "mcuboot.scratch-address": "0x9000000",
+            "mcuboot.scratch-size": "0x20000",
+            "mcuboot.max-img-sectors": "0x3C0",
+            "mcuboot.max-align": 32,
+            "mcuboot.bootstrap": true,
+            "mcuboot.application-hooks": true,
+            "mcuboot.application-littlefs": true,
+            "mcuboot.application-sdcard": null,
+            "mcuboot.application-dfu": true,
+            "mcuboot.signature-algorithm": "SIGNATURE_TYPE_EC256",
+            "mcuboot.encrypt-ec256": true,
+            "mcuboot.include-keys": null
+        }
+    }
+}