Skip to content

Shift DTS before Kconfig #12108

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
merged 9 commits into from
Feb 1, 2019
Merged

Shift DTS before Kconfig #12108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
029b56f
cmake: export PROJECT_BINARY_DIR variable to kconfig
galak Dec 7, 2018
47a33ac
cmake: Run dts before kconfig
galak Jan 18, 2019
68e4a62
dts: Remove mcuboot.overlay
galak Nov 15, 2018
9ce4cce
dts: stop generating CONFIG_FLASH_LOAD_{OFFSET,SIZE}
galak Nov 15, 2018
abc7d7e
doc: Add KCONFIG_DOC_MODE env var handling
carlescufi Jan 30, 2019
2906c36
doc: Add docs about kconfigfunctions
galak Jan 22, 2019
d4ed823
dts: Move CONFIG_SRAM_* & CONFIG_FLASH_* back to Kconfig
galak Dec 7, 2018
d8a9fb8
boards: colibri_imx7d_m4/warp7_m4: Remove CONFIG_XIP for dts
galak Dec 7, 2018
ee63a78
boards: mimxrt{1020,1050,1060,1064}_evk remove CONFIG_ from dts files
galak Dec 14, 2018
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
4 changes: 2 additions & 2 deletions Kconfig.zephyr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ config HAS_FLASH_LOAD_OFFSET
This option is selected by targets having a FLASH_LOAD_OFFSET
and FLASH_LOAD_SIZE.

if !HAS_DTS
config FLASH_LOAD_OFFSET
hex "Kernel load offset"
default $(dt_hex_val,DT_CODE_PARTITION_OFFSET) if BOOTLOADER_MCUBOOT
default 0
depends on HAS_FLASH_LOAD_OFFSET
help
Expand All @@ -97,6 +97,7 @@ config FLASH_LOAD_OFFSET

config FLASH_LOAD_SIZE
hex "Kernel load size"
default $(dt_hex_val,DT_CODE_PARTITION_SIZE) if BOOTLOADER_MCUBOOT
default 0
depends on HAS_FLASH_LOAD_OFFSET
help
Expand All @@ -106,7 +107,6 @@ config FLASH_LOAD_SIZE
the device.

If unsure, leave at the default value 0.
endif

config TEXT_SECTION_OFFSET
hex
Expand Down
36 changes: 36 additions & 0 deletions arch/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,42 @@ config BIG_ENDIAN
is used to select linker script OUTPUT_FORMAT and command
line option for gen_isr_tables.py.

if ARC || ARM || NIOS2 || X86

config SRAM_SIZE
int "SRAM Size in kB"
default $(dt_int_val,DT_SRAM_SIZE)
help
This option specifies the size of the SRAM in kB. It is normally set by
the board's defconfig file and the user should generally avoid modifying
it via the menu configuration.

config SRAM_BASE_ADDRESS
hex "SRAM Base Address"
default $(dt_hex_val,DT_SRAM_BASE_ADDRESS)
help
This option specifies the base address of the SRAM on the board. It is
normally set by the board's defconfig file and the user should generally
avoid modifying it via the menu configuration.

config FLASH_SIZE
int "Flash Size in kB"
default $(dt_int_val,DT_FLASH_SIZE) if (XIP && ARM) || !ARM
help
This option specifies the size of the flash in kB. It is normally set by
the board's defconfig file and the user should generally avoid modifying
it via the menu configuration.

config FLASH_BASE_ADDRESS
hex "Flash Base Address"
default $(dt_hex_val,DT_FLASH_BASE_ADDRESS) if (XIP && ARM) || !ARM
help
This option specifies the base address of the flash on the board. It is
normally set by the board's defconfig file and the user should generally
avoid modifying it via the menu configuration.

endif # ARM || ARC || NIOS2 || X86

if ARCH_HAS_TRUSTED_EXECUTION

config TRUSTED_EXECUTION_SECURE
Expand Down
1 change: 1 addition & 0 deletions boards/arm/96b_carbon/96b_carbon.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
zephyr,shell-uart = &usart1;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

