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 | 80 |
1 files changed, 30 insertions, 50 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 135dfd8..bf7861e 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,86 +1,66 @@ | |||
1 | From 4c748ee698961515c1602373f4f5d399c0a8e4a1 Mon Sep 17 00:00:00 2001 | 1 | From 003b18993fe1c5b1e64a44a3b831c63afb0e9a94 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: Wed, 14 Sep 2016 17:10:22 +0300 | 3 | Date: Mon, 15 May 2017 15:31:36 +0300 |
4 | Subject: [PATCH] Make sdboot default on all boards | 4 | Subject: [PATCH] Make sdboot default on all boards |
5 | 5 | ||
6 | --- | 6 | --- |
7 | include/configs/apalis_imx6.h | 13 +++++++------ | 7 | include/configs/apalis_imx6.h | 3 ++- |
8 | include/configs/colibri_imx6.h | 3 ++- | 8 | include/configs/colibri_imx6.h | 3 ++- |
9 | include/configs/colibri_imx7.h | 2 +- | 9 | include/configs/colibri_imx7.h | 2 +- |
10 | include/configs/colibri_vf.h | 2 +- | 10 | include/configs/colibri_vf.h | 2 +- |
11 | 4 files changed, 11 insertions(+), 9 deletions(-) | 11 | 4 files changed, 6 insertions(+), 4 deletions(-) |
12 | 12 | ||
13 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h | 13 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h |
14 | index 3ea4a5c..53d9a0c 100644 | 14 | index 8dce5af..4f2f689 100644 |
15 | --- a/include/configs/apalis_imx6.h | 15 | --- a/include/configs/apalis_imx6.h |
16 | +++ b/include/configs/apalis_imx6.h | 16 | +++ b/include/configs/apalis_imx6.h |
17 | @@ -252,14 +252,14 @@ | 17 | @@ -256,7 +256,8 @@ |
18 | "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | ||
19 | |||
20 | #define SD_BOOTCMD \ | ||
21 | - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ | ||
22 | - "rootwait\0" \ | ||
23 | + "drive=2\0" \ | ||
24 | "sdboot=run setup; " \ | ||
25 | - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ | ||
26 | + "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ | ||
27 | + "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ | ||
28 | "${vidargs}; echo Booting from SD card in 8-bit slot...; " \ | ||
29 | - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ | ||
30 | + "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ | ||
31 | "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ | ||
32 | - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ | ||
33 | + "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ | ||
34 | "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | ||
35 | |||
36 | #define USB_BOOTCMD \ | ||
37 | @@ -279,7 +279,8 @@ | ||
38 | #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" | ||
39 | #endif | 18 | #endif |
40 | #define CONFIG_EXTRA_ENV_SETTINGS \ | 19 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
20 | BOOTENV \ | ||
41 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ | 21 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ |
42 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ | 22 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ |
43 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ | 23 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ |
44 | "run nfsboot ; echo ; echo nfsboot failed ; " \ | 24 | "run distro_bootcmd ; " \ |
45 | "usb start ;" \ | 25 | "usb start ;" \ |
46 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | 26 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ |
47 | diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h | 27 | diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h |
48 | index adc2d1e..9fd5f4c 100644 | 28 | index af49bcc..f6c6e9a 100644 |
49 | --- a/include/configs/colibri_imx6.h | 29 | --- a/include/configs/colibri_imx6.h |
50 | +++ b/include/configs/colibri_imx6.h | 30 | +++ b/include/configs/colibri_imx6.h |
51 | @@ -245,7 +245,8 @@ | 31 | @@ -231,7 +231,8 @@ |
52 | |||
53 | #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" | 32 | #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" |
54 | #define CONFIG_EXTRA_ENV_SETTINGS \ | 33 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
34 | BOOTENV \ | ||
55 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ | 35 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ |
56 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ | 36 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ |
57 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ | 37 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ |
58 | "run nfsboot ; echo ; echo nfsboot failed ; " \ | 38 | "run distro_bootcmd ; " \ |
59 | "usb start ;" \ | 39 | "usb start ;" \ |
60 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | 40 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ |
61 | diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h | 41 | diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h |
62 | index e585c81..f6267a7 100644 | 42 | index 1709032..01a8f43 100644 |
63 | --- a/include/configs/colibri_imx7.h | 43 | --- a/include/configs/colibri_imx7.h |
64 | +++ b/include/configs/colibri_imx7.h | 44 | +++ b/include/configs/colibri_imx7.h |
65 | @@ -226,7 +226,7 @@ | 45 | @@ -104,7 +104,7 @@ |
66 | "ubi read ${fdt_addr_r} dtb && " \ | 46 | "ubi read ${fdt_addr_r} dtb && " \ |
67 | "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ | 47 | "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ |
68 | 48 | ||
69 | -#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" | 49 | -#define CONFIG_BOOTCOMMAND "run ubiboot; " \ |
70 | +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" | 50 | +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ |
71 | 51 | "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" | |
72 | #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 | ||
73 | 52 | ||
53 | #define BOOTENV_RUN_NET_USB_START "" | ||
74 | diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h | 54 | diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h |
75 | index 26cf60a..33a3e3b 100644 | 55 | index 6770f62..73a316a 100644 |
76 | --- a/include/configs/colibri_vf.h | 56 | --- a/include/configs/colibri_vf.h |
77 | +++ b/include/configs/colibri_vf.h | 57 | +++ b/include/configs/colibri_vf.h |
78 | @@ -185,7 +185,7 @@ | 58 | @@ -155,7 +155,7 @@ |
79 | "ubi read ${fdt_addr_r} dtb && " \ | 59 | "ubi read ${fdt_addr_r} dtb && " \ |
80 | "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ | 60 | "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ |
81 | |||
82 | -#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" | ||
83 | +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" | ||
84 | 61 | ||
85 | #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" | 62 | -#define CONFIG_BOOTCOMMAND "run ubiboot; " \ |
63 | +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ | ||
64 | "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" | ||
86 | 65 | ||
66 | #define BOOTENV_RUN_NET_USB_START "" | ||