Merge patch series "drivers: ata: Remove duplicate newlines"

[J-u-boot.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index c9a3359225288bb08bbcc7c54e39457c19630efc..abd406d4884133932b3b7bc1f2e8aacc57ce4cc3 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -20,6 +20,12 @@ config SYS_CACHE_SHIFT_6
 config SYS_CACHE_SHIFT_7
        bool
 
+config 32BIT
+       bool
+
+config 64BIT
+       bool
+
 config SYS_CACHELINE_SIZE
        int
        default 128 if SYS_CACHE_SHIFT_7
@@ -68,7 +74,6 @@ config M68K
        bool "M68000 architecture"
        select HAVE_PRIVATE_LIBGCC
        select USE_PRIVATE_LIBGCC
-       select NEEDS_MANUAL_RELOC
        select SYS_BOOT_GET_CMDLINE
        select SYS_BOOT_GET_KBD
        select SYS_CACHE_SHIFT_4
@@ -109,6 +114,7 @@ config PPC
 config RISCV
        bool "RISC-V architecture"
        select CREATE_ARCH_SYMLINK
+       select SUPPORT_ACPI
        select SUPPORT_OF_CONTROL
        select OF_CONTROL
        select DM
@@ -135,7 +141,7 @@ config SANDBOX
        select ARCH_SUPPORTS_LTO
        select BOARD_LATE_INIT
        select BZIP2
-       select CMD_POWEROFF
+       select CMD_POWEROFF if CMDLINE
        select DM
        select DM_EVENT
        select DM_FUZZING_ENGINE
@@ -149,14 +155,15 @@ config SANDBOX
        select GZIP_COMPRESSED
        select IO_TRACE
        select LZO
+       select MTD
        select OF_BOARD_SETUP
        select PCI_ENDPOINT
        select SPI
        select SUPPORT_OF_CONTROL
-       select SYSRESET_CMD_POWEROFF
+       select SYSRESET_CMD_POWEROFF if CMD_POWEROFF
        select SYS_CACHE_SHIFT_4
        select IRQ
-       select SUPPORT_EXTENSION_SCAN
+       select SUPPORT_EXTENSION_SCAN if CMDLINE
        select SUPPORT_ACPI
        imply BITREVERSE
        select BLOBLIST
@@ -209,6 +216,11 @@ config SANDBOX
        imply PHYSMEM
        imply GENERATE_ACPI_TABLE
        imply BINMAN
+       imply CMD_MBR
+       imply CMD_MMC
+       imply BOOTSTD_DEFAULTS if BOOTSTD_FULL && CMDLINE
+       imply BOOTMETH_DISTRO if BOOTSTD_FULL && CMDLINE
+       imply CMD_SYSBOOT if BOOTSTD_FULL
 
 config SH
        bool "SuperH architecture"
@@ -242,16 +254,17 @@ config X86
        imply CMD_PCI
        imply CMD_SF
        imply CMD_SF_TEST
-       imply CMD_ZBOOT
        imply DM_GPIO
        imply DM_KEYBOARD
        imply DM_MMC
        imply DM_RTC
-       imply DM_SCSI
+       imply SCSI
        imply DM_SERIAL
+       imply MTD
        imply DM_SPI
        imply DM_SPI_FLASH
        imply DM_USB
+       imply LAST_STAGE_INIT
        imply VIDEO
        imply SYSRESET
        imply SPL_SYSRESET
@@ -353,7 +366,16 @@ config SYS_BOARD
          leave this option empty.
 
 config SYS_CONFIG_NAME
-       string
+       string "Board header file" if ARCH_MESON || ARCH_VERSAL || \
+               ARCH_VERSAL_NET || ARCH_ZYNQ || ARCH_ZYNQMP || \
+               ARCH_ZYNQMP_R5 || MICROBLAZE || NIOS2
+       default "meson64" if ARCH_MESON
+       default "microblaze-generic" if MICROBLAZE
+       default "xilinx_versal" if ARCH_VERSAL
+       default "xilinx_versal_net" if ARCH_VERSAL_NET
+       default "xilinx_zynqmp" if ARCH_ZYNQMP
+       default "xilinx_zynqmp_r5" if ARCH_ZYNQMP_R5
+       default "zynq-common" if ARCH_ZYNQ
        help
          This option should contain the base name of board header file.
          The header file include/configs/<CONFIG_SYS_CONFIG_NAME>.h