kconfig: move CONFIG_OF_* to Kconfig
Subsystems (5)
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
This commit moves:
CONFIG_OF_CONTROL
CONFIG_OF_SEPARATE
CONFIG_OF_EMBED
CONFIG_OF_HOSTFILE
Because these options are currently not supported for SPL, the "Device Tree Control" menu does not appear in the SPL configuration.
Note:zynq-common.h should be adjusted so as not to change the default value of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME.
---
Changes in v3:
- Rename HAVE_OF_CONTROL_SUPPORT to SUPPORT_OF_CONTROL because HAVE_OF_CONTRO_SUPPORT sounds too long
- Do not specify the default of choice "Provider of DTB for DT control"
- Fix the default value of Sandbox
Changes in v2:
- Add "select OF_CONTROL" to TEGRA and Exynos5 boards because they always need a device tree to boot U-Boot
- Add HAVE_OF_CONTROL_SUPPORT
- Do not touch mx6qsabreauto board
(This will be coverd by commit 19a895cbe9430 in u-boot-imx.
Fabio has already sent a pull-req.)
- cleanup left-over comments in include/configs/exynos-*.h
Kconfig | 2 ++ arch/Kconfig | 4 +++ arch/arm/Kconfig | 1 + arch/arm/cpu/armv7/exynos/Kconfig | 5 ++++ configs/am335x_boneblack_vboot_defconfig | 1 + configs/coreboot-x86_defconfig | 1 + configs/microblaze-generic_defconfig | 2 ++ configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/sandbox_defconfig | 2 ++ configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_zc70x_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_defconfig | 1 + dts/Kconfig | 48 ++++++++++++++++++++++++++++++++ include/configs/am335x_evm.h | 2 -- include/configs/arndale.h | 2 -- include/configs/beaver.h | 2 -- include/configs/cardhu.h | 2 -- include/configs/colibri_t20_iris.h | 2 -- include/configs/colibri_t30.h | 2 -- include/configs/coreboot.h | 2 -- include/configs/dalmore.h | 2 -- include/configs/exynos4-dt.h | 4 --- include/configs/exynos5-dt.h | 4 --- include/configs/harmony.h | 2 -- include/configs/jetson-tk1.h | 2 -- include/configs/medcom-wide.h | 2 -- include/configs/microblaze-generic.h | 2 -- include/configs/paz00.h | 2 -- include/configs/plutux.h | 2 -- include/configs/sandbox.h | 2 -- include/configs/seaboard.h | 2 -- include/configs/tec-ng.h | 2 -- include/configs/tec.h | 2 -- include/configs/tegra-common-post.h | 1 - include/configs/trimslice.h | 2 -- include/configs/venice2.h | 2 -- include/configs/ventana.h | 2 -- include/configs/whistler.h | 2 -- include/configs/zynq-common.h | 9 +----- 46 files changed, 78 insertions(+), 61 deletions(-) create mode 100644 dts/Kconfig
Kconfig +2 -0
@@ -106,6 +106,8 @@ source "arch/Kconfig" source "common/Kconfig" +source "dts/Kconfig" + source "net/Kconfig" source "drivers/Kconfig"
arch/Kconfig +4 -0
@@ -7,6 +7,7 @@ config ARC config ARM bool "ARM architecture" + select SUPPORT_OF_CONTROL config AVR32 bool "AVR32 architecture"
@@ -19,6 +20,7 @@ config M68K config MICROBLAZE bool "MicroBlaze architecture" + select SUPPORT_OF_CONTROL config MIPS bool "MIPS architecture"
@@ -37,6 +39,7 @@ config PPC config SANDBOX bool "Sandbox" + select SUPPORT_OF_CONTROL config SH bool "SuperH architecture"
@@ -46,6 +49,7 @@ config SPARC config X86 bool "x86 architecture" + select SUPPORT_OF_CONTROL endchoice
arch/arm/Kconfig +1 -0
@@ -462,6 +462,7 @@ config ZYNQ config TEGRA bool "NVIDIA Tegra" select SPL + select OF_CONTROL if !SPL_BUILD config TARGET_VEXPRESS_AEMV8A bool "Support vexpress_aemv8a"
arch/arm/cpu/armv7/exynos/Kconfig +5 -0
@@ -23,18 +23,23 @@ config TARGET_ODROID config TARGET_ARNDALE bool "Exynos5250 Arndale board" + select OF_CONTROL if !SPL_BUILD config TARGET_SMDK5250 bool "SMDK5250 board" + select OF_CONTROL if !SPL_BUILD config TARGET_SNOW bool "Snow board" + select OF_CONTROL if !SPL_BUILD config TARGET_SMDK5420 bool "SMDK5420 board" + select OF_CONTROL if !SPL_BUILD config TARGET_PEACH_PIT bool "Peach Pi board" + select OF_CONTROL if !SPL_BUILD endchoice
configs/am335x_boneblack_vboot_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y +CONFIG_OF_CONTROL=y
configs/coreboot-x86_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000" CONFIG_X86=y CONFIG_TARGET_COREBOOT=y +CONFIG_OF_CONTROL=y
configs/microblaze-generic_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SPL=y +S:CONFIG_MICROBLAZE=y +S:CONFIG_TARGET_MICROBLAZE_GENERIC=y +CONFIG_OF_CONTROL=y +CONFIG_OF_EMBED=y
configs/odroid_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_ODROID=y +CONFIG_OF_CONTROL=y
configs/origen_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_ORIGEN=y +CONFIG_OF_CONTROL=y
configs/s5pc210_universal_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_S5PC210_UNIVERSAL=y +CONFIG_OF_CONTROL=y
configs/sandbox_defconfig +2 -0
@@ -0,0 +1,2 @@ +CONFIG_OF_CONTROL=y +CONFIG_OF_HOSTFILE=y
configs/trats2_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_TRATS2=y +CONFIG_OF_CONTROL=y
configs/trats_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_TRATS=y +CONFIG_OF_CONTROL=y
configs/zynq_microzed_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_MICROZED=y +CONFIG_OF_CONTROL=y
configs/zynq_zc70x_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC70X=y +CONFIG_OF_CONTROL=y
configs/zynq_zc770_xm010_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" +S:CONFIG_ARM=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC770=y +CONFIG_OF_CONTROL=y
configs/zynq_zc770_xm012_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" +S:CONFIG_ARM=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC770=y +CONFIG_OF_CONTROL=y
configs/zynq_zc770_xm013_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" +S:CONFIG_ARM=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC770=y +CONFIG_OF_CONTROL=y
configs/zynq_zed_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZED=y +CONFIG_OF_CONTROL=y
dts/Kconfig new file +48 -0
48 lines not on this page · raw message
include/configs/am335x_evm.h +0 -2
@@ -23,8 +23,6 @@# define CONFIG_TIMESTAMP # define CONFIG_LZO # ifdef CONFIG_ENABLE_VBOOT -# define CONFIG_OF_CONTROL -# define CONFIG_OF_SEPARATE # define CONFIG_DEFAULT_DEVICE_TREE am335x-boneblack# define CONFIG_FIT_SIGNATURE # define CONFIG_RSA
include/configs/arndale.h +0 -2
@@ -22,8 +22,6 @@#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* Allow tracing to be enabled */ #define CONFIG_TRACE
include/configs/beaver.h +0 -2
@@ -26,8 +26,6 @@/* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra30 (Beaver) # "
include/configs/cardhu.h +0 -2
@@ -26,8 +26,6 @@/* Enable fdt support for Cardhu. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra30-cardhu -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra30 (Cardhu) # "
include/configs/colibri_t20_iris.h +0 -2
@@ -11,8 +11,6 @@/* Enable FDT support */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-colibri_t20_iris -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (Colibri) # "
include/configs/colibri_t30.h +0 -2
@@ -12,8 +12,6 @@#include "tegra30-common.h" #define CONFIG_DEFAULT_DEVICE_TREE tegra30-colibri -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE #define V_PROMPT "Colibri T30 # "#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30"
include/configs/coreboot.h +0 -2
@@ -28,8 +28,6 @@#define CONFIG_LMB #define CONFIG_OF_LIBFDT -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE #define CONFIG_DEFAULT_DEVICE_TREE link#define CONFIG_BOOTSTAGE
include/configs/dalmore.h +0 -2
@@ -23,8 +23,6 @@/* Enable fdt support for Dalmore. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra114-dalmore -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra114 (Dalmore) # "
include/configs/exynos4-dt.h +0 -4
@@ -22,10 +22,6 @@#define CONFIG_BOARD_COMMON #define CONFIG_SYS_GENERIC_BOARD -/* Enable fdt support */ -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE -#define CONFIG_SYS_CACHELINE_SIZE 32/* input clock of PLL: EXYNOS4 boards have 24MHz input clock */
include/configs/exynos5-dt.h +0 -4
@@ -24,10 +24,6 @@#define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_EXYNOS_SPL -/* Enable fdt support for Exynos5250 */ -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE -/* Allow tracing to be enabled */ #define CONFIG_TRACE #define CONFIG_CMD_TRACE
include/configs/harmony.h +0 -2
@@ -13,8 +13,6 @@/* Enable fdt support for Harmony. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-harmony -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (Harmony) # "
include/configs/jetson-tk1.h +0 -2
@@ -14,8 +14,6 @@/* Enable fdt support for Jetson TK1. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra124-jetson-tk1 -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra124 (Jetson TK1) # "
include/configs/medcom-wide.h +0 -2
@@ -14,8 +14,6 @@/* Enable fdt support for Medcom-Wide. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-medcom-wide -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (Medcom-Wide) # "
include/configs/microblaze-generic.h +0 -2
@@ -15,8 +15,6 @@#define MICROBLAZE_V5 1/* Open Firmware DTS */ -#define CONFIG_OF_CONTROL 1 -#define CONFIG_OF_EMBED 1#define CONFIG_DEFAULT_DEVICE_TREE microblaze-generic/* linear and spi flash memory */
include/configs/paz00.h +0 -2
@@ -22,8 +22,6 @@/* Enable fdt support for Paz00. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-paz00 -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (Paz00) MOD # "
include/configs/plutux.h +0 -2
@@ -14,8 +14,6 @@/* Enable fdt support for Plutux. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-plutux -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (Plutux) # "
include/configs/sandbox.h +0 -2
@@ -38,8 +38,6 @@/* Number of bits in a C 'long' on this architecture */ #define CONFIG_SANDBOX_BITS_PER_LONG 64 -#define CONFIG_OF_CONTROL -#define CONFIG_OF_HOSTFILE #define CONFIG_OF_LIBFDT #define CONFIG_LMB #define CONFIG_FIT
include/configs/seaboard.h +0 -2
@@ -21,8 +21,6 @@/* Enable fdt support for Seaboard. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-seaboard -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (SeaBoard) # "
include/configs/tec-ng.h +0 -2
@@ -12,8 +12,6 @@/* Enable fdt support for tec-ng. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra30-tec-ng -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra30 (TEC-NG) # "
include/configs/tec.h +0 -2
@@ -14,8 +14,6 @@/* Enable fdt support for TEC. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-tec -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (TEC) # "
include/configs/tegra-common-post.h +0 -1
@@ -69,7 +69,6 @@/* remove devicetree support */ #ifdef CONFIG_OF_CONTROL -#undef CONFIG_OF_CONTROL#endif /* remove I2C support */
include/configs/trimslice.h +0 -2
@@ -13,8 +13,6 @@/* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-trimslice -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (TrimSlice) # "
include/configs/venice2.h +0 -2
@@ -14,8 +14,6 @@/* Enable fdt support for Venice2. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra124-venice2 -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra124 (Venice2) # "
include/configs/ventana.h +0 -2
@@ -13,8 +13,6 @@/* Enable fdt support for Ventana. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-ventana -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (Ventana) # "
include/configs/whistler.h +0 -2
@@ -13,8 +13,6 @@/* Enable fdt support for Whistler. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra20-whistler -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE /* High-level configuration options */ #define V_PROMPT "Tegra20 (Whistler) # "
include/configs/zynq-common.h +1 -8
@@ -227,8 +227,6 @@#define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */ /* FDT support */ -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE #define CONFIG_DISPLAY_BOARDINFO_LATE /* RSA support */
@@ -273,18 +271,13 @@#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1#define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#if defined(CONFIG_OF_CONTROL ) && defined(CONFIG_OF_SEPARATE ) -# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot-dtb.img" -#else -# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img" -#endif +#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot-dtb.img"#endif /* Disable dcache for SPL just for sure */ #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_DCACHE_OFF #undef CONFIG_FPGA -#undef CONFIG_OF_CONTROL#endif /* Address in RAM where the parameters must be copied by SPL. */
Signature · 1 line
1.9.1
PATCH v3 10/10 kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
This option specifies the default Device Tree used for the run-time configuration of U-Boot.
---
Changes in v3: None
Changes in v2:
- Fix the commit subject
- Rephrase the help comment of DEFAULT_DEVICE_TREE
- Do not touch mx6qsabreauto board
(This will be covered by commit 19a895cbe9430 in u-boot-imx.
Fabio has already sent a pull-req.)
configs/am335x_boneblack_vboot_defconfig | 1 + configs/arndale_defconfig | 1 + configs/beaver_defconfig | 1 + configs/cardhu_defconfig | 1 + configs/colibri_t20_iris_defconfig | 1 + configs/colibri_t30_defconfig | 1 + configs/coreboot-x86_defconfig | 1 + configs/dalmore_defconfig | 1 + configs/harmony_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/medcom-wide_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/paz00_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/plutux_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/seaboard_defconfig | 1 + configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/snow_defconfig | 1 + configs/tec-ng_defconfig | 1 + configs/tec_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/trimslice_defconfig | 1 + configs/venice2_defconfig | 1 + configs/ventana_defconfig | 1 + configs/vexpress_aemv8a_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + configs/whistler_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_zc70x_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_defconfig | 1 + dts/Kconfig | 7 +++++++ include/configs/am335x_evm.h | 1 - include/configs/arndale.h | 1 - include/configs/beaver.h | 3 --- include/configs/cardhu.h | 3 --- include/configs/colibri_t20_iris.h | 3 --- include/configs/colibri_t30.h | 1 - include/configs/coreboot.h | 1 - include/configs/dalmore.h | 3 --- include/configs/harmony.h | 3 --- include/configs/jetson-tk1.h | 3 --- include/configs/medcom-wide.h | 3 --- include/configs/microblaze-generic.h | 3 --- include/configs/odroid.h | 2 -- include/configs/origen.h | 2 -- include/configs/paz00.h | 3 --- include/configs/peach-pit.h | 2 -- include/configs/plutux.h | 3 --- include/configs/s5pc210_universal.h | 2 -- include/configs/sandbox.h | 1 - include/configs/seaboard.h | 3 --- include/configs/smdk5250.h | 2 -- include/configs/smdk5420.h | 2 -- include/configs/snow.h | 2 -- include/configs/tec-ng.h | 3 --- include/configs/tec.h | 3 --- include/configs/trats.h | 2 -- include/configs/trats2.h | 2 -- include/configs/trimslice.h | 3 --- include/configs/venice2.h | 3 --- include/configs/ventana.h | 3 --- include/configs/vexpress_aemv8a.h | 1 - include/configs/whistler.h | 3 --- include/configs/zynq_microzed.h | 1 - include/configs/zynq_zc70x.h | 1 - include/configs/zynq_zc770.h | 3 --- include/configs/zynq_zed.h | 1 - 76 files changed, 46 insertions(+), 81 deletions(-)
configs/am335x_boneblack_vboot_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
configs/arndale_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_ARNDALE=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
configs/beaver_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_BEAVER=y +CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
configs/cardhu_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_CARDHU=y +CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
configs/colibri_t20_iris_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_COLIBRI_T20_IRIS=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris"
configs/colibri_t30_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_COLIBRI_T30=y +CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
configs/coreboot-x86_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000" CONFIG_X86=y CONFIG_TARGET_COREBOOT=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="link"
configs/dalmore_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA114=y +S:CONFIG_TARGET_DALMORE=y +CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
configs/harmony_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_HARMONY=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"
configs/jetson-tk1_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA124=y +S:CONFIG_TARGET_JETSON_TK1=y +CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
configs/medcom-wide_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_MEDCOM_WIDE=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide"
configs/microblaze-generic_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_TARGET_MICROBLAZE_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
configs/odroid_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_ODROID=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
configs/origen_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_ORIGEN=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
configs/paz00_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_PAZ00=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00"
configs/peach-pit_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_PEACH_PIT=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
configs/plutux_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_PLUTUX=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"
configs/s5pc210_universal_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_S5PC210_UNIVERSAL=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
configs/sandbox_defconfig +1 -0
@@ -1,2 +1,3 @@ CONFIG_OF_CONTROL=y CONFIG_OF_HOSTFILE=y +CONFIG_DEFAULT_DEVICE_TREE="sandbox"
configs/seaboard_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_SEABOARD=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
configs/smdk5250_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_SMDK5250=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
configs/smdk5420_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_SMDK5420=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
configs/snow_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_SNOW=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
configs/tec-ng_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_TEC_NG=y +CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
configs/tec_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_TEC=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec"
configs/trats2_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_TRATS2=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
configs/trats_defconfig +1 -0
@@ -2,3 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_TRATS=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
configs/trimslice_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_TRIMSLICE=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
configs/venice2_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA124=y +S:CONFIG_TARGET_VENICE2=y +CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
configs/ventana_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_VENTANA=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana"
configs/vexpress_aemv8a_defconfig +1 -0
@@ -1,2 +1,3 @@ CONFIG_ARM=y CONFIG_TARGET_VEXPRESS_AEMV8A=y +CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
configs/vexpress_aemv8a_semi_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SEMIHOSTING,BASE_FVP" CONFIG_ARM=y CONFIG_TARGET_VEXPRESS_AEMV8A=y +CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
configs/whistler_defconfig +1 -0
@@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_WHISTLER=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler"
configs/zynq_microzed_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_MICROZED=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
configs/zynq_zc70x_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC70X=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
configs/zynq_zc770_xm010_defconfig +1 -0
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
configs/zynq_zc770_xm012_defconfig +1 -0
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
configs/zynq_zc770_xm013_defconfig +1 -0
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
configs/zynq_zed_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZED=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
dts/Kconfig +7 -0
@@ -45,4 +45,11 @@ config OF_HOSTFILE endchoice +config DEFAULT_DEVICE_TREE + string "Default Device Tree for DT control" + help + This option specifies the default Device Tree used for DT control. + It can be overrided from the command line: + $ make DEVICE_TREE=<device-tree-name> + endmenu
include/configs/am335x_evm.h +0 -1
@@ -23,7 +23,6 @@# define CONFIG_TIMESTAMP # define CONFIG_LZO # ifdef CONFIG_ENABLE_VBOOT -# define CONFIG_DEFAULT_DEVICE_TREE am335x-boneblack# define CONFIG_FIT_SIGNATURE # define CONFIG_RSA # endif
include/configs/arndale.h +0 -1
@@ -224,7 +224,6 @@#define CONFIG_POWER_I2C #define CONFIG_POWER_MAX77686 -#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-arndale#define CONFIG_PREBOOT
include/configs/beaver.h +0 -3
@@ -24,9 +24,6 @@/* VDD core PMIC */ #define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 -/* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver -/* High-level configuration options */ #define V_PROMPT "Tegra30 (Beaver) # "#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver"
include/configs/cardhu.h +0 -3
@@ -24,9 +24,6 @@/* VDD core PMIC */ #define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 -/* Enable fdt support for Cardhu. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra30-cardhu -/* High-level configuration options */ #define V_PROMPT "Tegra30 (Cardhu) # "#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Cardhu"
include/configs/colibri_t20_iris.h +0 -3
@@ -9,9 +9,6 @@#include "tegra20-common.h" -/* Enable FDT support */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-colibri_t20_iris -/* High-level configuration options */ #define V_PROMPT "Tegra20 (Colibri) # "#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T20 on Iris"
include/configs/colibri_t30.h +0 -1
@@ -11,7 +11,6 @@#include "tegra30-common.h" -#define CONFIG_DEFAULT_DEVICE_TREE tegra30-colibri#define V_PROMPT "Colibri T30 # "#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30"
include/configs/coreboot.h +0 -1
@@ -28,7 +28,6 @@#define CONFIG_LMB #define CONFIG_OF_LIBFDT -#define CONFIG_DEFAULT_DEVICE_TREE link#define CONFIG_BOOTSTAGE #define CONFIG_BOOTSTAGE_REPORT
include/configs/dalmore.h +0 -3
@@ -21,9 +21,6 @@#include "tegra114-common.h" -/* Enable fdt support for Dalmore. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra114-dalmore -/* High-level configuration options */ #define V_PROMPT "Tegra114 (Dalmore) # "#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore"
include/configs/harmony.h +0 -3
@@ -11,9 +11,6 @@#include <linux/sizes.h> #include "tegra20-common.h" -/* Enable fdt support for Harmony. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-harmony -/* High-level configuration options */ #define V_PROMPT "Tegra20 (Harmony) # "#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Harmony"
include/configs/jetson-tk1.h +0 -3
@@ -12,9 +12,6 @@#include "tegra124-common.h" -/* Enable fdt support for Jetson TK1. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra124-jetson-tk1 -/* High-level configuration options */ #define V_PROMPT "Tegra124 (Jetson TK1) # "#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"
include/configs/medcom-wide.h +0 -3
@@ -12,9 +12,6 @@#include "tegra20-common.h" -/* Enable fdt support for Medcom-Wide. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-medcom-wide -/* High-level configuration options */ #define V_PROMPT "Tegra20 (Medcom-Wide) # "#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide"
include/configs/microblaze-generic.h +0 -3
@@ -14,9 +14,6 @@/* MicroBlaze CPU */ #define MICROBLAZE_V5 1 -/* Open Firmware DTS */ -#define CONFIG_DEFAULT_DEVICE_TREE microblaze-generic -/* linear and spi flash memory */ #ifdef XILINX_FLASH_START #define FLASH
include/configs/odroid.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_SYS_PROMPT "Odroid # "/* Monitor Command Prompt */ -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos4412-odroid#define CONFIG_SYS_L2CACHE_OFF #ifndef CONFIG_SYS_L2CACHE_OFF
include/configs/origen.h +0 -2
@@ -13,8 +13,6 @@#define CONFIG_SYS_PROMPT "ORIGEN # " -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-origen/* High Level Configuration Options */ #define CONFIG_EXYNOS4210 1/* which is a EXYNOS4210 SoC */
include/configs/paz00.h +0 -3
@@ -20,9 +20,6 @@#include <linux/sizes.h> #include "tegra20-common.h" -/* Enable fdt support for Paz00. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-paz00 -/* High-level configuration options */ #define V_PROMPT "Tegra20 (Paz00) MOD # "#define CONFIG_TEGRA_BOARD_STRING "Compal Paz00"
include/configs/peach-pit.h +0 -2
@@ -13,8 +13,6 @@#include <configs/exynos5420.h> -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos5420-peach-pit/* select serial console configuration */ #define CONFIG_SERIAL3 /* use SERIAL 3 */
include/configs/plutux.h +0 -3
@@ -12,9 +12,6 @@#include "tegra20-common.h" -/* Enable fdt support for Plutux. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-plutux -/* High-level configuration options */ #define V_PROMPT "Tegra20 (Plutux) # "#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Plutux"
include/configs/s5pc210_universal.h +0 -2
@@ -14,8 +14,6 @@#define CONFIG_SYS_PROMPT "Universal # "/* Monitor Command Prompt */ -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-universal_c210#define CONFIG_TIZEN /* TIZEN lib */
include/configs/sandbox.h +0 -1
@@ -44,7 +44,6 @@#define CONFIG_FIT_SIGNATURE #define CONFIG_RSA #define CONFIG_CMD_FDT -#define CONFIG_DEFAULT_DEVICE_TREE sandbox#define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_FS_FAT
include/configs/seaboard.h +0 -3
@@ -19,9 +19,6 @@#include "tegra20-common.h" -/* Enable fdt support for Seaboard. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-seaboard -/* High-level configuration options */ #define V_PROMPT "Tegra20 (SeaBoard) # "#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Seaboard"
include/configs/smdk5250.h +0 -2
@@ -11,8 +11,6 @@#include <configs/exynos5250-dt.h> -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250/* Enable FIT support and comparison */ #define CONFIG_FIT
include/configs/smdk5420.h +0 -2
@@ -15,8 +15,6 @@#define CONFIG_SMDK5420 /* which is in a SMDK5420 */ -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos5420-smdk5420/* select serial console configuration */ #define CONFIG_SERIAL3 /* use SERIAL 3 */
include/configs/snow.h +0 -2
@@ -11,8 +11,6 @@#include <configs/exynos5250-dt.h> -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow/* Enable FIT support and comparison */ #define CONFIG_FIT
include/configs/tec-ng.h +0 -3
@@ -10,9 +10,6 @@#include "tegra30-common.h" -/* Enable fdt support for tec-ng. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra30-tec-ng -/* High-level configuration options */ #define V_PROMPT "Tegra30 (TEC-NG) # "#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten? NG Evaluation Carrier"
include/configs/tec.h +0 -3
@@ -12,9 +12,6 @@#include "tegra20-common.h" -/* Enable fdt support for TEC. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-tec -/* High-level configuration options */ #define V_PROMPT "Tegra20 (TEC) # "#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier"
include/configs/trats.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_TRATS -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-trats#define CONFIG_TIZEN /* TIZEN lib */
include/configs/trats2.h +0 -2
@@ -15,8 +15,6 @@#define CONFIG_SYS_PROMPT "Trats2 # "/* Monitor Command Prompt */ -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos4412-trats2#define CONFIG_TIZEN /* TIZEN lib */
include/configs/trimslice.h +0 -3
@@ -11,9 +11,6 @@#include <linux/sizes.h> #include "tegra20-common.h" -/* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-trimslice -/* High-level configuration options */ #define V_PROMPT "Tegra20 (TrimSlice) # "#define CONFIG_TEGRA_BOARD_STRING "Compulab Trimslice"
include/configs/venice2.h +0 -3
@@ -12,9 +12,6 @@#include "tegra124-common.h" -/* Enable fdt support for Venice2. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra124-venice2 -/* High-level configuration options */ #define V_PROMPT "Tegra124 (Venice2) # "#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2"
include/configs/ventana.h +0 -3
@@ -11,9 +11,6 @@#include <linux/sizes.h> #include "tegra20-common.h" -/* Enable fdt support for Ventana. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-ventana -/* High-level configuration options */ #define V_PROMPT "Tegra20 (Ventana) # "#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Ventana"
include/configs/vexpress_aemv8a.h +0 -1
@@ -51,7 +51,6 @@/* Flat Device Tree Definitions */ #define CONFIG_OF_LIBFDT -#define CONFIG_DEFAULT_DEVICE_TREE vexpress64/* SMP Spin Table Definitions */ #ifdef CONFIG_BASE_FVP
include/configs/whistler.h +0 -3
@@ -11,9 +11,6 @@#include <linux/sizes.h> #include "tegra20-common.h" -/* Enable fdt support for Whistler. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-whistler -/* High-level configuration options */ #define V_PROMPT "Tegra20 (Whistler) # "#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Whistler"
include/configs/zynq_microzed.h +0 -1
@@ -19,7 +19,6 @@#define CONFIG_SYS_NO_FLASH #define CONFIG_ZYNQ_SDHCI0 -#define CONFIG_DEFAULT_DEVICE_TREE zynq-microzed#include <configs/zynq-common.h>
include/configs/zynq_zc70x.h +0 -1
@@ -23,7 +23,6 @@#define CONFIG_ZYNQ_I2C0 #define CONFIG_ZYNQ_EEPROM #define CONFIG_ZYNQ_BOOT_FREEBSD -#define CONFIG_DEFAULT_DEVICE_TREE zynq-zc702#include <configs/zynq-common.h>
include/configs/zynq_zc770.h +0 -3
@@ -20,18 +20,15 @@# define CONFIG_ZYNQ_GEM_PHY_ADDR0 7# define CONFIG_ZYNQ_SDHCI0 # define CONFIG_ZYNQ_SPI -# define CONFIG_DEFAULT_DEVICE_TREE zynq-zc770-xm010#elif defined(CONFIG_ZC770_XM012 )# define CONFIG_ZYNQ_SERIAL_UART1 # undef CONFIG_SYS_NO_FLASH -# define CONFIG_DEFAULT_DEVICE_TREE zynq-zc770-xm012#elif defined(CONFIG_ZC770_XM013 )# define CONFIG_ZYNQ_SERIAL_UART0 # define CONFIG_ZYNQ_GEM1 # define CONFIG_ZYNQ_GEM_PHY_ADDR1 7 -# define CONFIG_DEFAULT_DEVICE_TREE zynq-zc770-xm013#else # define CONFIG_ZYNQ_SERIAL_UART0
include/configs/zynq_zed.h +0 -1
@@ -21,7 +21,6 @@#define CONFIG_ZYNQ_USB #define CONFIG_ZYNQ_SDHCI0 #define CONFIG_ZYNQ_BOOT_FREEBSD -#define CONFIG_DEFAULT_DEVICE_TREE zynq-zed#include <configs/zynq-common.h>
Signature · 1 line
1.9.1
PATCH v3 10/10 kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
Hi Masahiro,
Quoted 101 lines · Masahiro Yamada
This option specifies the default Device Tree used for the run-time configuration of U-Boot.
Signed-off-by Masahiro Yamada <[email protected]>Cc Simon Glass <[email protected]>Cc Stephen Warren <[email protected]>Cc Minkyu Kang <[email protected]>Cc Michal Simek <[email protected]>---
Changes in v3: None
Changes in v2:
- Fix the commit subject
- Rephrase the help comment ofDEFAULT_DEVICE_TREE
- Do not touch mx6qsabreauto board
(This will be covered by commit19a895cbe9430in u-boot-imx.
Fabio has already sent a pull-req.)configs/am335x_boneblack_vboot_defconfig | 1 + configs/arndale_defconfig | 1 + configs/beaver_defconfig | 1 + configs/cardhu_defconfig | 1 + configs/colibri_t20_iris_defconfig | 1 + configs/colibri_t30_defconfig | 1 + configs/coreboot-x86_defconfig | 1 + configs/dalmore_defconfig | 1 + configs/harmony_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/medcom-wide_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/paz00_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/plutux_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/seaboard_defconfig | 1 + configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/snow_defconfig | 1 + configs/tec-ng_defconfig | 1 + configs/tec_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/trimslice_defconfig | 1 + configs/venice2_defconfig | 1 + configs/ventana_defconfig | 1 + configs/vexpress_aemv8a_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + configs/whistler_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_zc70x_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_defconfig | 1 + dts/Kconfig | 7 +++++++ include/configs/am335x_evm.h | 1 - include/configs/arndale.h | 1 - include/configs/beaver.h | 3 --- include/configs/cardhu.h | 3 --- include/configs/colibri_t20_iris.h | 3 --- include/configs/colibri_t30.h | 1 - include/configs/coreboot.h | 1 - include/configs/dalmore.h | 3 --- include/configs/harmony.h | 3 --- include/configs/jetson-tk1.h | 3 --- include/configs/medcom-wide.h | 3 --- include/configs/microblaze-generic.h | 3 --- include/configs/odroid.h | 2 -- include/configs/origen.h | 2 -- include/configs/paz00.h | 3 --- include/configs/peach-pit.h | 2 -- include/configs/plutux.h | 3 --- include/configs/s5pc210_universal.h | 2 -- include/configs/sandbox.h | 1 - include/configs/seaboard.h | 3 --- include/configs/smdk5250.h | 2 -- include/configs/smdk5420.h | 2 -- include/configs/snow.h | 2 -- include/configs/tec-ng.h | 3 --- include/configs/tec.h | 3 --- include/configs/trats.h | 2 -- include/configs/trats2.h | 2 -- include/configs/trimslice.h | 3 --- include/configs/venice2.h | 3 --- include/configs/ventana.h | 3 --- include/configs/vexpress_aemv8a.h | 1 - include/configs/whistler.h | 3 --- include/configs/zynq_microzed.h | 1 - include/configs/zynq_zc70x.h | 1 - include/configs/zynq_zc770.h | 3 --- include/configs/zynq_zed.h | 1 - 76 files changed, 46 insertions(+), 81 deletions(-)configs/am335x_boneblack_vboot_defconfig +0
-0
configs/am335x_boneblack_vboot_defconfig CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" · line 6
Quoted 4 lines
configs/am335x_boneblack_vboot_defconfig +1
-0@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
Do we want to include this for SPL too? At some point we might support this. But if you want to define it only for U-Boot, that's OK.
Regards,
PATCH v3 10/10 kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
Hi Simon,
Quoted 14 lines · On Wed, 24 Sep 2014 17:09:35 -0600 Simon Glass <[email protected]> wrote:
configs/am335x_boneblack_vboot_defconfig CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" · line 6
Quoted 10 lines
configs/am335x_boneblack_vboot_defconfig +1
-0@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"Do we want to include this for SPL too? At some point we might support this. But if you want to define it only for U-Boot, that's OK.
Quoted 1 line
Regards,
I was planning to expand this for SPL in the future, but if you want to do that now, I am fine with it.
(The series is just moving CONFIGs verbatim from headers to defconfigs)
I am afraid the current SPL implementation is too special.
- special Makefile (scripts/Makefile.spl)
- special linker scripts (u-boot-spl.lds)
- special boot sequence (common/spl/spl.c)
etc. We need extra efforts because of that.
My long-term goal is to implement the normal image and the SPL image as more symetirical ones, and I hope CONFIG_SPL_* will go away eventually.
If we had implemented SPL as a generic case, you would not have needed a separate work for CONFIG_SPL_DM, right?
Perhaps, you would have implemented the Driver Model for both of the normal and SPL in the first place (and just enable CONFIG_DM for SPL and it would work).
But unfortunately, we don't.
Nor can I do that now.
I guess we need more refactoring.
If the device tree control for SPL is urgent necessity,
I am fine with CONFIG_SPL_OF_CONTROL like before, or another implementation.
Comments are welcome on this issue, of course.
Best Regards
Masahiro Yamada
PATCH v3 10/10 kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
Hi Masahiro,
Quoted 53 lines · Masahiro Yamada
Hi Simon,
Quoted 14 lines · On Wed, 24 Sep 2014 17:09:35 -0600 Simon Glass <[email protected]> wrote:
configs/am335x_boneblack_vboot_defconfig CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" · line 6
Quoted 10 lines
configs/am335x_boneblack_vboot_defconfig +1
-0@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"Do we want to include this for SPL too? At some point we might support this. But if you want to define it only for U-Boot, that's OK.
Quoted 1 line
Regards,
I was planning to expand this for SPL in the future, but if you want to do that now, I am fine with it.
(The series is just moving CONFIGs verbatim from headers to defconfigs)
I am afraid the current SPL implementation is too special.
- special
Makefile(scripts/Makefile.spl)
- special linker scripts (u-boot-spl.lds)
- special boot sequence (common/spl/spl.c)etc. We need extra efforts because of that.
My long-term goal is to implement the normal image and the SPL image as more symetirical ones, and I hope CONFIG_SPL_* will go away eventually.
If we had implemented SPL as a generic case, you would not have needed a separate work for
CONFIG_SPL_DM, right?
Perhaps, you would have implemented the Driver Model for both of the normal and SPL in the first place (and just enableCONFIG_DMfor SPL and it would work).But unfortunately, we don't.
Nor can I do that now.
I guess we need more refactoring.
Quoted 5 lines
If the device tree control for SPL is urgent necessity,
I am fine withCONFIG_SPL_OF_CONTROLlike before, or another implementation.Comments are welcome on this issue, of course.
Yes SPL should become less special, all of this sounds good.
With the DM SPL series we are getting close to just being able to enable FDT in SPL just like any other feature. I'm not planning to look at that imminently though as the DM SPL stuff is still pretty new.
Note that the reason for CONFIG_SPL_DM is mostly a migration exercise. It allows boards to decide when they are ready to switch to DM. I expect the option will be removed one day (since boards with SPL are mostly the well maintained ones I think).
Regards,
Simon
PATCH v3 10/10 kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
In reply to Masahiro YamadaQuoted 8 lines · Masahiro Yamada
This option specifies the default Device Tree used for the run-time configuration of U-Boot.
Signed-off-by Masahiro Yamada <[email protected]>Cc Simon Glass <[email protected]>Cc Stephen Warren <[email protected]>Cc Minkyu Kang <[email protected]>Cc Michal Simek <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140925/d91d422e/attachment.pgp>
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
In reply to Masahiro YamadaHi Masahiro,
Quoted 19 lines · Masahiro Yamada
This commit moves:
CONFIG_OF_CONTROL
CONFIG_OF_SEPARATE
CONFIG_OF_EMBED
CONFIG_OF_HOSTFILEBecause these options are currently not supported for SPL, the "Device Tree Control" menu does not appear in the SPL configuration.
Note:
zynq-common.hshould be adjusted so as not to change the default value ofCONFIG_SPL_FAT_LOAD_PAYLOAD_NAME.Signed-off-by Masahiro Yamada <[email protected]>Cc Simon Glass <[email protected]>Cc Stephen Warren <[email protected]>Cc Minkyu Kang <[email protected]>Cc Michal Simek <[email protected]>
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
Quoted 23 lines · Simon Glass
Hi Masahiro,
Quoted 14 lines · Masahiro Yamada
This commit moves:
CONFIG_OF_CONTROL
CONFIG_OF_SEPARATE
CONFIG_OF_EMBED
CONFIG_OF_HOSTFILEBecause these options are currently not supported for SPL, the "Device Tree Control" menu does not appear in the SPL configuration.
Note:
zynq-common.hshould be adjusted so as not to change the default value ofCONFIG_SPL_FAT_LOAD_PAYLOAD_NAME.Quoted 5 lines
Signed-off-by Masahiro Yamada <[email protected]>Cc Simon Glass <[email protected]>Cc Stephen Warren <[email protected]>Cc Minkyu Kang <[email protected]>Cc Michal Simek <[email protected]>
Quoted 3 lines
From the bits that I understand (not zynq and microblaze)
Acked-by Simon Glass <[email protected]>
:-)
No problem for zynq and Microblaze.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140925/af3769dd/attachment.pgp>
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
In reply to Simon GlassHi Simon,
Quoted 8 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
dts/Kconfig line 36
Quoted 5 lines
dts/Kconfig new file +5
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image.Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."
Why is CONFIG_OF_EMBED not recommended for production devices?
Best Regards
Masahiro Yamada
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
Quoted 13 lines · Masahiro Yamada
Hi Simon,
Quoted 6 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
Quoted 5 lines
dts/Kconfig new file +5
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image.
Quoted 5 lines
Quoted 2 lines
Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."Why is
CONFIG_OF_EMBEDnot recommended for production devices?
It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140925/365310db/attachment.pgp>
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
Hi,
Quoted 20 lines · Tom Rini
Quoted 13 lines · Masahiro Yamada
Hi Simon,
Quoted 6 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
Quoted 5 lines
dts/Kconfig new file +5
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image.Quoted 5 lines
Quoted 2 lines
Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."Why is
CONFIG_OF_EMBEDnot recommended for production devices?
Quoted 8 lines
It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good.
Addressing the binding differences, it's hard to see what these are right now since the sorting and other churn in the Linux device tree files. I think it would be good to sync the U-Boot files to the Linux ones so we can see what bindings still differ.
Regards,
Simon
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
Quoted 32 lines · Simon Glass
Hi,
Quoted 20 lines · Tom Rini
Quoted 13 lines · Masahiro Yamada
Hi Simon,
Quoted 6 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
Quoted 5 lines
dts/Kconfig new file +5
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image.Quoted 5 lines
Quoted 2 lines
Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."Why is
CONFIG_OF_EMBEDnot recommended for production devices?Quoted 8 lines
It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good.
Quoted 4 lines
Addressing the binding differences, it's hard to see what these are right now since the sorting and other churn in the Linux device tree files. I think it would be good to sync the U-Boot files to the Linux ones so we can see what bindings still differ.
Yes, agreed.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140926/015e1d0c/attachment.pgp>
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
Quoted 33 lines · Tom Rini
Quoted 32 lines · Simon Glass
Hi,
Quoted 28 lines · Tom Rini
Quoted 13 lines · Masahiro Yamada
Hi Simon,
Quoted 6 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
Quoted 5 lines
dts/Kconfig new file +5
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image.Quoted 5 lines
Quoted 2 lines
Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."Why is
CONFIG_OF_EMBEDnot recommended for production devices?It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good.
Quoted 6 lines
Quoted 4 lines
Addressing the binding differences, it's hard to see what these are right now since the sorting and other churn in the Linux device tree files. I think it would be good to sync the U-Boot files to the Linux ones so we can see what bindings still differ.
Yes, agreed.
There's a difference between:
a) The DT that U-Boot uses.
b) The DT that is passed to the kernel.
I don't see any problem embedding (a) into the U-Boot binary at all, since U-Boot is the only consumer. There's no need to update the DT separately. Even when not using CONFIG_OF_EMBED, the DT really is logically part of the bootloader.
(b) is the case where people care about updating the DT separately from the firmware.
Now, if we ever get to the point where we pass the same DT to both U-Boot and the kernel, then yes, embedding the DT into the U-Boot binary would be a bad idea, since the DT couldn't be updated separately then.
However, I think it's a bad idea to pass the same DT to both, since then updating it might break your bootloader and kernel, rather than just your kernel, which complicates recovery. Ideally, the only thing shared between bootloader and kernel should be the ability for the bootloader to load data (DT, initrd, kernel image) into memory, set up the appropriate CPU state, and jump to the kernel.
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
Quoted 52 lines · Stephen Warren
Quoted 33 lines · Tom Rini
Quoted 32 lines · Simon Glass
Hi,
Quoted 28 lines · Tom Rini
Quoted 13 lines · Masahiro Yamada
Hi Simon,
Quoted 6 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
Quoted 5 lines
(quoted diff) +5
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image.Quoted 5 lines
Quoted 2 lines
Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."Why is
CONFIG_OF_EMBEDnot recommended for production devices?It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good.
Quoted 6 lines
Quoted 4 lines
Addressing the binding differences, it's hard to see what these are right now since the sorting and other churn in the Linux device tree files. I think it would be good to sync the U-Boot files to the Linux ones so we can see what bindings still differ.
Yes, agreed.
There's a difference between:
a) The DT that U-Boot uses.
b) The DT that is passed to the kernel.
I don't see any problem embedding (a) into the U-Boot binary at all, since U-Boot is the only consumer. There's no need to update the DT separately. Even when not using
CONFIG_OF_EMBED, the DT really is logically part of the bootloader.
Quoted 7 lines
(b) is the case where people care about updating the DT separately from the firmware.
Now, if we ever get to the point where we pass the same DT to both U-Boot and the kernel, then yes, embedding the DT into the U-Boot binary would be a bad idea, since the DT couldn't be updated separately then.
Well part of the issue here is that at some decent levels of thinking why wouldn't (a) be at least a strict subset (generated?) of (b) ?
Quoted 6 lines
However, I think it's a bad idea to pass the same DT to both, since then updating it might break your bootloader and kernel, rather than just your kernel, which complicates recovery. Ideally, the only thing shared between bootloader and kernel should be the ability for the bootloader to load data (DT, initrd, kernel image) into memory, set up the appropriate CPU state, and jump to the kernel.
Well, the issue is that I've heard of some interest in trying to move forward with the case where U-Boot and Kernel share a DT or at least bundling one with another.
Now in my mind, it seems somewhat likely that we'll need to have "SPL" which has hard-coded information to it and just can't rely on a full DT being present and used and that loads U-Boot which can use a full DT. In that case watchdog+bootcount+redundant image is recovery path (watchdog cycles, bootcount sees we failed N times to get into something further, picks backup version to boot).
Of course there's lots of other fun bits around here to worry and think about.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140926/aadfad25/attachment.pgp>
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
Quoted 71 lines · Tom Rini
Quoted 52 lines · Stephen Warren
Quoted 33 lines · Tom Rini
Quoted 32 lines · Simon Glass
Hi,
Quoted 28 lines · Tom Rini
Quoted 13 lines · Masahiro Yamada
Hi Simon,
Quoted 6 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
Quoted 5 lines
(quoted diff) +5
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image.Quoted 5 lines
Quoted 2 lines
Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."Why is
CONFIG_OF_EMBEDnot recommended for production devices?It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good.
Quoted 6 lines
Quoted 4 lines
Addressing the binding differences, it's hard to see what these are right now since the sorting and other churn in the Linux device tree files. I think it would be good to sync the U-Boot files to the Linux ones so we can see what bindings still differ.
Yes, agreed.
There's a difference between:
a) The DT that U-Boot uses.
b) The DT that is passed to the kernel.
I don't see any problem embedding (a) into the U-Boot binary at all, since U-Boot is the only consumer. There's no need to update the DT separately. Even when not using
CONFIG_OF_EMBED, the DT really is logically part of the bootloader.Quoted 7 lines
(b) is the case where people care about updating the DT separately from the firmware.
Now, if we ever get to the point where we pass the same DT to both U-Boot and the kernel, then yes, embedding the DT into the U-Boot binary would be a bad idea, since the DT couldn't be updated separately then.
Well part of the issue here is that at some decent levels of thinking why wouldn't (a) be at least a strict subset (generated?) of (b) ?
Quoted 6 lines
However, I think it's a bad idea to pass the same DT to both, since then updating it might break your bootloader and kernel, rather than just your kernel, which complicates recovery. Ideally, the only thing shared between bootloader and kernel should be the ability for the bootloader to load data (DT, initrd, kernel image) into memory, set up the appropriate CPU state, and jump to the kernel.
Quoted 3 lines
Well, the issue is that I've heard of some interest in trying to move forward with the case where U-Boot and Kernel share a DT or at least bundling one with another.
Well, it depends on what you mean by "sharing a DT".
Certainly, they should share the same DT bindings (schema), so there's only one way of defining each device/feature/... in DT.
Certainly, they should share identical DT source files (*.dts). Or perhaps the U-Boot one is a subset of the kernel one, but at least identical content where they define the same thing.
This in turn means they'd share identical DT binary content (*.dtb), again perhaps with the same subset argument.
However, sharing the same physical copy of the DT in storage seems dangerous, since then you can't update the DT you pass to the kernel without risking something going wrong with the bootloader if the bootloader doesn't like the new DT you want to pass to the kernel.
Given that last point, CONFIG_OF_EMBED doesn't seem like any kind of problem to me; the DT copy that U-Boot uses would be strictly for U-Boot anyway, so there's no "separate updating" argument, and updating a DT that U-Boot uses is just as dangerous as updating the U-Boot code itself.
Quoted 3 lines
Now in my mind, it seems somewhat likely that we'll need to have "SPL" which has hard-coded information to it and just can't rely on a full DT being present and used and that loads U-Boot which can use a full DT.
Indeed, that was the point I was making to Simon earlier on. My thoughts are that if U-Boot needs hard-coded information anywhere, it should just use it always and not use DT. However, if U-Boot really wants to use DT, it should always use it and not have hard-coded tables of devices at all. Mixing both seems like a maintenance disaster. I would obviously prefer not using DT at all myself, in a bootloader at least.
Quoted 6 lines
In that case watchdog+bootcount+redundant image is recovery path (watchdog cycles, bootcount sees we failed N times to get into something further, picks backup version to boot).
Of course there's lots of other fun bits around here to worry and think about.
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
In reply to Tom RiniHi Tom,
Quoted 78 lines · Tom Rini
Quoted 10 lines · Stephen Warren
Quoted 9 lines · Tom Rini
Quoted 8 lines · Simon Glass
Hi,
Quoted 5 lines · Tom Rini
Quoted 4 lines · Masahiro Yamada
Hi Simon,
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
Review
Quoted 4 lines
(quoted diff) +4
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will bepicked up and
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
+ built into the U-Boot image.
Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."Why is
CONFIG_OF_EMBEDnot recommended for production devices?It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing
the
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share
the
Quoted 22 lines
Quoted 10 lines
Quoted 8 lines
Quoted 3 lines
DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good.
Addressing the binding differences, it's hard to see what these are right now since the sorting and other churn in the Linux device tree files. I think it would be good to sync the U-Boot files to the Linux ones so we can see what bindings still differ.
Yes, agreed.
There's a difference between:
a) The DT that U-Boot uses.
b) The DT that is passed to the kernel.
I don't see any problem embedding (a) into the U-Boot binary at all, since U-Boot is the only consumer. There's no need to update the DT separately. Even when not using
CONFIG_OF_EMBED, the DT really is logically part of the bootloader.Quoted 7 lines
(b) is the case where people care about updating the DT separately from the firmware.
Now, if we ever get to the point where we pass the same DT to both U-Boot and the kernel, then yes, embedding the DT into the U-Boot binary would be a bad idea, since the DT couldn't be updated separately then.
Well part of the issue here is that at some decent levels of thinking why wouldn't (a) be at least a strict subset (generated?) of (b) ?
Quoted 6 lines
However, I think it's a bad idea to pass the same DT to both, since then updating it might break your bootloader and kernel, rather than just your kernel, which complicates recovery. Ideally, the only thing shared between bootloader and kernel should be the ability for the bootloader to load data (DT, initrd, kernel image) into memory, set up the appropriate CPU state, and jump to the kernel.
Well, the issue is that I've heard of some interest in trying to move forward with the case where U-Boot and Kernel share a DT or at least bundling one with another.
Quoted 7 lines
Now in my mind, it seems somewhat likely that we'll need to have "SPL" which has hard-coded information to it and just can't rely on a full DT being present and used and that loads U-Boot which can use a full DT. In that case watchdog+bootcount+redundant image is recovery path (watchdog cycles, bootcount sees we failed N times to get into something further, picks backup version to boot).
If you look at Exynos there is a static table of information. See ./arch/arm/include/asm/arch-exynos/spl.h. In Chrome OS this is just copied from the device tree by a tool, so in principle it would be good to just have the DT available in SPL. There is actually no impediment to this really, it was done at the time to save time for the two settings that were needed and it grew from there. Provided that the DT is available I think it can in principle be used for everything, but I suppose there may be hard cases / exceptions. I feel that DT should buy Stephen flowers as there seems to have been a falling out :-)
Quoted 7 lines
Of course there's lots of other fun bits around here to worry and think about.
--
Tom
Regards,
Simon
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
In reply to Tom RiniHi.
Quoted 33 lines · On Fri, 26 Sep 2014 09:49:01 -0400 Tom Rini <[email protected]> wrote:
Quoted 32 lines · Simon Glass
Hi,
Quoted 28 lines · Tom Rini
Quoted 13 lines · Masahiro Yamada
Hi Simon,
Quoted 6 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
Quoted 5 lines
dts/Kconfig new file +5
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image.Quoted 5 lines
Quoted 2 lines
Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."Why is
CONFIG_OF_EMBEDnot recommended for production devices?It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good.
Quoted 6 lines
Quoted 4 lines
Addressing the binding differences, it's hard to see what these are right now since the sorting and other churn in the Linux device tree files. I think it would be good to sync the U-Boot files to the Linux ones so we can see what bindings still differ.
Yes, agreed.
Interesting.
If so, "u-boot,dm-pre-reloc" is a bad idea, isn't it?
It seems a really U-Boot-specific property,
although I only see it in test/dm/test.dts.
Best Regards
Masahiro Yamada
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
Hi Masahiro,
Quoted 48 lines · Masahiro Yamada
Hi.
Quoted 33 lines · On Fri, 26 Sep 2014 09:49:01 -0400 Tom Rini <[email protected]> wrote:
Quoted 32 lines · Simon Glass
Hi,
Quoted 28 lines · Tom Rini
Quoted 13 lines · Masahiro Yamada
Hi Simon,
Quoted 6 lines · On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass <[email protected]> wrote:
Quoted 5 lines
(quoted diff) +5
-0+config OF_EMBED + bool "Embedded DTB for DT control" + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image.Quoted 5 lines
Quoted 2 lines
Can you please add " This is suitable for debugging
and development only and is not recommended for production devices."Why is
CONFIG_OF_EMBEDnot recommended for production devices?It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good.
Quoted 6 lines
Quoted 4 lines
Addressing the binding differences, it's hard to see what these are right now since the sorting and other churn in the Linux device tree files. I think it would be good to sync the U-Boot files to the Linux ones so we can see what bindings still differ.
Yes, agreed.
Quoted 6 lines
Interesting.
If so, "u-boot,dm-pre-reloc" is a bad idea, isn't it?
It seems a really U-Boot-specific property,
although I only see it intest/dm/test.dts.
Yes it is U-Boot-specific, hence the prefix, but that is permitted. It is useful to avoid hacks I think, but let's see how it goes. Linux has its own properties also, also linux,stdout-path.
Regards,
Simon
PATCH v3 9/10 kconfig: move CONFIG_OF_* to Kconfig
In reply to Masahiro YamadaQuoted 14 lines · Masahiro Yamada
This commit moves:
CONFIG_OF_CONTROL
CONFIG_OF_SEPARATE
CONFIG_OF_EMBED
CONFIG_OF_HOSTFILEBecause these options are currently not supported for SPL, the "Device Tree Control" menu does not appear in the SPL configuration.
Note:
zynq-common.hshould be adjusted so as not to change the default value ofCONFIG_SPL_FAT_LOAD_PAYLOAD_NAME.
Quoted 5 lines
Signed-off-by Masahiro Yamada <[email protected]>Acked-by Simon Glass <[email protected]>Cc Stephen Warren <[email protected]>Cc Minkyu Kang <[email protected]>Acked-by Michal Simek <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140925/6bf5972f/attachment.pgp>