nrf52840_hic: Change default memory map and IO configuration

Author: mbrossard

records/board/nrf52840_bl.yaml

@@ -1,4 +1,4 @@
 common:
     sources:
         board:
-            - source/board/nrf52820_bl.c
+            - source/board/nrf52840_bl.c

source/board/nrf52840_bl.c

@@ -0,0 +1,65 @@
+/**
+ * @file    nrf52840_bl.c
+ * @brief   board ID and meta-data for HIC based on Nordic Semiconductor nRF52840
+ *
+ * DAPLink Interface Firmware
+ * Copyright (c) 2009-2021, Arm Limited, All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "target_config.h"
+#include "daplink_addr.h"
+#include "compiler.h"
+#include "target_board.h"
+#include "target_family.h"
+
+// Warning - changing the interface start will break backwards compatibility
+COMPILER_ASSERT(DAPLINK_ROM_IF_START == 0x00010000);
+COMPILER_ASSERT(DAPLINK_ROM_IF_SIZE == KB(188));
+
+/**
+* List of start and size for each size of flash sector
+* The size will apply to all sectors between the listed address and the next address
+* in the list.
+* The last pair in the list will have sectors starting at that address and ending
+* at address start + size.
+*/
+static const sector_info_t sectors_info[] = {
+    {DAPLINK_ROM_IF_START, 0x1000},
+};
+
+// nrf52840 target information
+target_cfg_t target_device = {
+    .sectors_info               = sectors_info,
+    .sector_info_length         = (sizeof(sectors_info))/(sizeof(sector_info_t)),
+    .flash_regions[0].start     = DAPLINK_ROM_IF_START,
+    .flash_regions[0].end       = DAPLINK_ROM_IF_START + DAPLINK_ROM_IF_SIZE,
+    .flash_regions[0].flags     = kRegionIsDefault,
+    .ram_regions[0].start       = DAPLINK_RAM_START,
+    .ram_regions[0].end         = DAPLINK_RAM_START + DAPLINK_RAM_SIZE,
+    /* .flash_algo not needed for bootloader */
+};
+
+// bootloader has no family
+const target_family_descriptor_t *g_target_family = NULL;
+
+const board_info_t g_board_info = {
+    .info_version               = kBoardInfoVersion,
+    .board_id                   = "0000",
+    .daplink_url_name           = "HELP_FAQHTM",
+    .daplink_drive_name         = "MAINTENANCE",
+    .daplink_target_url         = "https://mbed.com/daplink",
+    .target_cfg                 = &target_device,
+};

source/hic_hal/nordic/nrf52840/IO_Config.h

@@ -57,13 +57,13 @@ COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_NRF52840);
 #undef LED_CONNECTED
 
 // HID LED
-#define LED_HID           NRF_GPIO_PIN_MAP(0, 14)
+#define LED_HID           NRF_GPIO_PIN_MAP(0, 15)
 
 // MSC LED
-#define LED_MSC           NRF_GPIO_PIN_MAP(0, 14)
+#define LED_MSC           NRF_GPIO_PIN_MAP(0, 15)
 
 // CDC LED
-#define LED_CDC           NRF_GPIO_PIN_MAP(0, 14)
+#define LED_CDC           NRF_GPIO_PIN_MAP(0, 15)
 
 // POWER LED
 #define LED_PWR           NRF_GPIO_PIN_MAP(0, 17)

source/hic_hal/nordic/nrf52840/daplink_addr.h

@@ -22,29 +22,29 @@
 /* Device sizes */
 
 #define DAPLINK_ROM_START               0x00000000
-#define DAPLINK_ROM_SIZE                0x00020000 // Limit to 128 KiB
+#define DAPLINK_ROM_SIZE                0x00040000 // 256 KiB
 
 
 #define DAPLINK_RAM_START               0x20000000
-#define DAPLINK_RAM_SIZE                0x00008000 // 32 KiB
+#define DAPLINK_RAM_SIZE                0x00010000 // 64 KiB
 
 /* ROM sizes */
 
 #define DAPLINK_ROM_BL_START            0x00000000
-#define DAPLINK_ROM_BL_SIZE             0x00008000 // 32 KiB bootloader
+#define DAPLINK_ROM_BL_SIZE             0x00010000 // 64 KiB bootloader
 
-#define DAPLINK_ROM_IF_START            0x00008000
-#define DAPLINK_ROM_IF_SIZE             0x00017000
+#define DAPLINK_ROM_IF_START            0x00010000
+#define DAPLINK_ROM_IF_SIZE             0x0002F000
 
-#define DAPLINK_ROM_CONFIG_USER_START   0x0001F000
+#define DAPLINK_ROM_CONFIG_USER_START   0x0003F000
 #define DAPLINK_ROM_CONFIG_USER_SIZE    0x00001000
 
 /* RAM sizes */
 
 #define DAPLINK_RAM_APP_START           0x20000000
-#define DAPLINK_RAM_APP_SIZE            0x00007F00
+#define DAPLINK_RAM_APP_SIZE            0x0000FF00
 
-#define DAPLINK_RAM_SHARED_START        0x20007F00
+#define DAPLINK_RAM_SHARED_START        0x2000FF00
 #define DAPLINK_RAM_SHARED_SIZE         0x00000100
 
 /* Flash Programming Info */