summaryrefslogtreecommitdiffstats
path: root/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-01-14 14:55:08 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-02-01 06:58:28 +0000
commit866106a38dae09dbba01d6a9d77bc80189f94ad8 (patch)
tree043b512df5417f74f5810803aafad34ef313ffe1 /meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
parente2e0faabe64b922df8865ca1df23768ebc3b1fcf (diff)
downloadmeta-boot2qt-866106a38dae09dbba01d6a9d77bc80189f94ad8.tar.gz
yocto: upgrade to yocto 2.6 (thud)
Initial upgrade commit from yocto 2.5.2 (sumo) -> 2.6 (thud). System & some group 1 devices related meta layers, appends & patches updated: * poky, meta-openembedded & meta-mingw updated to thud branch - layer.conf files updated to support thud where applicable - obsolete gstreamer-plugins-bad BBMASK + bbappend overide removed - ostree build issues fixed with upstream submodule patch * meta-freescale & meta-freescale-3rdparty updated to thud branch * meta-toradex-bsp-common & meta-toradex-nxp update to latest tagged release (2.8b5) in toradex/rocko branch - to fix build issue a systemd patch taken from meta-toradex-bsp-common toradex/master-next branch (thud compatible) - mask gstreamer recipes from toradex layer and use older versions for libav and plugins-ugly, so that they match the imx version of gstreamer. * meta-raspberry update to latest in master branch (where thud layer compatibility is set) * meta-tegra update to latest in thud branch - vulkan disabled from jetsons since NVIDIA's Vulkan support is for X only Task-number: QTBUG-72413 Change-Id: Ida277b66840babc23e877161a26f1ae1b3c68fda Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch')
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch70
1 files changed, 37 insertions, 33 deletions
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
index 2e5382f..df1429b 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
@@ -1,59 +1,63 @@
1From 1abe757120dd19518fd09d2013f518fba46c4d06 Mon Sep 17 00:00:00 2001 1From 74ffd57e80fd3f4e2d2d0b60e42a3b570aeb9c97 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 15 May 2017 15:31:36 +0300 3Date: Mon, 15 May 2017 15:31:36 +0300
4Subject: [PATCH] Make sdboot default on all boards 4Subject: [PATCH] Make sdboot default on all boards
5 5
6... and remove console=tty1 from kernel args 6... and remove console=tty1 from kernel args
7--- 7---
8 include/configs/apalis_imx6.h | 3 ++- 8 include/configs/apalis_imx6.h | 5 +++--
9 include/configs/colibri_imx6.h | 3 ++- 9 include/configs/colibri_imx6.h | 5 +++--
10 include/configs/colibri_imx7.h | 2 +- 10 include/configs/colibri_imx7.h | 2 +-
11 include/configs/colibri_vf.h | 2 +- 11 include/configs/colibri_vf.h | 2 +-
12 4 files changed, 6 insertions(+), 4 deletions(-) 12 4 files changed, 8 insertions(+), 6 deletions(-)
13 13
14diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h 14diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
15index 71dfeb56f5..8dcb5cc5e4 100644 15index fa40c629c3..ad0284de8a 100644
16--- a/include/configs/apalis_imx6.h 16--- a/include/configs/apalis_imx6.h
17+++ b/include/configs/apalis_imx6.h 17+++ b/include/configs/apalis_imx6.h
18@@ -256,7 +256,8 @@ 18@@ -177,8 +177,9 @@
19 #ifdef CONFIG_TDX_EASY_INSTALLER
20 #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
21 #else
22-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
23- "run distro_bootcmd; usb start; " \
24+#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
25+ "run emmcboot; echo; echo emmcboot failed; " \
26+ "run distro_bootcmd; usb start; " \
27 "setenv stdout serial,vga; setenv stdin serial,usbkbd"
19 #endif 28 #endif
20 #define CONFIG_EXTRA_ENV_SETTINGS \ 29
21 BOOTENV \
22- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
23+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
24+ "run emmcboot ; echo ; echo emmcboot failed ; " \
25 "run distro_bootcmd ; " \
26 "usb start ;" \
27 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
28diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h 30diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
29index f1fd5b422e..ae0f3c9bfa 100644 31index fda171bd9e..df49efc9ef 100644
30--- a/include/configs/colibri_imx6.h 32--- a/include/configs/colibri_imx6.h
31+++ b/include/configs/colibri_imx6.h 33+++ b/include/configs/colibri_imx6.h
32@@ -231,7 +231,8 @@ 34@@ -157,8 +157,9 @@
33 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" 35 #ifdef CONFIG_TDX_EASY_INSTALLER
34 #define CONFIG_EXTRA_ENV_SETTINGS \ 36 #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
35 BOOTENV \ 37 #else
36- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ 38-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
37+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ 39- "run distro_bootcmd; usb start; " \
38+ "run emmcboot ; echo ; echo emmcboot failed ; " \ 40+#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
39 "run distro_bootcmd ; " \ 41+ "run emmcboot ; echo ; echo emmcboot failed ; " \
40 "usb start ;" \ 42+ "run distro_bootcmd; usb start; " \
41 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ 43 "setenv stdout serial,vga; setenv stdin serial,usbkbd"
44 #endif
45
42diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h 46diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
43index ea04762b49..47e8bd266d 100644 47index 6c91951878..4200512fea 100644
44--- a/include/configs/colibri_imx7.h 48--- a/include/configs/colibri_imx7.h
45+++ b/include/configs/colibri_imx7.h 49+++ b/include/configs/colibri_imx7.h
46@@ -104,7 +104,7 @@ 50@@ -128,7 +128,7 @@
47 "ubi read ${fdt_addr_r} dtb && " \ 51 #define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \
48 "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ 52 "run bootcmd_mmc0; run ubiboot; run distro_bootcmd"
49 53 #else
50-#define CONFIG_BOOTCOMMAND "run ubiboot; " \ 54-#define CONFIG_BOOTCOMMAND "run ubiboot; " \
51+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ 55+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \
52 "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" 56 "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd"
57 #endif
53 58
54 #define BOOTENV_RUN_NET_USB_START ""
55diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h 59diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
56index db610d53f1..a2c942cafe 100644 60index 0579bfdc4e..65a5dada5f 100644
57--- a/include/configs/colibri_vf.h 61--- a/include/configs/colibri_vf.h
58+++ b/include/configs/colibri_vf.h 62+++ b/include/configs/colibri_vf.h
59@@ -155,7 +155,7 @@ 63@@ -155,7 +155,7 @@