summaryrefslogtreecommitdiffstats
path: root/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch')
-rw-r--r--meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
index 174f3b0..b7c7d63 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
@@ -1,4 +1,4 @@
1From 1d5baa56ff177d7858727d1c4428096781e3817c Mon Sep 17 00:00:00 2001 1From 94531a3ecaea073316b9e4c341085ce5e277bd9f Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com> 2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Mon, 27 Oct 2014 14:53:25 +0200 3Date: Mon, 27 Oct 2014 14:53:25 +0200
4Subject: [PATCH] Update default args for apalis imx6 4Subject: [PATCH] Update default args for apalis imx6
@@ -10,10 +10,10 @@ disable cursor blinking.
10 1 file changed, 8 insertions(+), 7 deletions(-) 10 1 file changed, 8 insertions(+), 7 deletions(-)
11 11
12diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h 12diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
13index 162be2e..f659384 100644 13index e7d0d20..a1d425d 100644
14--- a/include/configs/apalis_imx6.h 14--- a/include/configs/apalis_imx6.h
15+++ b/include/configs/apalis_imx6.h 15+++ b/include/configs/apalis_imx6.h
16@@ -246,14 +246,14 @@ 16@@ -251,14 +251,14 @@
17 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" 17 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
18 18
19 #define SD_BOOTCMD \ 19 #define SD_BOOTCMD \
@@ -24,7 +24,7 @@ index 162be2e..f659384 100644
24- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ 24- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
25+ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ 25+ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \
26+ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ 26+ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \
27 "${vidargs}; echo Booting from SD card in 8bit slot...; " \ 27 "${vidargs}; echo Booting from SD card in 8-bit slot...; " \
28- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ 28- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
29+ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ 29+ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \
30 "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ 30 "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \
@@ -33,8 +33,8 @@ index 162be2e..f659384 100644
33 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" 33 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
34 34
35 #define USB_BOOTCMD \ 35 #define USB_BOOTCMD \
36@@ -273,7 +273,8 @@ 36@@ -278,7 +278,8 @@
37 #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" 37 #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
38 #endif 38 #endif
39 #define CONFIG_EXTRA_ENV_SETTINGS \ 39 #define CONFIG_EXTRA_ENV_SETTINGS \
40- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ 40- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
@@ -43,7 +43,7 @@ index 162be2e..f659384 100644
43 "run nfsboot ; echo ; echo nfsboot failed ; " \ 43 "run nfsboot ; echo ; echo nfsboot failed ; " \
44 "usb start ;" \ 44 "usb start ;" \
45 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ 45 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
46@@ -292,7 +293,7 @@ 46@@ -299,7 +300,7 @@
47 "|| setenv drive 2; load ${interface} ${drive}:1 " \ 47 "|| setenv drive 2; load ${interface} ${drive}:1 " \
48 "${kernel_addr_r} flash_blk.img\0" \ 48 "${kernel_addr_r} flash_blk.img\0" \
49 "setup=setenv setupargs fec_mac=${ethaddr} " \ 49 "setup=setenv setupargs fec_mac=${ethaddr} " \