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 A7FDFC433F5 for ; Tue, 18 Jan 2022 10:14:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EB0B883810; Tue, 18 Jan 2022 11:14:08 +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="o6ifTooB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6CCC3837FB; Tue, 18 Jan 2022 11:13:50 +0100 (CET) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (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 CF0ED8380E for ; Tue, 18 Jan 2022 11:13:42 +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-x335.google.com with SMTP id k5so17346687wmj.3 for ; Tue, 18 Jan 2022 02:13:42 -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=eEpqsfUuJuv3VFtjBeB48ZeELAMAbHFpnM8rz29LwXM=; b=o6ifTooBxhm/7eh3JGzRWrqrs8IR8TXVC0di7b+Si+q82YbZAUE607Pre+k8Ff9FEA /1ltGEpgME5ZNSfA0vRimJkS7EhjYroJReZnqqRtRTA/4AS1IRW1jV+TCsQ3EeaVH5Py rLHJV/enftrj5sBF0eSkLUX2tDKWoN0tDcx7+/VxJkf8YZ/IUCiUepA6mk1XPwdJO4VK /IoAU3I+efjq2RyYoEsHtcXNHNZPrHUYr7cpjMpgFcvCq3hrt7G17yq88ay1DovPbYci 8UhHgK5OaIWnIizLitWPJIlp0ri7g9kIXl2DfMuoSKqhQLHUp9rW8X7eVlX4TGdRHE80 ETug== 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=eEpqsfUuJuv3VFtjBeB48ZeELAMAbHFpnM8rz29LwXM=; b=D8oQ9TiZjlUhzjjgvamOeTaWGxmRn1n/7HkuNqV9AU1/UX/S9GabBXkQPNDw6KOL3r VP3jD354KlVEd/V/Y/DDXbwyohRM9ksm8A38D6jcQxl9YATyn7TNsr06/2+WvgygiPyb 8kekK9BuQgDVeCHOEJxtMaRuVgUvXBPLxpCi45FXWGXIlHg+XSA36JZpQk+mgOun/6Vd a3rryVBFcD5k2ZcwBgPtpVBpDp2XsmtfgbchnM6jHrvUux2zI8E66nl7G4ABgdJ+mGAj RKhbHQ9ZsI5N0sWQoOkpIuhY1ZgzDeksih90GDXEGcXMcXH3cM3QKFhTtunH18Z1h1Uj vSKw== X-Gm-Message-State: AOAM531O5aqaorETUfWCRjINpBEIn2Nf7ZnOFR8ULqxypYeXWOYKaM0q 4u8sEPx4Ouc4GK2KyQFgzMDO/15BDuqYfw== X-Google-Smtp-Source: ABdhPJww8jB7CegmtzvJPJ5wS/NumkWTPIevuDfelACKzdu/r8a9r9c4fIsvnGenMhYw9n5LbQHfng== X-Received: by 2002:a5d:5009:: with SMTP id e9mr23149830wrt.554.1642500822307; Tue, 18 Jan 2022 02:13:42 -0800 (PST) Received: from localhost.localdomain (203.247.120.78.rev.sfr.net. [78.120.247.203]) by smtp.googlemail.com with ESMTPSA id f16sm2213622wmg.48.2022.01.18.02.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 02:13:41 -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 , Igor Opaniuk , Michael Scott , Peng Fan , Simon Glass , Wasim Khan , Ye Li Subject: [PATCH v3 04/11] drivers: misc: Makefile: Enable fs_loader compilation at SPL Level Date: Tue, 18 Jan 2022 11:12:42 +0100 Message-Id: <20220118101249.87031-5-aouledameur@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220118101249.87031-1-aouledameur@baylibre.com> References: <20220118101249.87031-1-aouledameur@baylibre.com> MIME-Version: 1.0 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.2 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 --- (no changes since v1) arch/arm/mach-k3/common.c | 10 +++------- configs/j721e_evm_r5_defconfig | 1 + configs/j721e_hs_evm_r5_defconfig | 1 + drivers/misc/Kconfig | 9 +++++++++ drivers/misc/Makefile | 2 +- 5 files changed, 15 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/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/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 -- 2.25.1