From patchwork Mon Jan 16 18:34:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 1727200 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=oScYar4S; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NwgfT6dHTz23gc for ; Tue, 17 Jan 2023 05:34:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E8BDD82FE7; Mon, 16 Jan 2023 19:34:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="oScYar4S"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1650184231; Mon, 16 Jan 2023 19:34:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) (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 BFBAF81BBF for ; Mon, 16 Jan 2023 19:34:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ej1-x635.google.com with SMTP id hw16so58199914ejc.10 for ; Mon, 16 Jan 2023 10:34:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=EgqNJF+POPyt3TSreHLk71HxbzpiuaOEkcMbhUoarrQ=; b=oScYar4SIRHTAuIdHwbfxFZiJxAz5lqzsG2tdVmiPW+dcJW8K1r+y8z/+zDkNIUEUI yp3V8AH5O+gFcEkPSEYwRanXkQuWhxxE9IqDmDhb0vXD0Z74YBrMkeS4/o3MB6imlt4m 7pl7jeZAXCufQRjW32X85SWXUYj91LRWapjTrkTwSV1XK2zzlG8zpmo/NEcvTS9C1ixu Atqk9V1aA6Yb9suYW08udPezcj/ei3L+8h14hZ1/qWsQoE7FthreUVD5qi/shBdKLaUW +9TvRj0G3Vw+Hy/Ufqt+fmvo+DvLnwdv3SnEkSpaN1xJORVApS36bbf/fNZ4MdQhWTpV Hj+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=EgqNJF+POPyt3TSreHLk71HxbzpiuaOEkcMbhUoarrQ=; b=PYFg2y2kAb1+Ihk2LE0+5PN0bh715HVC4nGBpYmcMGHeXsITeGHcjvcqP+t1oFCEnD Sxkp7vGvNRuqQcAuGhxL8cjb94mTFc4uAZASarYbf1w3O+ga7mJnmGBcoIJqXa9yMjXW px8R27savs1Al4EU49/rJwneY790rVLNvk+NDffzUNOjWigu66DxIkTBTzZnE0bE/BwH aB4l5DKzDLl0tiWzKJt8BK5gSHWgNcnv0MHVNaNGgn/zN9fXFqQvLKvMANZ3IbFYKK8x 2GlqG/vpuC8lMfYHoV4Kcj82Y3i9Un9rMu9hB0kELWwdEj4oi3gKd1AVZ0gXEsnAMsT+ RSyw== X-Gm-Message-State: AFqh2krB+GltxGvlBEA2wllO0TvxXcfgWr0SQyd2TH2v7RdctoB9IeGT C9D2Jgm2G5/LqDK2ZJOW9W8= X-Google-Smtp-Source: AMrXdXsvdoopdO7VfDgAqebRkOog9MZkhMH0btSYMN4z9IhPXhO9mgv6ijRac6++WNDJm3mphcCCKA== X-Received: by 2002:a17:906:e8f:b0:872:5222:9024 with SMTP id p15-20020a1709060e8f00b0087252229024mr427438ejf.67.1673894050297; Mon, 16 Jan 2023 10:34:10 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id ez6-20020a056402450600b0048ebe118a46sm11716471edb.77.2023.01.16.10.34.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Jan 2023 10:34:09 -0800 (PST) Message-ID: <1927b0c6-4cc9-8a03-9406-5a10c9a0deba@gmail.com> Date: Mon, 16 Jan 2023 19:34:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 From: Johan Jonker Subject: [PATCH v1 1/2] rockchip: configs: mk808: change CONFIG_TPL_TEXT_BASE To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, u-boot@lists.denx.de Content-Language: en-US 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.6 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Simon Glass --- configs/mk808_defconfig | 2 +- doc/board/rockchip/rockchip.rst | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/configs/mk808_defconfig b/configs/mk808_defconfig index 7ba8338a..9ffda699 100644 --- a/configs/mk808_defconfig +++ b/configs/mk808_defconfig @@ -15,7 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3066a-mk808" CONFIG_SPL_TEXT_BASE=0x60000000 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 4ca7b00b..b190a76f 100644 --- a/doc/board/rockchip/rockchip.rst +++ b/doc/board/rockchip/rockchip.rst @@ -358,9 +358,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 @@ -384,7 +383,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