aboutsummaryrefslogtreecommitdiffstats
path: root/meta-toradex-extras/recipes/u-boot/u-boot-toradex
diff options
context:
space:
mode:
Diffstat (limited to 'meta-toradex-extras/recipes/u-boot/u-boot-toradex')
-rw-r--r--meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch57
-rw-r--r--meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch36
-rw-r--r--meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch12
-rw-r--r--meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch25
-rw-r--r--meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch14
5 files changed, 0 insertions, 144 deletions
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
deleted file mode 100644
index b7c7d637..00000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 94531a3ecaea073316b9e4c341085ce5e277bd9f 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
-
-Boot from sd card by default, disable kernel logs from tty1, and
-disable cursor blinking.
----
- 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 e7d0d20..a1d425d 100644
---- a/include/configs/apalis_imx6.h
-+++ b/include/configs/apalis_imx6.h
-@@ -251,14 +251,14 @@
- "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
- #define SD_BOOTCMD \
-- "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \
-- "rootwait\0" \
-+ "drive=2\0" \
- "sdboot=run setup; " \
-- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-+ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \
-+ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \
- "${vidargs}; echo Booting from SD card in 8-bit slot...; " \
-- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-+ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \
- "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \
-- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
-+ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \
- "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
- #define USB_BOOTCMD \
-@@ -278,7 +278,8 @@
- #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
- #endif
- #define CONFIG_EXTRA_ENV_SETTINGS \
-- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
-+ "run emmcboot ; echo ; echo emmcboot failed ; " \
- "run nfsboot ; echo ; echo nfsboot failed ; " \
- "usb start ;" \
- "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -299,7 +300,7 @@
- "|| setenv drive 2; load ${interface} ${drive}:1 " \
- "${kernel_addr_r} flash_blk.img\0" \
- "setup=setenv setupargs fec_mac=${ethaddr} " \
-- "consoleblank=0 no_console_suspend=1 console=tty1 " \
-+ "consoleblank=0 no_console_suspend=1 vt.global_cursor_default=0 " \
- "console=${console},${baudrate}n8\0 " \
- "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
- " source ${kernel_addr_r}\0" \
---
-1.9.1
-
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
deleted file mode 100644
index 07431286..00000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 10ebeba59e6fd25352aa44ecd85913126ec45afe Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 24 Feb 2016 15:39:52 +0200
-Subject: [PATCH] colibri imx6: enable sdboot by default
-
-remove console from tty1
----
- include/configs/colibri_imx6.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
-index c545334..eb0dfa9 100644
---- a/include/configs/colibri_imx6.h
-+++ b/include/configs/colibri_imx6.h
-@@ -242,7 +242,8 @@
-
- #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
- #define CONFIG_EXTRA_ENV_SETTINGS \
-- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
-+ "run emmcboot ; echo ; echo emmcboot failed ; " \
- "run nfsboot ; echo ; echo nfsboot failed ; " \
- "usb start ;" \
- "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -261,7 +262,7 @@
- "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \
- "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\0" \
- "setup=setenv setupargs fec_mac=${ethaddr} " \
-- "consoleblank=0 no_console_suspend=1 console=tty1 " \
-+ "consoleblank=0 no_console_suspend=1 " \
- "console=${console},${baudrate}n8\0 " \
- "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
- " source ${kernel_addr_r}\0" \
---
-1.9.1
-
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
deleted file mode 100644
index 501ad33b..00000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur git.orig/include/configs/colibri_imx7.h git/include/configs/colibri_imx7.h
---- git.orig/include/configs/colibri_imx7.h 2016-07-15 12:31:35.915934824 +0300
-+++ git/include/configs/colibri_imx7.h 2016-07-15 12:32:40.867937388 +0300
-@@ -248,7 +248,7 @@
- "${board}/flash_eth.img && source ${loadaddr}\0" \
- "setsdupdate=mmc rescan && setenv interface mmc && " \
- "fatload ${interface} 0:1 ${loadaddr} " \
-- "${board}/flash_blk.img && source ${loadaddr}\0" \
-+ "/flash_blk.img && source ${loadaddr}\0" \
- "setup=setenv setupargs " \
- "console=tty1 console=${console}" \
- ",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
deleted file mode 100644
index b54a4ae0..00000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f480a948551b0e5592d93cb7a5dc1653de900909 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 24 Feb 2016 16:01:33 +0200
-Subject: [PATCH] colibri vf: remove console from tty1
-
----
- include/configs/colibri_vf.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index b870812..0726fc5 100644
---- a/include/configs/colibri_vf.h
-+++ b/include/configs/colibri_vf.h
-@@ -202,7 +202,7 @@
- "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
- "source ${loadaddr}\0" \
- "setup=setenv setupargs " \
-- "console=tty1 console=${console}" \
-+ "console=${console}" \
- ",${baudrate}n8 ${memargs} consoleblank=0\0" \
- "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
- "setusbupdate=usb start && setenv interface usb && " \
---
-1.9.1
-
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
deleted file mode 100644
index 25476ddf..00000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur git.orig/include/configs/colibri_vf.h git/include/configs/colibri_vf.h
---- git.orig/include/configs/colibri_vf.h 2016-07-15 12:05:41.263873456 +0300
-+++ git/include/configs/colibri_vf.h 2016-07-15 12:06:19.759874976 +0300
-@@ -161,8 +161,8 @@
- "sdargs=root=/dev/mmcblk0p2 rw rootwait\0" \
- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
- "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-- "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \
-- "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
-+ "load mmc 0:1 ${kernel_addr_r} /${kernel_file} && " \
-+ "load mmc 0:1 ${fdt_addr_r} /${soc}-colibri-${fdt_board}.dtb && " \
- "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-
- #define NFS_BOOTCMD \