rpms/uboot-tools
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 2015.07 GA

Browse Source
This commit is contained in:
Peter Robinson 2015-07-15 12:01:37 +01:00
parent 098b0f37a2
commit 22628c2978
11 changed files with 36 additions and 856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Drop-duplicate-CONFIG_SYS_NO_FLASH-from-mx6_common.patch
View File

@ -1,27 +0,0 @@
From d3fda4d6daaebfaca34f1d641bb8ad707f1b166b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 2 Jul 2015 19:10:44 +0100
Subject: [PATCH 1/9] Drop duplicate CONFIG_SYS_NO_FLASH from mx6_common
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 2ef3201..4c66491 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -86,7 +86,6 @@
#define CONFIG_CMD_FAT
/* Miscellaneous configurable options */
-#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_CMDLINE_EDITING
--
2.4.3

24
0005-wandboard-add-support-for-generic-distro-boot.patch → 0001-wandboard-add-support-for-generic-distro-boot.patch
View File

@ -1,14 +1,14 @@
From 51ee37a8fd8e9ade5a7dbfd6c1b55467319ab211 Mon Sep 17 00:00:00 2001 From ee628ad871f52c14be04116280457fb0990cd143 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com> From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 23 Jun 2015 00:11:39 +0100 Date: Wed, 15 Jul 2015 11:30:24 +0100
Subject: [PATCH 5/9] wandboard: add support for generic distro boot Subject: [PATCH 1/5] wandboard: add support for generic distro boot
--- ---
include/configs/wandboard.h | 33 ++++++++++++++++++++++++--------- include/configs/wandboard.h | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-) 1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index f4e9cf2..1e346c1 100644 index f05b55a..b3ad82a 100644
--- a/include/configs/wandboard.h --- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h +++ b/include/configs/wandboard.h
@@ -54,9 +54,6 @@ @@ -54,9 +54,6 @@
@ -21,9 +21,9 @@ index f4e9cf2..1e346c1 100644
#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC
#define CONFIG_MII #define CONFIG_MII
#define IMX_FEC_BASE ENET_BASE_ADDR #define IMX_FEC_BASE ENET_BASE_ADDR
@@ -84,17 +81,29 @@ @@ -89,17 +86,29 @@
#define CONFIG_IMX_HDMI #define CONFIG_MXC_OCOTP
#define CONFIG_IMX_VIDEO_SKIP #endif
+#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_SPL_BUILD
+#include <config_distro_defaults.h> +#include <config_distro_defaults.h>
@ -55,7 +55,7 @@ index f4e9cf2..1e346c1 100644
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \ "mmcpart=1\0" \
@@ -113,7 +122,7 @@ @@ -118,7 +127,7 @@
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
"fi; " \ "fi; " \
"fi\0" \ "fi\0" \
@ -64,7 +64,7 @@ index f4e9cf2..1e346c1 100644
"root=${mmcroot}; run videoargs\0" \ "root=${mmcroot}; run videoargs\0" \
"videoargs=" \ "videoargs=" \
"setenv nextcon 0; " \ "setenv nextcon 0; " \
@@ -162,7 +171,7 @@ @@ -167,7 +176,7 @@
"else " \ "else " \
"bootz; " \ "bootz; " \
"fi;\0" \ "fi;\0" \
@ -73,7 +73,7 @@ index f4e9cf2..1e346c1 100644
"root=/dev/nfs " \ "root=/dev/nfs " \
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
"netboot=echo Booting from net ...; " \ "netboot=echo Booting from net ...; " \
@@ -197,9 +206,11 @@ @@ -202,9 +211,11 @@
"setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \ "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \
"if test $fdtfile = undefined; then " \ "if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; \0" \ "echo WARNING: Could not determine dtb to use; fi; \0" \
@ -85,7 +85,7 @@ index f4e9cf2..1e346c1 100644
"mmc dev ${mmcdev}; if mmc rescan; then " \ "mmc dev ${mmcdev}; if mmc rescan; then " \
"if run loadbootscript; then " \ "if run loadbootscript; then " \
"run bootscript; " \ "run bootscript; " \
@@ -211,6 +222,10 @@ @@ -216,6 +227,10 @@
"fi; " \ "fi; " \
"else run netboot; fi" "else run netboot; fi"
@ -97,5 +97,5 @@ index f4e9cf2..1e346c1 100644
#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-- --
2.4.3 2.4.5

