summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-18 19:11:03 +0900
committerMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-18 23:34:27 +0900
commit992e874885ab78e6647cb1ef850d3fad7074ae11 (patch)
treec7e925aee3ddd53bd75d992b5e934ae3dedcacac
parent7e421d640b3af31b7d9376c0ebb55833ab3e2aa0 (diff)
downloadblackbird-obmc-uboot-992e874885ab78e6647cb1ef850d3fad7074ae11.tar.gz
blackbird-obmc-uboot-992e874885ab78e6647cb1ef850d3fad7074ae11.zip
ARM: UniPhier: select CONFIG_SPL
Now UniPhier platform is only supported with SPL. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--configs/ph1_ld4_defconfig1
-rw-r--r--configs/ph1_pro4_defconfig1
-rw-r--r--configs/ph1_sld8_defconfig1
4 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2b0d2c9338..5eb1d03cfa 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -800,6 +800,7 @@ config ARCH_UNIPHIER
bool "Panasonic UniPhier platform"
select CPU_V7
select SUPPORT_SPL
+ select SPL
select OF_CONTROL if !SPL_BUILD
endchoice
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index 315534065d..2e9dd00c1d 100644
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
+S:CONFIG_ARM=y
diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index 7ea4e6e879..5dca64bf88 100644
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
+S:CONFIG_ARM=y
diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index ddf210cc0d..2a6e334506 100644
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
+S:CONFIG_ARM=y
OpenPOWER on IntegriCloud