Skip to content

Commit fdbe2a1

Browse files
MarianSavchukMarianSavchuk
authored
Merge pull request #5 from ARMmbed/master
merge from master repo
2 parents 03e6b46 + 23f95a0 commit fdbe2a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+51289
-8
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,13 @@ source/daplink/version_git.h
8787
# automated test results
8888
test_results
8989

90+
# mbedcli build related files
91+
.mbed
92+
.mbedignore
93+
custom_profile.json
94+
custom_targets.json
95+
log.txt
96+
mbed-os/
97+
9098
#vscode editor
9199
.vscode

‎projects.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ module:
4040
hic_k20dx: &module_hic_k20dx
4141
- records/rtos/rtos-cm3.yaml
4242
- records/hic_hal/k20dx.yaml
43+
hic_k26f: &module_hic_k26f
44+
- records/rtos/rtos-cm4.yaml
45+
- records/hic_hal/k26f.yaml
4346
hic_kl26z: &module_hic_kl26z
4447
- records/rtos/rtos-cm0.yaml
4548
- records/hic_hal/kl26z.yaml
@@ -91,6 +94,14 @@ projects:
9194
- *module_if
9295
- *module_hic_lpc4322
9396
- records/family/all_family.yaml
97+
k26f_bl:
98+
- *module_bl
99+
- *module_hic_k26f
100+
- records/board/k26f_bl.yaml
101+
k26f_if:
102+
- *module_if
103+
- *module_hic_k26f
104+
- records/family/all_family.yaml
94105
sam3u2c_bl:
95106
- *module_bl
96107
- *module_hic_sam3u2c
@@ -239,6 +250,10 @@ projects:
239250
- *module_if
240251
- *module_hic_k20dx
241252
- records/board/mimxrt1050_evk_qspi.yaml
253+
k26f_frdmk32w042_if:
254+
- *module_if
255+
- *module_hic_k26f
256+
- records/board/frdmk32w042.yaml
242257
lpc11u35_ff1705_l151_if:
243258
- *module_if
244259
- *module_hic_lpc11u35
@@ -571,6 +586,10 @@ projects:
571586
- *module_if
572587
- *module_hic_max32625
573588
- records/board/max32620fthr.yaml
589+
max32625_max32630fthr_if:
590+
- *module_if
591+
- *module_hic_max32625
592+
- records/board/max32630fthr.yaml
574593
max32625_if:
575594
- *module_if
576595
- *module_hic_max32625

‎records/board/frdmk32w042.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
common:
2+
sources:
3+
board:
4+
- source/board/frdmk32w042.c
5+
family:
6+
- source/family/freescale/k32w042/target.c
7+
- source/family/freescale/target_reset_k32w_series.c

‎records/board/k26f_bl.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
common:
2+
sources:
3+
board:
4+
- source/board/k26f_bl.c

‎records/board/max32630fthr.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
common:
2+
sources:
3+
board:
4+
- source/board/max32630fthr.c
5+
family:
6+
- source/family/maxim/max32630/target.c
7+
- source/family/maxim/max32630/flash_blob.c

‎records/hic_hal/k26f.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
common:
2+
target:
3+
- mk64fn1m0xxx12 # Closest device.
4+
core:
5+
- Cortex-M4F
6+
macros:
7+
- INTERFACE_K26F
8+
- CPU_MK26FN2M0VMD18
9+
- DAPLINK_HIC_ID=0x97969909 # DAPLINK_HIC_ID_K26F
10+
- FLASH_SSD_CONFIG_ENABLE_FLEXNVM_SUPPORT=0
11+
- FLASH_DRIVER_IS_FLASH_RESIDENT=1
12+
includes:
13+
- source/hic_hal/freescale/k26f
14+
- source/hic_hal/freescale/k26f/MK26F18
15+
- source/hic_hal/freescale/iap
16+
- projectfiles/uvision/k26f_bl/build
17+
sources:
18+
hic_hal:
19+
- source/hic_hal/freescale/k26f
20+
- source/hic_hal/freescale/k26f/MK26F18
21+
- source/hic_hal/freescale/k26f/armcc
22+
fsl_flash_driver:
23+
- source/hic_hal/freescale/iap
24+
25+
tool_specific:
26+
uvision:
27+
misc:
28+
ld_flags:
29+
- --predefine="-I..\..\..\source\hic_hal\freescale\k26f"
30+
c_flags:
31+
- --no_unaligned_access
32+
- --diag_suppress=66 # disable warning about enums not fitting in signed 32-bit
33+
cxx_flags:
34+
- --no_unaligned_access
35+
asm_flags:
36+
- --no_unaligned_access
37+
make_armcc:
38+
misc:
39+
ld_flags:
40+
- --predefine="-Isource\hic_hal\freescale\k26f"
41+
c_flags:
42+
- --no_unaligned_access
43+
- --diag_suppress=66 # disable warning about enums not fitting in signed 32-bit
44+
cxx_flags:
45+
- --no_unaligned_access
46+
asm_flags:
47+
- --no_unaligned_access

