|
 |
098b0f3 |
From 8cbd2ed9b11d4fec40a072628c7c74bc86530a53 Mon Sep 17 00:00:00 2001
|
|
|
db63f3b |
From: Peter Robinson <pbrobinson@gmail.com>
|
|
|
db63f3b |
Date: Mon, 22 Jun 2015 23:01:05 +0100
|
|
|
098b0f3 |
Subject: [PATCH 3/9] imx6: standardise OCOTP and fuse config to mx6_common
|
|
|
db63f3b |
|
|
|
db63f3b |
According to README.mxc_ocotp the OCOTP is a stanard i.MX6 SoC feature
|
|
|
db63f3b |
so centralise the config in mx6_common.h so functionality is standard
|
|
|
db63f3b |
across all boards
|
|
|
db63f3b |
|
|
|
db63f3b |
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
|
db63f3b |
---
|
|
|
db63f3b |
include/configs/aristainetos-common.h | 3 ---
|
|
|
db63f3b |
include/configs/embestmx6boards.h | 5 -----
|
|
|
db63f3b |
include/configs/gw_ventana.h | 5 -----
|
|
|
db63f3b |
include/configs/mx6_common.h | 4 ++++
|
|
|
db63f3b |
include/configs/mx6cuboxi.h | 2 --
|
|
|
db63f3b |
include/configs/mx6sabre_common.h | 5 -----
|
|
|
db63f3b |
include/configs/mx6slevk.h | 5 -----
|
|
|
db63f3b |
include/configs/mx6sxsabresd.h | 5 -----
|
|
|
db63f3b |
include/configs/nitrogen6x.h | 5 -----
|
|
|
db63f3b |
include/configs/novena.h | 6 ------
|
|
|
db63f3b |
include/configs/ot1200.h | 4 ----
|
|
|
db63f3b |
include/configs/platinum.h | 4 ----
|
|
|
db63f3b |
include/configs/tbs2910.h | 6 ------
|
|
|
db63f3b |
include/configs/tqma6.h | 4 ----
|
|
|
db63f3b |
include/configs/wandboard.h | 5 -----
|
|
|
db63f3b |
include/configs/warp.h | 4 ----
|
|
|
db63f3b |
16 files changed, 4 insertions(+), 68 deletions(-)
|
|
|
db63f3b |
|
|
|
db63f3b |
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
|
|
|
098b0f3 |
index dd012f1..4a5d4fb 100644
|
|
|
db63f3b |
--- a/include/configs/aristainetos-common.h
|
|
|
db63f3b |
+++ b/include/configs/aristainetos-common.h
|
|
|
db63f3b |
@@ -26,9 +26,6 @@
|
|
|
db63f3b |
|
|
|
db63f3b |
#define CONFIG_MXC_UART
|
|
|
db63f3b |
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-
|
|
|
db63f3b |
/* MMC Configs */
|
|
|
db63f3b |
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
|
|
db63f3b |
|
|
|
db63f3b |
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
|
|
|
098b0f3 |
index cba58aa..12744a6 100644
|
|
|
db63f3b |
--- a/include/configs/embestmx6boards.h
|
|
|
db63f3b |
+++ b/include/configs/embestmx6boards.h
|
|
|
db63f3b |
@@ -29,11 +29,6 @@
|
|
|
db63f3b |
|
|
|
db63f3b |
#define CONFIG_MXC_UART
|
|
|
db63f3b |
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#ifdef CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#endif
|
|
|
db63f3b |
-
|
|
|
db63f3b |
/* I2C Configs */
|
|
|
db63f3b |
#define CONFIG_CMD_I2C
|
|
|
db63f3b |
#define CONFIG_SYS_I2C
|
|
|
db63f3b |
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
|
|
|
098b0f3 |
index 902ec2c..df1ff43 100644
|
|
|
db63f3b |
--- a/include/configs/gw_ventana.h
|
|
|
db63f3b |
+++ b/include/configs/gw_ventana.h
|
|
|
098b0f3 |
@@ -165,11 +165,6 @@
|
|
|
db63f3b |
#define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */
|
|
|
db63f3b |
#define CONFIG_CMD_UBI
|
|
|
db63f3b |
#define CONFIG_RBTREE
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE /* eFUSE read/write support */
|
|
|
db63f3b |
-#ifdef CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#endif
|
|
|
db63f3b |
-
|
|
|
db63f3b |
|
|
|
db63f3b |
/* Ethernet support */
|
|
|
db63f3b |
#define CONFIG_FEC_MXC
|
|
|
db63f3b |
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
|
|
|
098b0f3 |
index 4c66491..568bbf4 100644
|
|
|
db63f3b |
--- a/include/configs/mx6_common.h
|
|
|
db63f3b |
+++ b/include/configs/mx6_common.h
|
|
|
098b0f3 |
@@ -110,4 +110,8 @@
|
|
|
db63f3b |
#define CONFIG_FSL_ESDHC
|
|
|
db63f3b |
#define CONFIG_FSL_USDHC
|
|
|
db63f3b |
|
|
|
db63f3b |
+/* Fuses */
|
|
|
db63f3b |
+#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
+#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
+
|
|
|
db63f3b |
#endif
|
|
|
db63f3b |
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
|
|
|
db63f3b |
index 3d5bba7..634a09f 100644
|
|
|
db63f3b |
--- a/include/configs/mx6cuboxi.h
|
|
|
db63f3b |
+++ b/include/configs/mx6cuboxi.h
|
|
|
db63f3b |
@@ -20,8 +20,6 @@
|
|
|
db63f3b |
#define CONFIG_BOARD_EARLY_INIT_F
|
|
|
db63f3b |
#define CONFIG_BOARD_LATE_INIT
|
|
|
db63f3b |
#define CONFIG_MXC_UART
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
|
|
|
db63f3b |
/* MMC Configs */
|
|
|
db63f3b |
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
|
|
|
db63f3b |
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
|
|
|
098b0f3 |
index 6c3c52e..e42dfc9 100644
|
|
|
db63f3b |
--- a/include/configs/mx6sabre_common.h
|
|
|
db63f3b |
+++ b/include/configs/mx6sabre_common.h
|
|
|
db63f3b |
@@ -21,11 +21,6 @@
|
|
|
db63f3b |
|
|
|
db63f3b |
#define CONFIG_MXC_UART
|
|
|
db63f3b |
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL)
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#endif
|
|
|
db63f3b |
-
|
|
|
db63f3b |
/* MMC Configs */
|
|
|
db63f3b |
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
|
|
db63f3b |
|
|
|
db63f3b |
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
|
|
|
098b0f3 |
index a7da111..3cecd94 100644
|
|
|
db63f3b |
--- a/include/configs/mx6slevk.h
|
|
|
db63f3b |
+++ b/include/configs/mx6slevk.h
|
|
|
098b0f3 |
@@ -192,9 +192,4 @@
|
|
|
db63f3b |
|
|
|
db63f3b |
#define CONFIG_IMX6_THERMAL
|
|
|
db63f3b |
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL)
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#endif
|
|
|
db63f3b |
-
|
|
|
db63f3b |
#endif /* __CONFIG_H */
|
|
|
db63f3b |
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
|
|
|
098b0f3 |
index 2b278a8..848bdcd 100644
|
|
|
db63f3b |
--- a/include/configs/mx6sxsabresd.h
|
|
|
db63f3b |
+++ b/include/configs/mx6sxsabresd.h
|
|
|
db63f3b |
@@ -178,11 +178,6 @@
|
|
|
db63f3b |
|
|
|
db63f3b |
#define CONFIG_IMX6_THERMAL
|
|
|
db63f3b |
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL)
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#endif
|
|
|
db63f3b |
-
|
|
|
db63f3b |
#define CONFIG_CMD_TIME
|
|
|
db63f3b |
|
|
|
db63f3b |
#define CONFIG_FSL_QSPI
|
|
|
db63f3b |
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
|
|
|
098b0f3 |
index 67a3c97..2e81ad4 100644
|
|
|
db63f3b |
--- a/include/configs/nitrogen6x.h
|
|
|
db63f3b |
+++ b/include/configs/nitrogen6x.h
|
|
|
db63f3b |
@@ -26,11 +26,6 @@
|
|
|
db63f3b |
#define CONFIG_USB_ETH_CDC
|
|
|
db63f3b |
#define CONFIG_NETCONSOLE
|
|
|
db63f3b |
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#ifdef CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#endif
|
|
|
db63f3b |
-
|
|
|
db63f3b |
#define CONFIG_MXC_UART
|
|
|
db63f3b |
#define CONFIG_MXC_UART_BASE UART2_BASE
|
|
|
db63f3b |
|
|
|
db63f3b |
diff --git a/include/configs/novena.h b/include/configs/novena.h
|
|
|
db63f3b |
index 1dc9d83..eb7ebd1 100644
|
|
|
db63f3b |
--- a/include/configs/novena.h
|
|
|
db63f3b |
+++ b/include/configs/novena.h
|
|
|
db63f3b |
@@ -24,7 +24,6 @@
|
|
|
db63f3b |
#define CONFIG_CMD_DHCP
|
|
|
db63f3b |
#define CONFIG_CMD_EEPROM
|
|
|
db63f3b |
#define CONFIG_CMD_I2C
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
#define CONFIG_CMD_MII
|
|
|
db63f3b |
#define CONFIG_CMD_PCI
|
|
|
db63f3b |
#define CONFIG_CMD_PING
|
|
|
db63f3b |
@@ -117,11 +116,6 @@
|
|
|
db63f3b |
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
|
|
db63f3b |
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
|
|
db63f3b |
|
|
|
db63f3b |
-/* OCOTP Configs */
|
|
|
db63f3b |
-#ifdef CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#endif
|
|
|
db63f3b |
-
|
|
|
db63f3b |
/* PCI express */
|
|
|
db63f3b |
#ifdef CONFIG_CMD_PCI
|
|
|
db63f3b |
#define CONFIG_PCI
|
|
|
db63f3b |
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
|
|
|
098b0f3 |
index fb58acf..0d06fce 100644
|
|
|
db63f3b |
--- a/include/configs/ot1200.h
|
|
|
db63f3b |
+++ b/include/configs/ot1200.h
|
|
|
db63f3b |
@@ -16,10 +16,6 @@
|
|
|
db63f3b |
#define CONFIG_BOARD_EARLY_INIT_F
|
|
|
db63f3b |
#define CONFIG_MISC_INIT_R
|
|
|
db63f3b |
|
|
|
db63f3b |
-/* FUSE Configs */
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-
|
|
|
db63f3b |
/* UART Configs */
|
|
|
db63f3b |
#define CONFIG_MXC_UART
|
|
|
db63f3b |
#define CONFIG_MXC_UART_BASE UART1_BASE
|
|
|
db63f3b |
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
|
|
|
db63f3b |
index fd19461..d651432 100644
|
|
|
db63f3b |
--- a/include/configs/platinum.h
|
|
|
db63f3b |
+++ b/include/configs/platinum.h
|
|
|
db63f3b |
@@ -23,7 +23,6 @@
|
|
|
db63f3b |
|
|
|
db63f3b |
#define CONFIG_CMD_BMODE
|
|
|
db63f3b |
#define CONFIG_CMD_DHCP
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
#define CONFIG_CMD_I2C
|
|
|
db63f3b |
#define CONFIG_CMD_MII
|
|
|
db63f3b |
#define CONFIG_CMD_MTDPARTS
|
|
|
db63f3b |
@@ -103,9 +102,6 @@
|
|
|
db63f3b |
#define CONFIG_APBH_DMA_BURST
|
|
|
db63f3b |
#define CONFIG_APBH_DMA_BURST8
|
|
|
db63f3b |
|
|
|
db63f3b |
-/* Fuse support */
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-
|
|
|
db63f3b |
/* Environment in NAND */
|
|
|
db63f3b |
#define CONFIG_ENV_IS_IN_NAND
|
|
|
db63f3b |
#define CONFIG_ENV_OFFSET (16 << 20)
|
|
|
db63f3b |
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
|
|
|
db63f3b |
index e1c9937..d97cba7 100644
|
|
|
db63f3b |
--- a/include/configs/tbs2910.h
|
|
|
db63f3b |
+++ b/include/configs/tbs2910.h
|
|
|
db63f3b |
@@ -167,12 +167,6 @@
|
|
|
db63f3b |
#define CONFIG_I2C_EDID
|
|
|
db63f3b |
#endif
|
|
|
db63f3b |
|
|
|
db63f3b |
-/* Fuses */
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#ifdef CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#endif
|
|
|
db63f3b |
-
|
|
|
db63f3b |
/* Environment organization */
|
|
|
db63f3b |
#define CONFIG_ENV_IS_IN_MMC
|
|
|
db63f3b |
#define CONFIG_SYS_MMC_ENV_DEV 2
|
|
|
db63f3b |
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
|
|
|
098b0f3 |
index 78a8e39..0993d6d 100644
|
|
|
db63f3b |
--- a/include/configs/tqma6.h
|
|
|
db63f3b |
+++ b/include/configs/tqma6.h
|
|
|
098b0f3 |
@@ -99,10 +99,6 @@
|
|
|
db63f3b |
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
|
|
db63f3b |
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */
|
|
|
db63f3b |
|
|
|
db63f3b |
-/* Fuses */
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-
|
|
|
db63f3b |
#define CONFIG_CMD_PING
|
|
|
db63f3b |
#define CONFIG_CMD_DHCP
|
|
|
db63f3b |
#define CONFIG_CMD_MII
|
|
|
db63f3b |
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
|
|
db63f3b |
index f05b55a..f4e9cf2 100644
|
|
|
db63f3b |
--- a/include/configs/wandboard.h
|
|
|
db63f3b |
+++ b/include/configs/wandboard.h
|
|
|
db63f3b |
@@ -84,11 +84,6 @@
|
|
|
db63f3b |
#define CONFIG_IMX_HDMI
|
|
|
db63f3b |
#define CONFIG_IMX_VIDEO_SKIP
|
|
|
db63f3b |
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#ifdef CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-#endif
|
|
|
db63f3b |
-
|
|
|
db63f3b |
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
|
|
db63f3b |
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
|
db63f3b |
"script=boot.scr\0" \
|
|
|
db63f3b |
diff --git a/include/configs/warp.h b/include/configs/warp.h
|
|
|
098b0f3 |
index 48e2058..2331767 100644
|
|
|
db63f3b |
--- a/include/configs/warp.h
|
|
|
db63f3b |
+++ b/include/configs/warp.h
|
|
|
098b0f3 |
@@ -94,10 +94,6 @@
|
|
|
db63f3b |
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
|
|
|
db63f3b |
#define DFU_DEFAULT_POLL_TIMEOUT 300
|
|
|
db63f3b |
|
|
|
db63f3b |
-/* Fuses */
|
|
|
db63f3b |
-#define CONFIG_CMD_FUSE
|
|
|
db63f3b |
-#define CONFIG_MXC_OCOTP
|
|
|
db63f3b |
-
|
|
|
db63f3b |
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
|
db63f3b |
"script=boot.scr\0" \
|
|
|
db63f3b |
"image=zImage\0" \
|
|
|
db63f3b |
--
|
|
|
db63f3b |
2.4.3
|
|
|
db63f3b |
|