leds {
Expand Down
1 change: 1 addition & 0 deletions boards/arm/96b_nitrogen/96b_nitrogen.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
zephyr,shell-uart = &uart0;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

/* These aliases are provided for compatibility with samples */
Expand Down
1 change: 1 addition & 0 deletions boards/arm/bbc_microbit/bbc_microbit.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
zephyr,shell-uart = &uart0;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

gpio_keys {
Expand Down
7 changes: 7 additions & 0 deletions boards/arm/colibri_imx7d_m4/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,12 @@ config PWM_1

endif # PWM_IMX

if !XIP
config FLASH_SIZE
default 0
config FLASH_BASE_ADDRESS
default 0
endif


endif # BOARD_COLIBRI_IMX7D_M4
2 changes: 0 additions & 2 deletions boards/arm/colibri_imx7d_m4/colibri_imx7d_m4.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
};

chosen {
#if defined(CONFIG_XIP)
zephyr,flash = &tcml_code;
#endif
zephyr,sram = &tcmu_sys;
zephyr,console = &uart2;
zephyr,shell-uart = &uart2;
Expand Down
1 change: 1 addition & 0 deletions boards/arm/disco_l475_iot1/disco_l475_iot1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
zephyr,shell-uart = &usart1;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

leds {
Expand Down
1 change: 1 addition & 0 deletions boards/arm/efr32_slwstk6061a/efr32_slwstk6061a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
zephyr,shell-uart = &usart0;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

/* These aliases are provided for compatibility with samples */
Expand Down
1 change: 1 addition & 0 deletions boards/arm/frdm_k64f/frdm_k64f.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
zephyr,console = &uart0;
zephyr,shell-uart = &uart0;
zephyr,uart-pipe = &uart0;
Expand Down
1 change: 1 addition & 0 deletions boards/arm/hexiwear_k64/hexiwear_k64.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
zephyr,console = &uart0;
zephyr,shell-uart = &uart0;
zephyr,bt-uart = &uart4;
Expand Down
20 changes: 20 additions & 0 deletions boards/arm/mimxrt1020_evk/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,24 @@ config ETH_MCUX_0

endif # NETWORKING

if CODE_ITCM

config FLASH_SIZE
default $(dt_int_val,DT_NXP_IMX_ITCM_0_SIZE,K)

config FLASH_BASE_ADDRESS
default $(dt_hex_val,DT_NXP_IMX_ITCM_0_BASE_ADDRESS)

endif # CODE_ITCM

if CODE_QSPI

config FLASH_SIZE
default $(dt_int_val,DT_NXP_IMX_FLEXSPI_402A8000_SIZE_1,K)

config FLASH_BASE_ADDRESS
default $(dt_hex_val,DT_NXP_IMX_FLEXSPI_402A8000_BASE_ADDRESS_1)

endif

endif # BOARD_MIMXRT1020_EVK
5 changes: 0 additions & 5 deletions boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@
};

chosen {
#if defined(CONFIG_CODE_ITCM)
zephyr,flash = &itcm0;
#elif defined(CONFIG_CODE_QSPI)
zephyr,flash = &is25wp064;
#endif
zephyr,sram = &dtcm0;
zephyr,console = &uart1;
zephyr,shell-uart = &uart1;
Expand Down
38 changes: 38 additions & 0 deletions boards/arm/mimxrt1050_evk/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,44 @@ config UART_MCUX_LPUART_3

endif # UART_MCUX_LPUART

if CODE_ITCM

config FLASH_SIZE
default $(dt_int_val,DT_NXP_IMX_ITCM_0_SIZE,K)

config FLASH_BASE_ADDRESS
default $(dt_hex_val,DT_NXP_IMX_ITCM_0_BASE_ADDRESS)

endif # CODE_ITCM

if CODE_HYPERFLASH || CODE_QSPI

config FLASH_SIZE
default $(dt_int_val,DT_NXP_IMX_FLEXSPI_402A8000_SIZE_1,K)

config FLASH_BASE_ADDRESS
default $(dt_hex_val,DT_NXP_IMX_FLEXSPI_402A8000_BASE_ADDRESS_1)

endif

if DATA_DTCM

config SRAM_SIZE
default $(dt_int_val,DT_NXP_IMX_DTCM_0_SIZE,K)

config SRAM_BASE_ADDRESS
default $(dt_hex_val,DT_NXP_IMX_DTCM_0_BASE_ADDRESS)
endif

if DATA_SDRAM

config SRAM_SIZE
default $(dt_int_val,DT_MMIO_SRAM_80000000_SIZE,K)

config SRAM_BASE_ADDRESS
default $(dt_hex_val,DT_MMIO_SRAM_80000000_BASE_ADDRESS)
endif

if NETWORKING

config NET_L2_ETHERNET
Expand Down
10 changes: 0 additions & 10 deletions boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,6 @@
};

chosen {
#if defined(CONFIG_CODE_ITCM)
zephyr,flash = &itcm0;
#elif defined(CONFIG_CODE_HYPERFLASH)
zephyr,flash = &hyperflash0;
#endif
#if defined(CONFIG_DATA_SDRAM)
zephyr,sram = &sdram0;
#else
zephyr,sram = &dtcm0;
#endif
zephyr,console = &uart1;
zephyr,shell-uart = &uart1;
};
Expand Down
10 changes: 0 additions & 10 deletions boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@

#include "mimxrt1050_evk.dts"

/ {
chosen {
#if defined(CONFIG_CODE_ITCM)
zephyr,flash = &itcm0;
#elif defined(CONFIG_CODE_QSPI)
zephyr,flash = &is25wp064;
#endif
};
};

/delete-node/ &hyperflash0;

&flexspi0 {
Expand Down
20 changes: 20 additions & 0 deletions boards/arm/mimxrt1060_evk/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,24 @@ config UART_MCUX_LPUART_3

endif # UART_MCUX_LPUART

if CODE_ITCM

config FLASH_SIZE
default $(dt_int_val,DT_NXP_IMX_ITCM_0_SIZE,K)

config FLASH_BASE_ADDRESS
default $(dt_hex_val,DT_NXP_IMX_ITCM_0_BASE_ADDRESS)

endif # CODE_ITCM

if CODE_HYPERFLASH || CODE_QSPI

config FLASH_SIZE
default $(dt_int_val,DT_NXP_IMX_FLEXSPI_402A8000_SIZE_1,K)

config FLASH_BASE_ADDRESS
default $(dt_hex_val,DT_NXP_IMX_FLEXSPI_402A8000_BASE_ADDRESS_1)

endif

endif # BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVK_HYPERFLASH
5 changes: 0 additions & 5 deletions boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
};

chosen {
#if defined(CONFIG_CODE_ITCM)
zephyr,flash = &itcm0;
#elif defined(CONFIG_CODE_QSPI)
zephyr,flash = &is25wp064;
#endif
zephyr,sram = &dtcm0;
zephyr,console = &uart1;
zephyr,shell-uart = &uart1;
Expand Down
10 changes: 0 additions & 10 deletions boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@

#include "mimxrt1060_evk.dts"

/ {
chosen {
#if defined(CONFIG_CODE_ITCM)
zephyr,flash = &itcm0;
#elif defined(CONFIG_CODE_HYPERFLASH)
zephyr,flash = &hyperflash0;
#endif
};
};

/delete-node/ &is25wp064;
&flexspi0 {
reg = <0x402a8000 0x4000>, <0x60000000 0x4000000>;
Expand Down
20 changes: 20 additions & 0 deletions boards/arm/mimxrt1064_evk/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,26 @@ if BOARD_MIMXRT1064_EVK
config BOARD
default "mimxrt1064_evk"

if CODE_ITCM

config FLASH_SIZE
default $(dt_int_val,DT_NXP_IMX_ITCM_0_SIZE,K)

config FLASH_BASE_ADDRESS
default $(dt_hex_val,DT_NXP_IMX_ITCM_0_BASE_ADDRESS)

endif # CODE_ITCM

if CODE_INTERNAL_QSPI

config FLASH_SIZE
default $(dt_int_val,DT_NXP_IMX_FLEXSPI_402A8000_SIZE_1,K)

config FLASH_BASE_ADDRESS
default $(dt_hex_val,DT_NXP_IMX_FLEXSPI_402A8000_BASE_ADDRESS_1)

endif

if GPIO_MCUX_IGPIO

config GPIO_MCUX_IGPIO_1
Expand Down
5 changes: 0 additions & 5 deletions boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
};

chosen {
#if defined(CONFIG_CODE_ITCM)
zephyr,flash = &itcm0;
#elif defined(CONFIG_CODE_INTERNAL_QSPI)
zephyr,flash = &w25q32jvwj0;
#endif
zephyr,sram = &dtcm0;
zephyr,console = &uart1;
zephyr,shell-uart = &uart1;
Expand Down
1 change: 1 addition & 0 deletions boards/arm/nrf51_pca10028/nrf51_pca10028.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
zephyr,uart-mcumgr = &uart0;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

leds {
Expand Down
1 change: 1 addition & 0 deletions boards/arm/nrf52810_pca10040/nrf52810_pca10040.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
zephyr,uart-mcumgr = &uart0;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

leds {
Expand Down
1 change: 1 addition & 0 deletions boards/arm/nrf52832_mdk/nrf52832_mdk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
zephyr,uart-mcumgr = &uart0;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

leds {
Expand Down
1 change: 1 addition & 0 deletions boards/arm/nrf52840_mdk/nrf52840_mdk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
zephyr,uart-mcumgr = &uart0;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

leds {
Expand Down
1 change: 1 addition & 0 deletions boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
zephyr,uart-mcumgr = &uart0;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

leds {
Expand Down
Loading