From: Jonas Karlman <jonas@kwiboo.se>
To: Kever Yang <kever.yang@rock-chips.com>,
Simon Glass <sjg@chromium.org>,
Philipp Tomsich <philipp.tomsich@vrull.eu>
Cc: Jagan Teki <jagan@edgeble.ai>,
Eugen Hristev <eugen.hristev@collabora.com>,
u-boot@lists.denx.de
Subject: Re: [PATCH 12/12] rockchip: Convert rk35xx to use standard boot
Date: Sun, 19 Mar 2023 09:13:06 +0000 (UTC) [thread overview]
Message-ID: <ad489c50-75dc-ee4d-ff08-e0b91b44eac9@kwiboo.se> (raw)
In-Reply-To: <7a4d1e68-ff63-0278-c02c-06cd23967cf7@rock-chips.com>
Hi Kever,
On 2023-03-19 07:16, Kever Yang wrote:
> Hi Jonas,
>
> I will pick other patches for fix of this series, and leave this
> one after the patch set[0] from Simon get land.
Thanks, I noticed that you did not include the following two patches
in your pull request.
Please consider them for next pull request to master to fix booting
on RK3588 / Radxa ROCK 5 Model B.
rockchip: Use an external TPL binary on RK3588 (prerequisite to fixes series)
- https://patchwork.ozlabs.org/project/uboot/patch/20230228213822.3583989-1-jonas@kwiboo.se/
rockchip: rk3588-rock-5b: Fix sdmmc boot (06/12 of fixes series)
- https://patchwork.ozlabs.org/project/uboot/patch/20230314003755.512696-7-jonas@kwiboo.se/
The generated u-boot-rockchip.bin will not contain rockchip TPL and is
not bootable by default on RK3588 without the first patch.
Thanks,
Jonas
>
>
> Thanks,
>
> - Kever
>
> https://patchwork.ozlabs.org/project/uboot/patch/20230302033930.2546548-7-sjg@chromium.org/>>
> On 2023/3/14 08:38, Jonas Karlman wrote:
>> Imply use of BOOTSTD and OF_LIBFDT_OVERLAY on RK3568 and RK3588.
>> Drop the use of scripts and rely on standard boot for all operation.
>>
>> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
>> ---
>> arch/arm/mach-rockchip/Kconfig | 6 ++++++
>> include/configs/rk3568_common.h | 9 +++++++--
>> include/configs/rk3588_common.h | 9 +++++++--
>> 3 files changed, 20 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
>> index e5ac58ae60b5..5e8aacc2ea14 100644
>> --- a/arch/arm/mach-rockchip/Kconfig
>> +++ b/arch/arm/mach-rockchip/Kconfig
>> @@ -289,6 +289,9 @@ config ROCKCHIP_RK3568
>> select DM_REGULATOR_FIXED
>> select DM_RESET
>> imply ROCKCHIP_COMMON_BOARD
>> + imply BOOTSTD_BOOTCOMMAND
>> + imply BOOTSTD_DEFAULTS
>> + imply OF_LIBFDT_OVERLAY
>> imply ROCKCHIP_OTP
>> imply MISC_INIT_R
>> help
>> @@ -310,6 +313,9 @@ config ROCKCHIP_RK3588
>> select SYSCON
>> select BOARD_LATE_INIT
>> imply ROCKCHIP_COMMON_BOARD
>> + imply BOOTSTD_BOOTCOMMAND
>> + imply BOOTSTD_DEFAULTS
>> + imply OF_LIBFDT_OVERLAY
>> imply ROCKCHIP_OTP
>> imply MISC_INIT_R
>> help
>> diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
>> index a5e1dde50888..164c123d9490 100644
>> --- a/include/configs/rk3568_common.h
>> +++ b/include/configs/rk3568_common.h
>> @@ -17,10 +17,15 @@
>>
>> #define ENV_MEM_LAYOUT_SETTINGS \
>> "scriptaddr=0x00c00000\0" \
>> + "script_offset_f=0xffe000\0" \
>> + "script_size_f=0x2000\0" \
>> "pxefile_addr_r=0x00e00000\0" \
>> "fdt_addr_r=0x0a100000\0" \
>> + "fdtoverlay_addr_r=0x02000000\0" \
>> "kernel_addr_r=0x02080000\0" \
>> - "ramdisk_addr_r=0x0a200000\0"
>> + "ramdisk_addr_r=0x0a200000\0" \
>> + "kernel_comp_addr_r=0x08000000\0" \
>> + "kernel_comp_size=0x2000000\0"
>>
>> #include <config_distro_bootcmd.h>
>> #define CFG_EXTRA_ENV_SETTINGS \
>> @@ -28,6 +33,6 @@
>> "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
>> "partitions=" PARTS_DEFAULT \
>> ROCKCHIP_DEVICE_SETTINGS \
>> - BOOTENV
>> + BOOTENV_BOOT_TARGETS
>>
>> #endif
>> diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h
>> index abd20139aaf3..7ff0481a69fd 100644
>> --- a/include/configs/rk3588_common.h
>> +++ b/include/configs/rk3588_common.h
>> @@ -16,10 +16,15 @@
>>
>> #define ENV_MEM_LAYOUT_SETTINGS \
>> "scriptaddr=0x00c00000\0" \
>> + "script_offset_f=0xffe000\0" \
>> + "script_size_f=0x2000\0" \
>> "pxefile_addr_r=0x00e00000\0" \
>> "fdt_addr_r=0x0a100000\0" \
>> + "fdtoverlay_addr_r=0x02000000\0" \
>> "kernel_addr_r=0x02080000\0" \
>> - "ramdisk_addr_r=0x0a200000\0"
>> + "ramdisk_addr_r=0x0a200000\0" \
>> + "kernel_comp_addr_r=0x08000000\0" \
>> + "kernel_comp_size=0x2000000\0"
>>
>> #include <config_distro_bootcmd.h>
>> #define CFG_EXTRA_ENV_SETTINGS \
>> @@ -27,6 +32,6 @@
>> "partitions=" PARTS_DEFAULT \
>> ENV_MEM_LAYOUT_SETTINGS \
>> ROCKCHIP_DEVICE_SETTINGS \
>> - BOOTENV
>> + BOOTENV_BOOT_TARGETS
>>
>> #endif /* __CONFIG_RK3588_COMMON_H */
prev parent reply other threads:[~2023-03-19 9:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 0:38 [PATCH 00/12] rockchip: Fixes for RK3568 and RK3588 and cleanup Jonas Karlman
2023-03-14 0:38 ` [PATCH 01/12] rockchip: Fix early use of bootph props Jonas Karlman
2023-03-14 3:15 ` Kever Yang
2023-03-14 0:38 ` [PATCH 02/12] rockchip: rk3568: Fix boot device detection Jonas Karlman
2023-03-14 3:16 ` Kever Yang
2023-03-14 0:38 ` [PATCH 03/12] rockchip: rk3568-rock-3a: Sync device tree from linux Jonas Karlman
2023-03-14 3:17 ` Kever Yang
2023-03-14 0:38 ` [PATCH 04/12] clk: rockchip: rk3568: Fix reset handler Jonas Karlman
2023-03-14 0:38 ` [PATCH 05/12] clk: rockchip: rk3588: Fix clk_aux16m in clock driver Jonas Karlman
2023-03-14 3:21 ` Kever Yang
2023-03-14 0:38 ` [PATCH 06/12] rockchip: rk3588-rock-5b: Fix sdmmc boot Jonas Karlman
2023-03-14 3:22 ` Kever Yang
2023-03-14 0:38 ` [PATCH 07/12] rockchip: rk3588: Add boot device detection Jonas Karlman
2023-03-14 3:22 ` Kever Yang
2023-03-14 0:38 ` [PATCH 08/12] rockchip: tinker-rk3288: Use common BOOT_TARGET_DEVICES Jonas Karlman
2023-03-14 3:28 ` Kever Yang
2023-03-14 0:38 ` [PATCH 09/12] mmc: rockchip_dw_mmc: Fix get_mmc_clk return value Jonas Karlman
2023-03-14 3:25 ` Kever Yang
2023-03-14 0:38 ` [PATCH 10/12] rockchip: include: configs: Remove dangling comments Jonas Karlman
2023-03-14 3:28 ` Kever Yang
2023-03-14 0:38 ` [PATCH 11/12] rockchip: include: configs: Remove unused SDRAM_BANK_SIZE Jonas Karlman
2023-03-14 3:29 ` Kever Yang
2023-03-14 0:38 ` [PATCH 12/12] rockchip: Convert rk35xx to use standard boot Jonas Karlman
2023-03-15 19:43 ` Simon Glass
2023-03-19 6:16 ` Kever Yang
2023-03-19 9:13 ` Jonas Karlman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ad489c50-75dc-ee4d-ff08-e0b91b44eac9@kwiboo.se \
--to=jonas@kwiboo.se \
--cc=eugen.hristev@collabora.com \
--cc=jagan@edgeble.ai \
--cc=kever.yang@rock-chips.com \
--cc=philipp.tomsich@vrull.eu \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.