diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-02-02 09:29:17 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-02-19 11:23:10 +0200 |
| commit | f56c2355a8a1bece0afd94783b0b787775781dba (patch) | |
| tree | cb808c6f87f4223f695618244bd57cad08cbb3ce /meta-toradex-extras | |
| parent | 4a8019ef9314bba9a8ecaa01a899b9602fab744b (diff) | |
apalis-imx6: update u-boot patch to match upstream changes
Change-Id: I9b53e51a6320c47d7491a87e8fa75ab756871cc8
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'meta-toradex-extras')
| -rw-r--r-- | meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch | 22 |
1 files changed, 13 insertions, 9 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 c7f0f9bf..60c5171e 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 @@ -From 7872f8e770a202f41fbcf0372b27eb3669c433a1 Mon Sep 17 00:00:00 2001 +From 7538ad166d0fb1999f32f2d80969184484c2ba07 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@digia.com> Date: Mon, 27 Oct 2014 14:53:25 +0200 Subject: [PATCH] Update default args for apalis imx6 @@ -6,14 +6,14 @@ Subject: [PATCH] Update default args for apalis imx6 Boot from sd card by default, disable kernel logs from tty1, and disable cursor blinking. --- - include/configs/apalis-imx6.h | 15 ++++++++------- + include/configs/apalis_imx6.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/include/configs/apalis-imx6.h b/include/configs/apalis-imx6.h -index 3fb17e2..728c5dd 100644 ---- a/include/configs/apalis-imx6.h -+++ b/include/configs/apalis-imx6.h -@@ -205,18 +205,19 @@ +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index 5d32118..289d611 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -212,14 +212,14 @@ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define SD_BOOTCMD \ @@ -32,6 +32,10 @@ index 3fb17e2..728c5dd 100644 + "sddtbload=setenv dtbparam; fatload mmc ${drive}:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + #ifndef CONFIG_APALIS_IMX6_V1_0 +@@ -229,7 +229,8 @@ + #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" + #endif #define CONFIG_EXTRA_ENV_SETTINGS \ - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ @@ -39,7 +43,7 @@ index 3fb17e2..728c5dd 100644 "run nfsboot ; echo ; echo nfsboot failed ; " \ "usb start ;" \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -229,7 +230,7 @@ +@@ -242,7 +243,7 @@ NFS_BOOTCMD \ SD_BOOTCMD \ "setup=setenv setupargs fec_mac=${ethaddr} " \ @@ -49,5 +53,5 @@ index 3fb17e2..728c5dd 100644 "setupdate=setenv drive 1; fatload mmc ${drive}:1 ${kernel_addr_r} " \ "flash_mmc.img || setenv drive 2; fatload mmc ${drive}:1 " \ -- -1.8.3.2 +1.9.1 |