ARM: uniphier: select SPL_DM rather than default in defconfig

Now UniPhier SoCs highly depend on Driver Model for SPL, too.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a99ae2844432d56abbc84af7e329bde89f551890..5f3af7773bf679ad6e7f541aa251eec22d480cae 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -817,6 +817,7 @@ config ARCH_UNIPHIER
        select SPL
        select OF_CONTROL
        select DM
+       select SPL_DM
        select DM_SERIAL
        select DM_I2C
        help

diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index f84dcdf46a4af78019cec0812b871f6eaabcd5f0..56c215fe375db5c3c8c46d74f08d0d652df8c92f 100644 (file)
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -17,7 +17,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 # CONFIG_CMD_MISC is not set
 CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8

diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index 2fc844d9074695c2f39d6180dd6e5396f345de7e..7624c547f68caec6f10d5e19ce8879094dc27730 100644 (file)
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -16,7 +16,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 # CONFIG_CMD_MISC is not set
 CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8

diff --git a/configs/ph1_sld3_defconfig b/configs/ph1_sld3_defconfig
index 386a0d13dd933cdb0a696bcc69cf3a7241394e5e..d49513251e3d8992ba868c125c124be114150b77 100644 (file)
--- a/configs/ph1_sld3_defconfig
+++ b/configs/ph1_sld3_defconfig
@@ -17,7 +17,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 # CONFIG_CMD_MISC is not set
 CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8

diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index 2af45d2a557a6974c3c39a7cb439255a8344e74f..1a35a77f67f3e303a3be7cac13d392c2f836d9cb 100644 (file)
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -17,7 +17,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 # CONFIG_CMD_MISC is not set
 CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8