[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-426-g9d137b0

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  9d137b0fc41da0b82bc9c5b231bfddd777c6e3d1 (commit)
       via  596b7b7c82cded24ff9f0e99e43b9fa9c7f6f036 (commit)
      from  f46cf4b4315d14243ed88b1b4e07ce15b22e5bd4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9d137b0fc41da0b82bc9c5b231bfddd777c6e3d1
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Oct 2 14:49:19 2014 +0200

    [UBOOT] Under Linux, eMMC is now mmcblk2 (staticaly defined)

commit 596b7b7c82cded24ff9f0e99e43b9fa9c7f6f036
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Oct 2 14:48:21 2014 +0200

    [LINUX] fix mmc numbering, eMMC->mmcblk2, SD -> mmcblk1

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf6/apf6-u-boot-2014.07.h     |    2 +-
 .../3.16/0506-armadeus-change_mmc_numbering.patch  |   21 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)
 create mode 100644 patches/linux/3.16/0506-armadeus-change_mmc_numbering.patch

diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index dc9ab7e..7f21060 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -127,7 +127,7 @@
 	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
 	"mmcpart=1\0" \
-	"mmcroot=/dev/mmcblk0p2 ro\0" \
+	"mmcroot=/dev/mmcblk2p2 ro\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
 	"update_sd_firmware_filename=u-boot.imx\0" \
 	"update_sd_firmware=" \
diff --git a/patches/linux/3.16/0506-armadeus-change_mmc_numbering.patch b/patches/linux/3.16/0506-armadeus-change_mmc_numbering.patch
new file mode 100644
index 0000000..87b6d5a
--- /dev/null
+++ b/patches/linux/3.16/0506-armadeus-change_mmc_numbering.patch
@@ -0,0 +1,21 @@
+Fix SD slot numbering.
+
+eMMC -> mmcblk2
+microSD -> mmcblk1
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
+---
+Index: linux-3.16/drivers/mmc/card/block.c
+===================================================================
+--- linux-3.16.orig/drivers/mmc/card/block.c	2014-10-02 12:10:07.741220869 +0200
++++ linux-3.16/drivers/mmc/card/block.c	2014-10-02 14:08:25.843109903 +0200
+@@ -2162,7 +2162,7 @@
+ 	 */
+ 
+ 	snprintf(md->disk->disk_name, sizeof(md->disk->disk_name),
+-		 "mmcblk%d%s", md->name_idx, subname ? subname : "");
++		 "mmcblk%d%s", card->host->index, subname ? subname : "");
+ 
+ 	if (mmc_card_mmc(card))
+ 		blk_queue_logical_block_size(md->queue.queue,


hooks/post-receive
-- 
armadeus