Browse Source

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.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
tags/2020-06-01
Masahiro Yamada 6 years ago
committed by Tom Rini
parent
commit
783e6a72b8
46 changed files with 78 additions and 61 deletions
  1. +2
    -0
      Kconfig
  2. +4
    -0
      arch/Kconfig
  3. +1
    -0
      arch/arm/Kconfig
  4. +5
    -0
      arch/arm/cpu/armv7/exynos/Kconfig
  5. +1
    -0
      configs/am335x_boneblack_vboot_defconfig
  6. +1
    -0
      configs/coreboot-x86_defconfig
  7. +2
    -0
      configs/microblaze-generic_defconfig
  8. +1
    -0
      configs/odroid_defconfig
  9. +1
    -0
      configs/origen_defconfig
  10. +1
    -0
      configs/s5pc210_universal_defconfig
  11. +2
    -0
      configs/sandbox_defconfig
  12. +1
    -0
      configs/trats2_defconfig
  13. +1
    -0
      configs/trats_defconfig
  14. +1
    -0
      configs/zynq_microzed_defconfig
  15. +1
    -0
      configs/zynq_zc70x_defconfig
  16. +1
    -0
      configs/zynq_zc770_xm010_defconfig
  17. +1
    -0
      configs/zynq_zc770_xm012_defconfig
  18. +1
    -0
      configs/zynq_zc770_xm013_defconfig
  19. +1
    -0
      configs/zynq_zed_defconfig
  20. +48
    -0
      dts/Kconfig
  21. +0
    -2
      include/configs/am335x_evm.h
  22. +0
    -2
      include/configs/arndale.h
  23. +0
    -2
      include/configs/beaver.h
  24. +0
    -2
      include/configs/cardhu.h
  25. +0
    -2
      include/configs/colibri_t20_iris.h
  26. +0
    -2
      include/configs/colibri_t30.h
  27. +0
    -2
      include/configs/coreboot.h
  28. +0
    -2
      include/configs/dalmore.h
  29. +0
    -4
      include/configs/exynos4-dt.h
  30. +0
    -4
      include/configs/exynos5-dt.h
  31. +0
    -2
      include/configs/harmony.h
  32. +0
    -2
      include/configs/jetson-tk1.h
  33. +0
    -2
      include/configs/medcom-wide.h
  34. +0
    -2
      include/configs/microblaze-generic.h
  35. +0
    -2
      include/configs/paz00.h
  36. +0
    -2
      include/configs/plutux.h
  37. +0
    -2
      include/configs/sandbox.h
  38. +0
    -2
      include/configs/seaboard.h
  39. +0
    -2
      include/configs/tec-ng.h
  40. +0
    -2
      include/configs/tec.h
  41. +0
    -1
      include/configs/tegra-common-post.h
  42. +0
    -2
      include/configs/trimslice.h
  43. +0
    -2
      include/configs/venice2.h
  44. +0
    -2
      include/configs/ventana.h
  45. +0
    -2
      include/configs/whistler.h
  46. +1
    -8
      include/configs/zynq-common.h

+ 2
- 0
Kconfig View File

@@ -106,6 +106,8 @@ source "arch/Kconfig"

source "common/Kconfig"

source "dts/Kconfig"

source "net/Kconfig"

source "drivers/Kconfig"


+ 4
- 0
arch/Kconfig View File

@@ -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



+ 1
- 0
arch/arm/Kconfig View File

@@ -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"


+ 5
- 0
arch/arm/cpu/armv7/exynos/Kconfig View File

@@ -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



+ 1
- 0
configs/am335x_boneblack_vboot_defconfig View File

@@ -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

+ 1
- 0
configs/coreboot-x86_defconfig View File

@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000"
CONFIG_X86=y
CONFIG_TARGET_COREBOOT=y
CONFIG_OF_CONTROL=y

+ 2
- 0
configs/microblaze-generic_defconfig View File

@@ -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

+ 1
- 0
configs/odroid_defconfig View File

@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_ODROID=y
CONFIG_OF_CONTROL=y

+ 1
- 0
configs/origen_defconfig View File

@@ -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

+ 1
- 0
configs/s5pc210_universal_defconfig View File

@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_S5PC210_UNIVERSAL=y
CONFIG_OF_CONTROL=y

