[poky] [PATCH] yocto-bsps: u-boot: Search for rootfs partitions on both SD and eMMC

[Jussi Kukkonen]

On 2 June 2016 at 10:51, Kevin Hao <kexin.hao at windriver.com> wrote:
>
> From: Jussi Laako <jussi.laako at linux.intel.com>
>
> On BeagleBone Black, first attempt to find rootfs from microSD
> and then from eMMC if not available.
>
> Fixes: #9176
>
> Signed-off-by: Jussi Laako <jussi.laako at linux.intel.com>
> [Kevin: update to 2016.03, also add subject prefix and Upstream-Status]
> Signed-off-by: Kevin Hao <kexin.hao at windriver.com>
> ---
> This is based on the patch [1] posted by Jussi Laako. Add the
Upstream-Status
> tag as required by Saul, also tweak the subject and u-boot version.
>
> [1] https://lists.yoctoproject.org/pipermail/poky/2016-March/010419.html
>
>  ...r-bootable-partitions-on-both-SD-and-eMMC.patch | 42
++++++++++++++++++++++
>  .../recipes-bsp/u-boot/u-boot_2016.03.bbappend     |  3 ++
>  2 files changed, 45 insertions(+)
>  create mode 100644
meta-yocto-bsp/recipes-bsp/u-boot/u-boot/0001-Search-for-bootable-partitions-on-both-SD-and-eMMC.patch
>  create mode 100644
meta-yocto-bsp/recipes-bsp/u-boot/u-boot_2016.03.bbappend
>
> diff --git
a/meta-yocto-bsp/recipes-bsp/u-boot/u-boot/0001-Search-for-bootable-partitions-on-both-SD-and-eMMC.patch
b/meta-yocto-bsp/recipes-bsp/u-boot/u-boot/0001-Search-for-bootable-partitions-on-both-SD-and-eMMC.patch
> new file mode 100644
> index 0000000..6c4c59b
> --- /dev/null
> +++
b/meta-yocto-bsp/recipes-bsp/u-boot/u-boot/0001-Search-for-bootable-partitions-on-both-SD-and-eMMC.patch
> @@ -0,0 +1,42 @@
> +From 86cc560ff9a6578326532e277d987e24661e5f04 Mon Sep 17 00:00:00 2001
> +From: Jussi Laako <jussi.laako at linux.intel.com>
> +Date: Fri, 26 Feb 2016 14:58:32 +0200
> +Subject: [PATCH] Search for bootable partitions on both SD and eMMC
> +
> +On BeagleBone Black, first attempt to boot from microSD and then from
> +eMMC if not available.
> +
> +Upstream-Status: Inappropriate [not author]
> +
> +Signed-off-by: Jussi Laako <jussi.laako at linux.intel.com>
> +[Kevin: Add the Upstream-Status tag]

I realise there are cases when upstreaming is not a good choice but ... I
don't think this was what Saul was hoping for when he recommended
upstreaming and asked for an Upstream-Status the first time this patch was
sent.

Jussi

> +Signed-off-by: Kevin Hao <kexin.hao at windriver.com>
> +---
> + include/configs/ti_armv7_common.h | 11 ++++++++++-
> + 1 file changed, 10 insertions(+), 1 deletion(-)
> +
> +diff --git a/include/configs/ti_armv7_common.h
b/include/configs/ti_armv7_common.h
> +index 199612b..ece87ab 100644
> +--- a/include/configs/ti_armv7_common.h
> ++++ b/include/configs/ti_armv7_common.h
> +@@ -60,7 +60,16 @@
> + #define DEFAULT_MMC_TI_ARGS \
> +       "mmcdev=0\0" \
> +       "mmcrootfstype=ext4 rootwait\0" \
> +-      "finduuid=part uuid mmc 0:2 uuid\0" \
> ++      "findsduuid=part uuid mmc 0:2 sduuid\0" \
> ++      "findemmcuuid=part uuid mmc 1:2 emmcuuid\0" \
> ++      "finduuid=if run findsduuid; then "\
> ++              "echo \"Boot from microSD\"; "\
> ++              "setenv uuid ${sduuid}; " \
> ++      "else " \
> ++              "run findemmcuuid; " \
> ++              "echo \"Boot from eMMC\"; " \
> ++              "setenv uuid ${emmcuuid}; " \
> ++      "fi;\0" \
> +       "args_mmc=run finduuid;setenv bootargs console=${console} " \
> +               "${optargs} " \
> +               "root=PARTUUID=${uuid} rw " \
> +--
> +2.7.0
> +
> diff --git a/meta-yocto-bsp/recipes-bsp/u-boot/u-boot_2016.03.bbappend
b/meta-yocto-bsp/recipes-bsp/u-boot/u-boot_2016.03.bbappend
> new file mode 100644
> index 0000000..01c8e68
> --- /dev/null
> +++ b/meta-yocto-bsp/recipes-bsp/u-boot/u-boot_2016.03.bbappend
> @@ -0,0 +1,3 @@
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +
> +SRC_URI_append = "
file://0001-Search-for-bootable-partitions-on-both-SD-and-eMMC.patch"
> --
> 2.8.1
>
> --
> _______________________________________________
> poky mailing list
> poky at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/poky/attachments/20160602/924a81d3/attachment-0001.html>