From 3da7b102b17e8ba1311749cbd2fb0be1c62bb615 Mon Sep 17 00:00:00 2001 From: Alexander Kurz Date: Mon, 20 May 2019 20:11:31 +0000 Subject: 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 Signed-off-by: Sascha Hauer --- arch/arm/boards/kindle-mx50/board.c | 2 +- arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/boot/mmc_kernel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/boards') diff --git a/arch/arm/boards/kindle-mx50/board.c b/arch/arm/boards/kindle-mx50/board.c index fb1d4c9375..bfcb9b83be 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 4f2cabd54e..b8d93be593 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 -- cgit v1.2.3