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 D6BCEC433F5 for ; Mon, 2 May 2022 16:37:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CBC2883F3C; Mon, 2 May 2022 18:37:11 +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="MtczWyrv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4CAAF830E5; Mon, 2 May 2022 18:37:05 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (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 0BA3083E3A for ; Mon, 2 May 2022 18:36:59 +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=pali@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 ams.source.kernel.org (Postfix) with ESMTPS id B6E7EB81909; Mon, 2 May 2022 16:36:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 575DDC385A4; Mon, 2 May 2022 16:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651509417; bh=Tl2lEcwUltVBvQbQrcXpkriTFGjChdlIqkKwprDqkkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MtczWyrvKaRNI+goiOLTSnlZeYi34YUlPKV+q79VmVGJplbMDJsnnNl0LsOyLEU19 V3NxahBzZuRGN+ipXSHxTik147DwRjrXY30B642IoL0+/RdPZaDA5vxK5DatAodumI AlQhPjA209Rbf++6GCpnn1zoLglpyPc2mNDZ668hPNqXG/qFMU8Ux6jGlAFx4ZuCph XZ4f1dqpXSfYYEy7jKTzqTk3VTl9aIQyC/4kGZxob6E2ZooJC8v1YtSbI0q17BBa9r IqCal9hRXw1Hjir4P2c8S9k41d7rXtaakXx8A4cegDOyh1CPm/4q4EDt4Z3mgB0TEv 4O4yMqnjGnGYA== Received: by pali.im (Postfix) id 73F8910BF; Mon, 2 May 2022 18:36:54 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Priyanka Jain , Simon Glass , Wolfgang Denk Cc: Sinan Akman , u-boot@lists.denx.de Subject: [PATCH 1/2] powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support for NOR booting Date: Mon, 2 May 2022 18:36:38 +0200 Message-Id: <20220502163639.10773-2-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220502163639.10773-1-pali@kernel.org> References: <20220502163639.10773-1-pali@kernel.org> 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.5 at phobos.denx.de X-Virus-Status: Clean Commit e8c0e0064c8a ("powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support") fixed SD card booting on mpc85xx boards but broke NOR booting on these boards. Reason is that U-Boot build system for NOR images uses binman and this binman ignores alignment defined in linker script. Instead it has own config file where is alignment defined. Fix binman alignment for mpc85xx boards to match what is _now_ defined in linker script. This change fixes building of U-Boot for NOR booting on P2020 board. Fixes: e8c0e0064c8a ("powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support") Signed-off-by: Pali Rohár --- arch/powerpc/dts/u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi index 9661f4dc88d3..67de476a45ed 100644 --- a/arch/powerpc/dts/u-boot.dtsi +++ b/arch/powerpc/dts/u-boot.dtsi @@ -20,7 +20,7 @@ u-boot-dtb-with-ucode { #ifdef CONFIG_MPC85xx - align = <256>; + align = <4>; #endif }; #ifdef CONFIG_MPC85XX_HAVE_RESET_VECTOR -- 2.20.1