diff options
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.patch | 63 |
1 files changed, 50 insertions, 13 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 bf7861e..f6dc0cc 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,20 +1,21 @@ | |||
1 | From 003b18993fe1c5b1e64a44a3b831c63afb0e9a94 Mon Sep 17 00:00:00 2001 | 1 | From f86bb70bd270967082cb8132eb68c3c3dea4a7a7 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Mon, 15 May 2017 15:31:36 +0300 | 3 | Date: Mon, 15 May 2017 15:31:36 +0300 |
4 | Subject: [PATCH] Make sdboot default on all boards | 4 | Subject: [PATCH 1/2] Make sdboot default on all boards |
5 | 5 | ||
6 | ... and remove console=tty1 from kernel args | ||
6 | --- | 7 | --- |
7 | include/configs/apalis_imx6.h | 3 ++- | 8 | include/configs/apalis_imx6.h | 5 +++-- |
8 | include/configs/colibri_imx6.h | 3 ++- | 9 | include/configs/colibri_imx6.h | 5 +++-- |
9 | include/configs/colibri_imx7.h | 2 +- | 10 | include/configs/colibri_imx7.h | 4 ++-- |
10 | include/configs/colibri_vf.h | 2 +- | 11 | include/configs/colibri_vf.h | 4 ++-- |
11 | 4 files changed, 6 insertions(+), 4 deletions(-) | 12 | 4 files changed, 10 insertions(+), 8 deletions(-) |
12 | 13 | ||
13 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h | 14 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h |
14 | index 8dce5af..4f2f689 100644 | 15 | index 76cbdf2..9b42af9 100644 |
15 | --- a/include/configs/apalis_imx6.h | 16 | --- a/include/configs/apalis_imx6.h |
16 | +++ b/include/configs/apalis_imx6.h | 17 | +++ b/include/configs/apalis_imx6.h |
17 | @@ -256,7 +256,8 @@ | 18 | @@ -257,7 +257,8 @@ |
18 | #endif | 19 | #endif |
19 | #define CONFIG_EXTRA_ENV_SETTINGS \ | 20 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
20 | BOOTENV \ | 21 | BOOTENV \ |
@@ -24,11 +25,20 @@ index 8dce5af..4f2f689 100644 | |||
24 | "run distro_bootcmd ; " \ | 25 | "run distro_bootcmd ; " \ |
25 | "usb start ;" \ | 26 | "usb start ;" \ |
26 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | 27 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ |
28 | @@ -280,7 +281,7 @@ | ||
29 | " ${loadaddr} flash_blk.img && " \ | ||
30 | "source ${loadaddr}\0" \ | ||
31 | "setup=setenv setupargs fec_mac=${ethaddr} " \ | ||
32 | - "consoleblank=0 no_console_suspend=1 console=tty1 " \ | ||
33 | + "consoleblank=0 no_console_suspend=1 " \ | ||
34 | "console=${console},${baudrate}n8\0 " \ | ||
35 | "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ | ||
36 | "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ | ||
27 | diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h | 37 | diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h |
28 | index af49bcc..f6c6e9a 100644 | 38 | index ab561f3..cbaeece 100644 |
29 | --- a/include/configs/colibri_imx6.h | 39 | --- a/include/configs/colibri_imx6.h |
30 | +++ b/include/configs/colibri_imx6.h | 40 | +++ b/include/configs/colibri_imx6.h |
31 | @@ -231,7 +231,8 @@ | 41 | @@ -232,7 +232,8 @@ |
32 | #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" | 42 | #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" |
33 | #define CONFIG_EXTRA_ENV_SETTINGS \ | 43 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
34 | BOOTENV \ | 44 | BOOTENV \ |
@@ -38,8 +48,17 @@ index af49bcc..f6c6e9a 100644 | |||
38 | "run distro_bootcmd ; " \ | 48 | "run distro_bootcmd ; " \ |
39 | "usb start ;" \ | 49 | "usb start ;" \ |
40 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | 50 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ |
51 | @@ -253,7 +254,7 @@ | ||
52 | "${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ | ||
53 | "source ${loadaddr}\0" \ | ||
54 | "setup=setenv setupargs fec_mac=${ethaddr} " \ | ||
55 | - "consoleblank=0 no_console_suspend=1 console=tty1 " \ | ||
56 | + "consoleblank=0 no_console_suspend=1 " \ | ||
57 | "console=${console},${baudrate}n8\0 " \ | ||
58 | "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ | ||
59 | "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ | ||
41 | diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h | 60 | diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h |
42 | index 1709032..01a8f43 100644 | 61 | index 2d6cee3..6773296 100644 |
43 | --- a/include/configs/colibri_imx7.h | 62 | --- a/include/configs/colibri_imx7.h |
44 | +++ b/include/configs/colibri_imx7.h | 63 | +++ b/include/configs/colibri_imx7.h |
45 | @@ -104,7 +104,7 @@ | 64 | @@ -104,7 +104,7 @@ |
@@ -51,8 +70,17 @@ index 1709032..01a8f43 100644 | |||
51 | "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" | 70 | "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" |
52 | 71 | ||
53 | #define BOOTENV_RUN_NET_USB_START "" | 72 | #define BOOTENV_RUN_NET_USB_START "" |
73 | @@ -138,7 +138,7 @@ | ||
74 | "fatload ${interface} 0:1 ${loadaddr} " \ | ||
75 | "${board}/flash_blk.img && source ${loadaddr}\0" \ | ||
76 | "setup=setenv setupargs " \ | ||
77 | - "console=tty1 console=${console}" \ | ||
78 | + "console=${console}" \ | ||
79 | ",${baudrate}n8 ${memargs} consoleblank=0\0" \ | ||
80 | "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ | ||
81 | "setusbupdate=usb start && setenv interface usb && " \ | ||
54 | diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h | 82 | diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h |
55 | index 6770f62..73a316a 100644 | 83 | index 7fea78b..5bc3e3d 100644 |
56 | --- a/include/configs/colibri_vf.h | 84 | --- a/include/configs/colibri_vf.h |
57 | +++ b/include/configs/colibri_vf.h | 85 | +++ b/include/configs/colibri_vf.h |
58 | @@ -155,7 +155,7 @@ | 86 | @@ -155,7 +155,7 @@ |
@@ -64,3 +92,12 @@ index 6770f62..73a316a 100644 | |||
64 | "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" | 92 | "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" |
65 | 93 | ||
66 | #define BOOTENV_RUN_NET_USB_START "" | 94 | #define BOOTENV_RUN_NET_USB_START "" |
95 | @@ -190,7 +190,7 @@ | ||
96 | "fatload ${interface} 0:1 ${loadaddr} " \ | ||
97 | "${board}/flash_blk.img && source ${loadaddr}\0" \ | ||
98 | "setup=setenv setupargs " \ | ||
99 | - "console=tty1 console=${console}" \ | ||
100 | + "console=${console}" \ | ||
101 | ",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \ | ||
102 | "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ | ||
103 | "setusbupdate=usb start && setenv interface usb && " \ | ||