Copy prj.conf settings, boot/zephyr/boards, *.conf

legrand-gregshue · legrand-gregshue · commit 3494cc069214 · 2022-10-11T19:04:29.000-07:00
In order to replicate the settings of the original build
the prj.conf settings, other *.conf files, and local boards/
settings were **copied** into this project configuration directory.
Unfortunately the Zephyr build system does not seem to provide
process settings to look elsewhere for board directories.

The build `west build -p always -b nrf52840dk_nrf52840
mcuboot/samples/zephyr_external_config` succeeds with the same flash and
sram size as the original.

Signed-off-by: Gregory SHUE &lt;gregory.shue@legrand.com&gt;
diff --git a/samples/zephyr_external_config/boards/actinius_icarus.conf b/samples/zephyr_external_config/boards/actinius_icarus.conf
@@ -0,0 +1,8 @@
+# Disable Zephyr console
+CONFIG_CONSOLE=n
+
+# MCUBoot settings
+CONFIG_BOOT_MAX_IMG_SECTORS=256
+
+# MCUboot serial recovery
+CONFIG_MCUBOOT_SERIAL=y
diff --git a/samples/zephyr_external_config/boards/bl5340_dvk_cpuapp.conf b/samples/zephyr_external_config/boards/bl5340_dvk_cpuapp.conf
@@ -0,0 +1,6 @@
+CONFIG_MULTITHREADING=y
+# Enable QSPI (MX25R64) - Slot 1 in QSPI
+CONFIG_NORDIC_QSPI_NOR=y
+CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=4
+CONFIG_BOOT_MAX_IMG_SECTORS=256
diff --git a/samples/zephyr_external_config/boards/circuitdojo_feather_nrf9160.conf b/samples/zephyr_external_config/boards/circuitdojo_feather_nrf9160.conf
@@ -0,0 +1,16 @@
+# Disable Zephyr console
+CONFIG_CONSOLE=n
+
+# Multithreading
+CONFIG_MULTITHREADING=y
+
+# MCUBoot settings
+CONFIG_BOOT_MAX_IMG_SECTORS=256
+
+# MCUboot serial recovery
+CONFIG_MCUBOOT_SERIAL=y
+CONFIG_BOOT_SERIAL_DETECT_DELAY=450
+CONFIG_MCUBOOT_INDICATION_LED=y
+
+# Size of mcuboot partition
+CONFIG_SIZE_OPTIMIZATIONS=y
diff --git a/samples/zephyr_external_config/boards/conexio_stratus.conf b/samples/zephyr_external_config/boards/conexio_stratus.conf
@@ -0,0 +1,21 @@
+# Disable Zephyr console
+CONFIG_CONSOLE=n
+CONFIG_CONSOLE_HANDLER=n
+CONFIG_UART_CONSOLE=n
+
+# Multithreading
+CONFIG_MULTITHREADING=y
+
+# MCUBoot settings
+CONFIG_BOOT_MAX_IMG_SECTORS=256
+
+# MCUboot serial recovery
+CONFIG_MCUBOOT_SERIAL=y
+CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_0"
+CONFIG_BOOT_SERIAL_DETECT_PIN=12
+CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0
+CONFIG_BOOT_SERIAL_DETECT_DELAY=450
+CONFIG_MCUBOOT_INDICATION_LED=y
+
+# Size of mcuboot partition
+CONFIG_SIZE_OPTIMIZATIONS=y
diff --git a/samples/zephyr_external_config/boards/disco_l475_iot1.conf b/samples/zephyr_external_config/boards/disco_l475_iot1.conf
@@ -0,0 +1,2 @@
+CONFIG_BOOT_MAX_IMG_SECTORS=256
+CONFIG_WATCHDOG=y
diff --git a/samples/zephyr_external_config/boards/flash_sim_driver.conf b/samples/zephyr_external_config/boards/flash_sim_driver.conf
@@ -0,0 +1,2 @@
+CONFIG_FLASH_SIMULATOR=y
+CONFIG_FLASH_SIMULATOR_UNALIGNED_READ=y
diff --git a/samples/zephyr_external_config/boards/frdm_k64f.conf b/samples/zephyr_external_config/boards/frdm_k64f.conf
@@ -0,0 +1 @@
+CONFIG_WATCHDOG=y
diff --git a/samples/zephyr_external_config/boards/intel_s1000_crb.conf b/samples/zephyr_external_config/boards/intel_s1000_crb.conf
@@ -0,0 +1,4 @@
+CONFIG_DEBUG=n
+CONFIG_I2C=n
+CONFIG_BOOT_MAX_IMG_SECTORS=512
+CONFIG_BOOT_WAIT_FOR_USB_DFU=y
diff --git a/samples/zephyr_external_config/boards/intel_s1000_crb.overlay b/samples/zephyr_external_config/boards/intel_s1000_crb.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/ {
+	sram0: memory@be000000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0xbe000000 0x30000>;
+	};
+};
+
diff --git a/samples/zephyr_external_config/boards/mimxrt1020_evk.conf b/samples/zephyr_external_config/boards/mimxrt1020_evk.conf
@@ -0,0 +1,4 @@
+# Copyright 2021 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=1024
diff --git a/samples/zephyr_external_config/boards/mimxrt1024_evk.conf b/samples/zephyr_external_config/boards/mimxrt1024_evk.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2021 Prevas A/S
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=512
diff --git a/samples/zephyr_external_config/boards/mimxrt1050_evk_qspi.conf b/samples/zephyr_external_config/boards/mimxrt1050_evk_qspi.conf
@@ -0,0 +1,5 @@
+# Copyright 2021-2022 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=1024
+CONFIG_BOOT_ERASE_PROGRESSIVELY=y
diff --git a/samples/zephyr_external_config/boards/mimxrt1060_evk.conf b/samples/zephyr_external_config/boards/mimxrt1060_evk.conf
@@ -0,0 +1,5 @@
+# Copyright 2021-2022 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=1024
+CONFIG_BOOT_ERASE_PROGRESSIVELY=y
diff --git a/samples/zephyr_external_config/boards/mimxrt1060_evkb.conf b/samples/zephyr_external_config/boards/mimxrt1060_evkb.conf
@@ -0,0 +1,5 @@
+# Copyright 2021-2022 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=1024
+CONFIG_BOOT_ERASE_PROGRESSIVELY=y
diff --git a/samples/zephyr_external_config/boards/mimxrt1064_evk.conf b/samples/zephyr_external_config/boards/mimxrt1064_evk.conf
@@ -0,0 +1,4 @@
+# Copyright 2021 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=512
diff --git a/samples/zephyr_external_config/boards/mimxrt1160_evk_cm7.conf b/samples/zephyr_external_config/boards/mimxrt1160_evk_cm7.conf
@@ -0,0 +1,7 @@
+# Copyright 2022 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=1024
+CONFIG_BOOT_ERASE_PROGRESSIVELY=y
+# Move swap provides better wear levelling, so use it by default
+CONFIG_BOOT_SWAP_USING_MOVE=y
diff --git a/samples/zephyr_external_config/boards/mimxrt1170_evk_cm7.conf b/samples/zephyr_external_config/boards/mimxrt1170_evk_cm7.conf
@@ -0,0 +1,7 @@
+# Copyright 2022 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=1024
+CONFIG_BOOT_ERASE_PROGRESSIVELY=y
+# Move swap provides better wear levelling, so use it by default
+CONFIG_BOOT_SWAP_USING_MOVE=y
diff --git a/samples/zephyr_external_config/boards/mimxrt685_evk_cm33.conf b/samples/zephyr_external_config/boards/mimxrt685_evk_cm33.conf
@@ -0,0 +1,4 @@
+# Copyright 2021 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=8192
diff --git a/samples/zephyr_external_config/boards/nrf51dk_nrf51422.conf b/samples/zephyr_external_config/boards/nrf51dk_nrf51422.conf
@@ -0,0 +1,6 @@
+# Due the small boot partition, we can't enable logging or the debug
+# optimization level out off the box. You need to increase the boot
+# partition size with a zephyr DTS overlay to make MCUboot's debug
+# builds fit.
+CONFIG_LOG=n
+CONFIG_SIZE_OPTIMIZATIONS=y
diff --git a/samples/zephyr_external_config/boards/nrf52840_big.overlay b/samples/zephyr_external_config/boards/nrf52840_big.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2020 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &boot_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+
+&flash0 {
+	partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			boot_partition: partition@0 {
+				label = "mcuboot";
+				reg = <0x000000000 0x00010000>;
+			};
+			slot0_partition: partition@10000 {
+				label = "image-0";
+				reg = <0x000010000 0x000074000>;
+			};
+			slot1_partition: partition@75000 {
+				label = "image-1";
+				reg = <0x00084000 0x000074000>;
+			};
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+	};
+};
diff --git a/samples/zephyr_external_config/boards/nrf52840_single_slot.overlay b/samples/zephyr_external_config/boards/nrf52840_single_slot.overlay
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2020 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &boot_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+
+&flash0 {
+	partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			boot_partition: partition@0 {
+				label = "mcuboot";
+				reg = <0x000000000 0x00010000>;
+			};
+			slot0_partition: partition@10000 {
+				label = "image-0";
+				reg = <0x000010000 0x0000E8000>;
+			};
+	};
+};
diff --git a/samples/zephyr_external_config/boards/nrf52840dk_hooks_sample_overlay.conf b/samples/zephyr_external_config/boards/nrf52840dk_hooks_sample_overlay.conf
@@ -0,0 +1,6 @@
+CONFIG_UPDATEABLE_IMAGE_NUMBER=2
+
+CONFIG_FLASH_SIMULATOR=y
+CONFIG_FLASH_SIMULATOR_UNALIGNED_READ=y
+
+CONFIG_BOOT_IMAGE_ACCESS_HOOKS=y
diff --git a/samples/zephyr_external_config/boards/nrf52840dk_nrf52840.conf b/samples/zephyr_external_config/boards/nrf52840dk_nrf52840.conf
@@ -0,0 +1,2 @@
+# Ensure that the qspi driver is disabled by default
+CONFIG_NORDIC_QSPI_NOR=n
diff --git a/samples/zephyr_external_config/boards/nrf52840dk_qspi_nor.conf b/samples/zephyr_external_config/boards/nrf52840dk_qspi_nor.conf
@@ -0,0 +1,3 @@
+CONFIG_NORDIC_QSPI_NOR=y
+CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
diff --git a/samples/zephyr_external_config/boards/nrf52840dk_qspi_nor_secondary.overlay b/samples/zephyr_external_config/boards/nrf52840dk_qspi_nor_secondary.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2020 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &boot_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &scratch_partition;
+
+&flash0 {
+	partitions {
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x000000000 0x00010000>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x000010000 0x0000e8000>;
+		};
+	};
+};
+
+&mx25r64 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		slot1_partition: partition@0 {
+			label = "image-1";
+			reg = <0x000000000 0x0000e8000>;
+		};
+	};
+};
diff --git a/samples/zephyr_external_config/boards/nrf52840dk_qspi_secondary_boot.conf b/samples/zephyr_external_config/boards/nrf52840dk_qspi_secondary_boot.conf
@@ -0,0 +1,2 @@
+CONFIG_MULTITHREADING=y
+CONFIG_BOOT_MAX_IMG_SECTORS=256
diff --git a/samples/zephyr_external_config/boards/nrf52840dk_ram.overlay b/samples/zephyr_external_config/boards/nrf52840dk_ram.overlay
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &slot1_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &boot_partition;
+
+&flash0 {
+	partitions {
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x000000000 0x00010000>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x000010000 0x00000A000>;
+		};
+	};
+};
+
+/ {
+	soc {
+		flash_controller2: flash-controller@2 {
+			compatible = "zephyr,sim-flash";
+			reg = <0x00000000 DT_SIZE_K(40)>;
+
+			#address-cells = <1>;
+			#size-cells = <1>;
+			erase-value = <0xff>;
+
+			flash_sim0: flash_sim@0 {
+				status = "okay";
+				compatible = "soc-nv-flash";
+				erase-block-size = <4096>;
+				write-block-size = <1>;
+				reg = <0x00000000 DT_SIZE_K(40)>;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					slot1_partition: partition@0 {
+						label = "image-1";
+						reg = <0x00000000 0x00000A000>;
+					};
+				};
+			};
+		};
+	};
+};
diff --git a/samples/zephyr_external_config/boards/nrf52840dk_ram_multi.overlay b/samples/zephyr_external_config/boards/nrf52840dk_ram_multi.overlay
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &slot1_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &boot_partition;
+
+&flash0 {
+	partitions {
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x000000000 0x00010000>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x000010000 0x00000A000>;
+		};
+		slot1_partition: partition@1A000 {
+			label = "image-1";
+			reg = <0x00001A000 0x00000A000>;
+		};
+		slot3_partition: partition@24000 {
+			label = "image-3";
+			reg = <0x000024000 0x00000A000>;
+		};
+	};
+};
+
+/ {
+	soc {
+		flash_controller2: flash-controller@2 {
+			compatible = "zephyr,sim-flash";
+			reg = <0x00000000 DT_SIZE_K(40)>;
+
+			#address-cells = <1>;
+			#size-cells = <1>;
+			erase-value = <0xff>;
+
+			flash_sim0: flash_sim@0 {
+				status = "okay";
+				compatible = "soc-nv-flash";
+				erase-block-size = <4096>;
+				write-block-size = <1>;
+				reg = <0x00000000 DT_SIZE_K(40)>;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					slot2_partition: partition@0 {
+						label = "image-2";
+						reg = <0x00000000 0x00000A000>;
+					};
+				};
+			};
+		};
+	};
+};
diff --git a/samples/zephyr_external_config/boards/nrf52840dongle_nrf52840.conf b/samples/zephyr_external_config/boards/nrf52840dongle_nrf52840.conf
diff --git a/samples/zephyr_external_config/boards/nrf52_minimal_footprint.conf b/samples/zephyr_external_config/boards/nrf52_minimal_footprint.conf
diff --git a/samples/zephyr_external_config/boards/pinnacle_100_dvk.conf b/samples/zephyr_external_config/boards/pinnacle_100_dvk.conf
diff --git a/samples/zephyr_external_config/boards/sparkfun_thing_plus_nrf9160.conf b/samples/zephyr_external_config/boards/sparkfun_thing_plus_nrf9160.conf
diff --git a/samples/zephyr_external_config/boards/thingy53_nrf5340_cpuapp.conf b/samples/zephyr_external_config/boards/thingy53_nrf5340_cpuapp.conf
diff --git a/samples/zephyr_external_config/boards/tlsr9518adk80d.conf b/samples/zephyr_external_config/boards/tlsr9518adk80d.conf
diff --git a/samples/zephyr_external_config/nrf52840dk_nrf52840_cc310_ecdsa.conf b/samples/zephyr_external_config/nrf52840dk_nrf52840_cc310_ecdsa.conf
diff --git a/samples/zephyr_external_config/prj.conf b/samples/zephyr_external_config/prj.conf
diff --git a/samples/zephyr_external_config/ram_load.conf b/samples/zephyr_external_config/ram_load.conf
diff --git a/samples/zephyr_external_config/serial_recovery.conf b/samples/zephyr_external_config/serial_recovery.conf
diff --git a/samples/zephyr_external_config/single_slot.conf b/samples/zephyr_external_config/single_slot.conf
diff --git a/samples/zephyr_external_config/usb_cdc_acm_log_recovery.conf b/samples/zephyr_external_config/usb_cdc_acm_log_recovery.conf

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+CONFIG_BOOT_MAX_IMG_SECTORS=256`
	`2`	`+CONFIG_WATCHDOG=y`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+CONFIG_FLASH_SIMULATOR=y`
	`2`	`+CONFIG_FLASH_SIMULATOR_UNALIGNED_READ=y`