projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-rockchip-20200820' of https://gitlab.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git]
/
arch
/
Kconfig
diff --git
a/arch/Kconfig
b/arch/Kconfig
index
ae9c93e
..
e4a0a02
100644
(file)
--- a/
arch/Kconfig
+++ b/
arch/Kconfig
@@
-10,7
+10,6
@@
choice
config ARC
bool "ARC architecture"
config ARC
bool "ARC architecture"
- select ARCH_EARLY_INIT_R
select ARC_TIMER
select CLK
select HAVE_PRIVATE_LIBGCC
select ARC_TIMER
select CLK
select HAVE_PRIVATE_LIBGCC
@@
-86,6
+85,7
@@
config RISCV
config SANDBOX
bool "Sandbox"
select BOARD_LATE_INIT
config SANDBOX
bool "Sandbox"
select BOARD_LATE_INIT
+ select BZIP2
select DM
select DM_GPIO
select DM_I2C
select DM
select DM_GPIO
select DM_I2C
@@
-94,8
+94,10
@@
config SANDBOX
select DM_SERIAL
select DM_SPI
select DM_SPI_FLASH
select DM_SERIAL
select DM_SPI
select DM_SPI_FLASH
+ select GZIP_COMPRESSED
select HAVE_BLOCK_DEVICE
select LZO
select HAVE_BLOCK_DEVICE
select LZO
+ select OF_BOARD_SETUP
select PCI_ENDPOINT
select SPI
select SUPPORT_OF_CONTROL
select PCI_ENDPOINT
select SPI
select SUPPORT_OF_CONTROL
@@
-136,6
+138,7
@@
config SANDBOX
imply ACPI_PMC
imply ACPI_PMC_SANDBOX
imply CMD_PMC
imply ACPI_PMC
imply ACPI_PMC_SANDBOX
imply CMD_PMC
+ imply CMD_CLONE
config SH
bool "SuperH architecture"
config SH
bool "SuperH architecture"
@@
-157,6
+160,7
@@
config X86
select TIMER
select USE_PRIVATE_LIBGCC
select X86_TSC_TIMER
select TIMER
select USE_PRIVATE_LIBGCC
select X86_TSC_TIMER
+ imply HAS_ROM if X86_RESET_VECTOR
imply BLK
imply CMD_DM
imply CMD_FPGA_LOADMK
imply BLK
imply CMD_DM
imply CMD_FPGA_LOADMK
@@
-187,6
+191,7
@@
config X86
imply PCH
imply RTC_MC146818
imply IRQ
imply PCH
imply RTC_MC146818
imply IRQ
+ imply ACPIGEN if !QEMU
# Thing to enable for when SPL/TPL are enabled: SPL
imply SPL_DM
# Thing to enable for when SPL/TPL are enabled: SPL
imply SPL_DM