diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-10-12 13:51:49 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-10-12 13:16:28 +0000 |
| commit | b51b11cd16c115f8aba0d25cd79ca2bae6bd8353 (patch) | |
| tree | 6cdf33b02740d08aaa54b5d2af52e3c60fae143c /meta-fsl-extras | |
| parent | c23e67cc73e4fe0d7c07dd79bd2380367d2047d6 (diff) | |
apalis-imx6: modify u-boot to provide support for ixora v1.0
Allow user to change drive slot where u-boot should use for booting.
Ixora v1.1 and v1.0 are using different slots.
Task-number: QTBUG-63458
Change-Id: I490438cb6d56910d84d9a392bb84a33f574375ce
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Diffstat (limited to 'meta-fsl-extras')
| -rw-r--r-- | meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch | 37 | ||||
| -rw-r--r-- | meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch new file mode 100644 index 00000000..1bf7c271 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch @@ -0,0 +1,37 @@ +From 1f3926a8e90a7e582d28b845e812d0642a4dc5ce Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Thu, 12 Oct 2017 11:02:54 +0300 +Subject: [PATCH 3/3] apalis-imx6: Ixora v1.0 support + +Add sddrive variable that can be changed to boot from different mmc card +slot when using different versions of ixora carrier board. +Default to drive 1, which is correct for Ixora v1.1. +--- + include/configs/apalis_imx6.h | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index 121eaa7..77a8874 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -227,15 +227,16 @@ + "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define SD_BOOTCMD \ +- "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \ ++ "sddrive=1\0" \ ++ "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 " \ + "rootwait\0" \ +- "sdboot=run setup; " \ ++ "sdboot=run setup; run sdsetup; " \ + "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ + "${vidargs}; echo Booting from SD card; " \ +- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ ++ "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} " \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${kernel_addr_r} ${dtbparam}\0" \ +- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ ++ "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define USB_BOOTCMD \ diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend index e501f5e9..78e32d38 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -31,4 +31,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-Make-sdboot-default-on-all-boards.patch \ file://0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch \ + file://0003-apalis-imx6-Ixora-v1.0-support.patch \ " |