patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

kconfig: Rename USE_CODE_PARTITION to USE_DT_CODE_PARTITION

Browse source 
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>
This commit is contained in:
Ulf Magnusson 2019-11-16 01:22:16 +01:00 committed by Anas Nashif
parent 1f9c5f136d
commit 90b9eb3a9e
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Kconfig.zephyr
View file

@ -85,7 +85,7 @@ config HAS_FLASH_LOAD_OFFSET
This option is selected by targets having a FLASH_LOAD_OFFSET This option is selected by targets having a FLASH_LOAD_OFFSET
and FLASH_LOAD_SIZE. and FLASH_LOAD_SIZE.
config USE_CODE_PARTITION config USE_DT_CODE_PARTITION
bool "Link application into /chosen/zephyr,code-partition from devicetree" bool "Link application into /chosen/zephyr,code-partition from devicetree"
depends on HAS_FLASH_LOAD_OFFSET depends on HAS_FLASH_LOAD_OFFSET
help help
@ -98,9 +98,9 @@ config USE_CODE_PARTITION
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
config FLASH_LOAD_OFFSET config FLASH_LOAD_OFFSET
# Only user-configurable when USE_CODE_PARTITION is disabled # Only user-configurable when USE_DT_CODE_PARTITION is disabled
hex "Kernel load offset" if !USE_CODE_PARTITION hex "Kernel load offset" if !USE_DT_CODE_PARTITION
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_CODE_PARTITION default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_DT_CODE_PARTITION
default 0 default 0
depends on HAS_FLASH_LOAD_OFFSET depends on HAS_FLASH_LOAD_OFFSET
help help
@ -112,9 +112,9 @@ config FLASH_LOAD_OFFSET
If unsure, leave at the default value 0. If unsure, leave at the default value 0.
config FLASH_LOAD_SIZE config FLASH_LOAD_SIZE
# Only user-configurable when USE_CODE_PARTITION is disabled # Only user-configurable when USE_DT_CODE_PARTITION is disabled
hex "Kernel load size" if !USE_CODE_PARTITION hex "Kernel load size" if !USE_DT_CODE_PARTITION
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_CODE_PARTITION default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_DT_CODE_PARTITION
default 0 default 0
depends on HAS_FLASH_LOAD_OFFSET depends on HAS_FLASH_LOAD_OFFSET
help help
@ -356,7 +356,7 @@ config BOOTLOADER_SRAM_SIZE
config BOOTLOADER_MCUBOOT config BOOTLOADER_MCUBOOT
bool "MCUboot bootloader support" bool "MCUboot bootloader support"
select USE_CODE_PARTITION select USE_DT_CODE_PARTITION
help help
This option signifies that the target uses MCUboot as a bootloader, 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. or in other words that the image is to be chain-loaded by MCUboot.

6
boards/arm/nrf52840_pca10059/Kconfig.defconfig
View file

@ -9,7 +9,7 @@ if BOARD_NRF52840_PCA10059
config BOARD config BOARD
default "nrf52840_pca10059" 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 # To let the nRF5 bootloader load an application, the application
# must be linked after Nordic MBR, that is factory-programmed on the board. # must be linked after Nordic MBR, that is factory-programmed on the board.
@ -18,14 +18,14 @@ if BOARD_HAS_NRF5_BOOTLOADER && !USE_CODE_PARTITION
# DTS file, so we manually override FLASH_LOAD_OFFEST to link the application # DTS file, so we manually override FLASH_LOAD_OFFEST to link the application
# correctly, after Nordic MBR. # 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, # which will make it link into the correct partition specified in DTS file,
# so no override is necessary. # so no override is necessary.
config FLASH_LOAD_OFFSET config FLASH_LOAD_OFFSET
default 0x1000 default 0x1000
endif # BOARD_HAS_NRF5_BOOTLOADER && !USE_CODE_PARTITION endif # BOARD_HAS_NRF5_BOOTLOADER && !USE_DT_CODE_PARTITION
if ADC if ADC

2
soc/riscv/openisa_rv32m1/linker.ld
View file

@ -28,7 +28,7 @@
#define VECTOR_SIZE CONFIG_RISCV_RV32M1_VECTOR_SIZE #define VECTOR_SIZE CONFIG_RISCV_RV32M1_VECTOR_SIZE
#ifdef CONFIG_USE_CODE_PARTITION #ifdef CONFIG_USE_DT_CODE_PARTITION
#ifdef CONFIG_BOOTLOADER_MCUBOOT #ifdef CONFIG_BOOTLOADER_MCUBOOT