diff options
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.patch | 30 |
1 files changed, 15 insertions, 15 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 60c5171..174f3b0 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 @@ | |||
1 | From 7538ad166d0fb1999f32f2d80969184484c2ba07 Mon Sep 17 00:00:00 2001 | 1 | From 1d5baa56ff177d7858727d1c4428096781e3817c Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@digia.com> | 2 | From: Samuli Piippo <samuli.piippo@digia.com> |
3 | Date: Mon, 27 Oct 2014 14:53:25 +0200 | 3 | Date: Mon, 27 Oct 2014 14:53:25 +0200 |
4 | Subject: [PATCH] Update default args for apalis imx6 | 4 | Subject: [PATCH] Update default args for apalis imx6 |
@@ -10,30 +10,30 @@ disable cursor blinking. | |||
10 | 1 file changed, 8 insertions(+), 7 deletions(-) | 10 | 1 file changed, 8 insertions(+), 7 deletions(-) |
11 | 11 | ||
12 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h | 12 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h |
13 | index 5d32118..289d611 100644 | 13 | index 162be2e..f659384 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 | @@ -212,14 +212,14 @@ | 16 | @@ -246,14 +246,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 \ |
20 | - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ | 20 | - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ |
21 | - "rootwait\0" \ | 21 | - "rootwait\0" \ |
22 | + "drive=2\0" \ | 22 | + "drive=2\0" \ |
23 | "sdboot=" "run setup; " \ | 23 | "sdboot=run setup; " \ |
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 8bit slot...; " \ |
28 | - "run sddtbload; fatload mmc 1:1 ${kernel_addr_r} " \ | 28 | - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ |
29 | + "run sddtbload; fatload 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" \ |
31 | - "sddtbload=setenv dtbparam; fatload mmc 1:1 ${fdt_addr_r} " \ | 31 | - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ |
32 | + "sddtbload=setenv dtbparam; fatload mmc ${drive}:1 ${fdt_addr_r} " \ | 32 | + "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ |
33 | "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | 33 | "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" |
34 | 34 | ||
35 | #ifndef CONFIG_APALIS_IMX6_V1_0 | 35 | #define USB_BOOTCMD \ |
36 | @@ -229,7 +229,8 @@ | 36 | @@ -273,7 +273,8 @@ |
37 | #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" | 37 | #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" |
38 | #endif | 38 | #endif |
39 | #define CONFIG_EXTRA_ENV_SETTINGS \ | 39 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
@@ -43,15 +43,15 @@ index 5d32118..289d611 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 | @@ -242,7 +243,7 @@ | 46 | @@ -292,7 +293,7 @@ |
47 | NFS_BOOTCMD \ | 47 | "|| setenv drive 2; load ${interface} ${drive}:1 " \ |
48 | SD_BOOTCMD \ | 48 | "${kernel_addr_r} flash_blk.img\0" \ |
49 | "setup=setenv setupargs fec_mac=${ethaddr} " \ | 49 | "setup=setenv setupargs fec_mac=${ethaddr} " \ |
50 | - "consoleblank=0 no_console_suspend=1 console=tty1 " \ | 50 | - "consoleblank=0 no_console_suspend=1 console=tty1 " \ |
51 | + "consoleblank=0 no_console_suspend=1 vt.global_cursor_default=0 " \ | 51 | + "consoleblank=0 no_console_suspend=1 vt.global_cursor_default=0 " \ |
52 | "console=${console},${baudrate}n8\0 " \ | 52 | "console=${console},${baudrate}n8\0 " \ |
53 | "setupdate=setenv drive 1; fatload mmc ${drive}:1 ${kernel_addr_r} " \ | 53 | "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ |
54 | "flash_mmc.img || setenv drive 2; fatload mmc ${drive}:1 " \ | 54 | " source ${kernel_addr_r}\0" \ |
55 | -- | 55 | -- |
56 | 1.9.1 | 56 | 1.9.1 |
57 | 57 | ||