rockchip: add option to change method of loading u-boot

PATCH Superseded Ziyuan Xu 2 participants 3 messages Jul 12, 2016

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Rockchip

lore

Share & tools

lore

Ziyuan Xu

author

2016-07-12 03:18 UTC #0 lore raw

PATCH v4 1/1 rockchip: add option to change method of loading u-boot

From: Xu Ziyuan <[email protected]>

If we would like to boot from SD card, we have to implement mmc driver in SPL stage, and get a slightly large SPL binrary. Rockchip SoC's bootrom code has the ability to load spl and u-boot, then boot.

If CONFIG_ROCKCHIP_SPL_BACK_TO_BROM is enabled, the spl will return to tbootrom in board_init_f(), then bootrom load u-boot binrary.

This patch does that.

Loading sequence after rework:
bootrom ==> spl ==> bootrom ==> u-boot

Signed-off-by Ziyuan Xu <[email protected]>

Acked-by Simon Glass <[email protected]>

---

Changes in v4:
- Add acked flag from Simon
- Rename to CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
- Add Kconfig option for this feature support
- Revise some nits
- Update comments a little
- Update commit message

Changes in v3:
- Add CONFIG_ROCKCHIP_RK3288_SPL_BACKTO_BROM for enabling this feature
- Update doc/README.rockchip to instruct how to use it
- Detailed commit message

Changes in v2:
- Add sdcard iomux initlization in board_init() to fix sdmmc command sending timeout issue when booting from eMMC

 arch/arm/mach-rockchip/Kconfig                     |  8 ++++++
 arch/arm/mach-rockchip/Makefile                    |  1 +
 arch/arm/mach-rockchip/board.c                     | 33 ++++++++++++++++++++++
 arch/arm/mach-rockchip/rk3036/Makefile             |  1 -
 arch/arm/mach-rockchip/rk3288-board-spl.c          |  5 +++-
 .../mach-rockchip/{rk3036 => }/save_boot_param.S   |  2 +-
 doc/README.rockchip                                | 14 +++++++++
 include/configs/rk3288_common.h                    |  5 ++++
 8 files changed, 66 insertions(+), 3 deletions(-)
 rename arch/arm/mach-rockchip/{rk3036 => }/save_boot_param.S (90%)

arch/arm/mach-rockchip/Kconfig +8 -0

index 2a8afac..fe60c7a 100644
@@ -17,6 +17,14 @@ config ROCKCHIP_RK3036
 	  and video codec support. Peripherals include Gigabit Ethernet,
 	  USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
 
+config ROCKCHIP_SPL_BACK_TO_BROM
+	bool "SPL returns to bootrom"
+	default y if ROCKCHIP_RK3036
+	help
+	  Rochchip SoCs have ability to load SPL & U-BOOT binrary. This opinion,
+	  if enabled, SPL will return to boorom, then load U-BOOT binrary to keep
+	  going on.
+
 config SYS_MALLOC_F
 	default y

arch/arm/mach-rockchip/Makefile +1 -0

index 55567cb..c08d61b 100644
@@ -7,6 +7,7 @@
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
+obj-$(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) += save_boot_param.o
 else
 obj-$(CONFIG_ROCKCHIP_RK3288) += board.o
 endif

arch/arm/mach-rockchip/board.c +33 -0

index 816540e..b07e073 100644
@@ -10,12 +10,45 @@
 #include <ram.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
+#include <asm/arch/periph.h>
+#include <asm/gpio.h>
+#include <dm/pinctrl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
+#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
+	struct udevice *pinctrl;
+	int ret;
+
+    /*
+     * We need to implement sdcard iomux here for the further
+     * initlization, otherwise, it'll hit sdcard command sending
+     * timeout exception.
+     */
+	ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
+	if (ret) {
+		debug("%s: Cannot find pinctrl device\n", __func__);
+		goto err;
+	}
+	ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
+	if (ret) {
+		debug("%s: Failed to set up SD card\n", __func__);
+		goto err;
+	}
+
+	return 0;
+err:
+	printf("board_init: Error %d\n", ret);
+
+	/* No way to report error here */
+	hang();
+
+	return -1;
+#else
 	return 0;
+#endif
 }
 
 int dram_init(void)

arch/arm/mach-rockchip/rk3036/Makefile +0 -1

index 97d299d..6095777 100644
@@ -10,4 +10,3 @@ obj-y += syscon_rk3036.o
 endif
 
 obj-y += sdram_rk3036.o
-obj-y += save_boot_param.o

arch/arm/mach-rockchip/rk3288-board-spl.c +4 -1

index 773ea42..0728e64 100644
@@ -151,7 +151,7 @@ static int configure_emmc(struct udevice *pinctrl)
 	return 0;
 }
 #endif
