From 060613f119837fafc7c90a5dcc1aa1bf81ff319b Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Sat, 19 Nov 2022 18:45:11 -0500
Subject: [PATCH] Convert CONFIG_FSL_IIM to Kconfig
This converts the following to Kconfig:
CONFIG_FSL_IIM
Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/m53menlo_defconfig | 1 +
configs/mx51evk_defconfig | 1 +
configs/mx53ppd_defconfig | 1 +
configs/usbarmory_defconfig | 1 +
doc/README.fsl_iim | 2 +-
drivers/misc/Kconfig | 4 ++++
include/configs/m53menlo.h | 3 ---
include/configs/mx51evk.h | 1 -
include/configs/mx53ppd.h | 2 --
include/configs/usbarmory.h | 3 ---
10 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index b4ada56a36..a5760242be 100644
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -80,6 +80,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041
CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MXC=y
+CONFIG_FSL_IIM=y
CONFIG_FSL_ESDHC_IMX=y
CONFIG_MTD=y
CONFIG_MTD_RAW_NAND=y
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index 89597c0574..d76ebe8fd2 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_USE_ETHPRIME=y
CONFIG_ETHPRIME="FEC0"
CONFIG_ARP_TIMEOUT=200
+CONFIG_FSL_IIM=y
CONFIG_FSL_ESDHC_IMX=y
CONFIG_MTD=y
CONFIG_PHYLIB=y
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index 328f546c5b..ed4ebbbe3c 100644
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_MXC=y
CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_PCA954x=y
CONFIG_MISC=y
+CONFIG_FSL_IIM=y
CONFIG_I2C_EEPROM=y
CONFIG_FSL_ESDHC_IMX=y
CONFIG_MTD=y
diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig
index 510e215bff..ed2bcc69fc 100644
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_MXC=y
+CONFIG_FSL_IIM=y
CONFIG_FSL_ESDHC_IMX=y
CONFIG_MTD=y
CONFIG_PINCTRL=y
diff --git a/doc/README.fsl_iim b/doc/README.fsl_iim
index e087f5e0e4..78d3cb8b3e 100644
--- a/doc/README.fsl_iim
+++ b/doc/README.fsl_iim
@@ -45,4 +45,4 @@ Fuse operations:
Configuration:
CONFIG_FSL_IIM
- Define this to enable the fsl_iim driver.
+ Enable this to enable the fsl_iim driver.
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a6da6e215d..fb3bbb3b91 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -267,6 +267,10 @@ config DS4510
and a configurable timer for the supervisor function. The device is
connected over I2C.
+config FSL_IIM
+ bool "Enable FSL IC Identification Module (IIM) driver"
+ depends on ARCH_MX31 || ARCH_MX5
+
config FSL_SEC_MON
bool "Enable FSL SEC_MON Driver"
help
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index f87bbf7ccf..eca86a9451 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -80,9 +80,6 @@
#define CFG_SYS_LDB_CLOCK 33260000
#define CONFIG_IMX_VIDEO_SKIP
-/* IIM Fuses */
-#define CONFIG_FSL_IIM
-
/* Watchdog */
/*
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 3c99b70a2b..6d9b954587 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -17,7 +17,6 @@
/*
* Hardware drivers
*/
-#define CONFIG_FSL_IIM
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 7160654eb3..913bc1996d 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -102,8 +102,6 @@
/* FLASH and environment organization */
-#define CONFIG_FSL_IIM
-
/* Backlight Control */
#define CONFIG_IMX6_PWM_PER_CLK 66666000
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index da68d7a0da..a2bc3cd23a 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -27,9 +27,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
-/* Fuse */
-#define CONFIG_FSL_IIM
-
/* Linux boot */
#define CONFIG_HOSTNAME "usbarmory"
--
2.39.5