blob: 8d28abe6e4e2b0ef70b3b3d684aa5356962aaf25 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
From 166dae45bcfcd92cd2802db785a30072f65c0900 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] 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 | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 3f224e54b8..9e1b5a0f75 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -238,12 +238,14 @@
"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
#define SD_BOOTCMD \
- "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \
- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+ "sddrive=1\0" \
+ "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 rootwait\0" \
+ "sdboot=run setup; run sdsetup; " \
+ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
"${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \
- "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \
+ "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} ${boot_file} " \
"&& run fdt_fixup && bootz ${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 \
|