6
0006-am33xx-add-support-for-generic-distro-boot.patch → 0002-am33xx-add-support-for-generic-distro-boot.patch
View File

@ -1,7 +1,7 @@
From 4a5e18997a61176a8a2678ec9405b62b14025fd3 Mon Sep 17 00:00:00 2001 From 7ab7e76c7813e7d9db16eeb2bd2cf15e98da1726 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com> From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 23 Jun 2015 00:53:25 +0100 Date: Tue, 23 Jun 2015 00:53:25 +0100
Subject: [PATCH 6/9] am33xx: add support for generic distro boot Subject: [PATCH 2/5] am33xx: add support for generic distro boot
--- ---
include/configs/am335x_evm.h | 28 ++++++++++++++++++---------- include/configs/am335x_evm.h | 28 ++++++++++++++++++----------
@ -76,5 +76,5 @@ index 0aea7d1..d6073b2 100644
"fdt_addr_r=0x88000000\0" \ "fdt_addr_r=0x88000000\0" \
"rdaddr=0x88080000\0" \ "rdaddr=0x88080000\0" \
-- --
2.4.3 2.4.5

35
0002-mx6cuboxi-drop-options-that-are-duplicated-in-mx6_co.patch
View File

@ -1,35 +0,0 @@
From 8f7dfb493b9c070dd3d7b05efba061aea27c83c5 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 22 Jun 2015 23:00:13 +0100
Subject: [PATCH 2/9] mx6cuboxi: drop options that are duplicated in mx6_common
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
--
2.4.3

6
0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch → 0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
View File

