Skip to content

Commit f261eda

Browse files
fix(nrf): corrects Adafruit Feather build and bootloader start address config
1 parent ea51ea4 commit f261eda

2 files changed

Lines changed: 12 additions & 15 deletions

File tree

app/boards/adafruit_feather_nrf52840.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
# Build UF2 by default, supported by the Adafruit nRF52 Bootloader
44
CONFIG_BUILD_OUTPUT_UF2=y
5+
CONFIG_BOOTLOADER_MCUBOOT=n
56

67
# Flash and partition support (required for custom partition layouts)
78
CONFIG_FLASH=y
89
CONFIG_FLASH_PAGE_LAYOUT=y
910
CONFIG_FLASH_MAP=y
1011
CONFIG_USE_DT_CODE_PARTITION=y
1112

12-
# Force flash base address to match UF2 target address
13-
CONFIG_FLASH_BASE_ADDRESS=0x26000
14-
1513
# Re-enable BT settings with global pm_static.yml
1614
CONFIG_BT_SETTINGS=y
1715

@@ -38,4 +36,4 @@ CONFIG_CLOCK_CONTROL_NRF=y
3836

3937
# Enable HFXO for better timing accuracy (recommended by Nordic for WS2812)
4038
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
41-
CONFIG_CLOCK_CONTROL_NRF_K32SRC_500PPM=y
39+
CONFIG_CLOCK_CONTROL_NRF_K32SRC_500PPM=y

app/boards/adafruit_feather_nrf52840.overlay

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@
9191
/* NeoPixel powered directly from 3.3V - no power enable needed */
9292
};
9393

94-
/* Disable board's default CDC node if it exists */
95-
&board_cdc_acm_uart {
96-
status = "disabled";
97-
};
98-
9994
/* Add dual CDC ACM nodes */
10095
&zephyr_udc0 {
10196
cdc_acm_uart0: cdc_acm_uart0 {
@@ -107,9 +102,13 @@
107102
compatible = "zephyr,cdc-acm-uart";
108103
label = "CDC_ACM_1";
109104
};
105+
106+
board_cdc_acm_uart: board_cdc_acm_uart {
107+
compatible = "zephyr,cdc-acm-uart";
108+
};
110109
};
111110

112-
/* Delete default MCUboot partitions and replace with UF2-compatible layout */
111+
/* Remove default partition map before defining UF2 layout */
113112
/delete-node/ &boot_partition;
114113
/delete-node/ &slot0_partition;
115114
/delete-node/ &slot1_partition;
@@ -137,10 +136,10 @@
137136
reg = <0x00000000 0x00026000>;
138137
};
139138

140-
code_partition: partition@26000 {
141-
label = "code_partition";
142-
reg = <0x00026000 0x000c6000>;
143-
};
139+
code_partition: partition@26000 {
140+
label = "code_partition";
141+
reg = <0x00026000 0x000c6000>;
142+
};
144143

145144
storage_partition: partition@ec000 {
146145
label = "storage";
@@ -159,4 +158,4 @@
159158
zephyr,code-partition = &code_partition;
160159
zephyr,settings-partition = &storage_partition;
161160
};
162-
};
161+
};

0 commit comments

Comments
 (0)