[PATCH 1/2] imx: Fix Kconfig dependency

[PATCH 1/2] imx: Fix Kconfig dependency

[Alexander Shiyan]

WARNING: unmet direct dependencies detected for IMX_OCOTP
Depends on [n]: NVMEM [=n] && (ARCH_IMX6 [=n] || ARCH_VF610 [=n] || ARCH_IMX8M[=y] || ARCH_IMX7 [=n]) && OFDEVICE [=y]
Selected by [y]:
- IMX8M_FEATCTRL [=y] && ARCH_IMX8M [=y]

WARNING: unmet direct dependencies detected for IMX_OCOTP
Depends on [n]: NVMEM [=n] && (ARCH_IMX6 [=n] || ARCH_VF610 [=n] || ARCH_IMX8M[=y] || ARCH_IMX7 [=n]) && OFDEVICE [=y]
Selected by [y]:
- IMX8M_FEATCTRL [=y] && ARCH_IMX8M [=y]

Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 drivers/soc/imx/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
index 71f72eb480..57f5577ace 100644
--- a/drivers/soc/imx/Kconfig
+++ b/drivers/soc/imx/Kconfig
@@ -12,6 +12,7 @@ config IMX8M_FEATCTRL
 	depends on ARCH_IMX8M
 	select FEATURE_CONTROLLER
 	select IMX_OCOTP
+	select NVMEM
 	default y
 	help
 	  This driver disables device tree nodes that are not applicable
-- 
2.38.2

[PATCH 2/2] ARM: imx: Fix build error without CONFIG_USB_GADGET_DRIVER_ARC_PBL

[Alexander Shiyan]

aarch64-buildroot-linux-gnu-ld: arch/arm/mach-imx/atf.pbl.o: in function `imx8mm_load_bl33':
/home/ARM64/bb-imx8/arch/arm/mach-imx/atf.c:102: undefined reference to `imx8mm_barebox_load_usb'
make[1]: *** [/home/ARM64/bb-imx8/images/Makefile:70: images/start_nxp_imx8mm_evk.pbl] Error 1
make: *** [Makefile:732: images] Error 2

Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 arch/arm/mach-imx/atf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/atf.c b/arch/arm/mach-imx/atf.c
index 38bab9c051..824569f614 100644
--- a/arch/arm/mach-imx/atf.c
+++ b/arch/arm/mach-imx/atf.c
@@ -87,6 +87,7 @@ void imx8mm_load_bl33(void *bl33)
 	case BOOTSOURCE_MMC:
 		imx8m_esdhc_load_image(instance, false);
 		break;
+#if IS_ENABLED(CONFIG_USB_GADGET_DRIVER_ARC_PBL)
 	case BOOTSOURCE_SERIAL:
 		/*
 		 * Traditionally imx-usb-loader sends the PBL twice. The first
@@ -112,11 +113,12 @@ void imx8mm_load_bl33(void *bl33)
 		}
 
 		break;
+#endif
 	case BOOTSOURCE_SPI:
 		imx8mm_qspi_load_image(instance, false);
 		break;
 	default:
-		printf("Unhandled bootsource BOOTSOURCE_%d\n", src);
+		printf("Unsupported bootsource BOOTSOURCE_%d\n", src);
 		hang();
 	}
 
-- 
2.38.2

Re: [PATCH 1/2] imx: Fix Kconfig dependency

[Sascha Hauer]

On Thu, Aug 24, 2023 at 06:39:32PM +0300, Alexander Shiyan wrote:
> WARNING: unmet direct dependencies detected for IMX_OCOTP
> Depends on [n]: NVMEM [=n] && (ARCH_IMX6 [=n] || ARCH_VF610 [=n] || ARCH_IMX8M[=y] || ARCH_IMX7 [=n]) && OFDEVICE [=y]
> Selected by [y]:
> - IMX8M_FEATCTRL [=y] && ARCH_IMX8M [=y]
> 
> WARNING: unmet direct dependencies detected for IMX_OCOTP
> Depends on [n]: NVMEM [=n] && (ARCH_IMX6 [=n] || ARCH_VF610 [=n] || ARCH_IMX8M[=y] || ARCH_IMX7 [=n]) && OFDEVICE [=y]
> Selected by [y]:
> - IMX8M_FEATCTRL [=y] && ARCH_IMX8M [=y]
> 
> Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
> ---
>  drivers/soc/imx/Kconfig | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks

Sascha

> 
> diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
> index 71f72eb480..57f5577ace 100644
> --- a/drivers/soc/imx/Kconfig
> +++ b/drivers/soc/imx/Kconfig
> @@ -12,6 +12,7 @@ config IMX8M_FEATCTRL
>  	depends on ARCH_IMX8M
>  	select FEATURE_CONTROLLER
>  	select IMX_OCOTP
> +	select NVMEM
>  	default y
>  	help
>  	  This driver disables device tree nodes that are not applicable
> -- 
> 2.38.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |