projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
arch
/
arm
/
Kconfig
diff --git
a/arch/arm/Kconfig
b/arch/arm/Kconfig
index 82e6f2dc91e4cee31921802c4ff53718c85bc4a7..876a620cf197b343ad2fdc27a9864a0bc6ee71ab 100644
(file)
--- a/
arch/arm/Kconfig
+++ b/
arch/arm/Kconfig
@@
-122,6
+122,7
@@
config ARCH_MVEBU
select DM_SPI
select DM_SPI_FLASH
select SPL_DM
select DM_SPI
select DM_SPI_FLASH
select SPL_DM
+ select SPL_DM_SEQ_ALIAS
select SPL_OF_CONTROL
select SPL_SIMPLE_BUS
select SPL_OF_CONTROL
select SPL_SIMPLE_BUS
@@
-701,8
+702,8
@@
config ARCH_UNIPHIER
Support for UniPhier SoC family developed by Socionext Inc.
(formerly, System LSI Business Division of Panasonic Corporation)
Support for UniPhier SoC family developed by Socionext Inc.
(formerly, System LSI Business Division of Panasonic Corporation)
-config
TARGET_STM32F429_DISCOVERY
- bool "Support STM32
F429 Discovery
"
+config
STM32
+ bool "Support STM32"
select CPU_V7M
select DM
select DM_SERIAL
select CPU_V7M
select DM
select DM_SERIAL
@@
-715,6
+716,10
@@
config ARCH_ROCKCHIP
select CPU_V7
select DM
select CPU_V7
select DM
+config TARGET_THUNDERX_88XX
+ bool "Support ThunderX 88xx"
+ select OF_CONTROL
+
endchoice
source "arch/arm/mach-at91/Kconfig"
endchoice
source "arch/arm/mach-at91/Kconfig"
@@
-757,6
+762,8
@@
source "arch/arm/mach-s5pc1xx/Kconfig"
source "arch/arm/mach-socfpga/Kconfig"
source "arch/arm/mach-socfpga/Kconfig"
+source "arch/arm/mach-stm32/Kconfig"
+
source "arch/arm/mach-tegra/Kconfig"
source "arch/arm/mach-uniphier/Kconfig"
source "arch/arm/mach-tegra/Kconfig"
source "arch/arm/mach-uniphier/Kconfig"
@@
-783,6
+790,7
@@
source "board/bluegiga/apx4devkit/Kconfig"
source "board/broadcom/bcm28155_ap/Kconfig"
source "board/broadcom/bcmcygnus/Kconfig"
source "board/broadcom/bcmnsp/Kconfig"
source "board/broadcom/bcm28155_ap/Kconfig"
source "board/broadcom/bcmcygnus/Kconfig"
source "board/broadcom/bcmnsp/Kconfig"
+source "board/cavium/thunderx/Kconfig"
source "board/cirrus/edb93xx/Kconfig"
source "board/compulab/cm_t335/Kconfig"
source "board/compulab/cm_t43/Kconfig"
source "board/cirrus/edb93xx/Kconfig"
source "board/compulab/cm_t335/Kconfig"
source "board/compulab/cm_t43/Kconfig"
@@
-830,7
+838,6
@@
source "board/spear/spear310/Kconfig"
source "board/spear/spear320/Kconfig"
source "board/spear/spear600/Kconfig"
source "board/spear/x600/Kconfig"
source "board/spear/spear320/Kconfig"
source "board/spear/spear600/Kconfig"
source "board/spear/x600/Kconfig"
-source "board/st/stm32f429-discovery/Kconfig"
source "board/st/stv0991/Kconfig"
source "board/sunxi/Kconfig"
source "board/syteco/zmx25/Kconfig"
source "board/st/stv0991/Kconfig"
source "board/sunxi/Kconfig"
source "board/syteco/zmx25/Kconfig"