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 69277C19F2B for ; Wed, 3 Aug 2022 21:57:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D3EF184522; Wed, 3 Aug 2022 23:57:07 +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="KxlTRRc8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E2D58458A; Wed, 3 Aug 2022 23:57:06 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::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 4959D8405C for ; Wed, 3 Aug 2022 23:57:04 +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 DF14CB82280; Wed, 3 Aug 2022 21:57:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87DD8C433C1; Wed, 3 Aug 2022 21:57:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659563822; bh=o4Ae3w7t50XslUVkaqd7eAGad5uAXIckVJx06r0wjj4=; h=From:To:Cc:Subject:Date:From; b=KxlTRRc8AAb/GFMoQfpqludOE0ZAu3EYf4WRqIKPH8nME2oV1p/yXmtFQaphfXfAV 9PGZYFolNyZ3NWrrZSmgo5dDtZw/6GuHK6JSRzRgxNow69mEVCrTouolKhLBN9aCNT 2HprPkJkTg8wINoKSW4yYZ/InnWQ71XAncTWt7gOfkFZeiBRHFX5cIErrGg9tdaarr lZhaDREJZr7GfgBAFb5aiSsFtrtLQ5hCcoTQmc8R6Zz0BR+pEP6udm0pnGuqq5CpBg UgbzGHa+nOQ5ASmoitCoX9gBF2UyL1SGCHy27vhh292MsUG1/2mBhQceS9vlwUq6sv 7iMGSOI4U6dHA== Received: by pali.im (Postfix) id 6E6237FD; Wed, 3 Aug 2022 23:56:59 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Simon Glass Cc: u-boot@lists.denx.de Subject: [PATCH] Makefile: Unify condition for mpc85xx reset vector Date: Wed, 3 Aug 2022 23:56:55 +0200 Message-Id: <20220803215655.2361-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 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 Use 'CONFIG_MPC85XX_HAVE_RESET_VECTOR && CONFIG_OF_SEPARATE' pattern instead of 'CONFIG_MPC85XX_HAVE_RESET_VECTOR && !CONFIG_OF_EMBED' also in OBJCOPYFLAGS_u-boot-nodtb.bin as this pattern is used in rest of Makefile. Signed-off-by: Pali Rohár --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d659c8118cba..23bf0c8b1e62 100644 --- a/Makefile +++ b/Makefile @@ -1267,7 +1267,7 @@ spl/u-boot-spl.srec: spl/u-boot-spl FORCE OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) \ - $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),$(if $(CONFIG_OF_EMBED),,-R .bootpg -R .resetvec)) + $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),$(if $(CONFIG_OF_SEPARATE),-R .bootpg -R .resetvec)) binary_size_check: u-boot-nodtb.bin FORCE @file_size=$(shell wc -c u-boot-nodtb.bin | awk '{print $$1}') ; \ -- 2.20.1