Skip to content

Commit 878a32c

Browse files
authored
Merge pull request #14326 from artokin/porting_from_feature_wisun_to_5_15
[mbed-os-5.15] Bring in MIMXRT1050_EVK changes from feature-wisun branch
2 parents fcabc21 + 55a1465 commit 878a32c

File tree

174 files changed

+40875
-11894
lines changed

Some content is hidden

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

174 files changed

+40875
-11894
lines changed

components/storage/blockdevice/COMPONENT_FLASHIAP/mbed_lib.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
"S5JS100": {
2323
"base-address": "0x40EF5000",
2424
"size": "0x80000"
25+
},
26+
"MIMXRT1050_EVK": {
27+
"base-address": "0x60400000",
28+
"size": "0x3C00000"
2529
}
2630
}
2731
}

features/netsocket/emac-drivers/TARGET_NXP_EMAC/TARGET_IMX/TARGET_MIMXRT1050_EVK/hardware_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void kinetis_init_eth_hardware(void)
215215
/* pull up the ENET_INT before RESET. */
216216
GPIO_WritePinOutput(GPIO1, 10, 1);
217217
GPIO_WritePinOutput(GPIO1, 9, 0);
218-
wait_ms(1);
218+
wait_us(1 * 1000);
219219
GPIO_WritePinOutput(GPIO1, 9, 1);
220220
}
221221

0 commit comments

Comments
 (0)