exynos: Convert to use CONFIG_BLK

Move all exynos boards over to use CONFIG_BLK.

This converts s5p_goni also, but adding dummy functions for pinmux and
peripheral ID. This will not function correctly, but gives the maintainer
more time to convert the board if desired.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index ed04369cfae386de5f6c65488251d52f19a1f02e..38077703621d2c3085c0394fd28929584821cb6e 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -8,6 +8,8 @@ config ARCH_EXYNOS4
        bool "Exynos4 SoC family"
        select BOARD_EARLY_INIT_F
        select CPU_V7A
+       select BLK
+       select DM_MMC
        help
          Samsung Exynos4 SoC family are based on ARM Cortex-A9 CPU. There
          are multiple SoCs in this family including Exynos4210, Exynos4412,
@@ -24,6 +26,9 @@ config ARCH_EXYNOS5
        imply USB_ETHER_ASIX
        imply USB_ETHER_RTL8152
        imply USB_ETHER_SMSC95XX
+       select BLK
+       select DM_MMC
+
        help
          Samsung Exynos5 SoC family are based on ARM Cortex-A15 CPU (and
          Cortex-A7 CPU in big.LITTLE configuration). There are multiple SoCs
@@ -33,6 +38,8 @@ config ARCH_EXYNOS7
        bool "Exynos7 SoC family"
        select ARM64
        select BOARD_EARLY_INIT_F
+       select BLK
+       select DM_MMC
        help
          Samsung Exynos7 SoC family are based on ARM Cortex-A57 CPU or
          Cortex-A53 CPU (and some in a big.LITTLE configuration). There are

diff --git a/arch/arm/mach-s5pc1xx/Kconfig b/arch/arm/mach-s5pc1xx/Kconfig
index 04acdaad79ce4d4320e8f757f0a3cee89815b8c0..8cffced5512b6950e0f50e4185fda0008d114376 100644 (file)
--- a/arch/arm/mach-s5pc1xx/Kconfig
+++ b/arch/arm/mach-s5pc1xx/Kconfig
@@ -7,6 +7,8 @@ choice
 config TARGET_S5P_GONI
        bool "S5P Goni board"
        select OF_CONTROL
+       select BLK
+       select DM_MMC
 
 config TARGET_SMDKC100
        bool "Support smdkc100 board"

diff --git a/arch/arm/mach-s5pc1xx/Makefile b/arch/arm/mach-s5pc1xx/Makefile
index a4be3fcbdae5ab33e8e3e0939a1aac6c1f517767..ab804604d5458d1b58c3965425dcdcbd39c3aa84 100644 (file)
--- a/arch/arm/mach-s5pc1xx/Makefile
+++ b/arch/arm/mach-s5pc1xx/Makefile
@@ -10,3 +10,4 @@ obj-y = cache.o
 obj-y  += reset.o
 
 obj-y  += clock.o
+obj-y  += pinmux.o

diff --git a/arch/arm/mach-s5pc1xx/pinmux.c b/arch/arm/mach-s5pc1xx/pinmux.c
new file mode 100644 (file)
index 0000000..818d751
--- /dev/null
+++ b/arch/arm/mach-s5pc1xx/pinmux.c
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Dummy functions to keep s5p_goni building (although it won't work)
+ *
+ * Copyright 2018 Google LLC
+ * Written by Simon Glass <sjg@chromium.org>
+ */
+
+#include <common.h>
+#include <asm/arch/pinmux.h>
+
+int exynos_pinmux_config(int peripheral, int flags)
+{
+       return 0;
+}
+
+int pinmux_decode_periph_id(const void *blob, int node)
+{
+       return 0;
+}