[U-Boot] [PATCH v5] rockchip: add option to change method of loading u-boot

Simon Glass
2016-07-15T03:19:58Z

On 12 July 2016 at 18:42, Ziyuan Xu <xzy.xu@rock-chips.com> wrote:
> hi Simon,
>
>
> On 2016?07?12? 21:28, Simon Glass wrote:
>>
>> On 12 July 2016 at 05:09, Ziyuan Xu <xzy.xu@rock-chips.com> wrote:
>>>
>>> From: Xu Ziyuan <xzy.xu@rock-chips.com>
>>>
>>> If we would like to boot from SD card, we have to implement mmc driver
>>> in SPL stage, and get a slightly large SPL binary. 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
>>> bootrom in board_init_f(), then bootrom loads u-boot binary.
>>>
>>> Loading sequence after rework:
>>> bootrom ==> spl ==> bootrom ==> u-boot
>>>
>>> Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
>>> Acked-by: Simon Glass <sjg@chromium.org>
>>> ---
>>>
>>> Changes in v5:
>>> - Revise some typos
>>>
>>> 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%)
>>
>> I fixed several typos in the Kconfig help, so ended up rewording it a
>> little. Your patches are good but please can you take a little more
>> time to read them before sending? Also please use "U-Boot"
>> consistently instead of u-boot, U-BOOT, etc. I am not claiming to be
>> perfect here either - in fact I am quite bad with typos sometimes. But
>> a read through will often reduce their number.
>>
>> Fixed, and:
>>
>> Applied to u-boot-rockchip, thanks!
>
> Thanks for your help, I will be more carefully. :-)
> [snip]
> A nit should be fixed.
>
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index d1c0dde..cf718fa 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -22,7 +22,7 @@ config ROCKCHIP_SPL_BACK_TO_BROM
> default y if ROCKCHIP_RK3036
> help
> Rockchip SoCs have ability to load SPL & U-Boot binary. If
> enabled,
> - SPL will return to the boot rom, whch will then load the U-Boot
> + SPL will return to the boot rom, which will then load the U-Boot
> binary to keep going on.

Thanks - fixed!

- Simon