-
+extern void back_to_bootrom(void);
 void board_init_f(ulong dummy)
 {
 	struct udevice *pinctrl;

@@ -206,6 +206,9 @@ void board_init_f(ulong dummy)
 		debug("DRAM init failed: %d\n", ret);
 		return;
 	}
+#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
+	back_to_bootrom();
+#endif
 }
 
 static int setup_led(void)

arch/arm/mach-rockchip/save_boot_param.S renamed from arch/arm/mach-rockchip/rk3036/save_boot_param.S +1 -1

similarity index 90%
rename from arch/arm/mach-rockchip/rk3036/save_boot_param.S
rename to arch/arm/mach-rockchip/save_boot_param.S
index 778ec83..85b407b 100644
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2015 Google, Inc
+ * (C) Copyright 2016 Rockchip Electronics Co., Ltd
  *
  * SPDX-License-Identifier:     GPL-2.0+
  */

doc/README.rockchip +14 -0

index f4e8348..3fc2582 100644
@@ -120,6 +120,20 @@ something like:
    Hit any key to stop autoboot:  0
    =>
 
+The rockchip bootrom can load and boot an initial spl, then continue to
+load a second-level bootloader(ie. U-BOOT) as soon as it returns to bootrom.
+Therefore RK3288 has another loading sequence like RK3036. The option of
+U-Boot is controlled with this setting in U-Boot:
+
+	#define CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
+
+You can create the image via the following operations:
+
+   ./firefly-rk3288/tools/mkimage -n rk3288 -T rksd -d \
+	firefly-rk3288/spl/u-boot-spl-dtb.bin out && \
+   cat firefly-rk3288/u-boot-dtb.bin >> out && \
+   sudo dd if=out of=/dev/sdc seek=64
+
 If you have an HDMI cable attached you should see a video console.
 
 For evb_rk3036 board:

include/configs/rk3288_common.h +5 -0

index 9d50d83..a980078 100644
@@ -33,7 +33,12 @@
 #define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SPL_BOARD_INIT
 
+#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
+/* Bootrom will load u-boot binrary to 0x0 once return from SPL */
+#define CONFIG_SYS_TEXT_BASE		0x00000000
+#else
 #define CONFIG_SYS_TEXT_BASE		0x00100000
+#endif
 #define CONFIG_SYS_INIT_SP_ADDR		0x00100000
 #define CONFIG_SYS_LOAD_ADDR		0x00800800
 #define CONFIG_SPL_STACK		0xff718000

Signature · 1 line

1.9.1

Andreas Färber

2016-07-12 04:30 UTC #1 lore raw

PATCH v4 1/1 rockchip: add option to change method of loading u-boot

Am 12.07.2016 um 05:18 schrieb Ziyuan Xu:

Quoted 4 lines

From: Xu Ziyuan <[email protected]>
If we would like to boot from SD card, we have to implement mmc driver in SPL stage, and get a slightly large SPL binrary. Rockchip SoC's

"binary"

Quoted 4 lines

bootrom code has the ability to load spl and u-boot, then boot.
If CONFIG_ROCKCHIP_SPL_BACK_TO_BROM is enabled, the spl will return to tbootrom in board_init_f(), then bootrom load u-boot binrary.

"the bootrom", "the bootrom loads", "binary"

Quoted 2 lines

This patch does that.

Redundant?

Quoted 6 lines

Loading sequence after rework:
bootrom ==> spl ==> bootrom ==> u-boot
Signed-off-by Ziyuan Xu <[email protected]>
Acked-by Simon Glass <[email protected]>

Regards,
Andreas

Signature · 3 lines

SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)

Ziyuan Xu

author

2016-07-12 05:47 UTC #2 lore raw

PATCH v4 1/1 rockchip: add option to change method of loading u-boot

hi Andreas,

Thanks for your catch. I will revise the typos.

Quoted 24 lines · Andreas F?rber

Am 12.07.2016 um 05:18 schrieb Ziyuan Xu:
Quoted 4 lines
From: Xu Ziyuan <[email protected]>
If we would like to boot from SD card, we have to implement mmc driver in SPL stage, and get a slightly large SPL binrary. Rockchip SoC's
"binary"
Quoted 4 lines
bootrom code has the ability to load spl and u-boot, then boot.
If CONFIG_ROCKCHIP_SPL_BACK_TO_BROM is enabled, the spl will return to tbootrom in board_init_f(), then bootrom load u-boot binrary.
"the bootrom", "the bootrom loads", "binary"
Quoted 1 line
This patch does that.
Redundant?
Quoted 5 lines
Loading sequence after rework:
bootrom ==> spl ==> bootrom ==> u-boot
Signed-off-by Ziyuan Xu <[email protected]>
Acked-by Simon Glass <[email protected]>
Regards,
Andreas