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 BCB8AC6FD1F for ; Sun, 19 Mar 2023 15:06:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 29EF88594F; Sun, 19 Mar 2023 16:06:19 +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="GXYacGWL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C4E9859E3; Sun, 19 Mar 2023 16:06:17 +0100 (CET) Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (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 85BAA85936 for ; Sun, 19 Mar 2023 16:06:12 +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-ed1-x532.google.com with SMTP id x3so37662317edb.10 for ; Sun, 19 Mar 2023 08:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679238372; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=Or0BDSr841fIWPh04xQ1u0sCsbXfCRsO4PfxbwiEScA=; b=GXYacGWLGHcaJ/WlCUemPOQyZSp1VCDVHIFVlI3MkKFBLt66+dnj6tdTnXyj+lNfMA sE+VPtoyyjW5l61muqpNIvg2yE1ybBbO9R7g5SRULT2JdzWrzek1tPQK86FTKOpO1YVx Qew2zD8u9I7LNxCrHPzvmDI3O+HFSstknUmsC6DcBbW2M1VV0am1RiMrwhLoS1shaRmW 3IwOHLFVdTpfaLKUl7/coTYa4a5RBt9B5LnLecyVoqyYyh5dTRC9WCwhBnPJiBOkQXyc 2AAq1O5kjkbVvsgDoYkuhtGNGhfYZaJXrVLoNcXCyKiPMFy4cDtrsOVhee0bXpWHwZWe idlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679238372; h=content-transfer-encoding:in-reply-to:content-language:references :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=Or0BDSr841fIWPh04xQ1u0sCsbXfCRsO4PfxbwiEScA=; b=6IfCCQoKoGzeU2oVpkQ9BkGE/QXQxASaisDye/aLXuAwEO7siCvTP6MqeqfnQxhSOZ UbZfDOLJAiqAvgitt+UrIgP5FeygCG2Aw06r1hPPdkhxHMfP0Z62Mlz6oIjl6I3DR0gV Fx6DgKN3ojStnYkpsL0xPFZjrrpqW4y5TtJw0qOHHVOU3Cxk6atUtXCywrfLoDAA17gt b52khofUczUCT6h/GhX4+NXJCr+uBCdpbI+TsBuQ+5w6YB6uFyImZBL4gviFTQR1Qu8E SmvXsgoZPBQMm8rSZBogb9p0MJ4tIDSFUVypBAP3JRtEAqRmhJTve4QOOdc82Epj8vC3 XgFw== X-Gm-Message-State: AO0yUKVIBsBDOKBU4ZpO3NRryk5V5PnuKLzz+MvjfXlsmC1Y5P1HITJv vMvRsn7EabSrs5ySzAeyCGg= X-Google-Smtp-Source: AK7set+oDtwkxbifRLNNd4CAtya/6FH6nKDGHqfcVE4Ig4RQAerluOvoMieWAb/9r+5R9vkJ/BE6KA== X-Received: by 2002:a05:6402:1810:b0:4fb:5795:b7e0 with SMTP id g16-20020a056402181000b004fb5795b7e0mr9846248edy.31.1679238372103; Sun, 19 Mar 2023 08:06:12 -0700 (PDT) Received: from [192.168.2.2] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id b44-20020a509f2f000000b004c09527d62dsm3612291edf.30.2023.03.19.08.06.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Mar 2023 08:06:11 -0700 (PDT) Message-ID: <25c1a69a-db07-9742-bf33-2cff55773746@gmail.com> Date: Sun, 19 Mar 2023 16:06:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 From: Johan Jonker Subject: [PATCH v2 5/6] 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 References: Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 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 --- Changed V2: use lower case hex --- configs/mk808_defconfig | 2 +- doc/board/rockchip/rockchip.rst | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/mk808_defconfig b/configs/mk808_defconfig index c080706d..5a264eb9 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 -- 2.20.1