Skip to content

soc: ambiq: apollo3x: Flash-controller reconfigured for mcuboot #80987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kartben merged 1 commit into from
Dec 11, 2024
Merged

soc: ambiq: apollo3x: Flash-controller reconfigured for mcuboot #80987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions boards/ambiq/apollo3_evb/apollo3_evb.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <ambiq/ambiq_apollo3_blue.dtsi>

#include "apollo3_evb-pinctrl.dtsi"
#include <zephyr/dt-bindings/input/input-event-codes.h>

/ {
model = "Ambiq Apollo3 Blue evaluation board";
Expand All @@ -13,9 +14,11 @@
zephyr,flash = &flash0;
zephyr,console = &uart0;
zephyr,shell-uart = &uart0;
zephyr,uart-mcumgr = &uart0;
zephyr,uart-pipe = &uart0;
zephyr,flash-controller = &flash;
zephyr,bt_hci = &bt_hci_apollo;
zephyr,code-partition = &slot0_partition;
};

aliases {
Expand All @@ -25,6 +28,8 @@
led2 = &led2;
sw0 = &button0;
sw1 = &button1;
bootloader-led0 = &led0;
mcuboot-led0 = &led0;
};

leds {
Expand Down Expand Up @@ -56,14 +61,17 @@
button0: button_0 {
gpios = <&gpio0_31 16 GPIO_ACTIVE_LOW>;
label = "BTN0";
zephyr,code = <INPUT_KEY_0>;
};
button1: button_1 {
gpios = <&gpio0_31 18 GPIO_ACTIVE_LOW>;
label = "BTN1";
zephyr,code = <INPUT_KEY_1>;
};
button2: button_2 {
gpios = <&gpio0_31 19 GPIO_ACTIVE_LOW>;
label = "BTN2";
zephyr,code = <INPUT_KEY_2>;
};
};
};
Expand All @@ -77,10 +85,28 @@
#address-cells = <1>;
#size-cells = <1>;

/* Set 16KB of storage at the end of the 976KB of flash */
storage_partition: partition@f0000 {
internal_boot_partition: partition@0 {
label = "internal_bootloader";
reg = <0x00000000 0xc000>;
};

boot_partition: partition@c000 {
label = "mcuboot";
reg = <0x0000c000 0xc000>;
};
slot0_partition: partition@18000 {
label = "image-0";
reg = <0x00018000 0x72000>;
};
slot1_partition: partition@8a000 {
label = "image-1";
reg = <0x0008a000 0x72000>;
};

/* Set 16KB of storage at the end of the 1024KB of flash */
storage_partition: partition@fc000 {
label = "storage";
reg = <0x000f0000 0x4000>;
reg = <0x000fc000 0x4000>;
};
};
};
Expand Down
29 changes: 26 additions & 3 deletions boards/rakwireless/rak11720/rak11720.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <ambiq/ambiq_apollo3_blue.dtsi>
#include <zephyr/dt-bindings/lora/sx126x.h>
#include "rak11720_apollo3-pinctrl.dtsi"
#include <zephyr/dt-bindings/input/input-event-codes.h>

/ {
model = "RAKwireless RAK11720 WisBlock LPWAN Module";
Expand All @@ -19,16 +20,20 @@
zephyr,flash = &flash0;
zephyr,console = &uart0;
zephyr,shell-uart = &uart0;
zephyr,uart-mcumgr = &uart0;
zephyr,uart-pipe = &uart0;
zephyr,flash-controller = &flash;
zephyr,bt_hci = &bt_hci_apollo;
zephyr,code-partition = &slot0_partition;
};

aliases {
watchdog0 = &wdt0;
led0 = &blue_led;
led1 = &green_led;
lora0 = &lora;
bootloader-led0 = &blue_led;
mcuboot-led0 = &blue_led;
};

leds {
Expand All @@ -53,10 +58,28 @@
#address-cells = <1>;
#size-cells = <1>;

/* Set 16KB of storage at the end of the 976KB of flash */
storage_partition: partition@f0000 {
internal_boot_partition: partition@0 {
label = "internal_bootloader";
reg = <0x00000000 0xc000>;
};

boot_partition: partition@c000 {
label = "mcuboot";
reg = <0x0000c000 0xc000>;
};
slot0_partition: partition@18000 {
label = "image-0";
reg = <0x00018000 0x72000>;
};
slot1_partition: partition@8a000 {
label = "image-1";
reg = <0x0008a000 0x72000>;
};

/* Set 16KB of storage at the end of the 1024KB of flash */
storage_partition: partition@fc000 {
label = "storage";
reg = <0x000f0000 0x4000>;
reg = <0x000fc000 0x4000>;
};
};
};
Expand Down
8 changes: 4 additions & 4 deletions dts/arm/ambiq/ambiq_apollo3_blue.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,17 @@
soc {
compatible = "ambiq,apollo3-blue", "ambiq,apollo3x", "simple-bus";

flash: flash-controller@c000 {
flash: flash-controller@0 {
compatible = "ambiq,flash-controller";
reg = <0x0000c000 0xf4000>;
reg = <0x00000000 0x100000>;

#address-cells = <1>;
#size-cells = <1>;

/* Flash region */
flash0: flash@c000 {
flash0: flash@0 {
compatible = "soc-nv-flash";
reg = <0x0000c000 0xf4000>;
reg = <0x00000000 0x100000>;
};
};

Expand Down
7 changes: 7 additions & 0 deletions soc/ambiq/apollo3x/Kconfig.defconfig.apollo3_blue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,11 @@ config BT_HCI_ACL_FLOW_CONTROL

endif # BT

if !BOOTLOADER_MCUBOOT

config FLASH_LOAD_OFFSET
default 0xc000

endif # !BOOTLOADER_MCUBOOT

endif # SOC_APOLLO3_BLUE
Loading