Skip to contentSkip to conversation

imx: Update FSL_MFGPROT config for iMX8M

PATCH New Gaurav Jain 2 participants 4 messages Apr 19, 2022 – Apr 22, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 imx: Update FSL_MFGPROT config for iMX8M

From: Ye Li <[email protected]>

Update the Kconfig and Makefile to allow build for iMX8M and restrict the build only in u-boot.

---
 arch/arm/mach-imx/Kconfig  | 2 +-
 arch/arm/mach-imx/Makefile | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
arch/arm/mach-imx/Kconfig +1 -1
index 9aa1d84336..ad0fb36502 100644
@@ -137,7 +137,7 @@ config CMD_NANDBCB
 
 config FSL_MFGPROT
 	bool "Support the 'mfgprot' command"
-	depends on IMX_HAB && ARCH_MX7
+	depends on IMX_HAB && (ARCH_MX7 || ARCH_IMX8M)
 	help
 	  This option enables the manufacturing protection command
 	  which can be used has a protection feature for Manufacturing
arch/arm/mach-imx/Makefile +4 -0
index 77e72702bb..aa0b6447f1 100644
@@ -38,8 +38,12 @@ ifeq ($(SOC),$(filter $(SOC),mx7))
 obj-y	+= cpu.o
 obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += mmc_env.o
+endif
+ifeq ($(SOC),$(filter $(SOC),mx7 imx8m))
+ifneq ($(CONFIG_SPL_BUILD),y)
 obj-$(CONFIG_FSL_MFGPROT) += cmd_mfgprot.o
 endif
+endif
 ifeq ($(SOC),$(filter $(SOC),mx5 mx6 mx7))
 obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
 endif
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 imx: Fix build error

From: Ye Li <[email protected]>

Fix wrong environment.h and remove DECLARE_GLOBAL_DATA_PTR

Fixes 30e39ac7c9 (imx: imx7 Support for Manufacturing Protection)
---
 arch/arm/mach-imx/cmd_mfgprot.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm/mach-imx/cmd_mfgprot.c +1 -3
index aed3b2f83d..ec8a8756f7 100644
@@ -12,13 +12,11 @@
 #include <linux/compiler.h>
 #include <command.h>
 #include <common.h>
-#include <environment.h>
+#include <env.h>
 #include <fsl_sec.h>
 #include <mapmem.h>
 #include <memalign.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /**
  * do_mfgprot() - Handle the "mfgprot" command-line command
  * @cmdtp:  Command data struct pointer
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 imx: Fix build error

Quoted 5 lines

From: Ye Li <[email protected]>
Fix wrong environment.h and remove DECLARE_GLOBAL_DATA_PTR

Fixes 30e39ac7c9 (imx: imx7 Support for Manufacturing Protection)

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#3 lore raw

PATCH 1/2 imx: Update FSL_MFGPROT config for iMX8M

In reply to Gaurav Jain
Quoted 5 lines

From: Ye Li <[email protected]>
Update the Kconfig and Makefile to allow build for iMX8M and restrict the build only in u-boot.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================