[U-Boot] Minor i.MX6 updates
The first two patches are a resend and basic cleanups of duplicate includes
The second 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.
It's defind earlier in the file
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- include/configs/mx6_common.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 50370e1..b37477a 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -87,7 +87,6 @@ #define CONFIG_CMD_FAT
/* Miscellaneous configurable options */ -#define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER
On 24/06/2015 18:09, Peter Robinson wrote:
It's defind earlier in the file
Signed-off-by: Peter Robinson pbrobinson@gmail.com
include/configs/mx6_common.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 50370e1..b37477a 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -87,7 +87,6 @@ #define CONFIG_CMD_FAT
/* Miscellaneous configurable options */ -#define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER
Applied to u-boot-imx, thanks !
Best regards, Stefano Babic
These options were merged into mx6_common and were seemingly missed in mx6cuboxi so drop the duplicates
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- include/configs/mx6cuboxi.h | 8 -------- 1 file changed, 8 deletions(-)
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 3f99512..3d5bba7 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -186,14 +186,6 @@ "fi; " \ "else run netboot; fi"
-/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE - -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
On 24/06/2015 18:09, Peter Robinson wrote:
These options were merged into mx6_common and were seemingly missed in mx6cuboxi so drop the duplicates
Signed-off-by: Peter Robinson pbrobinson@gmail.com
include/configs/mx6cuboxi.h | 8 -------- 1 file changed, 8 deletions(-)
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 3f99512..3d5bba7 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -186,14 +186,6 @@ "fi; " \ "else run netboot; fi"
-/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_CMDLINE_EDITING
/* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
Applied to u-boot-imx, thanks !
Best regards, Stefano Babic
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 --- 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(-)
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index eb50639..575f22d 100644 --- 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 5dfd56c..85155f1 100644 --- 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 6b8c82d..3d72832 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -168,11 +168,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 b37477a..2a0eb2a 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -112,4 +112,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 3d5bba7..634a09f 100644 --- 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 c8c9f81..3ed4d23 100644 --- 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 4b5c637..8cc9b5e 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -193,9 +193,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 63ec7c6..6d5d244 100644 --- 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 beaa119..b038dfe 100644 --- 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 1dc9d83..eb7ebd1 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -24,7 +24,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C -#define CONFIG_CMD_FUSE #define CONFIG_CMD_MII #define CONFIG_CMD_PCI #define CONFIG_CMD_PING @@ -117,11 +116,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 2bbf2b9..b2eb6f5 100644 --- 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 fd19461..d651432 100644 --- 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 e1c9937..d97cba7 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -167,12 +167,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 00294f6..37794fc 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -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 diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index f05b55a..f4e9cf2 100644 --- 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 39b4919..2592ddb 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -97,10 +97,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" \
On 24/06/2015 18:09, Peter Robinson wrote:
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
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(-)
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index eb50639..575f22d 100644 --- 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 5dfd56c..85155f1 100644 --- 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 6b8c82d..3d72832 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -168,11 +168,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 b37477a..2a0eb2a 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -112,4 +112,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 3d5bba7..634a09f 100644 --- 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 c8c9f81..3ed4d23 100644 --- 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 4b5c637..8cc9b5e 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -193,9 +193,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 63ec7c6..6d5d244 100644 --- 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 beaa119..b038dfe 100644 --- 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 1dc9d83..eb7ebd1 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -24,7 +24,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C -#define CONFIG_CMD_FUSE #define CONFIG_CMD_MII #define CONFIG_CMD_PCI #define CONFIG_CMD_PING @@ -117,11 +116,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 2bbf2b9..b2eb6f5 100644 --- 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 fd19461..d651432 100644 --- 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 e1c9937..d97cba7 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -167,12 +167,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 00294f6..37794fc 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -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 diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index f05b55a..f4e9cf2 100644 --- 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 39b4919..2592ddb 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -97,10 +97,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" \
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
Update boards that already include it, add DM options for those that don't yet.
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- configs/aristainetos2_defconfig | 2 ++ configs/aristainetos_defconfig | 2 ++ configs/cgtqmx6qeval_defconfig | 2 ++ configs/cm_fx6_defconfig | 2 ++ configs/gwventana_defconfig | 2 ++ configs/mx6dlarm2_defconfig | 2 ++ configs/mx6dlarm2_lpddr2_defconfig | 2 ++ configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6dlsabresd_defconfig | 2 ++ configs/mx6qarm2_defconfig | 2 ++ configs/mx6qarm2_lpddr2_defconfig | 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sabresd_spl_defconfig | 2 ++ configs/mx6sxsabresd_defconfig | 2 ++ configs/mx6sxsabresd_spl_defconfig | 2 ++ configs/nitrogen6dl2g_defconfig | 2 ++ configs/nitrogen6dl_defconfig | 2 ++ configs/nitrogen6q2g_defconfig | 2 ++ configs/nitrogen6q_defconfig | 2 ++ configs/nitrogen6s1g_defconfig | 2 ++ configs/nitrogen6s_defconfig | 2 ++ configs/novena_defconfig | 2 ++ configs/ot1200_defconfig | 2 ++ configs/ot1200_spl_defconfig | 2 ++ configs/platinum_picon_defconfig | 2 ++ configs/platinum_titanium_defconfig | 2 ++ configs/secomx6quq7_defconfig | 2 ++ configs/tbs2910_defconfig | 2 ++ configs/tqma6q_mba6_mmc_defconfig | 2 ++ configs/tqma6q_mba6_spi_defconfig | 2 ++ configs/tqma6s_mba6_mmc_defconfig | 2 ++ configs/tqma6s_mba6_spi_defconfig | 2 ++ configs/udoo_quad_defconfig | 2 ++ configs/warp_defconfig | 2 ++ include/configs/embestmx6boards.h | 2 -- include/configs/gw_ventana.h | 3 --- include/configs/mx6_common.h | 2 ++ include/configs/mx6cuboxi.h | 2 -- include/configs/mx6sabre_common.h | 2 -- 40 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index af92f69..1e59619 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_ARISTAINETOS2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index 306d4a8..f023aac 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_ARISTAINETOS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig index 58b98b7..7a3f75c 100644 --- a/configs/cgtqmx6qeval_defconfig +++ b/configs/cgtqmx6qeval_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_CGTQMX6EVAL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 4db785d..f141167 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_CM_FX6=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 5cfe983..3779a1c 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -7,3 +7,5 @@ CONFIG_SPL_STACK_R_ADDR=0x18000000 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig index 4324ccf..b81c9ab 100644 --- a/configs/mx6dlarm2_defconfig +++ b/configs/mx6dlarm2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,DDR_MB=2048" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig index 7681814..efbca94 100644 --- a/configs/mx6dlarm2_lpddr2_defconfig +++ b/configs/mx6dlarm2_lpddr2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 7578fc8..1052088 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index 92d77f9..becca3f 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig index 51ab7e3..2a3cab9 100644 --- a/configs/mx6qarm2_defconfig +++ b/configs/mx6qarm2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig index c590c39..b6db3ab 100644 --- a/configs/mx6qarm2_lpddr2_defconfig +++ b/configs/mx6qarm2_lpddr2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index 3d584bd..5deb638 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 887a509..8d40917 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index a9adcdb..70a06fb 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -4,3 +4,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index 058e3f8..b758e2b 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig index 0e3159e..cfd22e2 100644 --- a/configs/mx6sxsabresd_spl_defconfig +++ b/configs/mx6sxsabresd_spl_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index ec0e346..c777261 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 838a43e..94058aa 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index a739e22..b6243d2 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index b4b0524..827ae1c 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 118f605..221d2cf 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 3e70de9..26339df 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index ccc0055..2d8eaab 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -4,3 +4,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig index 20f64bb..693a7c2 100644 --- a/configs/ot1200_defconfig +++ b/configs/ot1200_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_OT1200=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig index 810dff8..be12cba 100644 --- a/configs/ot1200_spl_defconfig +++ b/configs/ot1200_spl_defconfig @@ -4,3 +4,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index 672ea28..06ed0bb 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_PICON=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index 39236f1..9fa33a2 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_TITANIUM=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig index f9d7ee9..c9bc064 100644 --- a/configs/secomx6quq7_defconfig +++ b/configs/secomx6quq7_defconfig @@ -7,3 +7,5 @@ CONFIG_SECOMX6_2GB=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 3e720a7..ed9c70f 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TBS2910=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index 01355b6..7d6348b 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index ba24663..c08adb4 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index cbb4500..b09c8c1 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 805d8ab..50d9246 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/udoo_quad_defconfig b/configs/udoo_quad_defconfig index 17f48c8..ebf2d9e 100644 --- a/configs/udoo_quad_defconfig +++ b/configs/udoo_quad_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_UDOO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo.cfg,MX6Q,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 24e1b9f..f43c66b 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -1,3 +1,5 @@ CONFIG_ARM=y CONFIG_TARGET_WARP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL" +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 85155f1..7b53df4 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -19,8 +19,6 @@
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
-#define CONFIG_IMX6_THERMAL - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 3d72832..b49c153 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -59,9 +59,6 @@ #define CONFIG_MXC_GPIO #define CONFIG_CMD_GPIO
-/* Thermal */ -#define CONFIG_IMX6_THERMAL - /* Serial */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 2a0eb2a..dec4299 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -116,4 +116,6 @@ #define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP
+#define CONFIG_IMX6_THERMAL + #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 634a09f..4eadfd8 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -14,8 +14,6 @@ #define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h"
-#define CONFIG_IMX6_THERMAL - #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 3ed4d23..ba95b08 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -11,8 +11,6 @@
#include "mx6_common.h"
-#define CONFIG_IMX6_THERMAL - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
On 24/06/2015 18:09, Peter Robinson wrote:
Update boards that already include it, add DM options for those that don't yet.
Signed-off-by: Peter Robinson pbrobinson@gmail.com
configs/aristainetos2_defconfig | 2 ++ configs/aristainetos_defconfig | 2 ++ configs/cgtqmx6qeval_defconfig | 2 ++ configs/cm_fx6_defconfig | 2 ++ configs/gwventana_defconfig | 2 ++ configs/mx6dlarm2_defconfig | 2 ++ configs/mx6dlarm2_lpddr2_defconfig | 2 ++ configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6dlsabresd_defconfig | 2 ++ configs/mx6qarm2_defconfig | 2 ++ configs/mx6qarm2_lpddr2_defconfig | 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sabresd_spl_defconfig | 2 ++ configs/mx6sxsabresd_defconfig | 2 ++ configs/mx6sxsabresd_spl_defconfig | 2 ++ configs/nitrogen6dl2g_defconfig | 2 ++ configs/nitrogen6dl_defconfig | 2 ++ configs/nitrogen6q2g_defconfig | 2 ++ configs/nitrogen6q_defconfig | 2 ++ configs/nitrogen6s1g_defconfig | 2 ++ configs/nitrogen6s_defconfig | 2 ++ configs/novena_defconfig | 2 ++ configs/ot1200_defconfig | 2 ++ configs/ot1200_spl_defconfig | 2 ++ configs/platinum_picon_defconfig | 2 ++ configs/platinum_titanium_defconfig | 2 ++ configs/secomx6quq7_defconfig | 2 ++ configs/tbs2910_defconfig | 2 ++ configs/tqma6q_mba6_mmc_defconfig | 2 ++ configs/tqma6q_mba6_spi_defconfig | 2 ++ configs/tqma6s_mba6_mmc_defconfig | 2 ++ configs/tqma6s_mba6_spi_defconfig | 2 ++ configs/udoo_quad_defconfig | 2 ++ configs/warp_defconfig | 2 ++ include/configs/embestmx6boards.h | 2 -- include/configs/gw_ventana.h | 3 --- include/configs/mx6_common.h | 2 ++ include/configs/mx6cuboxi.h | 2 -- include/configs/mx6sabre_common.h | 2 -- 40 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index af92f69..1e59619 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_ARISTAINETOS2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index 306d4a8..f023aac 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_ARISTAINETOS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig index 58b98b7..7a3f75c 100644 --- a/configs/cgtqmx6qeval_defconfig +++ b/configs/cgtqmx6qeval_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_CGTQMX6EVAL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 4db785d..f141167 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_CM_FX6=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 5cfe983..3779a1c 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -7,3 +7,5 @@ CONFIG_SPL_STACK_R_ADDR=0x18000000 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig index 4324ccf..b81c9ab 100644 --- a/configs/mx6dlarm2_defconfig +++ b/configs/mx6dlarm2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,DDR_MB=2048" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig index 7681814..efbca94 100644 --- a/configs/mx6dlarm2_lpddr2_defconfig +++ b/configs/mx6dlarm2_lpddr2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 7578fc8..1052088 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index 92d77f9..becca3f 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig index 51ab7e3..2a3cab9 100644 --- a/configs/mx6qarm2_defconfig +++ b/configs/mx6qarm2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig index c590c39..b6db3ab 100644 --- a/configs/mx6qarm2_lpddr2_defconfig +++ b/configs/mx6qarm2_lpddr2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index 3d584bd..5deb638 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 887a509..8d40917 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index a9adcdb..70a06fb 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -4,3 +4,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index 058e3f8..b758e2b 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig index 0e3159e..cfd22e2 100644 --- a/configs/mx6sxsabresd_spl_defconfig +++ b/configs/mx6sxsabresd_spl_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index ec0e346..c777261 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 838a43e..94058aa 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index a739e22..b6243d2 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index b4b0524..827ae1c 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 118f605..221d2cf 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 3e70de9..26339df 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index ccc0055..2d8eaab 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -4,3 +4,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig index 20f64bb..693a7c2 100644 --- a/configs/ot1200_defconfig +++ b/configs/ot1200_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_OT1200=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig index 810dff8..be12cba 100644 --- a/configs/ot1200_spl_defconfig +++ b/configs/ot1200_spl_defconfig @@ -4,3 +4,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index 672ea28..06ed0bb 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_PICON=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index 39236f1..9fa33a2 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_TITANIUM=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig index f9d7ee9..c9bc064 100644 --- a/configs/secomx6quq7_defconfig +++ b/configs/secomx6quq7_defconfig @@ -7,3 +7,5 @@ CONFIG_SECOMX6_2GB=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 3e720a7..ed9c70f 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TBS2910=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index 01355b6..7d6348b 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index ba24663..c08adb4 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index cbb4500..b09c8c1 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 805d8ab..50d9246 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/udoo_quad_defconfig b/configs/udoo_quad_defconfig index 17f48c8..ebf2d9e 100644 --- a/configs/udoo_quad_defconfig +++ b/configs/udoo_quad_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_UDOO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo.cfg,MX6Q,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 24e1b9f..f43c66b 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -1,3 +1,5 @@ CONFIG_ARM=y CONFIG_TARGET_WARP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL" +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 85155f1..7b53df4 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -19,8 +19,6 @@
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
-#define CONFIG_IMX6_THERMAL
/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 3d72832..b49c153 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -59,9 +59,6 @@ #define CONFIG_MXC_GPIO #define CONFIG_CMD_GPIO
-/* Thermal */ -#define CONFIG_IMX6_THERMAL
/* Serial */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 2a0eb2a..dec4299 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -116,4 +116,6 @@ #define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP
+#define CONFIG_IMX6_THERMAL
#endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 634a09f..4eadfd8 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -14,8 +14,6 @@ #define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h"
-#define CONFIG_IMX6_THERMAL
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 3ed4d23..ba95b08 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -11,8 +11,6 @@
#include "mx6_common.h"
-#define CONFIG_IMX6_THERMAL
/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
Update boards that already include it, add DM options for those that don't yet.
Signed-off-by: Peter Robinson pbrobinson@gmail.com
configs/aristainetos2_defconfig | 2 ++ configs/aristainetos_defconfig | 2 ++ configs/cgtqmx6qeval_defconfig | 2 ++ configs/cm_fx6_defconfig | 2 ++ configs/gwventana_defconfig | 2 ++ configs/mx6dlarm2_defconfig | 2 ++ configs/mx6dlarm2_lpddr2_defconfig | 2 ++ configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6dlsabresd_defconfig | 2 ++ configs/mx6qarm2_defconfig | 2 ++ configs/mx6qarm2_lpddr2_defconfig | 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sabresd_spl_defconfig | 2 ++ configs/mx6sxsabresd_defconfig | 2 ++ configs/mx6sxsabresd_spl_defconfig | 2 ++ configs/nitrogen6dl2g_defconfig | 2 ++ configs/nitrogen6dl_defconfig | 2 ++ configs/nitrogen6q2g_defconfig | 2 ++ configs/nitrogen6q_defconfig | 2 ++ configs/nitrogen6s1g_defconfig | 2 ++ configs/nitrogen6s_defconfig | 2 ++ configs/novena_defconfig | 2 ++ configs/ot1200_defconfig | 2 ++ configs/ot1200_spl_defconfig | 2 ++ configs/platinum_picon_defconfig | 2 ++ configs/platinum_titanium_defconfig | 2 ++ configs/secomx6quq7_defconfig | 2 ++ configs/tbs2910_defconfig | 2 ++ configs/tqma6q_mba6_mmc_defconfig | 2 ++ configs/tqma6q_mba6_spi_defconfig | 2 ++ configs/tqma6s_mba6_mmc_defconfig | 2 ++ configs/tqma6s_mba6_spi_defconfig | 2 ++ configs/udoo_quad_defconfig | 2 ++ configs/warp_defconfig | 2 ++ include/configs/embestmx6boards.h | 2 -- include/configs/gw_ventana.h | 3 --- include/configs/mx6_common.h | 2 ++ include/configs/mx6cuboxi.h | 2 -- include/configs/mx6sabre_common.h | 2 -- 40 files changed, 72 insertions(+), 9 deletions(-)
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
Stefano,
in the u-boot-imx repository there is already thermal support for tbs2910. We would need to revert commit fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. Can you squash the revert into this patch, please?
Peter,
can you please cc: all board maintainers when sending patches?
Thanks, Soeren
Hi Soeren,
On 28/06/2015 17:27, Soeren Moch wrote:
Update boards that already include it, add DM options for those that don't yet.
Signed-off-by: Peter Robinson pbrobinson@gmail.com
configs/aristainetos2_defconfig | 2 ++ configs/aristainetos_defconfig | 2 ++ configs/cgtqmx6qeval_defconfig | 2 ++ configs/cm_fx6_defconfig | 2 ++ configs/gwventana_defconfig | 2 ++ configs/mx6dlarm2_defconfig | 2 ++ configs/mx6dlarm2_lpddr2_defconfig | 2 ++ configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6dlsabresd_defconfig | 2 ++ configs/mx6qarm2_defconfig | 2 ++ configs/mx6qarm2_lpddr2_defconfig | 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sabresd_spl_defconfig | 2 ++ configs/mx6sxsabresd_defconfig | 2 ++ configs/mx6sxsabresd_spl_defconfig | 2 ++ configs/nitrogen6dl2g_defconfig | 2 ++ configs/nitrogen6dl_defconfig | 2 ++ configs/nitrogen6q2g_defconfig | 2 ++ configs/nitrogen6q_defconfig | 2 ++ configs/nitrogen6s1g_defconfig | 2 ++ configs/nitrogen6s_defconfig | 2 ++ configs/novena_defconfig | 2 ++ configs/ot1200_defconfig | 2 ++ configs/ot1200_spl_defconfig | 2 ++ configs/platinum_picon_defconfig | 2 ++ configs/platinum_titanium_defconfig | 2 ++ configs/secomx6quq7_defconfig | 2 ++ configs/tbs2910_defconfig | 2 ++ configs/tqma6q_mba6_mmc_defconfig | 2 ++ configs/tqma6q_mba6_spi_defconfig | 2 ++ configs/tqma6s_mba6_mmc_defconfig | 2 ++ configs/tqma6s_mba6_spi_defconfig | 2 ++ configs/udoo_quad_defconfig | 2 ++ configs/warp_defconfig | 2 ++ include/configs/embestmx6boards.h | 2 -- include/configs/gw_ventana.h | 3 --- include/configs/mx6_common.h | 2 ++ include/configs/mx6cuboxi.h | 2 -- include/configs/mx6sabre_common.h | 2 -- 40 files changed, 72 insertions(+), 9 deletions(-)
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
Stefano,
in the u-boot-imx repository there is already thermal support for tbs2910. We would need to revert commit fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. Can you squash the revert into this patch, please?
Thanks to note it - I'll do it.
Peter,
can you please cc: all board maintainers when sending patches?
This is the reason I applied 1-2 and not 3-4. Maybe there is some other issues and some other maintainers can raise the hand. I will let some time before applying the last two patches.
Thanks for advise,
Stefano babic
On Sun, Jun 28, 2015 at 4:27 PM, Soeren Moch smoch@web.de wrote:
Update boards that already include it, add DM options for those that don't yet.
Signed-off-by: Peter Robinson pbrobinson@gmail.com
configs/aristainetos2_defconfig | 2 ++ configs/aristainetos_defconfig | 2 ++ configs/cgtqmx6qeval_defconfig | 2 ++ configs/cm_fx6_defconfig | 2 ++ configs/gwventana_defconfig | 2 ++ configs/mx6dlarm2_defconfig | 2 ++ configs/mx6dlarm2_lpddr2_defconfig | 2 ++ configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6dlsabresd_defconfig | 2 ++ configs/mx6qarm2_defconfig | 2 ++ configs/mx6qarm2_lpddr2_defconfig | 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sabresd_spl_defconfig | 2 ++ configs/mx6sxsabresd_defconfig | 2 ++ configs/mx6sxsabresd_spl_defconfig | 2 ++ configs/nitrogen6dl2g_defconfig | 2 ++ configs/nitrogen6dl_defconfig | 2 ++ configs/nitrogen6q2g_defconfig | 2 ++ configs/nitrogen6q_defconfig | 2 ++ configs/nitrogen6s1g_defconfig | 2 ++ configs/nitrogen6s_defconfig | 2 ++ configs/novena_defconfig | 2 ++ configs/ot1200_defconfig | 2 ++ configs/ot1200_spl_defconfig | 2 ++ configs/platinum_picon_defconfig | 2 ++ configs/platinum_titanium_defconfig | 2 ++ configs/secomx6quq7_defconfig | 2 ++ configs/tbs2910_defconfig | 2 ++ configs/tqma6q_mba6_mmc_defconfig | 2 ++ configs/tqma6q_mba6_spi_defconfig | 2 ++ configs/tqma6s_mba6_mmc_defconfig | 2 ++ configs/tqma6s_mba6_spi_defconfig | 2 ++ configs/udoo_quad_defconfig | 2 ++ configs/warp_defconfig | 2 ++ include/configs/embestmx6boards.h | 2 -- include/configs/gw_ventana.h | 3 --- include/configs/mx6_common.h | 2 ++ include/configs/mx6cuboxi.h | 2 -- include/configs/mx6sabre_common.h | 2 -- 40 files changed, 72 insertions(+), 9 deletions(-)
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
Stefano,
in the u-boot-imx repository there is already thermal support for tbs2910. We would need to revert commit fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. Can you squash the revert into this patch, please?
Peter,
can you please cc: all board maintainers when sending patches?
I was emailing the list that getmainters.pl returns.
On 28.06.2015 18:09, Peter Robinson wrote:
On Sun, Jun 28, 2015 at 4:27 PM, Soeren Moch smoch@web.de wrote:
Update boards that already include it, add DM options for those that don't yet.
Signed-off-by: Peter Robinson pbrobinson@gmail.com
configs/aristainetos2_defconfig | 2 ++ configs/aristainetos_defconfig | 2 ++ configs/cgtqmx6qeval_defconfig | 2 ++ configs/cm_fx6_defconfig | 2 ++ configs/gwventana_defconfig | 2 ++ configs/mx6dlarm2_defconfig | 2 ++ configs/mx6dlarm2_lpddr2_defconfig | 2 ++ configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6dlsabresd_defconfig | 2 ++ configs/mx6qarm2_defconfig | 2 ++ configs/mx6qarm2_lpddr2_defconfig | 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sabresd_spl_defconfig | 2 ++ configs/mx6sxsabresd_defconfig | 2 ++ configs/mx6sxsabresd_spl_defconfig | 2 ++ configs/nitrogen6dl2g_defconfig | 2 ++ configs/nitrogen6dl_defconfig | 2 ++ configs/nitrogen6q2g_defconfig | 2 ++ configs/nitrogen6q_defconfig | 2 ++ configs/nitrogen6s1g_defconfig | 2 ++ configs/nitrogen6s_defconfig | 2 ++ configs/novena_defconfig | 2 ++ configs/ot1200_defconfig | 2 ++ configs/ot1200_spl_defconfig | 2 ++ configs/platinum_picon_defconfig | 2 ++ configs/platinum_titanium_defconfig | 2 ++ configs/secomx6quq7_defconfig | 2 ++ configs/tbs2910_defconfig | 2 ++ configs/tqma6q_mba6_mmc_defconfig | 2 ++ configs/tqma6q_mba6_spi_defconfig | 2 ++ configs/tqma6s_mba6_mmc_defconfig | 2 ++ configs/tqma6s_mba6_spi_defconfig | 2 ++ configs/udoo_quad_defconfig | 2 ++ configs/warp_defconfig | 2 ++ include/configs/embestmx6boards.h | 2 -- include/configs/gw_ventana.h | 3 --- include/configs/mx6_common.h | 2 ++ include/configs/mx6cuboxi.h | 2 -- include/configs/mx6sabre_common.h | 2 -- 40 files changed, 72 insertions(+), 9 deletions(-)
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
Stefano,
in the u-boot-imx repository there is already thermal support for tbs2910. We would need to revert commit fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. Can you squash the revert into this patch, please?
Peter,
can you please cc: all board maintainers when sending patches?
I was emailing the list that getmainters.pl returns.
./scripts/get_maintainer.pl <this patch> in u-boot-imx prints following board maintainers:
Heiko Schocher hs@denx.de (maintainer:ARISTAINETOS BOARD) Nikita Kiryanov nikita@compulab.co.il (maintainer:CM_FX6 BOARD) Tim Harvey tharvey@gateworks.com (maintainer:GW_VENTANA BOARD) Jason Liu r64343@freescale.com (maintainer:MX6QARM2 BOARD) Ye Li b37916@freescale.com (maintainer:MX6QARM2 BOARD) Fabio Estevam fabio.estevam@freescale.com (maintainer:MX6QSABREAUTO BOARD) Eric Nelson eric.nelson@boundarydevices.com (maintainer:NITROGEN6X BOARD) Marek Vasut marex@denx.de (maintainer:NOVENA BOARD) Christian Gmeiner christian.gmeiner@gmail.com (maintainer:BACHMANN ELECTRON...) Stefan Roese sr@denx.de (maintainer:PLATINUM BOARD) Boris Brezillon boris.brezillon@free-electrons.com (maintainer:MX6QUQ7 BOARD) Soeren Moch smoch@web.de (maintainer:TBS2910 BOARD) Markus Niebel Markus.Niebel@tq-group.com (maintainer:TQ SYSTEMS TQMA6...) Otavio Salvador otavio@ossystems.com.br (maintainer:WaRP BOARD) "Eric Bénard" eric@eukrea.com (maintainer:MX6BOARDS BOARD)
Regards, Soeren
Hi Peter,
On 28/06/2015 18:23, Soeren Moch wrote:
Stefano,
in the u-boot-imx repository there is already thermal support for tbs2910. We would need to revert commit fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. Can you squash the revert into this patch, please?
Peter,
can you please cc: all board maintainers when sending patches?
I was emailing the list that getmainters.pl returns.
./scripts/get_maintainer.pl <this patch> in u-boot-imx prints following board maintainers:
Heiko Schocher hs@denx.de (maintainer:ARISTAINETOS BOARD) Nikita Kiryanov nikita@compulab.co.il (maintainer:CM_FX6 BOARD) Tim Harvey tharvey@gateworks.com (maintainer:GW_VENTANA BOARD) Jason Liu r64343@freescale.com (maintainer:MX6QARM2 BOARD) Ye Li b37916@freescale.com (maintainer:MX6QARM2 BOARD) Fabio Estevam fabio.estevam@freescale.com (maintainer:MX6QSABREAUTO BOARD) Eric Nelson eric.nelson@boundarydevices.com (maintainer:NITROGEN6X BOARD) Marek Vasut marex@denx.de (maintainer:NOVENA BOARD) Christian Gmeiner christian.gmeiner@gmail.com (maintainer:BACHMANN ELECTRON...) Stefan Roese sr@denx.de (maintainer:PLATINUM BOARD) Boris Brezillon boris.brezillon@free-electrons.com (maintainer:MX6QUQ7 BOARD) Soeren Moch smoch@web.de (maintainer:TBS2910 BOARD) Markus Niebel Markus.Niebel@tq-group.com (maintainer:TQ SYSTEMS TQMA6...) Otavio Salvador otavio@ossystems.com.br (maintainer:WaRP BOARD) "Eric Bénard" eric@eukrea.com (maintainer:MX6BOARDS BOARD)
In fact they are a lot. Peter, what do you mind to repost only 3 and 4 (first two patches were IMHO without drawbacks and I have already applied them), reverting and squashing fbd18aa610df896ccebbebb3fb88b19dddd7c413 as suggested by Soeren and putting all board maintainers in CC ?
Best regards, Stefano Babic
On Sun, Jun 28, 2015 at 5:32 PM, Stefano Babic sbabic@denx.de wrote:
Hi Peter,
On 28/06/2015 18:23, Soeren Moch wrote:
Stefano,
in the u-boot-imx repository there is already thermal support for tbs2910. We would need to revert commit fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. Can you squash the revert into this patch, please?
Peter,
can you please cc: all board maintainers when sending patches?
I was emailing the list that getmainters.pl returns.
./scripts/get_maintainer.pl <this patch> in u-boot-imx prints following board maintainers:
Heiko Schocher hs@denx.de (maintainer:ARISTAINETOS BOARD) Nikita Kiryanov nikita@compulab.co.il (maintainer:CM_FX6 BOARD) Tim Harvey tharvey@gateworks.com (maintainer:GW_VENTANA BOARD) Jason Liu r64343@freescale.com (maintainer:MX6QARM2 BOARD) Ye Li b37916@freescale.com (maintainer:MX6QARM2 BOARD) Fabio Estevam fabio.estevam@freescale.com (maintainer:MX6QSABREAUTO BOARD) Eric Nelson eric.nelson@boundarydevices.com (maintainer:NITROGEN6X BOARD) Marek Vasut marex@denx.de (maintainer:NOVENA BOARD) Christian Gmeiner christian.gmeiner@gmail.com (maintainer:BACHMANN ELECTRON...) Stefan Roese sr@denx.de (maintainer:PLATINUM BOARD) Boris Brezillon boris.brezillon@free-electrons.com (maintainer:MX6QUQ7 BOARD) Soeren Moch smoch@web.de (maintainer:TBS2910 BOARD) Markus Niebel Markus.Niebel@tq-group.com (maintainer:TQ SYSTEMS TQMA6...) Otavio Salvador otavio@ossystems.com.br (maintainer:WaRP BOARD) "Eric Bénard" eric@eukrea.com (maintainer:MX6BOARDS BOARD)
In fact they are a lot. Peter, what do you mind to repost only 3 and 4 (first two patches were IMHO without drawbacks and I have already applied them), reverting and squashing fbd18aa610df896ccebbebb3fb88b19dddd7c413 as suggested by Soeren and putting all board maintainers in CC ?
Sorry I haven't got back to this, with the commit above already in 2015.07 I've not reverted it on my rebase but rather just rebased the patch on master. Will be reposting in a moment.
Peter
On Wed, Jun 24, 2015 at 5:09 PM, Peter Robinson pbrobinson@gmail.com wrote:
The first two patches are a resend and basic cleanups of duplicate includes
The second 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.
There's not 7 patches, just 4, not quite sure what I did there, sorry :)
Peter
On 24/06/2015 18:11, Peter Robinson wrote:
On Wed, Jun 24, 2015 at 5:09 PM, Peter Robinson pbrobinson@gmail.com wrote:
The first two patches are a resend and basic cleanups of duplicate includes
The second 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.
There's not 7 patches, just 4, not quite sure what I did there, sorry :)
Ok, do not worry !
Regards, Stefano
participants (3)
-
Peter Robinson -
Soeren Moch -
Stefano Babic