From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B3C34C6FD19 for ; Tue, 14 Mar 2023 00:40:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 63B7686177; Tue, 14 Mar 2023 01:39:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="b8glq/Af"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D5A8385DF9; Tue, 14 Mar 2023 01:38:45 +0100 (CET) Received: from wrqvtzvf.outbound-mail.sendgrid.net (wrqvtzvf.outbound-mail.sendgrid.net [149.72.126.143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D4347860F3 for ; Tue, 14 Mar 2023 01:38:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=LIQp9qiU71fOd7vJf/n5wECEVxkR5oTrO46DDR2vO1Q=; b=b8glq/Afd21vX28mAY8FESG31RhCpmm4hSOCs385LIuMOkyGuvLK9O+F4JSmQ35vxV2i U8ZEbooPEY+F5y654n6Rnc9dBHQIribAa/f122Tkvyvzww8xsiwycOgmo9bEj/vB98Ep11 g2GmKc+DicFDXI1Oh/bQ9LGyO1vVXnJokt00iNt45muoRDOiA+HaD/SmFbX3VHuoWNr6Hm i1KO/Od5Z4+ndoLki0TCtggkPLIkH4V2jSx31AIz7+GZg9N1G4Jwfzsn8O++zJfGhpMGhe cJGy08EDx+7H15WOVn9vicylXruYaZs1Ir79itrnXQ3+KcX9j0WaLLV8EwmL5+uQ== Received: by filterdrecv-68f8d557c9-z8zks with SMTP id filterdrecv-68f8d557c9-z8zks-1-640FC20E-E 2023-03-14 00:38:38.537175188 +0000 UTC m=+1731924.809638965 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id BuCBmshoQX-xJldHdxEIZQ Tue, 14 Mar 2023 00:38:38.344 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 12/12] rockchip: Convert rk35xx to use standard boot Date: Tue, 14 Mar 2023 00:38:38 +0000 (UTC) Message-Id: <20230314003755.512696-13-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: =?us-ascii?Q?TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxA?= =?us-ascii?Q?fZekEeQsTe+RrMu3cja6a0h+DMgd+SpioD6WStg?= =?us-ascii?Q?IxIJzLhLb7Dr5eZgaCQhwaxUWeDbP4TTF6mlLB9?= =?us-ascii?Q?ipFIAAxax+VVNUieK9jCoTDj6xq7wvFN4cCh6zp?= =?us-ascii?Q?=2FzjVZuHh3aThNp6ge3MV3Iammno4Bp5EpDVYBdS?= =?us-ascii?Q?gj+CIBA4tuFVimF501L9ATWXw=2F9bCTM878BqaL?= To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 #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 #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 */ -- 2.39.2