From patchwork Thu Jan 27 12:16:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amjad Ouled-Ameur X-Patchwork-Id: 1585014 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=U9ia2YDy; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jl03w3G1cz9tB1 for ; Thu, 27 Jan 2022 23:18:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A93E983434; Thu, 27 Jan 2022 13:17:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.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=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.b="U9ia2YDy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F54583765; Thu, 27 Jan 2022 13:17:34 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) (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 CAEF4834D2 for ; Thu, 27 Jan 2022 13:17:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aouledameur@baylibre.com Received: by mail-wm1-x336.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so1761326wme.0 for ; Thu, 27 Jan 2022 04:17:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6C7VOkyrrQOikMSL5MNB26bcrfgQ9cRJJS+h5K5f5qw=; b=U9ia2YDyQ3frbv6jjt3Cs15jnUqV4pfjDFQkepvozk7N8tsTsf7NwQxlVjfu2U/rYH fgw6vi+y0V8q3L5u3MFlIVDLM0m5uAkojIZITlXdv/11pfdDW3QwwM75ti6JEpJff/j6 vDnVxYSV+c6Dy9fvBPCmT0eKi/BC5/WlyXTK6qSHZwH97Jgy27h/6Czz4PmUqWlrNpMm jOyQOK+xsXD/3J19mCBonw0pXk5lmNAqUb3rnhAb+8YpoVS+t+Wm4YagGpjyolXB4pZl OfwBTC/5ovrRDj8orrU4rLOvzVq8y+tP5JC/cScWCNCF4iIkfxGXAjQjxItncwXWUmd8 APNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6C7VOkyrrQOikMSL5MNB26bcrfgQ9cRJJS+h5K5f5qw=; b=RfJjgL6eVgjPzwhDSpbmjeTs6XoheA+aylCQz7StOADx1TPKNT/tIyIsODLTcleqBJ +xJTKkyCXgoDjYygBngbHrkllTmlEngeMP9eJ/ys3azpIEPBds0CQlnINbYun1owr7rH eVPnBOt468KPD3eUGEr2Njb1DfvWe620BZUR5LO9WVj256R7+hCfMu35OcbrlaU/L9jB 4l7hG6Phun1FAj6GQ/nsLdrTdT+Iksmagg5nYO/+rwFGlU5d2CXbJHK05ikgMAHxiisy xqWEUXRquQmQ8w/SoEOVlatYVmUc4SW1YZnJ3Bw3xLUzrj62P3couHw0n35p7XKJRgW0 PcvA== X-Gm-Message-State: AOAM532Sd3ObvMeVYmgyihm2+TrSgsbsmlaCwJoKLPgity3OrAOffp8J lZiqvRuPsC9aE+fK606pjtI3Azs/yIHv3jQK X-Google-Smtp-Source: ABdhPJzgI/0pdZWJZ5lT2vVJQr7Mgj2bRArUpfADtt3Ov6Kkp2wJMgn/wOI4rEyFlSuk9J5PyKTRPQ== X-Received: by 2002:a1c:5401:: with SMTP id i1mr5783985wmb.169.1643285845430; Thu, 27 Jan 2022 04:17:25 -0800 (PST) Received: from localhost.localdomain (203.247.120.78.rev.sfr.net. [78.120.247.203]) by smtp.googlemail.com with ESMTPSA id f8sm2345026wry.46.2022.01.27.04.17.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 04:17:25 -0800 (PST) From: Amjad Ouled-Ameur To: u-boot@lists.denx.de Cc: khilman@baylibre.com, Keerthy , Amjad Ouled-Ameur , "Andrew F. Davis" , Asherah Connor , Bin Meng , Chin-Liang See , Dinh Nguyen , Heiko Schocher , Igor Opaniuk , Michael Scott , Oleksandr Suvorov , Peng Fan , Simon Glass , Wasim Khan , Ye Li Subject: [PATCH v4 04/11] drivers: misc: Makefile: Enable fs_loader compilation at SPL Level Date: Thu, 27 Jan 2022 13:16:53 +0100 Message-Id: <20220127121700.130821-5-aouledameur@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220127121700.130821-1-aouledameur@baylibre.com> References: <20220127121700.130821-1-aouledameur@baylibre.com> 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.5 at phobos.denx.de X-Virus-Status: Clean From: Keerthy Enable fs_loader compilation at SPL Level. Signed-off-by: Keerthy [Amjad: fix compilation failures for J721e platform] Signed-off-by: Amjad Ouled-Ameur --- Changes in v4: - Enable SPL fs_loader for j7200_evm_r5 and socfpga_arria10. arch/arm/mach-k3/common.c | 10 +++------- configs/j7200_evm_r5_defconfig | 1 + configs/j721e_evm_r5_defconfig | 1 + configs/j721e_hs_evm_r5_defconfig | 1 + configs/socfpga_arria10_defconfig | 1 + drivers/misc/Kconfig | 9 +++++++++ drivers/misc/Makefile | 2 +- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 39d00270b7fa..b4b75f4e6c86 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -156,13 +156,15 @@ void init_env(void) #endif } -#ifdef CONFIG_FS_LOADER int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr) { struct udevice *fsdev; char *name = NULL; int size = 0; + if (!IS_ENABLED(CONFIG_FS_LOADER)) + return 0; + *loadaddr = 0; #ifdef CONFIG_SPL_ENV_SUPPORT switch (spl_boot_device()) { @@ -186,12 +188,6 @@ int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr) return size; } -#else -int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr) -{ - return 0; -} -#endif __weak void release_resources_for_core_shutdown(void) { diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig index aeb76e8023f1..f5a8f325c0f1 100644 --- a/configs/j7200_evm_r5_defconfig +++ b/configs/j7200_evm_r5_defconfig @@ -91,6 +91,7 @@ CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_FS_LOADER=y +CONFIG_SPL_FS_LOADER=y CONFIG_K3_AVS0=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SPL_MMC_HS400_SUPPORT=y diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig index b0759d1f305d..1fb13a8a707d 100644 --- a/configs/j721e_evm_r5_defconfig +++ b/configs/j721e_evm_r5_defconfig @@ -88,6 +88,7 @@ CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_FS_LOADER=y +CONFIG_SPL_FS_LOADER=y CONFIG_ESM_K3=y CONFIG_K3_AVS0=y CONFIG_ESM_PMIC=y diff --git a/configs/j721e_hs_evm_r5_defconfig b/configs/j721e_hs_evm_r5_defconfig index 3d2bbb4844e8..1e4a93ff53fe 100644 --- a/configs/j721e_hs_evm_r5_defconfig +++ b/configs/j721e_hs_evm_r5_defconfig @@ -82,6 +82,7 @@ CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_FS_LOADER=y +CONFIG_SPL_FS_LOADER=y CONFIG_K3_AVS0=y CONFIG_MMC_SDHCI=y CONFIG_SPL_MMC_SDHCI_ADMA=y diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig index d6b744475039..63284cb0eb54 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig @@ -40,6 +40,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DWAPB_GPIO=y CONFIG_FS_LOADER=y +CONFIG_SPL_FS_LOADER=y CONFIG_MMC_DW=y CONFIG_MTD=y CONFIG_PHY_MICREL=y diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index a8baaeaf5cfe..0ade3e32b0ef 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -453,6 +453,15 @@ config FS_LOADER The consumer driver would then use this loader to program whatever, ie. the FPGA device. +config SPL_FS_LOADER + bool "Enable loader driver for file system" + help + This is file system generic loader which can be used to load + the file image from the storage into target such as memory. + + The consumer driver would then use this loader to program whatever, + ie. the FPGA device. + config GDSYS_SOC bool "Enable gdsys SOC driver" depends on MISC diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index f9826d2462d1..bca7b24e99ad 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -37,7 +37,7 @@ obj-$(CONFIG_FSL_IFC) += fsl_ifc.o obj-$(CONFIG_FSL_IIM) += fsl_iim.o obj-$(CONFIG_FSL_MC9SDZ60) += mc9sdz60.o obj-$(CONFIG_FSL_SEC_MON) += fsl_sec_mon.o -obj-$(CONFIG_FS_LOADER) += fs_loader.o +obj-$(CONFIG_$(SPL_)FS_LOADER) += fs_loader.o obj-$(CONFIG_GDSYS_IOEP) += gdsys_ioep.o obj-$(CONFIG_GDSYS_RXAUI_CTRL) += gdsys_rxaui_ctrl.o obj-$(CONFIG_GDSYS_SOC) += gdsys_soc.o