summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurz <akurz@kbdbabel.org>2019-05-20 20:11:31 +0000
committerSascha Hauer <s.hauer@pengutronix.de>2019-05-21 11:46:31 +0200
commit3da7b102b17e8ba1311749cbd2fb0be1c62bb615 (patch)
treea31fcabd190a5df07c17d058526fd83a9dd5cb6a
parentaf5b2e70c43f0dffbbabbcdb179624c5497eb5e4 (diff)
downloadbarebox-3da7b102b17e8ba1311749cbd2fb0be1c62bb615.tar.gz
ARM: boards: kindle mx50: adapt MCI name to DTS
The MCI instances got aliases in the DTS from linux upstream which changed the eMMC devicename e.g. from disk0 to mmc2. Adapt to this. Signed-off-by: Alexander Kurz <akurz@blala.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--Documentation/boards/imx/amazon-kindle-4-5.rst4
-rw-r--r--arch/arm/boards/kindle-mx50/board.c2
-rw-r--r--arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/boot/mmc_kernel2
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/boards/imx/amazon-kindle-4-5.rst b/Documentation/boards/imx/amazon-kindle-4-5.rst
index 26f072e..f71ffe1 100644
--- a/Documentation/boards/imx/amazon-kindle-4-5.rst
+++ b/Documentation/boards/imx/amazon-kindle-4-5.rst
@@ -68,5 +68,5 @@ e.g. for the D01100 just write the imx-header and the application section:
.. code-block:: console
$ loady -t usbserial
- $ memcpy -b -s barebox-kindle-d01100.img -d /dev/disk0.boot0.imx_header 1024 0 2048
- $ memcpy -b -s barebox-kindle-d01100.img -d /dev/disk0.boot0.self 4096 0 253952
+ $ memcpy -b -s barebox-kindle-d01100.img -d /dev/mmc2.boot0.imx_header 1024 0 2048
+ $ memcpy -b -s barebox-kindle-d01100.img -d /dev/mmc2.boot0.self 4096 0 253952
diff --git a/arch/arm/boards/kindle-mx50/board.c b/arch/arm/boards/kindle-mx50/board.c
index fb1d4c9..bfcb9b8 100644
--- a/arch/arm/boards/kindle-mx50/board.c
+++ b/arch/arm/boards/kindle-mx50/board.c
@@ -98,7 +98,7 @@ static void kindle_rev_init(void)
int ret;
size_t size;
void *buf;
- const char userdata[] = "/dev/disk0.boot0.userdata";
+ const char userdata[] = "/dev/mmc2.boot0.userdata";
ret = read_file_2(userdata, &size, &buf, 128);
if (ret && ret != -EFBIG) {
pr_err("Could not read board info from %s\n", userdata);
diff --git a/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/boot/mmc_kernel b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/boot/mmc_kernel
index 4f2cabd..b8d93be 100644
--- a/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/boot/mmc_kernel
+++ b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/boot/mmc_kernel
@@ -12,4 +12,4 @@ armlinux_system_serial="$global.board.ocotp_serial"
global linux.bootargs.dyn.root="root=/dev/mmcblk0p1 rootwait ro"
-bootm -c /dev/disk0.kernel
+bootm -c /dev/mmc2.kernel