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>utp
parent
540d434aa4
commit
783e6a72b8
2
Kconfig
2
Kconfig
|
@ -106,6 +106,8 @@ source "arch/Kconfig"
|
||||||
|
|
||||||
source "common/Kconfig"
|
source "common/Kconfig"
|
||||||
|
|
||||||
|
source "dts/Kconfig"
|
||||||
|
|
||||||
source "net/Kconfig"
|
source "net/Kconfig"
|
||||||
|
|
||||||
source "drivers/Kconfig"
|
source "drivers/Kconfig"
|
||||||
|
|
|
@ -7,6 +7,7 @@ config ARC
|
||||||
|
|
||||||
config ARM
|
config ARM
|
||||||
bool "ARM architecture"
|
bool "ARM architecture"
|
||||||
|
select SUPPORT_OF_CONTROL
|
||||||
|
|
||||||
config AVR32
|
config AVR32
|
||||||
bool "AVR32 architecture"
|
bool "AVR32 architecture"
|
||||||
|
@ -19,6 +20,7 @@ config M68K
|
||||||
|
|
||||||
config MICROBLAZE
|
config MICROBLAZE
|
||||||
bool "MicroBlaze architecture"
|
bool "MicroBlaze architecture"
|
||||||
|
select SUPPORT_OF_CONTROL
|
||||||
|
|
||||||
config MIPS
|
config MIPS
|
||||||
bool "MIPS architecture"
|
bool "MIPS architecture"
|
||||||
|
@ -37,6 +39,7 @@ config PPC
|
||||||
|
|
||||||
config SANDBOX
|
config SANDBOX
|
||||||
bool "Sandbox"
|
bool "Sandbox"
|
||||||
|
select SUPPORT_OF_CONTROL
|
||||||
|
|
||||||
config SH
|
config SH
|
||||||
bool "SuperH architecture"
|
bool "SuperH architecture"
|
||||||
|
@ -46,6 +49,7 @@ config SPARC
|
||||||
|
|
||||||
config X86
|
config X86
|
||||||
bool "x86 architecture"
|
bool "x86 architecture"
|
||||||
|
select SUPPORT_OF_CONTROL
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
|
|
@ -462,6 +462,7 @@ config ZYNQ
|
||||||
config TEGRA
|
config TEGRA
|
||||||
bool "NVIDIA Tegra"
|
bool "NVIDIA Tegra"
|
||||||
select SPL
|
select SPL
|
||||||
|
select OF_CONTROL if !SPL_BUILD
|
||||||
|
|
||||||
config TARGET_VEXPRESS_AEMV8A
|
config TARGET_VEXPRESS_AEMV8A
|
||||||
bool "Support vexpress_aemv8a"
|
bool "Support vexpress_aemv8a"
|
||||||
|
|
|
@ -23,18 +23,23 @@ config TARGET_ODROID
|
||||||
|
|
||||||
config TARGET_ARNDALE
|
config TARGET_ARNDALE
|
||||||
bool "Exynos5250 Arndale board"
|
bool "Exynos5250 Arndale board"
|
||||||
|
select OF_CONTROL if !SPL_BUILD
|
||||||
|
|
||||||
config TARGET_SMDK5250
|
config TARGET_SMDK5250
|
||||||
bool "SMDK5250 board"
|
bool "SMDK5250 board"
|
||||||
|
select OF_CONTROL if !SPL_BUILD
|
||||||
|
|
||||||
config TARGET_SNOW
|
config TARGET_SNOW
|
||||||
bool "Snow board"
|
bool "Snow board"
|
||||||
|
select OF_CONTROL if !SPL_BUILD
|
||||||
|
|
||||||
config TARGET_SMDK5420
|
config TARGET_SMDK5420
|
||||||
bool "SMDK5420 board"
|
bool "SMDK5420 board"
|
||||||
|
select OF_CONTROL if !SPL_BUILD
|
||||||
|
|
||||||
config TARGET_PEACH_PIT
|
config TARGET_PEACH_PIT
|
||||||
bool "Peach Pi board"
|
bool "Peach Pi board"
|
||||||
|
select OF_CONTROL if !SPL_BUILD
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
|
|
@ -2,3 +2,4 @@ CONFIG_SPL=y
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT"
|
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT"
|
||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_TARGET_AM335X_EVM=y
|
+S:CONFIG_TARGET_AM335X_EVM=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000"
|
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000"
|
||||||
CONFIG_X86=y
|
CONFIG_X86=y
|
||||||
CONFIG_TARGET_COREBOOT=y
|
CONFIG_TARGET_COREBOOT=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
+S:CONFIG_MICROBLAZE=y
|
+S:CONFIG_MICROBLAZE=y
|
||||||
+S:CONFIG_TARGET_MICROBLAZE_GENERIC=y
|
+S:CONFIG_TARGET_MICROBLAZE_GENERIC=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
CONFIG_OF_EMBED=y
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_ARCH_EXYNOS=y
|
CONFIG_ARCH_EXYNOS=y
|
||||||
CONFIG_TARGET_ODROID=y
|
CONFIG_TARGET_ODROID=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -2,3 +2,4 @@ CONFIG_SPL=y
|
||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_EXYNOS=y
|
+S:CONFIG_ARCH_EXYNOS=y
|
||||||
+S:CONFIG_TARGET_ORIGEN=y
|
+S:CONFIG_TARGET_ORIGEN=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_ARCH_EXYNOS=y
|
CONFIG_ARCH_EXYNOS=y
|
||||||
CONFIG_TARGET_S5PC210_UNIVERSAL=y
|
CONFIG_TARGET_S5PC210_UNIVERSAL=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
CONFIG_OF_HOSTFILE=y
|
|
@ -1,3 +1,4 @@
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_ARCH_EXYNOS=y
|
CONFIG_ARCH_EXYNOS=y
|
||||||
CONFIG_TARGET_TRATS2=y
|
CONFIG_TARGET_TRATS2=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_ARCH_EXYNOS=y
|
CONFIG_ARCH_EXYNOS=y
|
||||||
CONFIG_TARGET_TRATS=y
|
CONFIG_TARGET_TRATS=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -2,3 +2,4 @@ CONFIG_SPL=y
|
||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ZYNQ=y
|
+S:CONFIG_ZYNQ=y
|
||||||
+S:CONFIG_TARGET_ZYNQ_MICROZED=y
|
+S:CONFIG_TARGET_ZYNQ_MICROZED=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -2,3 +2,4 @@ CONFIG_SPL=y
|
||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ZYNQ=y
|
+S:CONFIG_ZYNQ=y
|
||||||
+S:CONFIG_TARGET_ZYNQ_ZC70X=y
|
+S:CONFIG_TARGET_ZYNQ_ZC70X=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
|
||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ZYNQ=y
|
+S:CONFIG_ZYNQ=y
|
||||||
+S:CONFIG_TARGET_ZYNQ_ZC770=y
|
+S:CONFIG_TARGET_ZYNQ_ZC770=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
|
||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ZYNQ=y
|
+S:CONFIG_ZYNQ=y
|
||||||
+S:CONFIG_TARGET_ZYNQ_ZC770=y
|
+S:CONFIG_TARGET_ZYNQ_ZC770=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
|
||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ZYNQ=y
|
+S:CONFIG_ZYNQ=y
|
||||||
+S:CONFIG_TARGET_ZYNQ_ZC770=y
|
+S:CONFIG_TARGET_ZYNQ_ZC770=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -2,3 +2,4 @@ CONFIG_SPL=y
|
||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ZYNQ=y
|
+S:CONFIG_ZYNQ=y
|
||||||
+S:CONFIG_TARGET_ZYNQ_ZED=y
|
+S:CONFIG_TARGET_ZYNQ_ZED=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
|
|
@ -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
|
|
@ -23,8 +23,6 @@
|
||||||
# define CONFIG_TIMESTAMP
|
# define CONFIG_TIMESTAMP
|
||||||
# define CONFIG_LZO
|
# define CONFIG_LZO
|
||||||
# ifdef CONFIG_ENABLE_VBOOT
|
# ifdef CONFIG_ENABLE_VBOOT
|
||||||
# define CONFIG_OF_CONTROL
|
|
||||||
# define CONFIG_OF_SEPARATE
|
|
||||||
# define CONFIG_DEFAULT_DEVICE_TREE am335x-boneblack
|
# define CONFIG_DEFAULT_DEVICE_TREE am335x-boneblack
|
||||||
# define CONFIG_FIT_SIGNATURE
|
# define CONFIG_FIT_SIGNATURE
|
||||||
# define CONFIG_RSA
|
# define CONFIG_RSA
|
||||||
|
|
|
@ -22,8 +22,6 @@
|
||||||
#define CONFIG_DISPLAY_CPUINFO
|
#define CONFIG_DISPLAY_CPUINFO
|
||||||
#define CONFIG_DISPLAY_BOARDINFO
|
#define CONFIG_DISPLAY_BOARDINFO
|
||||||
|
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* Allow tracing to be enabled */
|
/* Allow tracing to be enabled */
|
||||||
#define CONFIG_TRACE
|
#define CONFIG_TRACE
|
||||||
|
|
|
@ -26,8 +26,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra30 (Beaver) # "
|
#define V_PROMPT "Tegra30 (Beaver) # "
|
||||||
|
|
|
@ -26,8 +26,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Cardhu. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Cardhu. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-cardhu
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-cardhu
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra30 (Cardhu) # "
|
#define V_PROMPT "Tegra30 (Cardhu) # "
|
||||||
|
|
|
@ -11,8 +11,6 @@
|
||||||
|
|
||||||
/* Enable FDT support */
|
/* Enable FDT support */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-colibri_t20_iris
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-colibri_t20_iris
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (Colibri) # "
|
#define V_PROMPT "Tegra20 (Colibri) # "
|
||||||
|
|
|
@ -12,8 +12,6 @@
|
||||||
#include "tegra30-common.h"
|
#include "tegra30-common.h"
|
||||||
|
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-colibri
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-colibri
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
#define V_PROMPT "Colibri T30 # "
|
#define V_PROMPT "Colibri T30 # "
|
||||||
#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30"
|
#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30"
|
||||||
|
|
|
@ -28,8 +28,6 @@
|
||||||
|
|
||||||
#define CONFIG_LMB
|
#define CONFIG_LMB
|
||||||
#define CONFIG_OF_LIBFDT
|
#define CONFIG_OF_LIBFDT
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE link
|
#define CONFIG_DEFAULT_DEVICE_TREE link
|
||||||
|
|
||||||
#define CONFIG_BOOTSTAGE
|
#define CONFIG_BOOTSTAGE
|
||||||
|
|
|
@ -23,8 +23,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Dalmore. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Dalmore. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra114-dalmore
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra114-dalmore
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra114 (Dalmore) # "
|
#define V_PROMPT "Tegra114 (Dalmore) # "
|
||||||
|
|
|
@ -22,10 +22,6 @@
|
||||||
#define CONFIG_BOARD_COMMON
|
#define CONFIG_BOARD_COMMON
|
||||||
#define CONFIG_SYS_GENERIC_BOARD
|
#define CONFIG_SYS_GENERIC_BOARD
|
||||||
|
|
||||||
/* Enable fdt support */
|
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
#define CONFIG_SYS_CACHELINE_SIZE 32
|
#define CONFIG_SYS_CACHELINE_SIZE 32
|
||||||
|
|
||||||
/* input clock of PLL: EXYNOS4 boards have 24MHz input clock */
|
/* input clock of PLL: EXYNOS4 boards have 24MHz input clock */
|
||||||
|
|
|
@ -24,10 +24,6 @@
|
||||||
#define CONFIG_ARCH_EARLY_INIT_R
|
#define CONFIG_ARCH_EARLY_INIT_R
|
||||||
#define CONFIG_EXYNOS_SPL
|
#define CONFIG_EXYNOS_SPL
|
||||||
|
|
||||||
/* Enable fdt support for Exynos5250 */
|
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* Allow tracing to be enabled */
|
/* Allow tracing to be enabled */
|
||||||
#define CONFIG_TRACE
|
#define CONFIG_TRACE
|
||||||
#define CONFIG_CMD_TRACE
|
#define CONFIG_CMD_TRACE
|
||||||
|
|
|
@ -13,8 +13,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Harmony. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Harmony. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-harmony
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-harmony
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (Harmony) # "
|
#define V_PROMPT "Tegra20 (Harmony) # "
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Jetson TK1. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Jetson TK1. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra124-jetson-tk1
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra124-jetson-tk1
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra124 (Jetson TK1) # "
|
#define V_PROMPT "Tegra124 (Jetson TK1) # "
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Medcom-Wide. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Medcom-Wide. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-medcom-wide
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-medcom-wide
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (Medcom-Wide) # "
|
#define V_PROMPT "Tegra20 (Medcom-Wide) # "
|
||||||
|
|
|
@ -15,8 +15,6 @@
|
||||||
#define MICROBLAZE_V5 1
|
#define MICROBLAZE_V5 1
|
||||||
|
|
||||||
/* Open Firmware DTS */
|
/* Open Firmware DTS */
|
||||||
#define CONFIG_OF_CONTROL 1
|
|
||||||
#define CONFIG_OF_EMBED 1
|
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE microblaze-generic
|
#define CONFIG_DEFAULT_DEVICE_TREE microblaze-generic
|
||||||
|
|
||||||
/* linear and spi flash memory */
|
/* linear and spi flash memory */
|
||||||
|
|
|
@ -22,8 +22,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Paz00. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Paz00. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-paz00
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-paz00
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (Paz00) MOD # "
|
#define V_PROMPT "Tegra20 (Paz00) MOD # "
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Plutux. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Plutux. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-plutux
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-plutux
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (Plutux) # "
|
#define V_PROMPT "Tegra20 (Plutux) # "
|
||||||
|
|
|
@ -38,8 +38,6 @@
|
||||||
/* Number of bits in a C 'long' on this architecture */
|
/* Number of bits in a C 'long' on this architecture */
|
||||||
#define CONFIG_SANDBOX_BITS_PER_LONG 64
|
#define CONFIG_SANDBOX_BITS_PER_LONG 64
|
||||||
|
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_HOSTFILE
|
|
||||||
#define CONFIG_OF_LIBFDT
|
#define CONFIG_OF_LIBFDT
|
||||||
#define CONFIG_LMB
|
#define CONFIG_LMB
|
||||||
#define CONFIG_FIT
|
#define CONFIG_FIT
|
||||||
|
|
|
@ -21,8 +21,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Seaboard. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Seaboard. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-seaboard
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-seaboard
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (SeaBoard) # "
|
#define V_PROMPT "Tegra20 (SeaBoard) # "
|
||||||
|
|
|
@ -12,8 +12,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for tec-ng. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for tec-ng. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-tec-ng
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-tec-ng
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra30 (TEC-NG) # "
|
#define V_PROMPT "Tegra30 (TEC-NG) # "
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for TEC. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for TEC. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-tec
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-tec
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (TEC) # "
|
#define V_PROMPT "Tegra20 (TEC) # "
|
||||||
|
|
|
@ -69,7 +69,6 @@
|
||||||
|
|
||||||
/* remove devicetree support */
|
/* remove devicetree support */
|
||||||
#ifdef CONFIG_OF_CONTROL
|
#ifdef CONFIG_OF_CONTROL
|
||||||
#undef CONFIG_OF_CONTROL
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* remove I2C support */
|
/* remove I2C support */
|
||||||
|
|
|
@ -13,8 +13,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-trimslice
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-trimslice
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (TrimSlice) # "
|
#define V_PROMPT "Tegra20 (TrimSlice) # "
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Venice2. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Venice2. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra124-venice2
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra124-venice2
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra124 (Venice2) # "
|
#define V_PROMPT "Tegra124 (Venice2) # "
|
||||||
|
|
|
@ -13,8 +13,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Ventana. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Ventana. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-ventana
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-ventana
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (Ventana) # "
|
#define V_PROMPT "Tegra20 (Ventana) # "
|
||||||
|
|
|
@ -13,8 +13,6 @@
|
||||||
|
|
||||||
/* Enable fdt support for Whistler. Flash the image in u-boot-dtb.bin */
|
/* Enable fdt support for Whistler. Flash the image in u-boot-dtb.bin */
|
||||||
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-whistler
|
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-whistler
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
|
|
||||||
/* High-level configuration options */
|
/* High-level configuration options */
|
||||||
#define V_PROMPT "Tegra20 (Whistler) # "
|
#define V_PROMPT "Tegra20 (Whistler) # "
|
||||||
|
|
|
@ -227,8 +227,6 @@
|
||||||
#define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */
|
#define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */
|
||||||
|
|
||||||
/* FDT support */
|
/* FDT support */
|
||||||
#define CONFIG_OF_CONTROL
|
|
||||||
#define CONFIG_OF_SEPARATE
|
|
||||||
#define CONFIG_DISPLAY_BOARDINFO_LATE
|
#define CONFIG_DISPLAY_BOARDINFO_LATE
|
||||||
|
|
||||||
/* RSA support */
|
/* RSA support */
|
||||||
|
@ -273,18 +271,13 @@
|
||||||
#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
|
#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
|
||||||
#define CONFIG_SPL_LIBDISK_SUPPORT
|
#define CONFIG_SPL_LIBDISK_SUPPORT
|
||||||
#define CONFIG_SPL_FAT_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"
|
||||||
# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
|
|
||||||
#else
|
|
||||||
# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Disable dcache for SPL just for sure */
|
/* Disable dcache for SPL just for sure */
|
||||||
#ifdef CONFIG_SPL_BUILD
|
#ifdef CONFIG_SPL_BUILD
|
||||||
#define CONFIG_SYS_DCACHE_OFF
|
#define CONFIG_SYS_DCACHE_OFF
|
||||||
#undef CONFIG_FPGA
|
#undef CONFIG_FPGA
|
||||||
#undef CONFIG_OF_CONTROL
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Address in RAM where the parameters must be copied by SPL. */
|
/* Address in RAM where the parameters must be copied by SPL. */
|
||||||
|
|
Loading…
Reference in New Issue