Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / arch / powerpc / cpu / ppc4xx / Kconfig

diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
index 23ecc895fbcd7b93072e413acd0051d33192a5fc..a6066efe8167b66ecca945faf63470922daacf95 100644 (file)
--- a/arch/powerpc/cpu/ppc4xx/Kconfig
+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
@@ -8,6 +8,9 @@ choice
        prompt "Target select"
        optional
 
+config TARGET_LWMON5
+       bool "Support lwmon5"
+
 config TARGET_T3CORP
        bool "Support t3corp"
 
@@ -25,11 +28,9 @@ config TARGET_CANYONLANDS
        select DM
        select DM_SERIAL
 
-config TARGET_EBONY
-       bool "Support ebony"
-
 config TARGET_KATMAI
        bool "Support katmai"
+       select PHYS_64BIT
 
 config TARGET_KILAUEA
        bool "Support kilauea"
@@ -40,21 +41,12 @@ config TARGET_LUAN
 config TARGET_MAKALU
        bool "Support makalu"
 
-config TARGET_OCOTEA
-       bool "Support ocotea"
-
 config TARGET_REDWOOD
        bool "Support redwood"
 
 config TARGET_SEQUOIA
        bool "Support sequoia"
 
-config TARGET_TAIHU
-       bool "Support taihu"
-
-config TARGET_TAISHAN
-       bool "Support taishan"
-
 config TARGET_WALNUT
        bool "Support walnut"
 
@@ -64,12 +56,6 @@ config TARGET_YOSEMITE
 config TARGET_YUCCA
        bool "Support yucca"
 
-config TARGET_FX12MM
-       bool "Support fx12mm"
-
-config TARGET_V5FX30TEVAL
-       bool "Support v5fx30teval"
-
 config TARGET_CPCI2DP
        bool "Support CPCI2DP"
 
@@ -118,20 +104,28 @@ config TARGET_ICON
 config TARGET_MIP405
        bool "Support MIP405"
 
+config TARGET_MIP405T
+       bool "Support MIP405T"
+
 config TARGET_PIP405
        bool "Support PIP405"
 
 config TARGET_XPEDITE1000
        bool "Support xpedite1000"
 
-config TARGET_ML507
-       bool "Support ml507"
-
 config TARGET_XILINX_PPC405_GENERIC
        bool "Support xilinx-ppc405-generic"
+       select SUPPORT_SPL
+       select OF_CONTROL
+       select DM
+       select DM_SERIAL
 
 config TARGET_XILINX_PPC440_GENERIC
        bool "Support xilinx-ppc440-generic"
+       select SUPPORT_SPL
+       select OF_CONTROL
+       select DM
+       select DM_SERIAL
 
 endchoice
 
@@ -139,21 +133,15 @@ source "board/amcc/acadia/Kconfig"
 source "board/amcc/bamboo/Kconfig"
 source "board/amcc/bubinga/Kconfig"
 source "board/amcc/canyonlands/Kconfig"
-source "board/amcc/ebony/Kconfig"
 source "board/amcc/katmai/Kconfig"
 source "board/amcc/kilauea/Kconfig"
 source "board/amcc/luan/Kconfig"
 source "board/amcc/makalu/Kconfig"
-source "board/amcc/ocotea/Kconfig"
 source "board/amcc/redwood/Kconfig"
 source "board/amcc/sequoia/Kconfig"
-source "board/amcc/taihu/Kconfig"
-source "board/amcc/taishan/Kconfig"
 source "board/amcc/walnut/Kconfig"
 source "board/amcc/yosemite/Kconfig"
 source "board/amcc/yucca/Kconfig"
-source "board/avnet/fx12mm/Kconfig"
-source "board/avnet/v5fx30teval/Kconfig"
 source "board/esd/cpci2dp/Kconfig"
 source "board/esd/cpci405/Kconfig"
 source "board/esd/plu405/Kconfig"
@@ -165,12 +153,12 @@ source "board/gdsys/405ex/Kconfig"
 source "board/gdsys/dlvision/Kconfig"
 source "board/gdsys/gdppc440etx/Kconfig"
 source "board/gdsys/intip/Kconfig"
+source "board/liebherr/lwmon5/Kconfig"
 source "board/mosaixtech/icon/Kconfig"
 source "board/mpl/mip405/Kconfig"
 source "board/mpl/pip405/Kconfig"
 source "board/t3corp/Kconfig"
 source "board/xes/xpedite1000/Kconfig"
-source "board/xilinx/ml507/Kconfig"
 source "board/xilinx/ppc405-generic/Kconfig"
 source "board/xilinx/ppc440-generic/Kconfig"