Skip to contentSkip to conversation

ARM: rmobile: Add recovery SPL for R-Car Gen3

PATCH Superseded Marek Vasut 1 participant 1 message May 1, 2019

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: rmobile: Add recovery SPL for R-Car Gen3

Build an SPL which can be started via SCIF download mode on R-Car Gen3 and allows loading and executing U-Boot uImage with the next stage code. This is also useful for starting e.g. ATF BL2, which inits the hardware and returns to the U-Boot SPL, which can then load e.g. U-Boot proper.

The H3, M3-W, M3-N SoCs have plenty of SRAM for storing the U-Boot SPL while the payload, e.g. ATF BL2, executes, so there is no problem here.

However, E3 and D3 have much less SRAM, hence the loader uses a trick where it copies itself beyond the area used by BL2 and executes from there. That area is 32kiB large and not enough to hold U-Boot SPL, BSS, stack and malloc area, so the later two are placed at +0x4000 offset from start of SRAM, another area not used by ATF BL2. To make things even more complicated, the SCIF loader cannot load to the upper 32kiB of the SRAM directly, hence the copying approach.

Cc Nobuhiro Iwamatsu <[email protected]>
---
 Kconfig                              |  1 +
 Makefile                             |  3 ++
 arch/arm/mach-rmobile/Kconfig        | 11 +++++
 arch/arm/mach-rmobile/Makefile       | 73 ++++++++++++++++++++++++++++
 board/renesas/draak/Makefile         |  4 ++
 board/renesas/eagle/Makefile         |  4 ++
 board/renesas/ebisu/Makefile         |  4 ++
 board/renesas/rcar-common/gen3-spl.c | 55 +++++++++++++++++++++
 board/renesas/salvator-x/Makefile    |  4 ++
 board/renesas/ulcb/Makefile          |  4 ++
 include/configs/rcar-gen3-common.h   | 21 ++++++++
 11 files changed, 184 insertions(+)
 create mode 100644 board/renesas/rcar-common/gen3-spl.c
Kconfig +1 -0
index 7a5491bd67..84a6d21a5f 100644
@@ -155,6 +155,7 @@ config SYS_MALLOC_LEN
 config SPL_SYS_MALLOC_F_LEN
 	hex "Size of malloc() pool in SPL before relocation"
 	depends on SYS_MALLOC_F
+	default 0x2800 if RCAR_GEN3
 	default SYS_MALLOC_F_LEN
 	help
 	  Before relocation, memory is very limited on many platforms. Still,
Makefile +3 -0
index d6a6ef19ab..14fc782371 100644
@@ -1102,6 +1102,9 @@ OBJCOPYFLAGS_u-boot-spl.srec = $(OBJCOPYFLAGS_u-boot.srec)
 spl/u-boot-spl.srec: spl/u-boot-spl FORCE
 	$(call if_changed,objcopy)
 
+%.scif: %.srec
+	$(Q)$(MAKE) $(build)=arch/arm/mach-rmobile $@
+
 OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \
 		$(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) \
 		$(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),-R .bootpg -R .resetvec)
arch/arm/mach-rmobile/Kconfig +11 -0
index c6e5f75daf..5b5d96e665 100644
@@ -13,11 +13,22 @@ config RCAR_GEN3
 	select ARM64
 	select PHY
 	select CMD_CACHE
+	select SUPPORT_SPL
 	imply CMD_FS_UUID
 	imply CMD_GPT
 	imply CMD_UUID
 	imply CMD_MMC_SWRITE if MMC
 	imply SUPPORT_EMMC_RPMB if MMC
+	imply SPL
+	imply SPL_BOARD_INIT
+	imply SPL_GZIP
+	imply SPL_LIBCOMMON_SUPPORT
+	imply SPL_LIBGENERIC_SUPPORT
+	imply SPL_SERIAL_SUPPORT
+	imply SPL_SYS_MALLOC_SIMPLE
+	imply SPL_TINY_MEMSET
+	imply SPL_YMODEM_SUPPORT
+	imply USE_TINY_PRINTF
 
 endchoice
 
arch/arm/mach-rmobile/Makefile +73 -0

76 lines not on this page · raw message

board/renesas/draak/Makefile +4 -0
index 604522ebb1..0140b61bff 100644
@@ -6,4 +6,8 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+obj-y	:= ../rcar-common/gen3-spl.o
+else
 obj-y	:= draak.o
+endif
board/renesas/eagle/Makefile +4 -0
index dffa295404..04402a2ced 100644
@@ -6,4 +6,8 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+obj-y	:= ../rcar-common/gen3-spl.o
+else
 obj-y	:= eagle.o
+endif
board/renesas/ebisu/Makefile +4 -0
index 2741035c57..39971f11b2 100644
@@ -6,4 +6,8 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+obj-y	:= ../rcar-common/gen3-spl.o
+else
 obj-y	:= ebisu.o
+endif
board/renesas/rcar-common/gen3-spl.c new file +55 -0

55 lines not on this page · raw message

board/renesas/salvator-x/Makefile +4 -0
index 5b4dea91c1..fb506be470 100644
@@ -6,4 +6,8 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+obj-y	:= ../rcar-common/gen3-spl.o
+else
 obj-y	:= salvator-x.o
+endif
board/renesas/ulcb/Makefile +4 -0
index 406fdc8fa4..cd9a5834c1 100644
@@ -6,4 +6,8 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+obj-y	:= ../rcar-common/gen3-spl.o
+else
 obj-y	:= ulcb.o cpld.o
+endif
include/configs/rcar-gen3-common.h +21 -0
index 20f982165d..f7d822eb3c 100644
@@ -13,6 +13,10 @@
 
 #define CONFIG_REMAKE_ELF
 
+#ifdef CONFIG_SPL
+#define CONFIG_SPL_TARGET	"spl/u-boot-spl.scif"
+#endif
+
 /* boot option */
 
 #define CONFIG_CMDLINE_TAG
@@ -64,4 +68,21 @@
 	"tftp 0x48000000 Image-"CONFIG_DEFAULT_FDT_FILE"; " \
 	"booti 0x48080000 - 0x48000000"
 
+/* SPL support */
+#if defined(CONFIG_R8A7795) || defined(CONFIG_R8A7796) || defined(CONFIG_R8A77965)
+#define CONFIG_SPL_TEXT_BASE		0xe6338000
+#define CONFIG_SPL_BSS_START_ADDR	0xe633f000
+#define CONFIG_SPL_BSS_MAX_SIZE		0x1000
+#else
+#define CONFIG_SPL_TEXT_BASE		0xe6318000
+#define CONFIG_SPL_BSS_START_ADDR	0xe631f000
+#define CONFIG_SPL_BSS_MAX_SIZE		0x1000
+#endif
+#define CONFIG_SPL_STACK		0xe6304000
+#define CONFIG_SPL_MAX_SIZE		0x7000
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_CONS_SCIF2
+#define CONFIG_SH_SCIF_CLK_FREQ		65000000
+#endif
+
 #endif	/* __RCAR_GEN3_COMMON_H */
Signature · 1 line
2.20.1