| Message ID | a86db78a-a16b-625f-a2a6-3b4ce1dd674e@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [v1,1/6] rockchip: gpio: rk_gpio: use ROCKCHIP_GPIOS_PER_BANK as divider | expand |
On Thu, 16 Mar 2023 at 10:48, Johan Jonker <jbx6244@gmail.com> wrote: > > Currently the Rockchip rk3066a u-boot-tpl.bin file needs > to add the characters "RK30", while the other SoCs replace > the first 4 bytes. Bring this in line with the rest by > lowering CONFIG_TPL_TEXT_BASE and update rockchip.rst > instructions. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > configs/mk808_defconfig | 2 +- > doc/board/rockchip/rockchip.rst | 7 +++---- > 2 files changed, 4 insertions(+), 5 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> > > diff --git a/configs/mk808_defconfig b/configs/mk808_defconfig > index c080706d..548df9c5 100644 > --- a/configs/mk808_defconfig > +++ b/configs/mk808_defconfig > @@ -18,7 +18,7 @@ CONFIG_SPL_TEXT_BASE=0x60000000 > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3066=y > # CONFIG_ROCKCHIP_STIMER is not set > -CONFIG_TPL_TEXT_BASE=0x10080C04 > +CONFIG_TPL_TEXT_BASE=0x10080C00 lower-case hex is better!
diff --git a/configs/mk808_defconfig b/configs/mk808_defconfig index c080706d..548df9c5 100644 --- a/configs/mk808_defconfig +++ b/configs/mk808_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL_TEXT_BASE=0x60000000 CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3066=y # CONFIG_ROCKCHIP_STIMER is not set -CONFIG_TPL_TEXT_BASE=0x10080C04 +CONFIG_TPL_TEXT_BASE=0x10080C00 CONFIG_TPL_STACK=0x1008FFFF CONFIG_TARGET_MK808=y CONFIG_SPL_STACK_R_ADDR=0x70000000 diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst index b5563b8f..7d903946 100644 --- a/doc/board/rockchip/rockchip.rst +++ b/doc/board/rockchip/rockchip.rst @@ -380,9 +380,8 @@ Program with commands in a bash script ./flash.sh: #!/bin/sh - printf "RK30" > tplspl.bin - dd if=u-boot-tpl.bin >> tplspl.bin - truncate -s %2048 tplspl.bin + printf "RK30" | dd conv=notrunc bs=4 count=1 of=u-boot-tpl.bin + truncate -s %2048 u-boot-tpl.bin truncate -s %2048 u-boot-spl.bin ../tools/boot_merger --verbose config-flash.ini ../tools/upgrade_tool ul ./RK30xxLoader_uboot.bin @@ -406,7 +405,7 @@ config-flash.ini: NUM=2 LOADER1=FlashData LOADER2=FlashBoot - FlashData=tplspl.bin + FlashData=u-boot-tpl.bin FlashBoot=u-boot-spl.bin [OUTPUT] PATH=RK30xxLoader_uboot.bin