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 3DB5AC4321E for ; Sun, 4 Dec 2022 15:06:19 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5F2FE85301; Sun, 4 Dec 2022 16:06:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="HXfZ/MTk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CAA63852F1; Sun, 4 Dec 2022 16:06:01 +0100 (CET) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 866DF852F8 for ; Sun, 4 Dec 2022 16:05:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-ed1-x52a.google.com with SMTP id d14so7634853edj.11 for ; Sun, 04 Dec 2022 07:05:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MJY2+QMrIeZ10b0Tx9MMT9+TMfsdshgpW7bpd0+3Pos=; b=HXfZ/MTk2w9hAlHNJVwb11dRPgQ2XQ9prD8aOudC+gOOy18WfZEmtLa207bNCVY1UX My3ulmIWe4EoVs5PsEkEAw5tfOuPUUehJx0l+tpMhlF8cFyAvvgx1JUaqZFaY0/4Zqve mk4qJYH+/SSFe5mnVHkvXurqv16PKXTyQwyPE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MJY2+QMrIeZ10b0Tx9MMT9+TMfsdshgpW7bpd0+3Pos=; b=HqMsnc/iLsDjvrGqw/wajFKmFF6phsgApCjwIEZ3SQPc9/X0Nzs7wH8UrY7uBMcQPS 4VyF0qqiGmhiXK8W6hwcmMlF2Mi2/YVwBArAUbp7O2NANmQlMi6T8nA/iSEf3AgZggYr J5clgp8cLDXXFU9ddxRVysRhKSsLWwzSy9k+KtQi4O5JM1iyWdR1QM2K8KwH1CIGBrKf PFx4jBN6+yZzKCVLCrhV5sJ9n3YIr6aF+VjkisbtZw/NbFxcSujJEcpoYZDa/i+9bP/u M1OFGGArBfDQ/Dn/DNumVE0DGEmia9UYC1x3gEo9w2povsqTrmrVLdctIjMuuEfNHgtP 5ktA== X-Gm-Message-State: ANoB5pm/0MiOMoGcUBVjTZQ8p5ahggMWoj355Q6M8L4Bt1+HrUx8r4MR +vJzM0Pgt4G7LbvRnY7eEgbuw134NDu1UngV X-Google-Smtp-Source: AA0mqf7Z9iA5qzjF5zR1xsi2V6Yc5sohvAxR16/cwPHOtGXhBUZCOXshDdvSb7O/omcPjfeOiG2A1A== X-Received: by 2002:a05:6402:294d:b0:467:6b55:3cf5 with SMTP id ed13-20020a056402294d00b004676b553cf5mr72131659edb.22.1670166358831; Sun, 04 Dec 2022 07:05:58 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0073dc5bb7c32sm5240058eja.64.2022.12.04.07.05.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:05:58 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 002/149] rk32xx: Use standard TPL linker script Date: Sun, 4 Dec 2022 10:03:27 -0500 Message-Id: <20221204150554.4165941-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204150554.4165941-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204150554.4165941-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 As of 2f41ade79e59 ("linker: Modify linker scripts to be more generic") we can use the same linker script for SPL and TPL and not have to make use of #undef tricks. Remove these last remnants. Signed-off-by: Tom Rini --- arch/arm/mach-rockchip/rk3288/Kconfig | 3 --- arch/arm/mach-rockchip/u-boot-tpl.lds | 12 ------------ configs/evb-rk3229_defconfig | 1 - 3 files changed, 16 deletions(-) delete mode 100644 arch/arm/mach-rockchip/u-boot-tpl.lds diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 1be2b585212e..ea94ad114247 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -168,9 +168,6 @@ config SPL_LIBGENERIC_SUPPORT config SPL_SERIAL default y -config TPL_LDSCRIPT - default "arch/arm/mach-rockchip/u-boot-tpl.lds" - config TPL_STACK default 0xff718000 diff --git a/arch/arm/mach-rockchip/u-boot-tpl.lds b/arch/arm/mach-rockchip/u-boot-tpl.lds deleted file mode 100644 index f5a89721ce82..000000000000 --- a/arch/arm/mach-rockchip/u-boot-tpl.lds +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2019 Rockchip Electronic Co.,Ltd - */ - -#undef CONFIG_SPL_TEXT_BASE -#define CONFIG_SPL_TEXT_BASE CONFIG_TPL_TEXT_BASE - -#undef CONFIG_SPL_MAX_SIZE -#define CONFIG_SPL_MAX_SIZE CONFIG_TPL_MAX_SIZE - -#include "../cpu/u-boot-spl.lds" diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 33202e48fe76..8b4da5b3e7dd 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -11,7 +11,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb" CONFIG_SPL_TEXT_BASE=0x60000000 CONFIG_ROCKCHIP_RK322X=y CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 -CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl.lds" CONFIG_TARGET_EVB_RK3229=y CONFIG_SPL_STACK_R_ADDR=0x60600000 CONFIG_DEBUG_UART_BASE=0x11030000 -- 2.25.1