[PATCH 5/5] board: silinux: Enable recovery SPL for EK874 board

[Lad Prabhakar]

Enable building SPL for EK874 board which is based on R8A774C0 SoC.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj at bp.renesas.com>
Reviewed-by: Biju Das <biju.das.jz at bp.renesas.com>
---
 arch/arm/mach-rmobile/Makefile  | 2 +-
 board/silinux/ek874/Makefile    | 4 ++++
 configs/silinux_ek874_defconfig | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-rmobile/Makefile
index 3206bce722..9f56af465e 100644
--- a/arch/arm/mach-rmobile/Makefile
+++ b/arch/arm/mach-rmobile/Makefile
@@ -22,7 +22,7 @@ cmd_objcopy = $(OBJCOPY) --gap-fill=0x00 $(OBJCOPYFLAGS) \
 spl/u-boot-spl.srec: spl/u-boot-spl FORCE
 	$(call if_changed,objcopy)
 
-ifneq ($(CONFIG_R8A77990)$(CONFIG_R8A77995),)
+ifneq ($(CONFIG_R8A774C0)$(CONFIG_R8A77990)$(CONFIG_R8A77995),)
 #
 # The first 6 generate statements generate the R-Car Gen3 SCIF loader header.
 # The subsequent generate statements represent the following chunk of assembler
diff --git a/board/silinux/ek874/Makefile b/board/silinux/ek874/Makefile
index 32a3a00990..4c8f0925f1 100644
--- a/board/silinux/ek874/Makefile
+++ b/board/silinux/ek874/Makefile
@@ -6,4 +6,8 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+obj-y	:= ../../renesas/rcar-common/gen3-spl.o
+else
 obj-y	:= ek874.o ../../renesas/rcar-common/common.o
+endif
diff --git a/configs/silinux_ek874_defconfig b/configs/silinux_ek874_defconfig
index 442e24a3d7..dcd75604a2 100644
--- a/configs/silinux_ek874_defconfig
+++ b/configs/silinux_ek874_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
+CONFIG_SPL_TEXT_BASE=0xe6318000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_OFFSET=0x3F0000
@@ -9,7 +10,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_RCAR_GEN3=y
 CONFIG_TARGET_SILINUX_EK874=y
 # CONFIG_BOARD_EARLY_INIT_F is not set
-# CONFIG_SPL is not set
 CONFIG_SOC_DEVICE=y
 CONFIG_SOC_DEVICE_RENESAS=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a774c0-ek874-u-boot"
-- 
2.17.1