Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2014-12-01 14:01:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-am335xevm.changes 2014-11-20 18:43:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xevm.changes 2014-12-01 14:01:42.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 25 08:29:14 UTC 2014 - [email protected] + +- Update to 2015.01-rc2 +- Update patch fix_omap_boot_mode.patch to be upstreamable and +rename it to boot_mode_fallback.patch +- Drop obsolete patch: arndale.patch +- Add patches: + * fix_arm_hf_toolchain.patch: fix build with hard float toolchain + * fix_spl_ext.patch: fix SPL EXT error checks + * fix_sata.patch: fix sata support and fix also mx53loco build + +------------------------------------------------------------------- u-boot-arndale.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-rpib.changes: same change u-boot-snow.changes: same change u-boot-vexpressaemv8a.changes: same change u-boot.changes: same change Old: ---- arndale.patch fix_omap_boot_mode.patch u-boot-2015.01-rc1.tar.bz2 New: ---- boot_mode_fallback.patch fix_arm_hf_toolchain.patch fix_sata.patch fix_spl_ext.patch u-boot-2015.01-rc2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-am335xevm.spec ++++++ --- /var/tmp/diff_new_pack.YcWmnN/_old 2014-12-01 14:01:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YcWmnN/_new 2014-12-01 14:01:47.000000000 +0100 @@ -25,22 +25,24 @@ %define cuboxi_spl 0 Name: u-boot-am335xevm -Version: 2015.01~rc1 +Version: 2015.01~rc2 Release: 0 Summary: The u-boot firmware for the am335xevm arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot #Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch -Patch3: fix_omap_boot_mode.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch +Patch3: boot_mode_fallback.patch +Patch4: mx53loco-bootscr.patch +Patch5: origen-ext2.patch +Patch10: fix_arm_hf_toolchain.patch +Patch11: fix_spl_ext.patch +Patch12: fix_sata.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: fix_snow_extra_env_settings.patch @@ -72,19 +74,18 @@ %prep #%setup -q -n u-boot-%{version} -%setup -q -n u-boot-2015.01-rc1 +%setup -q -n u-boot-2015.01-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 -# Fix SPL boot mode for OMAP3 and OMAP4 boards only -%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle" -%patch3 -%endif +%patch3 -p1 +%patch4 %patch5 -%patch6 -%patch7 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 u-boot-arndale.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 ++++++ --- /var/tmp/diff_new_pack.YcWmnN/_old 2014-12-01 14:01:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YcWmnN/_new 2014-12-01 14:01:47.000000000 +0100 @@ -25,22 +25,24 @@ %define cuboxi_spl 0 Name: u-boot-omap3beagle -Version: 2015.01~rc1 +Version: 2015.01~rc2 Release: 0 Summary: The u-boot firmware for the omap3beagle arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot #Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch -Patch3: fix_omap_boot_mode.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch +Patch3: boot_mode_fallback.patch +Patch4: mx53loco-bootscr.patch +Patch5: origen-ext2.patch +Patch10: fix_arm_hf_toolchain.patch +Patch11: fix_spl_ext.patch +Patch12: fix_sata.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: fix_snow_extra_env_settings.patch @@ -72,19 +74,18 @@ %prep #%setup -q -n u-boot-%{version} -%setup -q -n u-boot-2015.01-rc1 +%setup -q -n u-boot-2015.01-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 -# Fix SPL boot mode for OMAP3 and OMAP4 boards only -%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle" -%patch3 -%endif +%patch3 -p1 +%patch4 %patch5 -%patch6 -%patch7 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 ++++++ u-boot-omap4panda.spec ++++++ --- /var/tmp/diff_new_pack.YcWmnN/_old 2014-12-01 14:01:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YcWmnN/_new 2014-12-01 14:01:47.000000000 +0100 @@ -25,22 +25,24 @@ %define cuboxi_spl 0 Name: u-boot-omap4panda -Version: 2015.01~rc1 +Version: 2015.01~rc2 Release: 0 Summary: The u-boot firmware for the omap4panda arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot #Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch -Patch3: fix_omap_boot_mode.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch +Patch3: boot_mode_fallback.patch +Patch4: mx53loco-bootscr.patch +Patch5: origen-ext2.patch +Patch10: fix_arm_hf_toolchain.patch +Patch11: fix_spl_ext.patch +Patch12: fix_sata.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: fix_snow_extra_env_settings.patch @@ -72,19 +74,18 @@ %prep #%setup -q -n u-boot-%{version} -%setup -q -n u-boot-2015.01-rc1 +%setup -q -n u-boot-2015.01-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 -# Fix SPL boot mode for OMAP3 and OMAP4 boards only -%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle" -%patch3 -%endif +%patch3 -p1 +%patch4 %patch5 -%patch6 -%patch7 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 ++++++ u-boot-paz00.spec ++++++ --- /var/tmp/diff_new_pack.YcWmnN/_old 2014-12-01 14:01:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YcWmnN/_new 2014-12-01 14:01:47.000000000 +0100 @@ -25,22 +25,24 @@ %define cuboxi_spl 0 Name: u-boot-paz00 -Version: 2015.01~rc1 +Version: 2015.01~rc2 Release: 0 Summary: The u-boot firmware for the paz00 arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot #Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch -Patch3: fix_omap_boot_mode.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch +Patch3: boot_mode_fallback.patch +Patch4: mx53loco-bootscr.patch +Patch5: origen-ext2.patch +Patch10: fix_arm_hf_toolchain.patch +Patch11: fix_spl_ext.patch +Patch12: fix_sata.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: fix_snow_extra_env_settings.patch @@ -72,19 +74,18 @@ %prep #%setup -q -n u-boot-%{version} -%setup -q -n u-boot-2015.01-rc1 +%setup -q -n u-boot-2015.01-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 -# Fix SPL boot mode for OMAP3 and OMAP4 boards only -%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle" -%patch3 -%endif +%patch3 -p1 +%patch4 %patch5 -%patch6 -%patch7 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 u-boot-rpib.spec: same change ++++++ u-boot-snow.spec ++++++ --- /var/tmp/diff_new_pack.YcWmnN/_old 2014-12-01 14:01:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YcWmnN/_new 2014-12-01 14:01:47.000000000 +0100 @@ -25,22 +25,24 @@ %define cuboxi_spl 0 Name: u-boot-snow -Version: 2015.01~rc1 +Version: 2015.01~rc2 Release: 0 Summary: The u-boot firmware for the snow arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot #Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch -Patch3: fix_omap_boot_mode.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch +Patch3: boot_mode_fallback.patch +Patch4: mx53loco-bootscr.patch +Patch5: origen-ext2.patch +Patch10: fix_arm_hf_toolchain.patch +Patch11: fix_spl_ext.patch +Patch12: fix_sata.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: fix_snow_extra_env_settings.patch @@ -72,19 +74,18 @@ %prep #%setup -q -n u-boot-%{version} -%setup -q -n u-boot-2015.01-rc1 +%setup -q -n u-boot-2015.01-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 -# Fix SPL boot mode for OMAP3 and OMAP4 boards only -%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle" -%patch3 -%endif +%patch3 -p1 +%patch4 %patch5 -%patch6 -%patch7 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 ++++++ u-boot-vexpressaemv8a.spec ++++++ --- /var/tmp/diff_new_pack.YcWmnN/_old 2014-12-01 14:01:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YcWmnN/_new 2014-12-01 14:01:47.000000000 +0100 @@ -25,22 +25,24 @@ %define cuboxi_spl 0 Name: u-boot-vexpressaemv8a -Version: 2015.01~rc1 +Version: 2015.01~rc2 Release: 0 Summary: The u-boot firmware for the vexpressaemv8a arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot #Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch -Patch3: fix_omap_boot_mode.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch +Patch3: boot_mode_fallback.patch +Patch4: mx53loco-bootscr.patch +Patch5: origen-ext2.patch +Patch10: fix_arm_hf_toolchain.patch +Patch11: fix_spl_ext.patch +Patch12: fix_sata.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: fix_snow_extra_env_settings.patch @@ -72,19 +74,18 @@ %prep #%setup -q -n u-boot-%{version} -%setup -q -n u-boot-2015.01-rc1 +%setup -q -n u-boot-2015.01-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 -# Fix SPL boot mode for OMAP3 and OMAP4 boards only -%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle" -%patch3 -%endif +%patch3 -p1 +%patch4 %patch5 -%patch6 -%patch7 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.YcWmnN/_old 2014-12-01 14:01:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YcWmnN/_new 2014-12-01 14:01:47.000000000 +0100 @@ -19,16 +19,15 @@ Name: u-boot -Version: 2015.01~rc1 +Version: 2015.01~rc2 Release: 0 Summary: Tools for the u-boot Firmware License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot #Source: u-boot-%{version}.tar.bz2 -Source: u-boot-2015.01-rc1.tar.bz2 +Source: u-boot-2015.01-rc2.tar.bz2 BuildRequires: libopenssl-devel -BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,7 +47,7 @@ %prep #%setup -q -n u-boot-%{version} -%setup -q -n u-boot-2015.01-rc1 +%setup -q -n u-boot-2015.01-rc2 %build # needed for include/config/auto.conf ++++++ boot_mode_fallback.patch ++++++ diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index ee71f79..2c34b75 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -101,7 +101,8 @@ void spl_mmc_load_image(void) err = mmc_load_image_raw(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) - } else if (boot_mode == MMCSD_MODE_FS) { + } + if (err || boot_mode == MMCSD_MODE_FS) { debug("boot mode - FS\n"); #ifdef CONFIG_SPL_FAT_SUPPORT #ifdef CONFIG_SPL_OS_BOOT ++++++ fix_arm_hf_toolchain.patch ++++++ diff --git a/arch/arm/config.mk b/arch/arm/config.mk index c339e6d..cd41e48 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -16,7 +16,7 @@ endif LDFLAGS_FINAL += --gc-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections \ -fno-common -ffixed-r9 -PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \ +PLATFORM_RELFLAGS += \ $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) # Support generic board on ARM ++++++ fix_sata.patch ++++++ >From patchwork Thu Nov 27 09:11:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [U-Boot,v2] sata: fix reset_sata for dwc_ahsata From: Soeren Moch <[email protected]> X-Patchwork-Id: 415412 Message-Id: <[email protected]> To: [email protected] Cc: Soeren Moch <[email protected]>, Tom Rini <[email protected]> Date: Thu, 27 Nov 2014 10:11:41 +0100 - fix crash when sata device is not initialized - remove disable_sata_clock() since it is not clear which clock for which device should be disabled here - call disable_sata_clock() for mx6 in preboot_os instead Signed-off-by: Soeren Moch <[email protected]> Acked-by: Nikita Kiryanov <[email protected]> Tested-by: Nikita Kiryanov <[email protected]> --- Changes in v2: - fix type cast warning Cc: Tom Rini <[email protected]> Cc: Nikita Kiryanov <[email protected]> Cc: Simon Glass <[email protected]> Cc: [email protected] Cc: Fabio Estevam <[email protected]> Cc: Stefano Babic <[email protected]> --- arch/arm/imx-common/cpu.c | 3 +++ drivers/block/dwc_ahsata.c | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index b58df7d..28ccd29 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -206,6 +206,9 @@ void arch_preboot_os(void) { #if defined(CONFIG_CMD_SATA) sata_stop(); +#if defined(CONFIG_MX6) + disable_sata_clock(); +#endif #endif #if defined(CONFIG_VIDEO_IPUV3) /* disable video before launching O/S */ diff --git a/drivers/block/dwc_ahsata.c b/drivers/block/dwc_ahsata.c index 9a2b547..01a4148 100644 --- a/drivers/block/dwc_ahsata.c +++ b/drivers/block/dwc_ahsata.c @@ -594,22 +594,24 @@ int init_sata(int dev) int reset_sata(int dev) { - struct ahci_probe_ent *probe_ent = - (struct ahci_probe_ent *)sata_dev_desc[dev].priv; - struct sata_host_regs *host_mmio = - (struct sata_host_regs *)probe_ent->mmio_base; + struct ahci_probe_ent *probe_ent; + struct sata_host_regs *host_mmio; if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) { printf("The sata index %d is out of ranges\n\r", dev); return -1; } + probe_ent = (struct ahci_probe_ent *)sata_dev_desc[dev].priv; + if (NULL == probe_ent) + /* not initialized, so nothing to reset */ + return 0; + + host_mmio = (struct sata_host_regs *)probe_ent->mmio_base; setbits_le32(&host_mmio->ghc, SATA_HOST_GHC_HR); while (readl(&host_mmio->ghc) & SATA_HOST_GHC_HR) udelay(100); - disable_sata_clock(); - return 0; } ++++++ fix_spl_ext.patch ++++++ >From e0b2aa128ed6e70496050c8b8f509b56d75b8860 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <[email protected]> Date: Tue, 25 Nov 2014 15:20:02 +0100 Subject: [U-Boot] [PATCH] spl: Fix SPL EXT support Commit 9f12cd0e062614e19734b2ab37842d387457c5e5 has broken SPL EXT support. This patch update error code check to get SPL EXT support working again. Tested on a Pandaboard (rev. A3). Signed-off-by: Guillaume GARDET <[email protected]> Cc: Tom Rini <[email protected]> Cc: Suriyan Ramasami <[email protected]> --- common/spl/spl_ext.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 5ff9bc5..9d37fd3 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -43,7 +43,7 @@ int spl_load_image_ext(block_dev_desc_t *block_dev, goto end; } err = ext4fs_read((char *)header, sizeof(struct image_header), &actlen); - if (err <= 0) { + if (err < 0) { puts("spl: ext4fs_read failed\n"); goto end; } @@ -54,12 +54,12 @@ int spl_load_image_ext(block_dev_desc_t *block_dev, end: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - if (err <= 0) + if (err < 0) printf("%s: error reading image %s, err - %d\n", __func__, filename, err); #endif - return err <= 0; + return err < 0; } #ifdef CONFIG_SPL_OS_BOOT @@ -95,7 +95,7 @@ int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition) goto defaults; } err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); - if (err <= 0) { + if (err < 0) { printf("spl: error reading image %s, err - %d, falling back to default\n", file, err); goto defaults; @@ -124,7 +124,7 @@ defaults: puts("spl: ext4fs_open failed\n"); err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); - if (err <= 0) { + if (err < 0) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: error reading image %s, err - %d\n", __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err); -- 1.8.4.5 ++++++ u-boot-2015.01-rc1.tar.bz2 -> u-boot-2015.01-rc2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/u-boot/u-boot-2015.01-rc1.tar.bz2 /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-2015.01-rc2.tar.bz2 differ: char 11, line 1 ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.YcWmnN/_old 2014-12-01 14:01:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YcWmnN/_new 2014-12-01 14:01:47.000000000 +0100 @@ -25,22 +25,24 @@ %define cuboxi_spl CUBOXI_SPL Name: u-boot-BOARDNAME -Version: 2015.01~rc1 +Version: 2015.01~rc2 Release: 0 Summary: The u-boot firmware for the BOARDNAME arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot #Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch -Patch3: fix_omap_boot_mode.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch +Patch3: boot_mode_fallback.patch +Patch4: mx53loco-bootscr.patch +Patch5: origen-ext2.patch +Patch10: fix_arm_hf_toolchain.patch +Patch11: fix_spl_ext.patch +Patch12: fix_sata.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: fix_snow_extra_env_settings.patch @@ -72,19 +74,18 @@ %prep #%setup -q -n u-boot-%{version} -%setup -q -n u-boot-2015.01-rc1 +%setup -q -n u-boot-2015.01-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 -# Fix SPL boot mode for OMAP3 and OMAP4 boards only -%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle" -%patch3 -%endif +%patch3 -p1 +%patch4 %patch5 -%patch6 -%patch7 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
