Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2015-11-16 18:51:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-11-08 11:26:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2015-11-16 18:51:53.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Nov 15 13:11:56 UTC 2015 - [email protected] + +- Backport 0001-configs-Use-config_distro_defaults.h-in-ti_armv7_com.patch + +------------------------------------------------------------------- +Sat Nov 14 15:03:05 UTC 2015 - [email protected] + +- 0001-mx6cuboxi-use-load-instead-of-fatload.patch + for cubox-i use load instead of fatload + +------------------------------------------------------------------- u-boot-a13-olinuxino.changes: same change u-boot-a13-olinuxinom.changes: same change u-boot-a20-olinuxino-lime.changes: same change u-boot-a20-olinuxino-lime2.changes: same change u-boot-a20-olinuxinomicro.changes: same change u-boot-am335xevm.changes: same change u-boot-arndale.changes: same change u-boot-bananapi.changes: same change u-boot-beaglex15.changes: same change u-boot-colibrit20.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-firefly-rk3288.changes: same change u-boot-highbank.changes: same change u-boot-jetson-tk1.changes: same change u-boot-melea1000.changes: same change u-boot-merriia80optimus.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6cuboxi.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-odroid-xu3.changes: same change u-boot-odroid.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-paz00.changes: same change u-boot-pcm051rev3.changes: same change u-boot-rpi.changes: same change u-boot-rpi2.changes: same change u-boot-snow.changes: same change u-boot-spring.changes: same change u-boot.changes: same change New: ---- 0001-configs-Use-config_distro_defaults.h-in-ti_armv7_com.patch 0001-mx6cuboxi-use-load-instead-of-fatload.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-a10-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.QxWHuH/_old 2015-11-16 18:51:58.000000000 +0100 +++ /var/tmp/diff_new_pack.QxWHuH/_new 2015-11-16 18:51:58.000000000 +0100 @@ -41,6 +41,10 @@ Patch1: U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch # PATCH-FIX-UPSTREAM Fix am335x booting Patch2: U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch +# PATCH-FIX-UPSTREAM cuboxi-ext4load.patch -- fix cuboxi booting +Patch3: 0001-mx6cuboxi-use-load-instead-of-fatload.patch +# PATCH-FEATURE-UPSTREAM +Patch4: 0001-configs-Use-config_distro_defaults.h-in-ti_armv7_com.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -71,6 +75,8 @@ %setup -q -n u-boot-%{archive_version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell %patch99 -p1 u-boot-a13-olinuxino.spec: same change u-boot-a13-olinuxinom.spec: same change u-boot-a20-olinuxino-lime.spec: same change u-boot-a20-olinuxino-lime2.spec: same change u-boot-a20-olinuxinomicro.spec: same change u-boot-am335xevm.spec: same change u-boot-arndale.spec: same change u-boot-bananapi.spec: same change u-boot-beaglex15.spec: same change u-boot-colibrit20.spec: same change u-boot-cubieboard.spec: same change u-boot-cubieboard2.spec: same change u-boot-cubietruck.spec: same change u-boot-firefly-rk3288.spec: same change u-boot-highbank.spec: same change u-boot-jetson-tk1.spec: same change u-boot-melea1000.spec: same change u-boot-merriia80optimus.spec: same change u-boot-mx53loco.spec: same change u-boot-mx6cuboxi.spec: same change u-boot-mx6qsabrelite.spec: same change u-boot-odroid-xu3.spec: same change u-boot-odroid.spec: same change u-boot-omap3beagle.spec: same change u-boot-omap4panda.spec: same change u-boot-paz00.spec: same change u-boot-pcm051rev3.spec: same change u-boot-rpi.spec: same change u-boot-rpi2.spec: same change u-boot-snow.spec: same change u-boot-spring.spec: same change ++++++ 0001-configs-Use-config_distro_defaults.h-in-ti_armv7_com.patch ++++++ >From 755324c432f62306487786f89efce96398291a03 Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" <[email protected]> Date: Thu, 29 Oct 2015 21:54:15 +0300 Subject: [PATCH] configs: Use config_distro_defaults.h in ti_armv7_common.h CONFIG_BOOTDELAY is defined in config_distro_defaults.h Signed-off-by: Matwey V. Kornilov <[email protected]> [trini: Drop omap3_logic.h settings which were a warning and no longer correct usage]. Signed-off-by: Tom Rini <[email protected]> --- include/configs/omap3_logic.h | 9 --------- include/configs/ti_armv7_common.h | 7 ++----- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index ecd5615..7b60f29 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -272,13 +272,4 @@ #endif /* (CONFIG_CMD_NET) */ -/* - * BOOTP fields - */ - -#define CONFIG_BOOTP_SUBNETMASK 0x00000001 -#define CONFIG_BOOTP_GATEWAY 0x00000002 -#define CONFIG_BOOTP_HOSTNAME 0x00000004 -#define CONFIG_BOOTP_BOOTPATH 0x00000010 - #endif /* __CONFIG_H */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 32bb805..7810dd6 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -67,11 +67,6 @@ "rootfstype=${mmcrootfstype}\0" /* - * Default to a quick boot delay. - */ -#define CONFIG_BOOTDELAY 1 - -/* * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, * we say (for simplicity) that we have 1 bank, always, even when * we have more. We always start at 0x80000000, and we place the @@ -288,4 +283,6 @@ #define NETARGS "" #endif +#include <config_distro_defaults.h> + #endif /* __CONFIG_TI_ARMV7_COMMON_H__ */ -- 2.1.4 ++++++ 0001-mx6cuboxi-use-load-instead-of-fatload.patch ++++++ >From 80416e65668e210019b4e12bff563053cd4d2188 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold <[email protected]> Date: Sat, 14 Nov 2015 19:21:28 +0100 Subject: [PATCH] mx6cuboxi: use load instead of fatload That way the FS can also be ext2/3/4 . --- include/configs/mx6cuboxi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 6e89dd1..690e6b0 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -114,11 +114,11 @@ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}\0" \ + "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ + "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- 2.6.2 ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.QxWHuH/_old 2015-11-16 18:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.QxWHuH/_new 2015-11-16 18:51:59.000000000 +0100 @@ -41,6 +41,10 @@ Patch1: U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch # PATCH-FIX-UPSTREAM Fix am335x booting Patch2: U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch +# PATCH-FIX-UPSTREAM cuboxi-ext4load.patch -- fix cuboxi booting +Patch3: 0001-mx6cuboxi-use-load-instead-of-fatload.patch +# PATCH-FEATURE-UPSTREAM +Patch4: 0001-configs-Use-config_distro_defaults.h-in-ti_armv7_com.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -71,6 +75,8 @@ %setup -q -n u-boot-%{archive_version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell %patch99 -p1
