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 DBEE8C433F5 for ; Sun, 29 May 2022 16:58:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B0C7C843C1; Sun, 29 May 2022 18:57:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 2E611843A4; Sun, 29 May 2022 18:56:37 +0200 (CEST) Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (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 DFB8D84361 for ; Sun, 29 May 2022 18:55:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f177.google.com with SMTP id v11so9212116qkf.1 for ; Sun, 29 May 2022 09:55:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a2wnPoRwcyeqVr5T5oT757uYUszbXo5TuzEt8lOc7lc=; b=M4J7SwOQxYK43rz5QkesPuTZsbj9kujuUYPNbFlOOoqvzxP84kp2LHqZ2cI2SJNElM VgWTOFVV9lMvySGLi0cJGTpJBLmRMLPesLZBGL/26ElUjRPiIm0lDWmmywvQDesO2ebI BR4sPDFSDDB25ZwZsVZvdg5CttZHj7+cLDQ6TVihX3REasnpQvCkloDihD5vUQQo65JD fnux+93VSerMRfUKldUx3XZ+KZxGkPN4TLSH9UK7QNx+n09+kdfg4VUI6WITCiYhFSy7 ytpduEnMYhXUM0Q/f3jAQGNIGzb2K6RlhN5sBr8VxqU0vkuNgsTaCzElRKzRke0LBdCR 9kBw== X-Gm-Message-State: AOAM532phJkbRRIemgF3/keqgDz7th63x187uEgXRgBUtqPLOgsiHyWa AKGiD2IRxmdKPhdV88+REGE/mwI8Gw== X-Google-Smtp-Source: ABdhPJy91Hklh2bv4RM3un8mqzwxq/yQlkVSBDSBRG62LLge1zURcqPg7MFCNHfR7dXhsJ9jcPLDgg== X-Received: by 2002:a05:620a:2092:b0:6a3:975b:fe57 with SMTP id e18-20020a05620a209200b006a3975bfe57mr23838809qka.183.1653843339375; Sun, 29 May 2022 09:55:39 -0700 (PDT) Received: from localhost.localdomain (2603-6081-7b00-25fd-0000-0000-0000-1003.res6.spectrum.com. [2603:6081:7b00:25fd::1003]) by smtp.gmail.com with ESMTPSA id o15-20020ac841cf000000b002f90517bc25sm6130409qtm.41.2022.05.29.09.55.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 09:55:39 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 17/20] spl: Remove CONFIG_SPL_START_S_PATH and rework the logic behind it Date: Sun, 29 May 2022 12:55:18 -0400 Message-Id: <20220529165521.912054-17-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220529165521.912054-1-trini@konsulko.com> References: <20220529165521.912054-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.5 at phobos.denx.de X-Virus-Status: Clean In some cases, when we don't use CONFIG_SPL_FRAMEWORK nor are we on PowerPC using their specific SPL/TPL framework, we need to specify the start.S file to use for these typically very constrained systems. Do this within the Makefile logic, rather than introducing a string-based CONFIG option, as this would get slightly complex to do in Kconfig for a very limited number of users. Signed-off-by: Tom Rini --- arch/arm/Makefile | 4 ++-- arch/mips/Makefile | 4 +--- include/configs/ci20.h | 4 ---- include/configs/mxs.h | 5 ----- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 85c23bcf775b..4afa8e4adf02 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -103,8 +103,8 @@ libs-y += $(machdirs) head-y := arch/arm/cpu/$(CPU)/start.o ifeq ($(CONFIG_SPL_BUILD),y) -ifneq ($(CONFIG_SPL_START_S_PATH),) -head-y := $(CONFIG_SPL_START_S_PATH:"%"=%)/start.o +ifeq ($(CONFIG_SYS_SOC)$(CONFIG_SPL_FRAMEWORK),"mxs") +head-y := arch/arm/cpu/arm926ejs/mxs/start.o endif endif diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 6502aebd2960..32c436f2bcb6 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -3,9 +3,7 @@ head-y := arch/mips/cpu/start.o ifeq ($(CONFIG_SPL_BUILD),y) -ifneq ($(CONFIG_SPL_START_S_PATH),) -head-y := $(CONFIG_SPL_START_S_PATH:"%"=%)/start.o -endif +head-$(CONFIG_ARCH_JZ47XX) := arch/mips/mach-jz47xx/start.o endif libs-y += arch/mips/cpu/ diff --git a/include/configs/ci20.h b/include/configs/ci20.h index bcec88415f92..01f636490536 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -30,8 +30,4 @@ /* Miscellaneous configuration options */ #define CONFIG_SYS_BOOTM_LEN (64 << 20) -/* SPL */ - -#define CONFIG_SPL_START_S_PATH "arch/mips/mach-jz47xx" - #endif /* __CONFIG_CI20_H__ */ diff --git a/include/configs/mxs.h b/include/configs/mxs.h index ebabc92b303b..fc15ed82c6ed 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -43,11 +43,6 @@ /* Startup hooks */ -/* SPL */ -#ifndef CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs" -#endif - /* Memory sizes */ /* OCRAM at 0x0 ; 32kB on MX23 ; 128kB on MX28 */ -- 2.25.1