‎source/board/frdmk32w042.c‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/**
2+
* @file frdmk32w042.c
3+
* @brief board ID for the NXP FRDM-K32W042 board
4+
*
5+
* DAPLink Interface Firmware
6+
* Copyright (c) 2017-2019, ARM Limited, All Rights Reserved
7+
* SPDX-License-Identifier: Apache-2.0
8+
*
9+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
10+
* not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
*/
21+
22+
#include "target_board.h"
23+
#include "target_family.h"
24+
25+
const board_info_t g_board_info = {
26+
.infoVersion = 0x0,
27+
.board_id = "0225",
28+
.family_id = kNXP_KinetisK32W_FamilyID,
29+
.flags = kEnablePageErase,
30+
.daplink_url_name = "PRODINFOHTM",
31+
.daplink_drive_name = "K32W042",
32+
.daplink_target_url = "http://www.nxp.com/frdm-k32w042",
33+
.target_cfg = &target_device,
34+
};

‎source/board/k26f_bl.c‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/**
2+
* @file k26f_bl.c
3+
* @brief board ID and meta-data for the hardware interface circuit (HIC) based on the NXP K26F
4+
*
5+
* DAPLink Interface Firmware
6+
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
7+
* SPDX-License-Identifier: Apache-2.0
8+
*
9+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
10+
* not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
*/
21+
22+
#include "target_config.h"
23+
#include "daplink_addr.h"
24+
#include "compiler.h"
25+
#include "target_board.h"
26+
#include "target_family.h"
27+
28+
// Warning - changing the interface start will break backwards compatibility
29+
COMPILER_ASSERT(DAPLINK_ROM_IF_START == KB(64));
30+
31+
// k26f target information
32+
target_cfg_t target_device = {
33+
.sector_size = DAPLINK_SECTOR_SIZE,
34+
// Assume memory regions are same size. Flash algo should ignore requests
35+
// when variable sized sectors exist
36+
// .sector_cnt = ((.flash_end - .flash_start) / .sector_size);
37+
.sector_cnt = (DAPLINK_ROM_IF_SIZE / DAPLINK_SECTOR_SIZE),
38+
.flash_start = DAPLINK_ROM_IF_START,
39+
.flash_end = DAPLINK_ROM_IF_START + DAPLINK_ROM_IF_SIZE,
40+
.ram_start = 0x1fff0000,
41+
.ram_end = 0x20030000,
42+
/* .flash_algo not needed for bootloader */
43+
};
44+
45+
//bootloader has no family
46+
const target_family_descriptor_t *g_target_family = NULL;
47+
48+
const board_info_t g_board_info = {
49+
.infoVersion = 0x0,
50+
.board_id = "0000",
51+
.daplink_url_name = "HELP_FAQHTM",
52+
.daplink_drive_name = "BOOTLOADER",
53+
.daplink_target_url = "https://mbed.com/daplink",
54+
.target_cfg = &target_device,
55+
};

‎source/board/max32630fthr.c‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/**
2+
* @file max32630fthr.c
3+
* @brief board ID for the Maxim Integrated's MAX32630FTHR
4+
*
5+
* DAPLink Interface Firmware
6+
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
7+
* SPDX-License-Identifier: Apache-2.0
8+
*
9+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
10+
* not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
*/
21+
22+
#include "target_family.h"
23+
#include "target_board.h"
24+
25+
const board_info_t g_board_info = {
26+
.board_id = "0409",
27+
.family_id = kStub_HWReset_FamilyID,
28+
.flags = kEnablePageErase,
29+
.target_cfg = &target_device,
30+
};

‎source/daplink/RTX_Config.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
#ifndef OS_CLOCK
8888
#if defined(INTERFACE_LPC11U35) || defined(INTERFACE_K20D5) || defined (INTERFACE_KL26Z)
8989
#define OS_CLOCK 48000000
90+
#elif defined(INTERFACE_K26F)
91+
#define OS_CLOCK 120000000
9092
#elif defined(INTERFACE_SAM3U2C)
9193
#define OS_CLOCK 96000000
9294
#elif defined(INTERFACE_LPC4322)

0 commit comments

Comments
 (0)