aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLad Prabhakar2021-03-15 22:24:06 +0000
committerMarek Vasut2021-03-16 20:09:30 +0100
commit9e346340d76cc5bbc6a23fc746f7ee7629af2b34 (patch)
tree995aafc6db557fe0511eab0582bc39204dc850b6
parent07148c18994517610a21cfe9dd370296df349712 (diff)
board: silinux: Enable recovery SPL for EK874 board
Enable building SPL for EK874 board which is based on R8A774C0 SoC. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
-rw-r--r--arch/arm/mach-rmobile/Makefile2
-rw-r--r--board/silinux/ek874/Makefile4
-rw-r--r--configs/silinux_ek874_defconfig2
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-rmobile/Makefile
index 3206bce7220..9f56af465ec 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 32a3a009900..4c8f0925f1e 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 442e24a3d74..dcd75604a2d 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"