+ 2
- 0
configs/sandbox_defconfig View File

@@ -0,0 +1,2 @@
CONFIG_OF_CONTROL=y
CONFIG_OF_HOSTFILE=y

+ 1
- 0
configs/trats2_defconfig View File

@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS2=y
CONFIG_OF_CONTROL=y

+ 1
- 0
configs/trats_defconfig View File

@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS=y
CONFIG_OF_CONTROL=y

+ 1
- 0
configs/zynq_microzed_defconfig View File

@@ -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

+ 1
- 0
configs/zynq_zc70x_defconfig View File

@@ -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

+ 1
- 0
configs/zynq_zc770_xm010_defconfig View File

@@ -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

+ 1
- 0
configs/zynq_zc770_xm012_defconfig View File

@@ -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

+ 1
- 0
configs/zynq_zc770_xm013_defconfig View File

@@ -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

+ 1
- 0
configs/zynq_zed_defconfig View File

@@ -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

+ 48
- 0
dts/Kconfig View File

@@ -0,0 +1,48 @@
#
# Device Tree Control
#
# TODO:
# This feature is not currently supported for SPL,
# but this restriction should be removed in the future.

config SUPPORT_OF_CONTROL
bool

menu "Device Tree Control"
depends on !SPL_BUILD
depends on SUPPORT_OF_CONTROL

config OF_CONTROL
bool "Run-time configuration via Device Tree"
help
This feature provides for run-time configuration of U-Boot
via a flattened device tree.

choice
prompt "Provider of DTB for DT control"
depends on OF_CONTROL

config OF_SEPARATE
bool "Separate DTB for DT control"
depends on !SANDBOX
help
If this option is enabled, the device tree will be built and
placed as a separate u-boot.dtb file alongside the U-Boot image.

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.

config OF_HOSTFILE
bool "Host filed DTB for DT control"
depends on SANDBOX
help
If this option is enabled, DTB will be read from a file on startup.
This is only useful for Sandbox. Use the -d flag to U-Boot to
specify the file to read.

endchoice

endmenu

+ 0
- 2
include/configs/am335x_evm.h View File

@@ -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


+ 0
- 2
include/configs/arndale.h View File

@@ -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


+ 0
- 2
include/configs/beaver.h View File

@@ -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) # "


+ 0
- 2
include/configs/cardhu.h View File

@@ -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) # "


+ 0
- 2
include/configs/colibri_t20_iris.h View File

@@ -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) # "


+ 0
- 2
include/configs/colibri_t30.h View File

@@ -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"


+ 0
- 2
include/configs/coreboot.h View File

@@ -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


+ 0
- 2
include/configs/dalmore.h View File

@@ -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) # "


+ 0
- 4
include/configs/exynos4-dt.h View File

@@ -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 */


+ 0
- 4
include/configs/exynos5-dt.h View File

@@ -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


+ 0
- 2
include/configs/harmony.h View File

@@ -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) # "


+ 0
- 2
include/configs/jetson-tk1.h View File

@@ -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) # "


+ 0
- 2
include/configs/medcom-wide.h View File

@@ -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) # "


+ 0
- 2
include/configs/microblaze-generic.h View File

@@ -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 */


+ 0
- 2
include/configs/paz00.h View File

@@ -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 # "


+ 0
- 2
include/configs/plutux.h View File

@@ -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) # "


+ 0
- 2
include/configs/sandbox.h View File

@@ -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


+ 0
- 2
include/configs/seaboard.h View File

@@ -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) # "


+ 0
- 2
include/configs/tec-ng.h View File

@@ -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) # "


+ 0
- 2
include/configs/tec.h View File

@@ -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) # "


+ 0
- 1
include/configs/tegra-common-post.h View File

@@ -69,7 +69,6 @@

/* remove devicetree support */
#ifdef CONFIG_OF_CONTROL
#undef CONFIG_OF_CONTROL
#endif

/* remove I2C support */


+ 0
- 2
include/configs/trimslice.h View File

@@ -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) # "


+ 0
- 2
include/configs/venice2.h View File

@@ -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) # "


+ 0
- 2
include/configs/ventana.h View File

@@ -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) # "


+ 0
- 2
include/configs/whistler.h View File

@@ -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) # "


+ 1
- 8
include/configs/zynq-common.h View File

@@ -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. */