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 D4D39ECAAD3 for ; Mon, 19 Sep 2022 09:32:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 94C5684A4D; Mon, 19 Sep 2022 11:32:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org 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=kernel.org header.i=@kernel.org header.b="n7ifZ92D"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5839C84AB8; Mon, 19 Sep 2022 11:32:17 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 163CB847EF for ; Mon, 19 Sep 2022 11:32:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5056660F9E; Mon, 19 Sep 2022 09:32:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFDB0C433C1; Mon, 19 Sep 2022 09:32:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663579932; bh=JzQPxrzzpVkBNwxeO1BV3PLV72pZOJFt6kNBakBovzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n7ifZ92DqTNvSMi7sI3dtDrkgw724OGr8X8DAQgDFgnPul1NCt0OMNX43PFgf6l3V xUPjbCT79P0Y56U0Qqq4ag/mR5Jmyp9LmUb70j+NS3MCHsW4+B1wHH466ukD0gODoO xEqhaGSo87OCfGuZAYsIS8QdrtIbIOVfAQq6mFvKjX7cyAuLYscifS5q3sTMjx4Rgo +24Z6U20idvKbLYbmDqr4Vh3jPnXY0UceOB1BcpF2UniVyjH8JDer01njv7ny+kNXQ PO7bgJQRoZXDQhuLlHrCoczx3rk+4vhUc97UzK/OM82bUFJUvdI5JvfsmxcIwtr9MT ysssqdECPW0Dw== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Tom Rini , =?UTF-8?q?Pali=20Roh=C3=A1r?= Cc: U-Boot Mailing List , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH] powerpc: mpc85xx: Fix incorrect application of patch Date: Mon, 19 Sep 2022 11:32:08 +0200 Message-Id: <20220919093208.13558-1-kabel@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220919075341.bdb6523ciy3eqtqw@pali> References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 I messed up application of patch 5a428e751044 ("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS"). I took it from a work-in-progress branch where I changed usage of CONFIG_SDCARD to CONFIG_SD_BOOT and refactored SYS_MPC85XX_NO_RESETVEC mess. But these changes aren't in master yet. Fix the wrong usage of these macros. Fixes: 5a428e751044 ("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS") Signed-off-by: Marek Behún --- Tom, should I send another PR with this fix or do you want to apply it yourself? BTW sorry about this. It wasn't caught by CI and I wanted to send at least the fixes to master ASAP. I now looked again together with Pali at the rest of the patches and they are fine. --- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index a36aa1793d..f28826c5d1 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -63,8 +63,8 @@ SECTIONS __init_end = .; _end = .; -#ifndef KEEP_RESET_VECTOR -#if defined(CONFIG_SD_BOOT) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) +#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC) +#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) mmc_u_boot_offs = .; #endif #endif @@ -101,7 +101,7 @@ SECTIONS .resetvec IMAGE_TEXT_BASE + RESET_VECTOR_OFFSET : { KEEP(*(.resetvec)) } = 0xffff -#if defined(CONFIG_SD_BOOT) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) +#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) mmc_u_boot_offs = .; #endif #endif -- 2.35.1