2015.07rc3 and some improvments to omap4/am33xx/imx6 distro boot
This commit is contained in:
Peter Robinson
parent
db63f3b76c
commit
098b0f37a2
@ -1,7 +1,7 @@
|
||||
From 7a3df82d9424bd58ba1e52698ef46c7a32d61b15 Mon Sep 17 00:00:00 2001
|
||||
From d3fda4d6daaebfaca34f1d641bb8ad707f1b166b 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
|
||||
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
|
||||
|
||||
@ -11,17 +11,17 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
|
||||
index 50370e1..b37477a 100644
|
||||
index 2ef3201..4c66491 100644
|
||||
--- a/include/configs/mx6_common.h
|
||||
+++ b/include/configs/mx6_common.h
|
||||
@@ -87,7 +87,6 @@
|
||||
@@ -86,7 +86,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
|
||||
#define CONFIG_CMDLINE_EDITING
|
||||
--
|
||||
2.4.3
|
||||
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From e87d8250dad301122a43e697cf44627c98f5dc57 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Wed, 17 Jun 2015 16:30:28 +0100
|
||||
Subject: [PATCH 1/2] Fix default env includes to fix sandbox build
|
||||
|
||||
defconfig and sandbox fails to build due to a with with the following error:
|
||||
|
||||
error: expected '}' before 'BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX'
|
||||
CONFIG_EXTRA_ENV_SETTINGS
|
||||
|
||||
Based on the responaes below to the thread add linux/kconfig.h higher in th includes
|
||||
and drop the now unneeded autoconf.h lower down to ensure the default environment is
|
||||
included correctly
|
||||
|
||||
http://lists.denx.de/pipermail/u-boot/2015-June/216849.html
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
tools/env/fw_env.h | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
|
||||
index d6faf34..60c0517 100644
|
||||
--- a/tools/env/fw_env.h
|
||||
+++ b/tools/env/fw_env.h
|
||||
@@ -6,6 +6,8 @@
|
||||
*/
|
||||
|
||||
/* Pull in the current config to define the default environment */
|
||||
+#include <linux/kconfig.h>
|
||||
+
|
||||
#ifndef __ASSEMBLY__
|
||||
#define __ASSEMBLY__ /* get only #defines from config.h */
|
||||
#include <config.h>
|
||||
@@ -13,7 +15,6 @@
|
||||
#else
|
||||
#include <config.h>
|
||||
#endif
|
||||
-#include <generated/autoconf.h>
|
||||
|
||||
/*
|
||||
* To build the utility with the static configuration
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From 4ff418fa70e038b1ce17545294d7638cb0e12390 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Mon, 15 Jun 2015 15:52:09 +0100
|
||||
Subject: [PATCH] If CONFIG_SANDBOX isn't defined the build fails in fw_env.c
|
||||
due to a with with the following error:
|
||||
|
||||
error: expected '}' before 'BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX'
|
||||
CONFIG_EXTRA_ENV_SETTINGS
|
||||
|
||||
A check to see if it's defined fixes this issue.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
include/configs/sandbox.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
|
||||
index 3caa83c..f72675b 100644
|
||||
--- a/include/configs/sandbox.h
|
||||
+++ b/include/configs/sandbox.h
|
||||
@@ -6,6 +6,10 @@
|
||||
#ifndef __CONFIG_H
|
||||
#define __CONFIG_H
|
||||
|
||||
+#ifndef CONFIG_SANDBOX
|
||||
+#define CONFIG_SANDBOX
|
||||
+#endif
|
||||
+
|
||||
#ifdef FTRACE
|
||||
#define CONFIG_TRACE
|
||||
#define CONFIG_CMD_TRACE
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From dd24ce0e4a2614848431d3734669741f524f010e Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Tue, 14 Oct 2014 00:38:28 -0500
|
||||
Subject: [PATCH 01/14] make sure that the filesystem is a type of fat
|
||||
|
||||
parted marks the partition table as being fat32 though we may pyt a fat16
|
||||
filesystem on it.
|
||||
---
|
||||
fs/fat/fat.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
|
||||
index bccc3e3..15f84ad 100644
|
||||
--- a/fs/fat/fat.c
|
||||
+++ b/fs/fat/fat.c
|
||||
@@ -74,7 +74,7 @@ int fat_set_blk_dev(block_dev_desc_t *dev_desc, disk_partition_t *info)
|
||||
/* Check for FAT12/FAT16/FAT32 filesystem */
|
||||
if (!memcmp(buffer + DOS_FS_TYPE_OFFSET, "FAT", 3))
|
||||
return 0;
|
||||
- if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT32", 5))
|
||||
+ if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT", 3))
|
||||
return 0;
|
||||
|
||||
cur_dev = NULL;
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From eb905357f4cbe0d6bf8346a20d5b3bb36a8887c6 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Sun, 29 Mar 2015 12:56:03 -0500
|
||||
Subject: [PATCH] omap4 distro boot partition fixup
|
||||
|
||||
---
|
||||
include/configs/ti_omap4_common.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
|
||||
index 5402793..31dd1f0 100644
|
||||
--- a/include/configs/ti_omap4_common.h
|
||||
+++ b/include/configs/ti_omap4_common.h
|
||||
@@ -101,7 +101,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" \
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 5ba14a142d5d3083f694dadbb1997f23fa171f0b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:29:28 +0000
|
||||
Subject: [PATCH 02/14] Add BOOTENV_POST_COMMAND, which is appended to the end
|
||||
of bootcmd
|
||||
|
||||
---
|
||||
include/config_distro_bootcmd.h | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 73f093f..7f8b393 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -164,6 +164,10 @@
|
||||
#define BOOTENV_BOOT_TARGETS \
|
||||
"boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
|
||||
|
||||
+#ifndef BOOTENV_POST_COMMAND
|
||||
+#define BOOTENV_POST_COMMAND
|
||||
+#endif
|
||||
+
|
||||
#define BOOTENV_DEV(devtypeu, devtypel, instance) \
|
||||
BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance)
|
||||
#define BOOTENV \
|
||||
@@ -226,7 +230,9 @@
|
||||
"distro_bootcmd=" BOOTENV_SET_SCSI_NEED_INIT \
|
||||
"for target in ${boot_targets}; do " \
|
||||
"run bootcmd_${target}; " \
|
||||
- "done\0"
|
||||
+ "done;" \
|
||||
+ BOOTENV_POST_COMMAND \
|
||||
+ "\0"
|
||||
|
||||
#ifndef CONFIG_BOOTCOMMAND
|
||||
#define CONFIG_BOOTCOMMAND "run distro_bootcmd"
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d908d1ed652b82c89101dfa5c814a0146a81a7bd Mon Sep 17 00:00:00 2001
|
||||
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/4] mx6cuboxi: drop options that are duplicated in mx6_common
|
||||
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
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From f5f57faaf4049dedb70a027544dec15b320dd29f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Thu, 18 Jun 2015 21:00:03 +0100
|
||||
Subject: [PATCH 2/2] raspberry pi fix timer
|
||||
|
||||
---
|
||||
drivers/mmc/bcm2835_sdhci.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
|
||||
index 078ef05..74b497e 100644
|
||||
--- a/drivers/mmc/bcm2835_sdhci.c
|
||||
+++ b/drivers/mmc/bcm2835_sdhci.c
|
||||
@@ -69,11 +69,11 @@ static inline void bcm2835_sdhci_raw_writel(struct sdhci_host *host, u32 val,
|
||||
* (Which is just as well - otherwise we'd have to nobble the DMA engine
|
||||
* too)
|
||||
*/
|
||||
- while (get_timer(bcm_host->last_write) < bcm_host->twoticks_delay)
|
||||
+ while (timer_get_us() < bcm_host->last_write + bcm_host->twoticks_delay)
|
||||
;
|
||||
|
||||
writel(val, host->ioaddr + reg);
|
||||
- bcm_host->last_write = get_timer(0);
|
||||
+ bcm_host->last_write = timer_get_us();
|
||||
}
|
||||
|
||||
static inline u32 bcm2835_sdhci_raw_readl(struct sdhci_host *host, int reg)
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 707026f080b057cf553b67cd23b3e81cd90c6efe Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:30:06 +0000
|
||||
Subject: [PATCH 03/14] Only set CONFIG_BOOTDELAY if not already set.
|
||||
|
||||
---
|
||||
include/config_distro_defaults.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
|
||||
index 1ecc0bb..b23eb04 100644
|
||||
--- a/include/config_distro_defaults.h
|
||||
+++ b/include/config_distro_defaults.h
|
||||
@@ -45,7 +45,9 @@
|
||||
|
||||
#define CONFIG_CMDLINE_EDITING
|
||||
#define CONFIG_AUTO_COMPLETE
|
||||
+#ifndef CONFIG_BOOTDELAY
|
||||
#define CONFIG_BOOTDELAY 2
|
||||
+#endif
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
#define CONFIG_MENU
|
||||
#define CONFIG_DOS_PARTITION
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 438fae6b3144c81ecbffc2f3236da57536e8404e Mon Sep 17 00:00:00 2001
|
||||
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/4] imx6: standardise OCOTP and fuse config to mx6_common
|
||||
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
|
||||
@ -28,7 +28,7 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
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
|
||||
index dd012f1..4a5d4fb 100644
|
||||
--- a/include/configs/aristainetos-common.h
|
||||
+++ b/include/configs/aristainetos-common.h
|
||||
@@ -26,9 +26,6 @@
|
||||
@ -42,7 +42,7 @@ index eb50639..575f22d 100644
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||
|
||||
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
|
||||
index 5dfd56c..85155f1 100644
|
||||
index cba58aa..12744a6 100644
|
||||
--- a/include/configs/embestmx6boards.h
|
||||
+++ b/include/configs/embestmx6boards.h
|
||||
@@ -29,11 +29,6 @@
|
||||
@ -58,10 +58,10 @@ index 5dfd56c..85155f1 100644
|
||||
#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
|
||||
index 902ec2c..df1ff43 100644
|
||||
--- a/include/configs/gw_ventana.h
|
||||
+++ b/include/configs/gw_ventana.h
|
||||
@@ -168,11 +168,6 @@
|
||||
@@ -165,11 +165,6 @@
|
||||
#define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */
|
||||
#define CONFIG_CMD_UBI
|
||||
#define CONFIG_RBTREE
|
||||
@ -74,10 +74,10 @@ index 6b8c82d..3d72832 100644
|
||||
/* Ethernet support */
|
||||
#define CONFIG_FEC_MXC
|
||||
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
|
||||
index b37477a..2a0eb2a 100644
|
||||
index 4c66491..568bbf4 100644
|
||||
--- a/include/configs/mx6_common.h
|
||||
+++ b/include/configs/mx6_common.h
|
||||
@@ -112,4 +112,8 @@
|
||||
@@ -110,4 +110,8 @@
|
||||
#define CONFIG_FSL_ESDHC
|
||||
#define CONFIG_FSL_USDHC
|
||||
|
||||
@ -100,7 +100,7 @@ index 3d5bba7..634a09f 100644
|
||||
/* 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
|
||||
index 6c3c52e..e42dfc9 100644
|
||||
--- a/include/configs/mx6sabre_common.h
|
||||
+++ b/include/configs/mx6sabre_common.h
|
||||
@@ -21,11 +21,6 @@
|
||||
@ -116,10 +116,10 @@ index c8c9f81..3ed4d23 100644
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||
|
||||
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
|
||||
index 4b5c637..8cc9b5e 100644
|
||||
index a7da111..3cecd94 100644
|
||||
--- a/include/configs/mx6slevk.h
|
||||
+++ b/include/configs/mx6slevk.h
|
||||
@@ -193,9 +193,4 @@
|
||||
@@ -192,9 +192,4 @@
|
||||
|
||||
#define CONFIG_IMX6_THERMAL
|
||||
|
||||
@ -130,7 +130,7 @@ index 4b5c637..8cc9b5e 100644
|
||||
-
|
||||
#endif /* __CONFIG_H */
|
||||
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
|
||||
index 63ec7c6..6d5d244 100644
|
||||
index 2b278a8..848bdcd 100644
|
||||
--- a/include/configs/mx6sxsabresd.h
|
||||
+++ b/include/configs/mx6sxsabresd.h
|
||||
@@ -178,11 +178,6 @@
|
||||
@ -146,7 +146,7 @@ index 63ec7c6..6d5d244 100644
|
||||
|
||||
#define CONFIG_FSL_QSPI
|
||||
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
|
||||
index beaa119..b038dfe 100644
|
||||
index 67a3c97..2e81ad4 100644
|
||||
--- a/include/configs/nitrogen6x.h
|
||||
+++ b/include/configs/nitrogen6x.h
|
||||
@@ -26,11 +26,6 @@
|
||||
@ -186,7 +186,7 @@ index 1dc9d83..eb7ebd1 100644
|
||||
#ifdef CONFIG_CMD_PCI
|
||||
#define CONFIG_PCI
|
||||
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
|
||||
index 2bbf2b9..b2eb6f5 100644
|
||||
index fb58acf..0d06fce 100644
|
||||
--- a/include/configs/ot1200.h
|
||||
+++ b/include/configs/ot1200.h
|
||||
@@ -16,10 +16,6 @@
|
||||
@ -240,10 +240,10 @@ index e1c9937..d97cba7 100644
|
||||
#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
|
||||
index 78a8e39..0993d6d 100644
|
||||
--- a/include/configs/tqma6.h
|
||||
+++ b/include/configs/tqma6.h
|
||||
@@ -100,10 +100,6 @@
|
||||
@@ -99,10 +99,6 @@
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
||||
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */
|
||||
|
||||
@ -271,10 +271,10 @@ index f05b55a..f4e9cf2 100644
|
||||
#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
|
||||
index 48e2058..2331767 100644
|
||||
--- a/include/configs/warp.h
|
||||
+++ b/include/configs/warp.h
|
||||
@@ -97,10 +97,6 @@
|
||||
@@ -94,10 +94,6 @@
|
||||
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
|
||||
#define DFU_DEFAULT_POLL_TIMEOUT 300
|
||||
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
From ecb7a2bbcf68921cdca7aed2740561b6bb14970b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:31:19 +0000
|
||||
Subject: [PATCH 04/14] Switch am335x_evm.h to use config_distro_defaults and
|
||||
config_distro_bootcmd. Add scriptaddr to DEFAULT_LINUX_BOOT_ENV, as
|
||||
scriptaddr is used for boot scripts in config_distro_defaults.
|
||||
|
||||
---
|
||||
include/configs/am335x_evm.h | 26 +++++++++++++++++---------
|
||||
include/configs/ti_armv7_common.h | 1 +
|
||||
2 files changed, 18 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
|
||||
index a87059c..3fb175e 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
|
||||
@@ -181,17 +196,10 @@
|
||||
"if test $fdtfile = undefined; then " \
|
||||
"echo WARNING: Could not determine device tree to use; fi; \0" \
|
||||
NANDARGS \
|
||||
- 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 110a4f8..b6e37b3 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.3.2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 654bd00dfe3b1fa00715703b40ba4323ca0d894f Mon Sep 17 00:00:00 2001
|
||||
From 686081c703dbe09da79a355232e3a19a034b82e6 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
|
||||
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.
|
||||
@ -12,7 +12,7 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
configs/aristainetos_defconfig | 2 ++
|
||||
configs/cgtqmx6qeval_defconfig | 2 ++
|
||||
configs/cm_fx6_defconfig | 2 ++
|
||||
configs/gwventana_defconfig | 2 ++
|
||||
configs/gwventana_defconfig | 1 +
|
||||
configs/mx6dlarm2_defconfig | 2 ++
|
||||
configs/mx6dlarm2_lpddr2_defconfig | 2 ++
|
||||
configs/mx6dlsabreauto_defconfig | 2 ++
|
||||
@ -48,360 +48,359 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
include/configs/mx6_common.h | 2 ++
|
||||
include/configs/mx6cuboxi.h | 2 --
|
||||
include/configs/mx6sabre_common.h | 2 --
|
||||
40 files changed, 72 insertions(+), 9 deletions(-)
|
||||
40 files changed, 71 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
|
||||
index af92f69..1e59619 100644
|
||||
index e676f0e..8b50539 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
|
||||
@@ -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 306d4a8..f023aac 100644
|
||||
index f5b0b6b..0bac533 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
|
||||
@@ -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 58b98b7..7a3f75c 100644
|
||||
index e1eb871..b719cba 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
|
||||
@@ -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 4db785d..f141167 100644
|
||||
index 6be5c17..7c117d9 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
|
||||
@@ -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 5cfe983..3779a1c 100644
|
||||
index 401f77e..adcbf78 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
|
||||
@@ -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 4324ccf..b81c9ab 100644
|
||||
index 6c1ba33..4237950 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
|
||||
@@ -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 7681814..efbca94 100644
|
||||
index 4624a09..054e912 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
|
||||
@@ -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 7578fc8..1052088 100644
|
||||
index 756e5db..99aaf92 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
|
||||
@@ -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 92d77f9..becca3f 100644
|
||||
index de99998..791b565 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
|
||||
@@ -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 51ab7e3..2a3cab9 100644
|
||||
index 42dbded..97fd4e0 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
|
||||
@@ -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 c590c39..b6db3ab 100644
|
||||
index 5f9105f..f18818d 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
|
||||
@@ -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 3d584bd..5deb638 100644
|
||||
index 9343bcc..b8c7cc9 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
|
||||
@@ -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 887a509..8d40917 100644
|
||||
index 732c1dc..29efcdd 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
|
||||
@@ -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 a9adcdb..70a06fb 100644
|
||||
index d93a40d..9a36678 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
|
||||
@@ -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 058e3f8..b758e2b 100644
|
||||
index e6e4db5..af4fe4a 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
|
||||
@@ -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 0e3159e..cfd22e2 100644
|
||||
index df34894..8c87191 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
|
||||
@@ -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 ec0e346..c777261 100644
|
||||
index 6cbc0e3..1561fc6 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
|
||||
@@ -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 838a43e..94058aa 100644
|
||||
index 055266c..ca30f94 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
|
||||
@@ -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 a739e22..b6243d2 100644
|
||||
index 7b5ccc7..f9792b5 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
|
||||
@@ -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 b4b0524..827ae1c 100644
|
||||
index 5cc245e..74fc2a7 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
|
||||
@@ -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 118f605..221d2cf 100644
|
||||
index b613a49..e4113af 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
|
||||
@@ -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 3e70de9..26339df 100644
|
||||
index b7cd09a..1ebdaf6 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
|
||||
@@ -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 ccc0055..2d8eaab 100644
|
||||
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_SETEXPR=y
|
||||
CONFIG_CMD_NET=y
|
||||
# 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 20f64bb..693a7c2 100644
|
||||
index ea78934..52c88c8 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
|
||||
@@ -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 810dff8..be12cba 100644
|
||||
index 3c7346b..30e9b79 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
|
||||
@@ -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 672ea28..06ed0bb 100644
|
||||
index 3484c46..5d5dbe1 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
|
||||
@@ -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 39236f1..9fa33a2 100644
|
||||
index 6a2cacf..a8f49fa 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
|
||||
@@ -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 f9d7ee9..c9bc064 100644
|
||||
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_SETEXPR=y
|
||||
CONFIG_CMD_NET=y
|
||||
# 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 3e720a7..ed9c70f 100644
|
||||
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_SETEXPR=y
|
||||
CONFIG_CMD_NET=y
|
||||
# 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 01355b6..7d6348b 100644
|
||||
index ceb3386..148baed 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
|
||||
@@ -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 ba24663..c08adb4 100644
|
||||
index e413ef4..e935360 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
|
||||
@@ -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 cbb4500..b09c8c1 100644
|
||||
index 6c37b4f..3ccdab1 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
|
||||
@@ -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 805d8ab..50d9246 100644
|
||||
index af7853f..14cee61 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
|
||||
@@ -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 17f48c8..ebf2d9e 100644
|
||||
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_SETEXPR=y
|
||||
CONFIG_CMD_NET=y
|
||||
# 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 24e1b9f..f43c66b 100644
|
||||
index dacb432..0422a91 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"
|
||||
@@ -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 85155f1..7b53df4 100644
|
||||
index 12744a6..7efaa79 100644
|
||||
--- a/include/configs/embestmx6boards.h
|
||||
+++ b/include/configs/embestmx6boards.h
|
||||
@@ -19,8 +19,6 @@
|
||||
@ -414,10 +413,10 @@ index 85155f1..7b53df4 100644
|
||||
#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
|
||||
index df1ff43..babc21c 100644
|
||||
--- a/include/configs/gw_ventana.h
|
||||
+++ b/include/configs/gw_ventana.h
|
||||
@@ -59,9 +59,6 @@
|
||||
@@ -56,9 +56,6 @@
|
||||
#define CONFIG_MXC_GPIO
|
||||
#define CONFIG_CMD_GPIO
|
||||
|
||||
@ -428,10 +427,10 @@ index 3d72832..b49c153 100644
|
||||
#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
|
||||
index 568bbf4..2a8de1c 100644
|
||||
--- a/include/configs/mx6_common.h
|
||||
+++ b/include/configs/mx6_common.h
|
||||
@@ -116,4 +116,6 @@
|
||||
@@ -114,4 +114,6 @@
|
||||
#define CONFIG_CMD_FUSE
|
||||
#define CONFIG_MXC_OCOTP
|
||||
|
||||
@ -452,7 +451,7 @@ index 634a09f..4eadfd8 100644
|
||||
#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
|
||||
index e42dfc9..66109bb 100644
|
||||
--- a/include/configs/mx6sabre_common.h
|
||||
+++ b/include/configs/mx6sabre_common.h
|
||||
@@ -11,8 +11,6 @@
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
From 8c3c5af7d22366bcebd48817190b22ddbb119f9d Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:32:40 +0000
|
||||
Subject: [PATCH 05/14] add back adding console= to the bootargs if not
|
||||
present.
|
||||
|
||||
A better soloution is needed, not upstreamable
|
||||
---
|
||||
common/cmd_pxe.c | 20 ++++++++++++++++++--
|
||||
1 file changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
|
||||
index 7e32c95..4f3c15d 100644
|
||||
--- a/common/cmd_pxe.c
|
||||
+++ b/common/cmd_pxe.c
|
||||
@@ -673,18 +673,34 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label)
|
||||
if ((label->ipappend & 0x3) || label->append) {
|
||||
char bootargs[CONFIG_SYS_CBSIZE] = "";
|
||||
char finalbootargs[CONFIG_SYS_CBSIZE];
|
||||
+ char console[30] = "";
|
||||
+ /* check for a console line in the boot args passed in from the
|
||||
+ * config file. If there is no console line and the enviornment
|
||||
+ * has a console variable add it to the bootargs
|
||||
+ */
|
||||
+ if ( !strstr(label->append, "console=") ) {
|
||||
+ printf("no console= \n");
|
||||
+ if (getenv("console")) {
|
||||
+ sprintf(console, " console=%s",
|
||||
+ getenv("console"));
|
||||
+ }
|
||||
+ }
|
||||
|
||||
if (strlen(label->append ?: "") +
|
||||
- strlen(ip_str) + strlen(mac_str) + 1 > sizeof(bootargs)) {
|
||||
- printf("bootarg overflow %zd+%zd+%zd+1 > %zd\n",
|
||||
+ strlen(ip_str) + strlen(mac_str) + strlen(console) +
|
||||
+ 1 > sizeof(bootargs)) {
|
||||
+ printf("bootarg overflow %zd+%zd+%zd+%zd+1 > %zd\n",
|
||||
strlen(label->append ?: ""),
|
||||
strlen(ip_str), strlen(mac_str),
|
||||
+ strlen(console),
|
||||
sizeof(bootargs));
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (label->append)
|
||||
strcpy(bootargs, label->append);
|
||||
+ if (strlen(console) > 0)
|
||||
+ strcat(bootargs, console);
|
||||
strcat(bootargs, ip_str);
|
||||
strcat(bootargs, mac_str);
|
||||
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a0ea06f292d590a2c3d198208a880d1e56ef8b21 Mon Sep 17 00:00:00 2001
|
||||
From 51ee37a8fd8e9ade5a7dbfd6c1b55467319ab211 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
|
||||
Subject: [PATCH 5/9] wandboard: add support for generic distro boot
|
||||
|
||||
---
|
||||
include/configs/wandboard.h | 33 ++++++++++++++++++++++++---------
|
||||
@ -1,7 +1,7 @@
|
||||
From a3b2b54e1f38abd38121de203618867178462a3a Mon Sep 17 00:00:00 2001
|
||||
From 4a5e18997a61176a8a2678ec9405b62b14025fd3 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
|
||||
Subject: [PATCH 6/9] am33xx: add support for generic distro boot
|
||||
|
||||
---
|
||||
include/configs/am335x_evm.h | 28 ++++++++++++++++++----------
|
||||
@ -9,7 +9,7 @@ Subject: [PATCH 2/3] am33xx: add support for generic distro boot
|
||||
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
|
||||
index 035c156..81f8331 100644
|
||||
--- a/include/configs/am335x_evm.h
|
||||
+++ b/include/configs/am335x_evm.h
|
||||
@@ -18,6 +18,21 @@
|
||||
@ -64,7 +64,7 @@ index a5f1f06..cb0022f 100644
|
||||
#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
|
||||
index 0aea7d1..d6073b2 100644
|
||||
--- a/include/configs/ti_armv7_common.h
|
||||
+++ b/include/configs/ti_armv7_common.h
|
||||
@@ -54,6 +54,7 @@
|
||||
@ -1,144 +0,0 @@
|
||||
From d5e9f0b3d2495bcf81647887c8aaadf02223d108 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:33:25 +0000
|
||||
Subject: [PATCH 06/14] wandboard: port to generic distro booting
|
||||
|
||||
set the variables and functions needed for generic distro booting.
|
||||
---
|
||||
include/configs/wandboard.h | 48 ++++++++++++++++++++++++---------------------
|
||||
1 file changed, 26 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
||||
index 117d1f7..1d8459c 100644
|
||||
--- a/include/configs/wandboard.h
|
||||
+++ b/include/configs/wandboard.h
|
||||
@@ -51,8 +51,6 @@
|
||||
#define CONFIG_CMD_BMODE
|
||||
#define CONFIG_CMD_SETEXPR
|
||||
|
||||
-#define CONFIG_BOOTDELAY 5
|
||||
-
|
||||
#define CONFIG_SYS_MEMTEST_START 0x10000000
|
||||
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
|
||||
#define CONFIG_LOADADDR 0x12000000
|
||||
@@ -74,9 +72,6 @@
|
||||
#define CONFIG_CMD_MMC
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
-#define CONFIG_CMD_EXT2
|
||||
-#define CONFIG_CMD_FAT
|
||||
-#define CONFIG_DOS_PARTITION
|
||||
|
||||
/* USB Configs */
|
||||
#define CONFIG_CMD_USB
|
||||
@@ -88,10 +83,6 @@
|
||||
#define CONFIG_MXC_USB_FLAGS 0
|
||||
|
||||
/* Ethernet Configuration */
|
||||
-#define CONFIG_CMD_PING
|
||||
-#define CONFIG_CMD_DHCP
|
||||
-#define CONFIG_CMD_MII
|
||||
-#define CONFIG_CMD_NET
|
||||
#define CONFIG_FEC_MXC
|
||||
#define CONFIG_MII
|
||||
#define IMX_FEC_BASE ENET_BASE_ADDR
|
||||
@@ -124,6 +115,16 @@
|
||||
#define CONFIG_MXC_OCOTP
|
||||
#endif
|
||||
|
||||
+#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)
|
||||
+
|
||||
+
|
||||
#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
|
||||
#define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
|
||||
#elif defined(CONFIG_MX6Q)
|
||||
@@ -133,13 +134,16 @@
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"script=boot.scr\0" \
|
||||
"image=zImage\0" \
|
||||
- "console=ttymxc0\0" \
|
||||
+ "console=ttymxc0,115200\0" \
|
||||
"splashpos=m,m\0" \
|
||||
- "fdt_high=0xffffffff\0" \
|
||||
- "initrd_high=0xffffffff\0" \
|
||||
- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
||||
- "fdt_addr=0x18000000\0" \
|
||||
+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\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" \
|
||||
@@ -158,7 +162,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; " \
|
||||
@@ -207,7 +211,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 ...; " \
|
||||
@@ -230,7 +234,8 @@
|
||||
"fi; " \
|
||||
"else " \
|
||||
"bootz; " \
|
||||
- "fi;\0"
|
||||
+ "fi;\0" \
|
||||
+ BOOTENV
|
||||
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
"mmc dev ${mmcdev}; if mmc rescan; then " \
|
||||
@@ -244,6 +249,10 @@
|
||||
"fi; " \
|
||||
"else run netboot; fi"
|
||||
|
||||
+#else
|
||||
+#define BOOT_TARGET_DEVICES
|
||||
+#endif
|
||||
+
|
||||
/* Miscellaneous configurable options */
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
#define CONFIG_SYS_HUSH_PARSER
|
||||
@@ -257,8 +266,6 @@
|
||||
|
||||
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
||||
|
||||
-#define CONFIG_CMDLINE_EDITING
|
||||
-
|
||||
/* Physical Memory Map */
|
||||
#define CONFIG_NR_DRAM_BANKS 1
|
||||
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
||||
@@ -281,9 +288,6 @@
|
||||
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||||
|
||||
-#define CONFIG_OF_LIBFDT
|
||||
-#define CONFIG_CMD_BOOTZ
|
||||
-
|
||||
#ifndef CONFIG_SYS_DCACHE_OFF
|
||||
#define CONFIG_CMD_CACHE
|
||||
#endif
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
From 2080f6a04c624b414b8934c7717b40836ed4dbcd Mon Sep 17 00:00:00 2001
|
||||
From 7a052aa7d5329d54f279b2b0aa967391a3d4363d Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:38:05 +0000
|
||||
Subject: [PATCH 07/14] Switch omap4 boards to use config_distro_defaults and
|
||||
Date: Thu, 2 Jul 2015 23:26:44 +0100
|
||||
Subject: [PATCH 7/9] Switch omap4 boards to use config_distro_defaults and
|
||||
config_distro_bootcmd.
|
||||
|
||||
Add pxefile_addr_r to DEFAULT_LINUX_BOOT_ENV, as pxefile_addr_r is used
|
||||
to store the pxe boot configuation file in config_distro_defaults.
|
||||
adjust adress of scriptaddr to be unique
|
||||
Add pxefile_addr_r to DEFAULT_LINUX_BOOT_ENV, as pxefile_addr_r is used
|
||||
to store the pxe boot configuation file in config_distro_defaults.
|
||||
adjust adress of scriptaddr to be unique
|
||||
---
|
||||
include/configs/ti_armv7_common.h | 3 ++-
|
||||
include/configs/ti_omap4_common.h | 39 ++++++++++++++++-----------------------
|
||||
2 files changed, 18 insertions(+), 24 deletions(-)
|
||||
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 b6e37b3..d1e259e 100644
|
||||
index d6073b2..3523e67 100644
|
||||
--- a/include/configs/ti_armv7_common.h
|
||||
+++ b/include/configs/ti_armv7_common.h
|
||||
@@ -54,7 +54,8 @@
|
||||
@ -27,12 +27,12 @@ index b6e37b3..d1e259e 100644
|
||||
"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 1c93aab..5402793 100644
|
||||
index e966134..51b7265 100644
|
||||
--- a/include/configs/ti_omap4_common.h
|
||||
+++ b/include/configs/ti_omap4_common.h
|
||||
@@ -82,6 +82,18 @@
|
||||
#undef CONFIG_CMD_NET
|
||||
#undef CONFIG_CMD_NFS
|
||||
@@ -78,6 +78,18 @@
|
||||
#define CONFIG_USB_TTY 1
|
||||
#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
|
||||
|
||||
+#ifndef CONFIG_SPL_BUILD
|
||||
+#include <config_distro_defaults.h>
|
||||
@ -49,7 +49,16 @@ index 1c93aab..5402793 100644
|
||||
/*
|
||||
* Environment setup
|
||||
*/
|
||||
@@ -129,30 +141,11 @@
|
||||
@@ -85,7 +97,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" \
|
||||
@@ -125,30 +137,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" \
|
||||
@ -85,5 +94,5 @@ index 1c93aab..5402793 100644
|
||||
/*
|
||||
* Defines for SPL
|
||||
--
|
||||
2.3.2
|
||||
2.4.3
|
||||
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
From 3391ec0e884965315e6b18f87d3713db4fd461e2 Mon Sep 17 00:00:00 2001
|
||||
From e3c92857da59b8c3fdc490515584bc394c10c544 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 11:11:51 +0000
|
||||
Subject: [PATCH 11/14] Add BOOTENV_INIT_COMMAND for commands that may be
|
||||
needed to run before bootcmd, such as setting the fdt file variables for
|
||||
platfroms that detect on boot.
|
||||
Date: Thu, 2 Jul 2015 23:28:56 +0100
|
||||
Subject: [PATCH 8/9] Add BOOTENV_INIT_COMMAND for commands that may be needed
|
||||
to run before bootcmd, such as setting the fdt file variables for platfroms
|
||||
that detect on boot.
|
||||
|
||||
---
|
||||
include/config_distro_bootcmd.h | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 8614cc4..1461eaf 100644
|
||||
index 3a360ca4..dcad4c8 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -164,6 +164,10 @@
|
||||
@@ -176,6 +176,10 @@
|
||||
#define BOOTENV_BOOT_TARGETS \
|
||||
"boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
|
||||
|
||||
@ -21,10 +21,10 @@ index 8614cc4..1461eaf 100644
|
||||
+#define BOOTENV_INIT_COMMAND
|
||||
+#endif
|
||||
+
|
||||
#ifndef BOOTENV_POST_COMMAND
|
||||
#define BOOTENV_POST_COMMAND
|
||||
#endif
|
||||
@@ -248,7 +252,7 @@
|
||||
#define BOOTENV_DEV(devtypeu, devtypel, instance) \
|
||||
BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance)
|
||||
#define BOOTENV \
|
||||
@@ -237,7 +241,7 @@
|
||||
\
|
||||
BOOT_TARGET_DEVICES(BOOTENV_DEV) \
|
||||
\
|
||||
@ -32,7 +32,7 @@ index 8614cc4..1461eaf 100644
|
||||
+ "distro_bootcmd=" BOOTENV_INIT_COMMAND BOOTENV_SET_SCSI_NEED_INIT \
|
||||
"for target in ${boot_targets}; do " \
|
||||
"run bootcmd_${target}; " \
|
||||
"done;" \
|
||||
"done\0"
|
||||
--
|
||||
2.3.2
|
||||
2.4.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From bd6c9bae1941c74cb9c963a702ff491a57d61ab3 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:49:53 +0000
|
||||
Subject: [PATCH 09/14] RiOT board: set console speed
|
||||
|
||||
---
|
||||
include/configs/embestmx6boards.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
|
||||
index b4b3ae8..b8696a3 100644
|
||||
--- a/include/configs/embestmx6boards.h
|
||||
+++ b/include/configs/embestmx6boards.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#define CONFIG_SYS_GENERIC_BOARD
|
||||
|
||||
#define CONFIG_MXC_UART_BASE UART2_BASE
|
||||
-#define CONFIG_CONSOLE_DEV "ttymxc1"
|
||||
+#define CONFIG_CONSOLE_DEV "ttymxc1,115200"
|
||||
#define CONFIG_MMCROOT "/dev/mmcblk1p2"
|
||||
|
||||
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
From b357a39500d81754e496f9e3f298a46cd92212b5 Mon Sep 17 00:00:00 2001
|
||||
From fdd3bd2875319bd9602a5b0621e07e7e6c7b51e4 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:45:22 +0000
|
||||
Subject: [PATCH 08/14] port utilite to distro generic boot commands
|
||||
Date: Fri, 3 Jul 2015 00:08:05 +0100
|
||||
Subject: [PATCH 9/9] port utilite to distro generic boot commands
|
||||
|
||||
---
|
||||
include/configs/cm_fx6.h | 109 ++++++++++++-----------------------------------
|
||||
1 file changed, 27 insertions(+), 82 deletions(-)
|
||||
include/configs/cm_fx6.h | 107 ++++++++++++-----------------------------------
|
||||
1 file changed, 27 insertions(+), 80 deletions(-)
|
||||
|
||||
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
|
||||
index 4207504..58dd5e1 100644
|
||||
index 231f4ba..8a2e46c 100644
|
||||
--- a/include/configs/cm_fx6.h
|
||||
+++ b/include/configs/cm_fx6.h
|
||||
@@ -12,7 +12,6 @@
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef __CONFIG_CM_FX6_H
|
||||
#define __CONFIG_CM_FX6_H
|
||||
|
||||
#include <asm/arch/imx-regs.h>
|
||||
-#include <config_distro_defaults.h>
|
||||
+#include <config_distro_defaults.h>
|
||||
#include "mx6_common.h"
|
||||
|
||||
/* Machine config */
|
||||
@@ -95,97 +94,43 @@
|
||||
@@ -66,97 +67,43 @@
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
|
||||
@ -117,7 +117,8 @@ index 4207504..58dd5e1 100644
|
||||
- "run trybootk;" \
|
||||
- "run setboottypez;" \
|
||||
- "run trybootk;\0"
|
||||
-
|
||||
+ BOOTENV
|
||||
|
||||
-#define CONFIG_BOOTCOMMAND \
|
||||
- "run setupmmcboot;" \
|
||||
- "mmc dev ${storagedev};" \
|
||||
@ -136,8 +137,6 @@ index 4207504..58dd5e1 100644
|
||||
- "fi;" \
|
||||
- "run setupnandboot;" \
|
||||
- "run nandboot;"
|
||||
+ BOOTENV
|
||||
+
|
||||
+#else /* ifndef CONFIG_SPL_BUILD */
|
||||
+#define CONFIG_EXTRA_ENV_SETTINGS
|
||||
+#endif
|
||||
@ -145,5 +144,5 @@ index 4207504..58dd5e1 100644
|
||||
#define CONFIG_PREBOOT "usb start"
|
||||
|
||||
--
|
||||
2.3.2
|
||||
2.4.3
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
From cfee6c407f7ed0ab2ed0f98645c10b2d34497f46 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:52:53 +0000
|
||||
Subject: [PATCH 10/14] Add support for loading environment from uEnv.txt in
|
||||
config_distro_bootcmd.
|
||||
|
||||
---
|
||||
include/config_distro_bootcmd.h | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 7f8b393..8614cc4 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -179,6 +179,7 @@
|
||||
"boot_prefixes=/ /boot/\0" \
|
||||
"boot_scripts=boot.scr.uimg boot.scr\0" \
|
||||
"boot_script_dhcp=boot.scr.uimg\0" \
|
||||
+ "boot_uenv_files=uEnv.txt\0" \
|
||||
BOOTENV_BOOT_TARGETS \
|
||||
\
|
||||
"boot_extlinux=" \
|
||||
@@ -209,11 +210,31 @@
|
||||
"fi; " \
|
||||
"done\0" \
|
||||
\
|
||||
+ "import_uenv_file=" \
|
||||
+ "load ${devtype} ${devnum}:${bootpart} " \
|
||||
+ "${scriptaddr} ${prefix}${uenv_file}; " \
|
||||
+ "env import -t -r ${scriptaddr} ${filesize}\0; " \
|
||||
+ "if test -n $uenvcmd; then " \
|
||||
+ "echo Running uenvcmd ...;" \
|
||||
+ "run uenvcmd;" \
|
||||
+ "fi;\0" \
|
||||
+ \
|
||||
+ "scan_dev_for_uenv_files=" \
|
||||
+ "for uenv_file in ${boot_uenv_files}; do " \
|
||||
+ "if test -e ${devtype} ${devnum}:${bootpart} " \
|
||||
+ "${prefix}${uenv_file}; then " \
|
||||
+ "echo Found U-boot env file" \
|
||||
+ "${prefix}${uenv_file}; " \
|
||||
+ "run import_uenv_file; " \
|
||||
+ "fi; " \
|
||||
+ "done\0" \
|
||||
+ \
|
||||
"scan_dev_for_boot=" \
|
||||
"echo Scanning ${devtype} ${devnum}:${bootpart}...; " \
|
||||
"for prefix in ${boot_prefixes}; do " \
|
||||
"run scan_dev_for_extlinux; " \
|
||||
"run scan_dev_for_scripts; " \
|
||||
+ "run scan_dev_for_uenv_files; " \
|
||||
"done\0" \
|
||||
\
|
||||
"scan_dev_for_boot_part=" \
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 93e869c13a91418a0024b059f3c13063bfbceca4 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 14:05:39 +0000
|
||||
Subject: [PATCH 12/14] beagle board: use ext support in the SPL
|
||||
|
||||
---
|
||||
include/configs/omap3_beagle.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
|
||||
index f25a940..eb782d8 100644
|
||||
--- a/include/configs/omap3_beagle.h
|
||||
+++ b/include/configs/omap3_beagle.h
|
||||
@@ -297,6 +297,9 @@
|
||||
/* Defines for SPL */
|
||||
#define CONFIG_SPL_OMAP3_ID_NAND
|
||||
|
||||
+#define CONFIG_SPL_EXT_SUPPORT
|
||||
+#undef CONFIG_SPL_FAT_SUPPORT
|
||||
+
|
||||
/* NAND boot config */
|
||||
#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16
|
||||
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From c1b63c708f15f8840307507b649c36abb529c08f Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Sat, 21 Mar 2015 12:17:08 -0500
|
||||
Subject: [PATCH 13/14] WANDBOARD: run the dsitro bootcmd first before falling
|
||||
back to old settings
|
||||
|
||||
---
|
||||
include/configs/wandboard.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
||||
index 1d8459c..07c3d63 100644
|
||||
--- a/include/configs/wandboard.h
|
||||
+++ b/include/configs/wandboard.h
|
||||
@@ -238,6 +238,7 @@
|
||||
BOOTENV
|
||||
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
+ "run distro_bootcmd;" \
|
||||
"mmc dev ${mmcdev}; if mmc rescan; then " \
|
||||
"if run loadbootscript; then " \
|
||||
"run bootscript; " \
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 78f73ac35437d852f432a60ec4aac279cb46cb29 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Sat, 21 Mar 2015 12:36:45 -0500
|
||||
Subject: [PATCH 14/14] BBB tell u-boot to look in the first partition to load
|
||||
contents
|
||||
|
||||
---
|
||||
include/configs/am335x_evm.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
|
||||
index 3fb175e..f223309 100644
|
||||
--- a/include/configs/am335x_evm.h
|
||||
+++ b/include/configs/am335x_evm.h
|
||||
@@ -86,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" \
|
||||
--
|
||||
2.3.2
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
dafee1b3cb07086f81035aec64bc2342 u-boot-2015.07-rc2.tar.bz2
|
||||
9cb8cab32f2bebbc271c507eb33bcd8c u-boot-2015.07-rc3.tar.bz2
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
%global candidate rc2
|
||||
%global candidate rc3
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2015.07
|
||||
Release: 0.3%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 0.4%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
|
||||
Group: Development/Tools
|
||||
@ -11,31 +11,14 @@ 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
|
||||
#Patch4: 0004-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
|
||||
#Patch5: 0005-add-back-adding-console-to-the-bootargs-if-not-prese.patch
|
||||
#Patch6: 0006-wandboard-port-to-generic-distro-booting.patch
|
||||
#Patch7: 0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
|
||||
#Patch8: 0008-port-utilite-to-distro-generic-boot-commands.patch
|
||||
#Patch9: 0009-RiOT-board-set-console-speed.patch
|
||||
#Patch10: 0010-Add-support-for-loading-environment-from-uEnv.txt-in.patch
|
||||
#Patch11: 0011-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||
#Patch12: 0012-beagle-board-use-ext-support-in-the-SPL.patch
|
||||
#Patch13: 0013-WANDBOARD-run-the-dsitro-bootcmd-first-before-fallin.patch
|
||||
#Patch14: 0014-BBB-tell-u-boot-to-look-in-the-first-partition-to-lo.patch
|
||||
#Patch15: 0001-omap4-distro-boot-partition-fixup.patch
|
||||
Patch1: 0001-Drop-duplicate-CONFIG_SYS_NO_FLASH-from-mx6_common.patch
|
||||
Patch2: 0002-mx6cuboxi-drop-options-that-are-duplicated-in-mx6_co.patch
|
||||
Patch3: 0003-imx6-standardise-OCOTP-and-fuse-config-to-mx6_common.patch
|
||||
Patch4: 0005-wandboard-add-support-for-generic-distro-boot.patch
|
||||
Patch5: 0006-am33xx-add-support-for-generic-distro-boot.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: dtc
|
||||
@ -200,6 +183,10 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jul 2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.4rc3
|
||||
- Update to 2015.07rc3
|
||||
- Some fixes for omap4/am33xx/imx6 devices
|
||||
|
||||
* Mon Jun 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.3rc2
|
||||
- Initial rebase of BBB/panda/wandboard generic distro boot support
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user