v2 i.MX6 consolidate the fuse and thermal options

U-Boot New Peter Robinson 4 participants 7 messages Jul 13, 2015 – Jul 30, 2015 Arm STM32

Share & tools

Peter Robinson

author

2015-07-13 23:52 UTC #0 lore raw

These two patches consolidate the fuse and thermal options. They're both options that are standard SoC features so should be there by default for all devices.

Peter Robinson

author

2015-07-13 23:52 UTC #1 lore raw

PATCH 1/2 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 <[email protected]>

---
 include/configs/aristainetos-common.h | 3 ---
 include/configs/embestmx6boards.h     | 5 -----
 include/configs/gw_ventana.h          | 5 -----
 include/configs/mx6_common.h          | 4 ++++
 include/configs/mx6cuboxi.h           | 2 --
 include/configs/mx6sabre_common.h     | 5 -----
 include/configs/mx6slevk.h            | 5 -----
 include/configs/mx6sxsabresd.h        | 5 -----
 include/configs/nitrogen6x.h          | 5 -----
 include/configs/novena.h              | 6 ------
 include/configs/ot1200.h              | 4 ----
 include/configs/platinum.h            | 4 ----
 include/configs/tbs2910.h             | 6 ------
 include/configs/tqma6.h               | 4 ----
 include/configs/wandboard.h           | 5 -----
 include/configs/warp.h                | 4 ----
 16 files changed, 4 insertions(+), 68 deletions(-)

include/configs/aristainetos-common.h +0 -3

index dd012f1..4a5d4fb 100644
@@ -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

include/configs/embestmx6boards.h +0 -5

index cba58aa..12744a6 100644
@@ -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

include/configs/gw_ventana.h +0 -5

index 902ec2c..df1ff43 100644
@@ -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

include/configs/mx6_common.h +4 -0

index 86d7b16..54ab890 100644
@@ -111,4 +111,8 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC
 
+/* Fuses */
+#define CONFIG_CMD_FUSE
+#define CONFIG_MXC_OCOTP
+
 #endif

include/configs/mx6cuboxi.h +0 -2

index 3d5bba7..634a09f 100644
@@ -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

include/configs/mx6sabre_common.h +0 -5

index 6c3c52e..e42dfc9 100644
@@ -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

include/configs/mx6slevk.h +0 -5

index a7da111..3cecd94 100644
@@ -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 */

include/configs/mx6sxsabresd.h +0 -5

index 2b278a8..848bdcd 100644
@@ -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

include/configs/nitrogen6x.h +0 -5

index 67a3c97..2e81ad4 100644
@@ -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

include/configs/novena.h +0 -6

index d9b7250..0970fd7 100644
@@ -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

include/configs/ot1200.h +0 -4

index fb58acf..0d06fce 100644
@@ -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

include/configs/platinum.h +0 -4

index fd19461..d651432 100644
@@ -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)

include/configs/tbs2910.h +0 -6

index 42e5821..5bc1209 100644
@@ -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

include/configs/tqma6.h +0 -4

index e0c4ada..bd93ec7 100644
@@ -100,10 +100,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

include/configs/wandboard.h +0 -5

index f05b55a..f4e9cf2 100644
@@ -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" \

include/configs/warp.h +0 -4

index 48e2058..2331767 100644
@@ -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" \

Signature · 1 line

2.4.5

Otavio Salvador

2015-07-14 11:52 UTC #2 lore raw

PATCH 1/2 imx6: standardise OCOTP and fuse config to mx6_common

Quoted 5 lines · Peter Robinson

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 <[email protected]>

Acked-by Otavio Salvador <[email protected]>

Signature · 3 lines

Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Soeren Moch

2015-07-14 11:56 UTC #3 lore raw

PATCH 1/2 imx6: standardise OCOTP and fuse config to mx6_common

Quoted 9 lines · Otavio Salvador

Quoted 5 lines · Peter Robinson
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 <[email protected]>
Acked-by Otavio Salvador <[email protected]>

Acked-by Soeren Moch <[email protected]>

Peter Robinson

author

2015-07-30 08:33 UTC #4 lore raw

In reply to Peter Robinson

Quoted 3 lines · Peter Robinson

These two patches consolidate the fuse and thermal options. They're both options that are standard SoC features so should be there by default for all devices.

What's the status of getting these pulled in?

Peter

Stefano Babic

2015-07-30 12:42 UTC #5 lore raw

Hi Peter,

Quoted 7 lines · Peter Robinson

Quoted 3 lines · Peter Robinson
These two patches consolidate the fuse and thermal options. They're both options that are standard SoC features so should be there by default for all devices.
What's the status of getting these pulled in?

I have already merged them (u-boot-imx):

commit 3c73b0a49a5c974bb313f8087dd0cfc54ea90ad2

Author: Peter Robinson <[email protected]>
Date:   Wed Jun 24 17:09:46 2015 +0100

imx6: standardise OCOTP and fuse config to mx6_common

If you do not yet find into mainline, they will be surely part after my next PR. Have you find something wrong ? By applying patches it is usual I have to solve conflicts, but it looked everything ok when I pushed. Which is the issue ?

Best regards,
Stefano

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: sbabic at denx.de
=====================================================================

Peter Robinson

author

2015-07-30 13:16 UTC #6 lore raw

Quoted 14 lines

Quoted 7 lines · Peter Robinson
Quoted 3 lines
These two patches consolidate the fuse and thermal options. They're both options that are standard SoC features so should be there by default for all devices.
What's the status of getting these pulled in?
I have already merged them (u-boot-imx):
commit 3c73b0a49a5c974bb313f8087dd0cfc54ea90ad2
Author: Peter Robinson <[email protected]>
Date:   Wed Jun 24 17:09:46 2015 +0100

Quoted 6 lines

imx6: standardise OCOTP and fuse config to mx6_common
If you do not yet find into mainline, they will be surely part after my next PR. Have you find something wrong ? By applying patches it is usual I have to solve conflicts, but it looked everything ok when I pushed. Which is the issue ?

Sorry, I thought i had the latest imx branch but it seems my git is playing funny with my head/laptop/network connection, sorry, I see it in the web interface, I'll go and bash on my local instances.

Peter