From patchwork Mon Nov 21 15:22:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jit Loon Lim X-Patchwork-Id: 1707429 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=iZa4w8Ua; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NGB2l3z4Nz23lT for ; Tue, 22 Nov 2022 02:22:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6AFB8852F0; Mon, 21 Nov 2022 16:22:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=intel.com 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=intel.com header.i=@intel.com header.b="iZa4w8Ua"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 51757852F5; Mon, 21 Nov 2022 16:22:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=AC_FROM_MANY_DOTS,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.2 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 C087D852EB for ; Mon, 21 Nov 2022 16:22:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=jitloonl@ecsmtp.png.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669044131; x=1700580131; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=B1aOoyFvYt4Dsc4Hbk0JF3KP+tpes5NPtsABnjPligY=; b=iZa4w8UakRGQZuaWqFl5Xn1MKPKUPDbpMSaSbUsWSc+547O39blDg0bG 21t79jqnmxU3uRG2V6EeGb7plBe7D8NJZRC4rtnGPXlEP/CtEWvsgMAkr e1ZJSPDRid0G02liIMs6cUscPLADv3SY09qOSffyXcGNzE7EOiGr++Vug ZicxAdfVGLx8o3ZHV06uEzjv6VPF+TrvJ8e2LR2jt83XALY7235d8vUAq bn7MGR1WjbXflkXhtB+8rzhP5yGnrvAiSbyrXhAaG/ddQbaf+Ds5pt4+X pEdokx7ivSUJCTb9BoKWltPxv+6ARauztfHCZADhcYV+k1SwWoNw21oCU g==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="377842541" X-IronPort-AV: E=Sophos;i="5.96,181,1665471600"; d="scan'208";a="377842541" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 07:22:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="618859264" X-IronPort-AV: E=Sophos;i="5.96,181,1665471600"; d="scan'208";a="618859264" Received: from pglmail07.png.intel.com ([10.221.193.207]) by orsmga006.jf.intel.com with ESMTP; 21 Nov 2022 07:22:05 -0800 Received: from localhost (pgli0028.png.intel.com [10.221.84.177]) by pglmail07.png.intel.com (Postfix) with ESMTP id 36AF54823; Mon, 21 Nov 2022 23:22:05 +0800 (+08) Received: by localhost (Postfix, from userid 12048045) id 327D8E0095F; Mon, 21 Nov 2022 23:22:05 +0800 (+08) From: Jit Loon Lim To: u-boot@lists.denx.de Cc: Jagan Teki , Vignesh R , Marek , Simon , Tien Fong , Kok Kiang , Siew Chin , Sin Hui , Raaj , Dinesh , Boon Khai , Alif , Teik Heng , Hazim , Jit Loon Lim , Sieu Mun Tang Subject: [PATCH] include: configs: soc64: Use CONFIG_SPL_ATF to differentiate bootfile Date: Mon, 21 Nov 2022 23:22:03 +0800 Message-Id: <20221121152203.19703-1-jit.loon.lim@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 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 From: Siew Chin Lim Legacy boot flow (SPL->U-Boot Proper->OS) boot to OS via Kernel Image and dtb files using booti command. ATF boot flow (SPL->ATF->U-Boot Proper->OS) boot to OS via kernel.itb file using bootm command. Change to use CONFIG_SPL_ATF to differentiate the bootfile of default environment variable. We shouldn't use CONFIG_FIT because it is enabled by default for U-Boot Proper. Signed-off-by: Siew Chin Lim Signed-off-by: Jit Loon Lim --- include/configs/socfpga_soc64_common.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 12da770077..7edffc3975 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -50,6 +50,13 @@ /* * Environment variable */ + +#if IS_ENABLED(CONFIG_SPL_ATF) +#define CONFIG_BOOTFILE "kernel.itb" +#else +#define CONFIG_BOOTFILE "Image" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ "qspibootimageaddr=0x020E0000\0" \ "qspifdtaddr=0x020D0000\0" \