kconfig: Rename USE_CODE_PARTITION to USE_DT_CODE_PARTITION
USE_CODE_PARTITION is a bit vague as a symbol name ("use code partition
how?"). Rename it to USE_DT_CODE_PARTITION to make it clearer that it's
about devicetree.
This would break any third-party configuration files that set it, but
it'll generate an error since kconfig.py promotes warnings to errors, so
it's probably not a big deal.
Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 63cd4d0..a0fead7 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -85,7 +85,7 @@
This option is selected by targets having a FLASH_LOAD_OFFSET
and FLASH_LOAD_SIZE.
-config USE_CODE_PARTITION
+config USE_DT_CODE_PARTITION
bool "Link application into /chosen/zephyr,code-partition from devicetree"
depends on HAS_FLASH_LOAD_OFFSET
help
@@ -98,9 +98,9 @@
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
config FLASH_LOAD_OFFSET
- # Only user-configurable when USE_CODE_PARTITION is disabled
- hex "Kernel load offset" if !USE_CODE_PARTITION
- default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_CODE_PARTITION
+ # Only user-configurable when USE_DT_CODE_PARTITION is disabled
+ hex "Kernel load offset" if !USE_DT_CODE_PARTITION
+ default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_DT_CODE_PARTITION
default 0
depends on HAS_FLASH_LOAD_OFFSET
help
@@ -112,9 +112,9 @@
If unsure, leave at the default value 0.
config FLASH_LOAD_SIZE
- # Only user-configurable when USE_CODE_PARTITION is disabled
- hex "Kernel load size" if !USE_CODE_PARTITION
- default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_CODE_PARTITION
+ # Only user-configurable when USE_DT_CODE_PARTITION is disabled
+ hex "Kernel load size" if !USE_DT_CODE_PARTITION
+ default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_DT_CODE_PARTITION
default 0
depends on HAS_FLASH_LOAD_OFFSET
help
@@ -356,7 +356,7 @@
config BOOTLOADER_MCUBOOT
bool "MCUboot bootloader support"
- select USE_CODE_PARTITION
+ select USE_DT_CODE_PARTITION
help
This option signifies that the target uses MCUboot as a bootloader,
or in other words that the image is to be chain-loaded by MCUboot.
diff --git a/boards/arm/nrf52840_pca10059/Kconfig.defconfig b/boards/arm/nrf52840_pca10059/Kconfig.defconfig
index bd2dd76..f82a146 100644
--- a/boards/arm/nrf52840_pca10059/Kconfig.defconfig
+++ b/boards/arm/nrf52840_pca10059/Kconfig.defconfig
@@ -9,7 +9,7 @@
config BOARD
default "nrf52840_pca10059"
-if BOARD_HAS_NRF5_BOOTLOADER && !USE_CODE_PARTITION
+if BOARD_HAS_NRF5_BOOTLOADER && !USE_DT_CODE_PARTITION
# To let the nRF5 bootloader load an application, the application
# must be linked after Nordic MBR, that is factory-programmed on the board.
@@ -18,14 +18,14 @@
# DTS file, so we manually override FLASH_LOAD_OFFEST to link the application
# correctly, after Nordic MBR.
-# When building MCUBoot, MCUBoot itself will select USE_CODE_PARTITION
+# When building MCUBoot, MCUBoot itself will select USE_DT_CODE_PARTITION
# which will make it link into the correct partition specified in DTS file,
# so no override is necessary.
config FLASH_LOAD_OFFSET
default 0x1000
-endif # BOARD_HAS_NRF5_BOOTLOADER && !USE_CODE_PARTITION
+endif # BOARD_HAS_NRF5_BOOTLOADER && !USE_DT_CODE_PARTITION
if ADC
diff --git a/soc/riscv/openisa_rv32m1/linker.ld b/soc/riscv/openisa_rv32m1/linker.ld
index 7fe1ae9..b441b89 100644
--- a/soc/riscv/openisa_rv32m1/linker.ld
+++ b/soc/riscv/openisa_rv32m1/linker.ld
@@ -28,7 +28,7 @@
#define VECTOR_SIZE CONFIG_RISCV_RV32M1_VECTOR_SIZE
-#ifdef CONFIG_USE_CODE_PARTITION
+#ifdef CONFIG_USE_DT_CODE_PARTITION
#ifdef CONFIG_BOOTLOADER_MCUBOOT
