Initial rebase of BBB/panda/wandboard generic distro boot support

2015-06-23 01:27:55 +01:00 · 2015-06-23 01:27:55 +01:00 · db63f3b76c
parent 89d644fbc8
commit db63f3b76c
8 changed files with 1116 additions and 9 deletions
--- a/0001-Drop-duplicate-CONFIG_SYS_NO_FLASH-from-mx6_common.patch
+++ b/0001-Drop-duplicate-CONFIG_SYS_NO_FLASH-from-mx6_common.patch
@ -0,0 +1,27 @@
+From 7a3df82d9424bd58ba1e52698ef46c7a32d61b15 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Mon, 22 Jun 2015 22:59:51 +0100
+Subject: [PATCH 1/4] 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 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
+-- 
+2.4.3
+
--- a/0001-wandboard-add-support-for-generic-distro-boot.patch
+++ b/0001-wandboard-add-support-for-generic-distro-boot.patch
@ -0,0 +1,101 @@
+From a0ea06f292d590a2c3d198208a880d1e56ef8b21 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Tue, 23 Jun 2015 00:11:39 +0100
+Subject: [PATCH 1/3] wandboard: add support for generic distro boot
+
+---
+ include/configs/wandboard.h | 33 ++++++++++++++++++++++++---------
+ 1 file changed, 24 insertions(+), 9 deletions(-)
+
+diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
+index f4e9cf2..1e346c1 100644
+--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
+@@ -54,9 +54,6 @@
+ #define CONFIG_MXC_USB_FLAGS		0
+ 
+ /* Ethernet Configuration */
+-#define CONFIG_CMD_PING
+-#define CONFIG_CMD_DHCP
+-#define CONFIG_CMD_MII
+ #define CONFIG_FEC_MXC
+ #define CONFIG_MII
+ #define IMX_FEC_BASE			ENET_BASE_ADDR
+@@ -84,17 +81,29 @@
+ #define CONFIG_IMX_HDMI
+ #define CONFIG_IMX_VIDEO_SKIP
+ 
+#ifndef CONFIG_SPL_BUILD
+#include <config_distro_defaults.h>
+#include <config_distro_bootcmd.h>
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(PXE, pxe, na) \
+       func(DHCP, dhcp, na)
+
+ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"script=boot.scr\0" \
+ 	"image=zImage\0" \
+-	"console=ttymxc0\0" \
+	"console=ttymxc0,115200\0" \
+ 	"splashpos=m,m\0" \
+ 	"fdtfile=undefined\0" \
+-	"fdt_high=0xffffffff\0" \
+-	"initrd_high=0xffffffff\0" \
+-	"fdt_addr=0x18000000\0" \
+	"fdt_addr_r=0x18000000\0" \
+ 	"boot_fdt=try\0" \
+	"pxefile_addr_r=0x17f00000\0" \
+	"scriptaddr=0x17e00000\0" \
+	"kernel_addr_r=0x11000000\0" \
+	"ramdisk_addr_r=0x18100000\0" \
+	"bootm_size=0x20000000\0" \
+ 	"ip_dyn=yes\0" \
+ 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+ 	"mmcpart=1\0" \
+@@ -113,7 +122,7 @@
+ 				"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
+ 			"fi; "	\
+ 		"fi\0" \
+-	"mmcargs=setenv bootargs console=${console},${baudrate} " \
+	"mmcargs=setenv bootargs console=${console} " \
+ 		"root=${mmcroot}; run videoargs\0" \
+ 	"videoargs=" \
+ 		"setenv nextcon 0; " \
+@@ -162,7 +171,7 @@
+ 		"else " \
+ 			"bootz; " \
+ 		"fi;\0" \
+-	"netargs=setenv bootargs console=${console},${baudrate} " \
+	"netargs=setenv bootargs console=${console} " \
+ 		"root=/dev/nfs " \
+ 	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+ 		"netboot=echo Booting from net ...; " \
+@@ -197,9 +206,11 @@
+ 			"setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine dtb to use; fi; \0" \
+		BOOTENV \
+ 
+ #define CONFIG_BOOTCOMMAND \
+ 	   "run findfdt; " \
+	   "run distro_bootcmd;" \
+ 	   "mmc dev ${mmcdev}; if mmc rescan; then " \
+ 		   "if run loadbootscript; then " \
+ 			   "run bootscript; " \
+@@ -211,6 +222,10 @@
+ 		   "fi; " \
+ 	   "else run netboot; fi"
+ 
+#else
+#define BOOT_TARGET_DEVICES
+#endif
+
+ /* Physical Memory Map */
+ #define CONFIG_NR_DRAM_BANKS		1
+ #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
+-- 
+2.4.3
+
--- a/0002-am33xx-add-support-for-generic-distro-boot.patch
+++ b/0002-am33xx-add-support-for-generic-distro-boot.patch
@ -0,0 +1,80 @@
+From a3b2b54e1f38abd38121de203618867178462a3a Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Tue, 23 Jun 2015 00:53:25 +0100
+Subject: [PATCH 2/3] am33xx: add support for generic distro boot
+
+---
+ include/configs/am335x_evm.h      | 28 ++++++++++++++++++----------
+ include/configs/ti_armv7_common.h |  1 +
+ 2 files changed, 19 insertions(+), 10 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index a5f1f06..cb0022f 100644
+--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
+@@ -18,6 +18,21 @@
+ 
+ #include <configs/ti_am335x_common.h>
+ 
+#include <config_distro_defaults.h>
+
+#define BOOTENV_BOOT_PARTITIONS "1 2"
+
+#define BOOTENV_INIT_COMMAND "run findfdt ;"
+#ifdef CONFIG_NAND
+#define BOOTENV_POST_COMMAND "run nandboot ;"
+#endif
+
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(MMC, mmc, 1)
+
+#include <config_distro_bootcmd.h>
+
+ #ifndef CONFIG_SPL_BUILD
+ #ifndef CONFIG_FIT
+ # define CONFIG_FIT
+@@ -71,7 +86,7 @@
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	DEFAULT_LINUX_BOOT_ENV \
+ 	"boot_fdt=try\0" \
+-	"bootpart=0:2\0" \
+	"bootpart=1\0" \
+ 	"bootdir=/boot\0" \
+ 	"bootfile=zImage\0" \
+ 	"fdtfile=undefined\0" \
+@@ -166,17 +181,10 @@
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
+ 	NANDARGS \
+ 	NETARGS \
+-	DFUARGS
+	DFUARGS \
+	BOOTENV
+ #endif
+ 
+-#define CONFIG_BOOTCOMMAND \
+-	"run findfdt; " \
+-	"run mmcboot;" \
+-	"setenv mmcdev 1; " \
+-	"setenv bootpart 1:2; " \
+-	"run mmcboot;" \
+-	"run nandboot;"
+-
+ /* NS16550 Configuration */
+ #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
+ #define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */
+diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
+index 7a95cb8..1194820 100644
+--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
+@@ -54,6 +54,7 @@
+ #define DEFAULT_LINUX_BOOT_ENV \
+ 	"loadaddr=0x82000000\0" \
+ 	"kernel_addr_r=0x82000000\0" \
+	"scriptaddr=0x82000000\0" \
+ 	"fdtaddr=0x88000000\0" \
+ 	"fdt_addr_r=0x88000000\0" \
+ 	"rdaddr=0x88080000\0" \
+-- 
+2.4.3
+
--- a/0002-mx6cuboxi-drop-options-that-are-duplicated-in-mx6_co.patch
+++ b/0002-mx6cuboxi-drop-options-that-are-duplicated-in-mx6_co.patch
@ -0,0 +1,35 @@
+From d908d1ed652b82c89101dfa5c814a0146a81a7bd 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/4] 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
+
--- a/0003-imx6-standardise-OCOTP-and-fuse-config-to-mx6_common.patch
+++ b/0003-imx6-standardise-OCOTP-and-fuse-config-to-mx6_common.patch
@ -0,0 +1,290 @@
+From 438fae6b3144c81ecbffc2f3236da57536e8404e 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/4] 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 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" \
+-- 
+2.4.3
+
--- a/0003-omap4-add-support-for-generic-distro-boot.patch
+++ b/0003-omap4-add-support-for-generic-distro-boot.patch
@ -0,0 +1,94 @@
+From 0318f599d63300ee3b6d11ab8164bb120e3cb423 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Tue, 23 Jun 2015 01:02:51 +0100
+Subject: [PATCH 3/3] omap4: add support for generic distro boot
+
+---
+ include/configs/ti_armv7_common.h |  3 ++-
+ include/configs/ti_omap4_common.h | 41 ++++++++++++++++-----------------------
+ 2 files changed, 19 insertions(+), 25 deletions(-)
+
+diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
+index 1194820..6bc6a5a 100644
+--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
+@@ -54,7 +54,8 @@
+ #define DEFAULT_LINUX_BOOT_ENV \
+ 	"loadaddr=0x82000000\0" \
+ 	"kernel_addr_r=0x82000000\0" \
+-	"scriptaddr=0x82000000\0" \
+	"pxefile_addr_r=0x87F00000\0" \
+	"scriptaddr=0x87E00000\0" \
+ 	"fdtaddr=0x88000000\0" \
+ 	"fdt_addr_r=0x88000000\0" \
+ 	"rdaddr=0x88080000\0" \
+diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
+index ef5a69d..f7bb3a2 100644
+--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
+@@ -81,6 +81,18 @@
+ /* Per-Soc commands */
+ #undef CONFIG_CMD_NFS
+ 
+#ifndef CONFIG_SPL_BUILD
+#include <config_distro_defaults.h>
+#include <config_distro_bootcmd.h>
+
+#define BOOTENV_INIT_COMMAND "run findfdt ;"
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(USB, usb, 0) \
+       func(PXE, pxe, na) \
+       func(DHCP, dhcp, na)
+
+ /*
+  * Environment setup
+  */
+@@ -88,7 +100,7 @@
+ 	DEFAULT_LINUX_BOOT_ENV \
+ 	"console=ttyO2,115200n8\0" \
+ 	"fdtfile=undefined\0" \
+-	"bootpart=0:2\0" \
+	"bootpart=1\0" \
+ 	"bootdir=/boot\0" \
+ 	"bootfile=zImage\0" \
+ 	"usbtty=cdc_acm\0" \
+@@ -128,30 +140,11 @@
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
+ 	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+	BOOTENV
+ 
+-#define CONFIG_BOOTCOMMAND \
+-	"run findfdt; " \
+-	"mmc dev ${mmcdev}; if mmc rescan; then " \
+-		"echo SD/MMC found on device ${mmcdev};" \
+-		"if run loadbootscript; then " \
+-			"run bootscript; " \
+-		"else " \
+-			"if run loadbootenv; then " \
+-				"run importbootenv; " \
+-			"fi;" \
+-			"if test -n ${uenvcmd}; then " \
+-				"echo Running uenvcmd ...;" \
+-				"run uenvcmd;" \
+-			"fi;" \
+-		"fi;" \
+-		"if run loadimage; then " \
+-			"run loadfdt;" \
+-			"run mmcboot; " \
+-		"fi; " \
+-		"if run loaduimage; then " \
+-			"run uimageboot;" \
+-		"fi; " \
+-	"fi"
+#else
+#define BOOT_TARGET_DEVICES
+#endif
+ 
+ /*
+  * Defines for SPL
+-- 
+2.4.3
+
--- a/0004-imx6-define-CONFIG_IMX6_THERMAL-as-a-default-option.patch
+++ b/0004-imx6-define-CONFIG_IMX6_THERMAL-as-a-default-option.patch
@ -0,0 +1,469 @@
+From 654bd00dfe3b1fa00715703b40ba4323ca0d894f Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Mon, 22 Jun 2015 23:01:37 +0100
+Subject: [PATCH 4/4] 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         | 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)
+ 
+-- 
+2.4.3
+
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@ -1,18 +1,26 @@
 %global candidate rc2

-Name:           uboot-tools
-Version:        2015.07
-Release:        0.2%{?candidate:.%{candidate}}%{?dist}
-Summary:        U-Boot utilities
+Name:      uboot-tools
+Version:   2015.07
+Release:   0.3%{?candidate:.%{candidate}}%{?dist}
+Summary:   U-Boot utilities

-Group:          Development/Tools
-License:        GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
-URL:            http://www.denx.de/wiki/U-Boot
-Source0:        ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
-Source1:        armv7-boards
+Group:     Development/Tools
+License:   GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
+URL:       http://www.denx.de/wiki/U-Boot
+Source0:   ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
+Source1:   armv7-boards

 Patch0:    0001-Fix-default-env-includes-to-fix-sandbox-build.patch
 Patch1:    0002-raspberry-pi-fix-timer.patch
+Patch2:    0001-Drop-duplicate-CONFIG_SYS_NO_FLASH-from-mx6_common.patch
+Patch3:    0002-mx6cuboxi-drop-options-that-are-duplicated-in-mx6_co.patch
+Patch4:    0003-imx6-standardise-OCOTP-and-fuse-config-to-mx6_common.patch
+Patch5:    0004-imx6-define-CONFIG_IMX6_THERMAL-as-a-default-option.patch
+Patch6:    0001-wandboard-add-support-for-generic-distro-boot.patch
+Patch7:    0002-am33xx-add-support-for-generic-distro-boot.patch
+Patch8:    0003-omap4-add-support-for-generic-distro-boot.patch
+
 #Patch1:   0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
 #Patch2:   0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
 #Patch3:   0003-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
@ -192,6 +200,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
 %endif

 %changelog
+* Mon Jun 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.3rc2
+- Initial rebase of BBB/panda/wandboard generic distro boot support
+
 * Tue Jun 16 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.2rc2
 - Enable i.MX6 marsboard and warp
 - Use upstream build fix