Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2012-08-07 08:24:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-08-03 19:43:57.387656292 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-highbank.changes 2012-08-07 08:24:12.000000000 +0200 @@ -0,0 +1,183 @@ +------------------------------------------------------------------- +Mon Aug 6 09:39:54 UTC 2012 - [email protected] + +- remove Marvell sources as they are non-free licensed (bnc#773824) + +------------------------------------------------------------------- +Thu Jul 26 18:21:44 UTC 2012 - [email protected] + +- fix ext2 support for origen +- add origen-spl.bin for origen + +------------------------------------------------------------------- +Thu Jul 26 09:47:31 UTC 2012 - [email protected] + +- merge u-boot-tools + +------------------------------------------------------------------- +Wed Jul 25 21:05:08 UTC 2012 - [email protected] + +- add ext2 support by default in mx53loco + +------------------------------------------------------------------- +Tue Jul 24 21:28:59 UTC 2012 - [email protected] + +- add support for mx53loco + +------------------------------------------------------------------- +Tue Jul 24 11:25:42 UTC 2012 - [email protected] + +- remove u-boot-omap3beagle + +------------------------------------------------------------------- +Mon Jul 23 22:34:04 UTC 2012 - [email protected] + +- bump to 2012.04.01 + - fixes bug in cmdline parsing + +------------------------------------------------------------------- +Mon Jul 23 22:26:47 UTC 2012 - [email protected] + +- add calxeda highbank support + +------------------------------------------------------------------- +Thu Jul 12 12:51:56 UTC 2012 - [email protected] + +- autoload boot.scr on beagle, so we can boot again + +------------------------------------------------------------------- +Thu Jul 12 08:12:15 UTC 2012 - [email protected] + +- update to upstream u-boot 2012.04 + -> gets rid of linaro fork, only mainline now + -> gets us omap3 MLO support, no more need for x-loader + -> potentially fixes voltage issues on omap4 + +------------------------------------------------------------------- +Thu Jun 14 09:04:53 UTC 2012 - [email protected] + +- add SUSE style conflicts to avoid installation of multiple + boot loaders + +------------------------------------------------------------------- +Tue Apr 17 11:59:55 UTC 2012 - [email protected] + +- Included u-boot.spec.in and gen_spec.sh in the spec file + +------------------------------------------------------------------- +Mon Feb 6 13:25:09 UTC 2012 - [email protected] + +- use ext2 on panda + +------------------------------------------------------------------- +Tue Dec 20 02:36:05 UTC 2011 - [email protected] + +- use ttyO2 as default console= on OMAP boards + +------------------------------------------------------------------- +Mon Dec 19 20:21:21 UTC 2011 - [email protected] + +- add u8500_href and origen configs + +------------------------------------------------------------------- +Fri Dec 16 16:03:01 UTC 2011 - [email protected] + +- fix lint failures + +------------------------------------------------------------------- +Fri Dec 16 14:46:53 CET 2011 - [email protected] + +- don't install map + +------------------------------------------------------------------- +Fri Dec 16 02:16:19 UTC 2011 - [email protected] + +- generalize spec file to be able to build for more boards +- add beagle board spec file +- remove boot.scr + +------------------------------------------------------------------- +Fri Dec 16 01:15:47 UTC 2011 - [email protected] + +- rename to u-boot-omap4panda + +------------------------------------------------------------------- +Tue Dec 13 17:24:45 UTC 2011 - [email protected] + +- new package based on u-boot-omap4panda but use linaro u-boot git + repo (http://git.linaro.org/git/boot/u-boot-linaro-stable.git) + instead of mainline u-boot. This package also contains the MLO + (this package obsoletes the x-loader package) + +------------------------------------------------------------------- +Tue Nov 29 22:53:44 UTC 2011 - [email protected] + +- COPYING CREDITS README are now in the standard package + +------------------------------------------------------------------- +Thu Nov 24 21:08:58 UTC 2011 - [email protected] + +- Corrected the links + +------------------------------------------------------------------- +Tue Nov 22 17:47:17 UTC 2011 - [email protected] + +- Build without u-boot tools as we have a u-boot-tools packages + +------------------------------------------------------------------- +Sun Nov 20 17:00:43 UTC 2011 - [email protected] + +- Cleaned the spec file up the spec file +- The name is the same as the package name + +------------------------------------------------------------------- +Sun Nov 13 13:13:39 UTC 2011 - [email protected] + +- Build u-boot according to http://elinux.org/Panda_How_to_MLO_&_u-boot +- Using .txt config file instead of .scr it's gerated via mkimage + +------------------------------------------------------------------- +Wed Nov 09 22:55:09 UTC 2011 - [email protected] + +- Used scr file based on http://elinux.org definition +- Build u-boot 20111109 +- Used the Meego panda u-boot as a base + +------------------------------------------------------------------- +Fri Feb 18 00:00:00 UTC 2011 - [email protected]> +- 2010.09-MeeGo +- Fix for u-boot fails to compile on armv7hl, BMC#13140 + +------------------------------------------------------------------- +Thu Nov 18 00:00:00 UTC 2010 - [email protected]> +- 2010.09-MeeGo +- Don't build against i586, BMC#10159 + +------------------------------------------------------------------- +Tue Oct 10 00:00:00 UTC 2010 - [email protected]> +- 2010.09-MeeGo +- Add Das u-boot package - FEA#9723 + +------------------------------------------------------------------- +Tue Oct 10 00:00:00 UTC 2010 - [email protected]> +- 2010.09.rc1-MeeGo +- Added option to enable boot.scr generation and copy + +------------------------------------------------------------------- +Mon Oct 04 00:00:00 UTC 2010 - [email protected]> +- 2010.09.rc1-MeeGo +- Update to 2010.09 + +------------------------------------------------------------------- +Wed Sep 14 00:00:00 UTC 2010 - [email protected]> +- 2010.09.rc1-MeeGo +- Update to 2010.09.rc1 +- MeeGo customization +- Enabled PandaBoard, Beagleboard build + +------------------------------------------------------------------- +Wed Mar 31 00:00:00 UTC 2010 - [email protected]> +- 2009.11.1-1mamba +- update to 2009.11.1 + +------------------------------------------------------------------- New Changes file: u-boot-mx53loco.changes: same change --- /work/SRC/openSUSE:Factory/u-boot/u-boot-omap4panda.changes 2012-07-24 17:22:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-omap4panda.changes 2012-08-07 08:24:12.000000000 +0200 @@ -1,0 +2,47 @@ +Mon Aug 6 09:39:54 UTC 2012 - [email protected] + +- remove Marvell sources as they are non-free licensed (bnc#773824) + +------------------------------------------------------------------- +Thu Jul 26 18:21:44 UTC 2012 - [email protected] + +- fix ext2 support for origen +- add origen-spl.bin for origen + +------------------------------------------------------------------- +Thu Jul 26 09:47:31 UTC 2012 - [email protected] + +- merge u-boot-tools + +------------------------------------------------------------------- +Wed Jul 25 21:05:08 UTC 2012 - [email protected] + +- add ext2 support by default in mx53loco + +------------------------------------------------------------------- +Tue Jul 24 21:28:59 UTC 2012 - [email protected] + +- add support for mx53loco + +------------------------------------------------------------------- +Tue Jul 24 11:25:42 UTC 2012 - [email protected] + +- remove u-boot-omap3beagle + +------------------------------------------------------------------- +Mon Jul 23 22:34:04 UTC 2012 - [email protected] + +- bump to 2012.04.01 + - fixes bug in cmdline parsing + +------------------------------------------------------------------- +Mon Jul 23 22:26:47 UTC 2012 - [email protected] + +- add calxeda highbank support + +------------------------------------------------------------------- +Thu Jul 12 12:51:56 UTC 2012 - [email protected] + +- autoload boot.scr on beagle, so we can boot again + +------------------------------------------------------------------- u-boot-origen.changes: same change u-boot-u8500href.changes: same change u-boot.changes: same change Old: ---- u-boot-2012.04.tar.bz2 u-boot-omap3beagle.changes u-boot-omap3beagle.spec New: ---- beagle-bootscr.patch exynos-ext2.patch mx53loco-bootscr.patch u-boot-2012.04.01.tar.bz2 u-boot-highbank.changes u-boot-highbank.spec u-boot-mx53loco.changes u-boot-mx53loco.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-highbank.spec ++++++ # # spec file for package u-boot-highbank # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader 0 %define origen_spl 0 Name: u-boot-highbank Version: 2012.04.01 Release: 0 Summary: The u-boot firmware for the highbank arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: u-boot-%{version}.tar.bz2 Source1: openSUSE_panda.txt Source300: rpmlintrc Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch Patch4: beagle-bootscr.patch Patch5: mx53loco-bootscr.patch Patch6: exynos-ext2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-highbank Provides: x-loader-highbank %endif ExclusiveArch: %arm %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the highbank arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{version} # 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 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_config # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %install install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %if %origen_spl == 1 install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /boot/u-boot.bin %if %x_loader == 1 /boot/MLO %endif %if %origen_spl == 1 /boot/origen-spl.bin %endif %doc COPYING CREDITS README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem # Copy some useful kermit scripts as well %doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-SoC doc/README.ARM-memory-map %changelog ++++++ u-boot-mx53loco.spec ++++++ # # spec file for package u-boot-mx53loco # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader 0 %define origen_spl 0 Name: u-boot-mx53loco Version: 2012.04.01 Release: 0 Summary: The u-boot firmware for the mx53loco arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: u-boot-%{version}.tar.bz2 Source1: openSUSE_panda.txt Source300: rpmlintrc Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch Patch4: beagle-bootscr.patch Patch5: mx53loco-bootscr.patch Patch6: exynos-ext2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-mx53loco Provides: x-loader-mx53loco %endif ExclusiveArch: %arm %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the mx53loco arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{version} # 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 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_config # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %install install -D -m 0644 u-boot.imx %{buildroot}/boot/u-boot.imx %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %if %origen_spl == 1 install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /boot/u-boot.imx %if %x_loader == 1 /boot/MLO %endif %if %origen_spl == 1 /boot/origen-spl.bin %endif %doc COPYING CREDITS README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem # Copy some useful kermit scripts as well %doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-SoC doc/README.ARM-memory-map %changelog ++++++ u-boot-omap4panda.spec ++++++ --- /var/tmp/diff_new_pack.98ZHeo/_old 2012-08-07 08:24:14.000000000 +0200 +++ /var/tmp/diff_new_pack.98ZHeo/_new 2012-08-07 08:24:14.000000000 +0200 @@ -19,9 +19,10 @@ %define x_loader 1 +%define origen_spl 0 Name: u-boot-omap4panda -Version: 2012.04 +Version: 2012.04.01 Release: 0 Summary: The u-boot firmware for the omap4panda arm platform License: GPL-2.0 @@ -33,6 +34,9 @@ Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch +Patch4: beagle-bootscr.patch +Patch5: mx53loco-bootscr.patch +Patch6: exynos-ext2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -56,10 +60,15 @@ %prep %setup -q -n u-boot-%{version} +# 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 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_config @@ -72,6 +81,9 @@ %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif +%if %origen_spl == 1 +install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -82,6 +94,9 @@ %if %x_loader == 1 /boot/MLO %endif +%if %origen_spl == 1 +/boot/origen-spl.bin +%endif %doc COPYING CREDITS README %files doc ++++++ u-boot-origen.spec ++++++ --- /var/tmp/diff_new_pack.98ZHeo/_old 2012-08-07 08:24:14.000000000 +0200 +++ /var/tmp/diff_new_pack.98ZHeo/_new 2012-08-07 08:24:14.000000000 +0200 @@ -19,9 +19,10 @@ %define x_loader 0 +%define origen_spl 1 Name: u-boot-origen -Version: 2012.04 +Version: 2012.04.01 Release: 0 Summary: The u-boot firmware for the origen arm platform License: GPL-2.0 @@ -33,6 +34,9 @@ Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch +Patch4: beagle-bootscr.patch +Patch5: mx53loco-bootscr.patch +Patch6: exynos-ext2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -56,10 +60,15 @@ %prep %setup -q -n u-boot-%{version} +# 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 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" origen_config @@ -72,6 +81,9 @@ %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif +%if %origen_spl == 1 +install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -82,6 +94,9 @@ %if %x_loader == 1 /boot/MLO %endif +%if %origen_spl == 1 +/boot/origen-spl.bin +%endif %doc COPYING CREDITS README %files doc ++++++ u-boot-u8500href.spec ++++++ --- /var/tmp/diff_new_pack.98ZHeo/_old 2012-08-07 08:24:14.000000000 +0200 +++ /var/tmp/diff_new_pack.98ZHeo/_new 2012-08-07 08:24:14.000000000 +0200 @@ -19,9 +19,10 @@ %define x_loader 0 +%define origen_spl 0 Name: u-boot-u8500href -Version: 2012.04 +Version: 2012.04.01 Release: 0 Summary: The u-boot firmware for the u8500href arm platform License: GPL-2.0 @@ -33,6 +34,9 @@ Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch +Patch4: beagle-bootscr.patch +Patch5: mx53loco-bootscr.patch +Patch6: exynos-ext2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -56,10 +60,15 @@ %prep %setup -q -n u-boot-%{version} +# 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 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" u8500_href_config @@ -72,6 +81,9 @@ %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif +%if %origen_spl == 1 +install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -82,6 +94,9 @@ %if %x_loader == 1 /boot/MLO %endif +%if %origen_spl == 1 +/boot/origen-spl.bin +%endif %doc COPYING CREDITS README %files doc ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.98ZHeo/_old 2012-08-07 08:24:14.000000000 +0200 +++ /var/tmp/diff_new_pack.98ZHeo/_new 2012-08-07 08:24:14.000000000 +0200 @@ -2,6 +2,8 @@ # spec file for package u-boot # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon +# Copyright (c) 2007-2010 by Silvan Calarco <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +19,45 @@ Name: u-boot -Version: 1 +Version: 2012.04.01 Release: 0 -Summary: fake package +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 +Patch5: 0006-ARMV7-hardfp-build-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -dummy package +Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. +This package contains: +mkimage- a tool that creates kernel bootable images for u-boot. + + +%package tools +Summary: Tools for the u-boot Firmware +Group: System/Boot + +%description tools +Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. +This package contains: +mkimage- a tool that creates kernel bootable images for u-boot. %prep +%setup -q -n u-boot-%{version} +%patch5 -p1 %build +make USE_PRIVATE_LIBGG=yes tools %install +install -D -m 0755 tools/mkimage %{buildroot}%{_bindir}/mkimage +install -D -m 0644 doc/mkimage.1 %{buildroot}%{_mandir}/man1/mkimage.1 -%clean - -%files +%files tools +%defattr(-,root,root) +%{_bindir}/mkimage +%{_mandir}/man1/mkimage.1.gz %changelog ++++++ beagle-bootscr.patch ++++++ >From 7ac25bef0f5d49410705e5e576c114bb2bdf7a2d Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Thu, 12 Jul 2012 14:51:05 +0200 Subject: [PATCH] OMAP: Add autorun support for boot.scr Signed-off-by: Alexander Graf <[email protected]> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index c4df587..afbe2b3 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -273,6 +273,9 @@ "loadramdisk=ext2load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ "loaduimagefat=ext2load mmc ${mmcdev} ${loadaddr} uImage\0" \ "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \ + "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "bootm ${loadaddr}\0" \ @@ -304,9 +307,13 @@ "echo Running uenvcmd ...;" \ "run uenvcmd;" \ "fi;" \ - "if run loaduimage; then " \ - "run mmcboot;" \ - "fi;" \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "fi; " \ + "fi; " \ "fi;" \ "run nandboot;" \ ++++++ exynos-ext2.patch ++++++ Index: u-boot-2012.04.01/include/configs/origen.h =================================================================== --- u-boot-2012.04.01.orig/include/configs/origen.h +++ u-boot-2012.04.01/include/configs/origen.h @@ -87,6 +87,7 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_MMC #define CONFIG_CMD_FAT +#define CONFIG_CMD_EXT2 /* EXT2 Support */ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS @@ -96,7 +97,35 @@ #define CONFIG_SPL #define COPY_BL2_FNPTR_ADDR 0x02020030 -#define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000" +#define CONFIG_EXTRA_ENV_SETTINGS \ + "loadaddr=0x40007000\0" \ + "rdaddr=0x42000000\0" \ + "kerneladdr=0x40007000\0" \ + "ramdiskaddr=0x42000000\0" \ + "console=ttySAC2,115200n8\0" \ + "mmcdev=0\0" \ + "bootenv=uEnv.txt\0" \ + "loadbootenv=ext2load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ + "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" +#define CONFIG_BOOTCOMMAND \ + "if mmc rescan ${mmcdev}; then " \ + "echo SD/MMC found on device ${mmcdev};" \ + "if run loadbootenv; then " \ + "echo Loaded environment from ${bootenv};" \ + "run importbootenv;" \ + "fi;" \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "fi; " \ + "fi;" /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ ++++++ mx53loco-bootscr.patch ++++++ Index: u-boot-2012.04.01/include/configs/mx53loco.h =================================================================== --- u-boot-2012.04.01.orig/include/configs/mx53loco.h +++ u-boot-2012.04.01/include/configs/mx53loco.h @@ -56,6 +56,7 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_CMD_FAT +#define CONFIG_CMD_EXT2 #define CONFIG_DOS_PARTITION /* Eth Configs */ @@ -106,6 +107,8 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "uimage=uImage\0" \ + "kerneladdr=0x70800000\0" \ + "ramdiskaddr=0x72000000\0" \ "mmcdev=0\0" \ "mmcpart=2\0" \ "mmcroot=/dev/mmcblk0p3 rw\0" \ @@ -114,10 +117,10 @@ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ "loadbootscript=" \ - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "ext2load mmc ${mmcdev} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ - "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "bootm\0" \ ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.98ZHeo/_old 2012-08-07 08:24:14.000000000 +0200 +++ /var/tmp/diff_new_pack.98ZHeo/_new 2012-08-07 08:24:14.000000000 +0200 @@ -3,8 +3,10 @@ BOARDNAME="$1" BOARDCONFIG="$2" +# omap3_beagle currently needs separate sources + if [ ! "$1" -o ! "$2" ]; then - for BOARDCONFIG in omap3_beagle omap4_panda u8500_href origen; do + for BOARDCONFIG in omap4_panda u8500_href origen highbank mx53loco; do BOARDNAME="$(echo $BOARDCONFIG | tr -d '_')" BOARDCONFIG=${BOARDCONFIG}_config bash $0 $BOARDNAME $BOARDCONFIG @@ -12,14 +14,21 @@ exit 0 fi -if [ "$(echo $BOARDCONFIG | grep omap)" ]; then - XLOADER=1 -else - XLOADER=0 -fi +XLOADER=0 +ORIGEN_SPL=0 +case "$BOARDCONFIG" in +mx*|efika*) BINEND=imx ;; +*omap*) BINEND=bin + XLOADER=1 ;; +*origen*) BINEND=bin + ORIGEN_SPL=1 ;; +*) BINEND=bin ;; +esac sed "s/BOARDCONFIG/$BOARDCONFIG/g s/BOARDNAME/$BOARDNAME/g +s/BINEND/$BINEND/g +s/ORIGEN_SPL/$ORIGEN_SPL/g s/XLOADER/$XLOADER/g" < u-boot.spec.in > u-boot-$BOARDNAME.spec cp u-boot.changes u-boot-$BOARDNAME.changes ++++++ u-boot-2012.04.tar.bz2 -> u-boot-2012.04.01.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/u-boot/u-boot-2012.04.tar.bz2 /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-2012.04.01.tar.bz2 differ: char 11, line 1 ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.98ZHeo/_old 2012-08-07 08:24:14.000000000 +0200 +++ /var/tmp/diff_new_pack.98ZHeo/_new 2012-08-07 08:24:14.000000000 +0200 @@ -19,9 +19,10 @@ %define x_loader XLOADER +%define origen_spl ORIGEN_SPL Name: u-boot-BOARDNAME -Version: 2012.04 +Version: 2012.04.01 Release: 0 Summary: The u-boot firmware for the BOARDNAME arm platform License: GPL-2.0 @@ -33,6 +34,9 @@ Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch +Patch4: beagle-bootscr.patch +Patch5: mx53loco-bootscr.patch +Patch6: exynos-ext2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -56,10 +60,15 @@ %prep %setup -q -n u-boot-%{version} +# 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 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG @@ -68,20 +77,26 @@ make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin +install -D -m 0644 u-boot.BINEND %{buildroot}/boot/u-boot.BINEND %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif +%if %origen_spl == 1 +install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin +%endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -/boot/u-boot.bin +/boot/u-boot.BINEND %if %x_loader == 1 /boot/MLO %endif +%if %origen_spl == 1 +/boot/origen-spl.bin +%endif %doc COPYING CREDITS README %files doc -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
