Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2014-12-17 19:15:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot" Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot-a10-olinuxino-lime.changes 2014-12-16 14:50:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2014-12-17 19:14:53.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 16 11:10:23 UTC 2014 - [email protected] + +- Backport SPL MMC raw boot mode fix: + * 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch + +------------------------------------------------------------------- u-boot-a20-olinuxino-lime2.changes: same change u-boot-am335xevm.changes: same change u-boot-arndale.changes: same change u-boot-bananapi.changes: same change u-boot-colibrit20iris.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-highbank.changes: same change u-boot-melea1000.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-paz00.changes: same change u-boot-rpi.changes: same change u-boot-snow.changes: same change u-boot-vexpressaemv8a.changes: same change u-boot.changes: same change New: ---- 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-a10-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.Xdpefj/_old 2014-12-17 19:14:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Xdpefj/_new 2014-12-17 19:14:59.000000000 +0100 @@ -40,6 +40,7 @@ Patch3: mx53loco-bootscr.patch Patch4: fix_snow_config.patch Patch10: fix_sata.patch +Patch11: 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch # Apply add_snow_usb_boot.patch only for snow, otherwise may break other boards Patch20: add_snow_usb_boot.patch # Apply fix_bootpart_snow_only.patch only for snow, otherwise will break other boards @@ -81,6 +82,7 @@ %patch3 %patch4 -p1 %patch10 -p1 +%patch11 -p1 %if "%{name}" == "u-boot-snow" # Apply some patches only for u-boot-snow to avoid to break other boards %patch20 -p1 u-boot-a20-olinuxino-lime2.spec: same change u-boot-am335xevm.spec: same change u-boot-arndale.spec: same change u-boot-bananapi.spec: same change u-boot-colibrit20iris.spec: same change u-boot-cubieboard.spec: same change u-boot-cubieboard2.spec: same change u-boot-cubietruck.spec: same change u-boot-highbank.spec: same change u-boot-melea1000.spec: same change u-boot-mx53loco.spec: same change u-boot-mx6qsabrelite.spec: same change u-boot-omap3beagle.spec: same change u-boot-omap4panda.spec: same change u-boot-paz00.spec: same change u-boot-rpi.spec: same change ++++++ u-boot-snow.spec ++++++ --- /var/tmp/diff_new_pack.Xdpefj/_old 2014-12-17 19:14:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Xdpefj/_new 2014-12-17 19:14:59.000000000 +0100 @@ -40,6 +40,7 @@ Patch3: mx53loco-bootscr.patch Patch4: fix_snow_config.patch Patch10: fix_sata.patch +Patch11: 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch # Apply add_snow_usb_boot.patch only for snow, otherwise may break other boards Patch20: add_snow_usb_boot.patch # Apply fix_bootpart_snow_only.patch only for snow, otherwise will break other boards @@ -81,6 +82,7 @@ %patch3 %patch4 -p1 %patch10 -p1 +%patch11 -p1 %if "%{name}" == "u-boot-snow" # Apply some patches only for u-boot-snow to avoid to break other boards %patch20 -p1 ++++++ u-boot-vexpressaemv8a.spec ++++++ --- /var/tmp/diff_new_pack.Xdpefj/_old 2014-12-17 19:14:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Xdpefj/_new 2014-12-17 19:14:59.000000000 +0100 @@ -40,6 +40,7 @@ Patch3: mx53loco-bootscr.patch Patch4: fix_snow_config.patch Patch10: fix_sata.patch +Patch11: 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch # Apply add_snow_usb_boot.patch only for snow, otherwise may break other boards Patch20: add_snow_usb_boot.patch # Apply fix_bootpart_snow_only.patch only for snow, otherwise will break other boards @@ -81,6 +82,7 @@ %patch3 %patch4 -p1 %patch10 -p1 +%patch11 -p1 %if "%{name}" == "u-boot-snow" # Apply some patches only for u-boot-snow to avoid to break other boards %patch20 -p1 ++++++ 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch ++++++ >From ca1f908171c0da7ee6ada74f3bf904946ab2abe2 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <[email protected]> Date: Mon, 15 Dec 2014 09:57:39 +0100 Subject: [U-Boot] [PATCH] spl: mmc: Fix raw boot mode (related to commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f) As reported by Robert Nelson, commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f may break MMC RAW boot mode. This patch fixes the check path to fix MMC Raw boot mode. Tested raw boot mode and FS boot mode on a pandaboard (rev. A3). Reported-by: Robert Nelson <[email protected]> Signed-off-by: Guillaume GARDET <[email protected]> Cc: Tom Rini <[email protected]> Cc: Robert Nelson <[email protected]> --- common/spl/spl_mmc.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 7bae16b..c2e596b 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -172,11 +172,24 @@ void spl_mmc_load_image(void) err = mmc_load_image_raw_sector(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); #endif - } else { + } + + switch(boot_mode){ + case MMCSD_MODE_RAW: +#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) + case MMCSD_MODE_FS: +#endif +#ifdef CONFIG_SUPPORT_EMMC_BOOT + case MMCSD_MODE_EMMCBOOT: +#endif + /* Boot mode is ok. Nothing to do. */ + break; + case MMCSD_MODE_UNDEFINED: + default: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - puts("spl: wrong MMC boot mode\n"); + puts("spl: wrong MMC boot mode\n"); #endif - hang(); + hang(); } if (err) -- 1.8.4.5 ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.Xdpefj/_old 2014-12-17 19:14:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Xdpefj/_new 2014-12-17 19:14:59.000000000 +0100 @@ -40,6 +40,7 @@ Patch3: mx53loco-bootscr.patch Patch4: fix_snow_config.patch Patch10: fix_sata.patch +Patch11: 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch # Apply add_snow_usb_boot.patch only for snow, otherwise may break other boards Patch20: add_snow_usb_boot.patch # Apply fix_bootpart_snow_only.patch only for snow, otherwise will break other boards @@ -81,6 +82,7 @@ %patch3 %patch4 -p1 %patch10 -p1 +%patch11 -p1 %if "%{name}" == "u-boot-snow" # Apply some patches only for u-boot-snow to avoid to break other boards %patch20 -p1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