@ -1,7 +1,7 @@
From 7a052aa7d5329d54f279b2b0aa967391a3d4363d Mon Sep 17 00:00:00 2001 From 99afbef73d291faf6ba069d36eef7d7b1eef6514 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com> From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 2 Jul 2015 23:26:44 +0100 Date: Thu, 2 Jul 2015 23:26:44 +0100
Subject: [PATCH 7/9] Switch omap4 boards to use config_distro_defaults and Subject: [PATCH 3/5] Switch omap4 boards to use config_distro_defaults and
config_distro_bootcmd. config_distro_bootcmd.
Add pxefile_addr_r to DEFAULT_LINUX_BOOT_ENV, as pxefile_addr_r is used Add pxefile_addr_r to DEFAULT_LINUX_BOOT_ENV, as pxefile_addr_r is used
@ -94,5 +94,5 @@ index e966134..51b7265 100644
/* /*
* Defines for SPL * Defines for SPL
-- --
2.4.3 2.4.5

290
0003-imx6-standardise-OCOTP-and-fuse-config-to-mx6_common.patch
View File

@ -1,290 +0,0 @@
From 8cbd2ed9b11d4fec40a072628c7c74bc86530a53 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 22 Jun 2015 23:01:05 +0100
Subject: [PATCH 3/9] 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>
---
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 dd012f1..4a5d4fb 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 cba58aa..12744a6 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 902ec2c..df1ff43 100644
--- 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 4c66491..568bbf4 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -110,4 +110,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 6c3c52e..e42dfc9 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 a7da111..3cecd94 100644
--- 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 2b278a8..848bdcd 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 67a3c97..2e81ad4 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 fb58acf..0d06fce 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 78a8e39..0993d6d 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -99,10 +99,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 48e2058..2331767 100644
--- 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" \
--
2.4.3

6
0008-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch → 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
View File

@ -1,7 +1,7 @@
From e3c92857da59b8c3fdc490515584bc394c10c544 Mon Sep 17 00:00:00 2001 From 63e521287c2ebbce0a1830dd66cdb5d29a5e9ae6 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com> From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 2 Jul 2015 23:28:56 +0100 Date: Thu, 2 Jul 2015 23:28:56 +0100
Subject: [PATCH 8/9] Add BOOTENV_INIT_COMMAND for commands that may be needed Subject: [PATCH 4/5] Add BOOTENV_INIT_COMMAND for commands that may be needed
to run before bootcmd, such as setting the fdt file variables for platfroms to run before bootcmd, such as setting the fdt file variables for platfroms
that detect on boot. that detect on boot.
@ -34,5 +34,5 @@ index 3a360ca4..dcad4c8 100644
"run bootcmd_${target}; " \ "run bootcmd_${target}; " \
"done\0" "done\0"
-- --
2.4.3 2.4.5

468
0004-imx6-define-CONFIG_IMX6_THERMAL-as-a-default-option.patch
View File

@ -1,468 +0,0 @@
From 686081c703dbe09da79a355232e3a19a034b82e6 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 2 Jul 2015 19:29:48 +0100
Subject: [PATCH 4/9] imx6: define CONFIG_IMX6_THERMAL as a default option
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 | 1 +
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, 71 insertions(+), 9 deletions(-)
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index e676f0e..8b50539 100644
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index f5b0b6b..0bac533 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig
index e1eb871..b719cba 100644
--- a/configs/cgtqmx6qeval_defconfig
+++ b/configs/cgtqmx6qeval_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 6be5c17..7c117d9 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -10,3 +10,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 401f77e..adcbf78 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
# CONFIG_CMD_FLASH is not set
CONFIG_DM=y
CONFIG_DM_SERIAL=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig
index 6c1ba33..4237950 100644
--- a/configs/mx6dlarm2_defconfig
+++ b/configs/mx6dlarm2_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig
index 4624a09..054e912 100644
--- a/configs/mx6dlarm2_lpddr2_defconfig
+++ b/configs/mx6dlarm2_lpddr2_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index 756e5db..99aaf92 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index de99998..791b565 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig
index 42dbded..97fd4e0 100644
--- a/configs/mx6qarm2_defconfig
+++ b/configs/mx6qarm2_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig
index 5f9105f..f18818d 100644
--- a/configs/mx6qarm2_lpddr2_defconfig
+++ b/configs/mx6qarm2_lpddr2_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 9343bcc..b8c7cc9 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 732c1dc..29efcdd 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index d93a40d..9a36678 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -5,3 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index e6e4db5..af4fe4a 100644
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -6,3 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,M
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig
index df34894..8c87191 100644
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -6,3 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX"
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 6cbc0e3..1561fc6 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 055266c..ca30f94 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,M
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 7b5ccc7..f9792b5 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 5cc245e..74fc2a7 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index b613a49..e4113af 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index b7cd09a..1ebdaf6 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index aca98b7..49fabfc 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_IMLS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
index ea78934..52c88c8 100644
--- a/configs/ot1200_defconfig
+++ b/configs/ot1200_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
index 3c7346b..30e9b79 100644
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -5,3 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
index 3484c46..5d5dbe1 100644
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -5,3 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 6a2cacf..a8f49fa 100644
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -5,3 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig
index 0095ceb..1fa5f71 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_IMLS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index bb14026..f0e5106 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_IMLS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
index ceb3386..148baed 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
index e413ef4..e935360 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
index 6c37b4f..3ccdab1 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
index af7853f..14cee61 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_SPI_FLASH=y
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/udoo_quad_defconfig b/configs/udoo_quad_defconfig
index 42c21c6..5e28330 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_IMLS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index dacb432..0422a91 100644
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -6,3 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 12744a6..7efaa79 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 df1ff43..babc21c 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -56,9 +56,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 568bbf4..2a8de1c 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -114,4 +114,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 e42dfc9..66109bb 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)
--
2.4.3

6
0009-port-utilite-to-distro-generic-boot-commands.patch → 0005-port-utilite-to-distro-generic-boot-commands.patch
View File

@ -1,7 +1,7 @@
From fdd3bd2875319bd9602a5b0621e07e7e6c7b51e4 Mon Sep 17 00:00:00 2001 From 6084de3105dedfe50d8456cb4b6f3eaee362fa35 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com> From: Peter Robinson <pbrobinson@gmail.com>
Date: Fri, 3 Jul 2015 00:08:05 +0100 Date: Fri, 3 Jul 2015 00:08:05 +0100
Subject: [PATCH 9/9] port utilite to distro generic boot commands Subject: [PATCH 5/5] port utilite to distro generic boot commands
--- ---
include/configs/cm_fx6.h | 107 ++++++++++++----------------------------------- include/configs/cm_fx6.h | 107 ++++++++++++-----------------------------------
@ -144,5 +144,5 @@ index 231f4ba..8a2e46c 100644
#define CONFIG_PREBOOT "usb start" #define CONFIG_PREBOOT "usb start"
-- --
2.4.3 2.4.5

2
sources
View File

@ -1 +1 @@
9cb8cab32f2bebbc271c507eb33bcd8c u-boot-2015.07-rc3.tar.bz2 3dac9a0b46fed77fc768ad3bd2d68c05 u-boot-2015.07.tar.bz2

22
uboot-tools.spec
View File

@ -1,8 +1,8 @@
%global candidate rc3 #global candidate rc3
Name: uboot-tools Name: uboot-tools
Version: 2015.07 Version: 2015.07
Release: 0.4%{?candidate:.%{candidate}}%{?dist} Release: 1%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities Summary: U-Boot utilities
Group: Development/Tools Group: Development/Tools
@ -11,14 +11,11 @@ URL: http://www.denx.de/wiki/U-Boot
Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2 Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
Source1: armv7-boards Source1: armv7-boards
Patch1: 0001-Drop-duplicate-CONFIG_SYS_NO_FLASH-from-mx6_common.patch Patch1: 0001-wandboard-add-support-for-generic-distro-boot.patch
Patch2: 0002-mx6cuboxi-drop-options-that-are-duplicated-in-mx6_co.patch Patch2: 0002-am33xx-add-support-for-generic-distro-boot.patch
Patch3: 0003-imx6-standardise-OCOTP-and-fuse-config-to-mx6_common.patch Patch3: 0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
Patch4: 0005-wandboard-add-support-for-generic-distro-boot.patch Patch4: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
Patch5: 0006-am33xx-add-support-for-generic-distro-boot.patch Patch5: 0005-port-utilite-to-distro-generic-boot-commands.patch
Patch6: 0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
Patch7: 0008-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
Patch8: 0009-port-utilite-to-distro-generic-boot-commands.patch
BuildRequires: bc BuildRequires: bc
BuildRequires: dtc BuildRequires: dtc
@ -99,6 +96,7 @@ git config --unset user.name
rm -rf .git rm -rf .git
%build
mkdir builds mkdir builds
# convert fedora logo to bmp for use in u-boot # convert fedora logo to bmp for use in u-boot
pngtopnm /usr/share/pixmaps/fedora-logo.png | ppmquant 256 | ppmtobmp -bpp 8 >fedora.bmp pngtopnm /usr/share/pixmaps/fedora-logo.png | ppmquant 256 | ppmtobmp -bpp 8 >fedora.bmp
@ -109,7 +107,6 @@ do
cp fedora.bmp $bmp cp fedora.bmp $bmp
done done
%build
%ifarch aarch64 %ifarch aarch64
make vexpress_aemv8a_juno_config vexpress_aemv8a_semi_config O=builds/vexpress_aemv8a/ make vexpress_aemv8a_juno_config vexpress_aemv8a_semi_config O=builds/vexpress_aemv8a/
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/vexpress_aemv8a/ make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/vexpress_aemv8a/
@ -183,6 +180,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
%endif %endif
%changelog %changelog
* Wed Jul 15 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-1
- Update to 2015.07 GA
* Thu Jul 2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.4rc3 * Thu Jul 2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.4rc3
- Update to 2015.07rc3 - Update to 2015.07rc3
- Some fixes for omap4/am33xx/imx6 devices - Some fixes for omap4/am33xx/imx6 devices