imx6: standardise OCOTP and fuse config to mx6_common

According to README.mxc_ocotp the OCOTP is a stanard i.MX6 SoC feature
so centralise the config in mx6_common.h so functionality is standard
across all boards

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index dd012f1c3e3ee1bdefed42fbd94bf98e9a2e6277..4a5d4fb0802cee4f3dbb01ef8504da057b462478 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -26,9 +26,6 @@
 
 #define CONFIG_MXC_UART
 
-#define CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index eb26f50bac2a2e1013231f75e4de606709c8e672..7162e9e09426d3e13553644279966f5437b29a20 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -29,11 +29,6 @@
 
 #define CONFIG_MXC_UART
 
-#define CONFIG_CMD_FUSE
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
-
 /* I2C Configs */
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 902ec2c5362a875c9b0c5157bfbf414e41cb1b04..df1ff434e50aa841c5259acba2de512e0a01ae39 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -165,11 +165,6 @@
 #define CONFIG_CMD_EECONFIG      /* Gateworks EEPROM config cmd */
 #define CONFIG_CMD_UBI
 #define CONFIG_RBTREE
-#define CONFIG_CMD_FUSE          /* eFUSE read/write support */
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
-
 
 /* Ethernet support */
 #define CONFIG_FEC_MXC

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 0667830c2237d8d9ea7b6f5311c9da944d2ef9d7..720456b6f892e3b10dd4c94c488539f409be2d4e 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -113,4 +113,8 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC
 
+/* Fuses */
+#define CONFIG_CMD_FUSE
+#define CONFIG_MXC_OCOTP
+
 #endif

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 3d5bba75d3845d76e358d98268b54786058bd70a..634a09f34928fd8e7e33233a223b9d139f484ec5 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -20,8 +20,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MXC_UART
-#define CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index c24e901fc4bf43017ab5fc0565e84ebfe5fb5072..e200036cb7e1387fbf4be67e6ed7b8e79673c784 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -21,11 +21,6 @@
 
 #define CONFIG_MXC_UART
 
-#define CONFIG_CMD_FUSE
-#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL)
-#define CONFIG_MXC_OCOTP
-#endif
-
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index f27bf206f0c3155131381aee36509e718287ee86..07d9d8529decf62e0ec06e32a1b440f297d40080 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -192,9 +192,4 @@
 
 #define CONFIG_IMX6_THERMAL
 
-#define CONFIG_CMD_FUSE
-#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL)
-#define CONFIG_MXC_OCOTP
-#endif
-
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 44af7291987b1195bf7ce1648b4a3bcebe81168e..778588850452f5b3c51878d78fd6c8037848f813 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -178,11 +178,6 @@
 
 #define CONFIG_IMX6_THERMAL
 
-#define CONFIG_CMD_FUSE
-#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL)
-#define CONFIG_MXC_OCOTP
-#endif
-
 #define CONFIG_CMD_TIME
 
 #define CONFIG_FSL_QSPI

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 91250b35dc27d63ed308db32379dd5e705335ce0..8aa6b8feeaf2fe0dc98707ee922eb44c754187cb 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -26,11 +26,6 @@
 #define CONFIG_USB_ETH_CDC
 #define CONFIG_NETCONSOLE
 
-#define CONFIG_CMD_FUSE
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
-
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE          UART2_BASE
 

diff --git a/include/configs/novena.h b/include/configs/novena.h
index d9b7250cad750db324efdcdee560f38306ca1fcb..0970fd75483e7ab9628bd76ff163bc0532587436 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -25,7 +25,6 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
 #define CONFIG_FAT_WRITE
-#define CONFIG_CMD_FUSE
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
@@ -118,11 +117,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
-/* OCOTP Configs */
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
-
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index aa58bff09ccc03666d5ddebd7b27e2128e17683d..7dd80d981f6819dc8b0709f7a3c763fa8ef18168 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -16,10 +16,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
 
-/* FUSE Configs */
-#define CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-
 /* UART Configs */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index fd1946160a3c8c9dd1e584217f6734bcfa8d8775..d65143240b6459244b1d81ace0956aa1c90537c1 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -23,7 +23,6 @@
 
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_FUSE
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MTDPARTS
@@ -103,9 +102,6 @@
 #define CONFIG_APBH_DMA_BURST
 #define CONFIG_APBH_DMA_BURST8
 
-/* Fuse support */
-#define CONFIG_MXC_OCOTP
-
 /* Environment in NAND */
 #define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              (16 << 20)

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 42e5821807493d06288a2aee72faf875f4f93bb9..5bc1209192a37f42dcdedb0c80d2fd7440a02942 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -173,12 +173,6 @@
 #define CONFIG_I2C_EDID
 #endif
 
-/* Fuses */
-#define CONFIG_CMD_FUSE
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
-
 /* Environment organization */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         2

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 6fe2a669a6d830496f5e4d09cf1bf8baccdf7f93..10fd5c1fbbb02e0eb55f2d79df1fc8c1a7405f31 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -98,10 +98,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 
-/* Fuses */
-#define CONFIG_MXC_OCOTP
-#define CONFIG_CMD_FUSE
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 6af256e1229f2fdc3677d56be943a94cb22cc8d6..5b182014b4a463af7439eb0ecc42f09b4ecc5416 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -84,11 +84,6 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
-#define CONFIG_CMD_FUSE
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
-
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \

diff --git a/include/configs/warp.h b/include/configs/warp.h
index 48e2058f5f0224ffd798b36797d1869dbed9a7e0..2331767b13aef25e0ad8be59a578cd352b7406b0 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -94,10 +94,6 @@
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-/* Fuses */
-#define CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \