I have made the following changes intended for : CE:Adaptation:N900 / u-boot
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/8428 Thank You, Marko Saukko [This message was auto-generated] --- Request # 8428: Messages from BOSS: State: review at 2013-03-14T12:08:49 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Adaptation:N900 / u-boot -> CE:Adaptation:N900 / u-boot changes files: -------------- --- u-boot.changes +++ u-boot.changes @@ -0,0 +1,3 @@ +* Thu Mar 14 2013 Marko Saukko <[email protected]> - 2010.09-MeeGo +- Drop non n900 related files and cleanup packaging. + ++++++ deleted changes files: --- u-boot-omap3beagle.changes --- u-boot-omap4panda.changes old: ---- Makefile makespec.pl meego_panda.cmd meego_panda.scr series u-boot-omap3beagle.changes u-boot-omap3beagle.spec u-boot-omap4panda.changes u-boot-omap4panda.spec u-boot.changes.in u-boot.spec.in spec files: ----------- --- u-boot.spec +++ u-boot.spec @@ -23,7 +23,6 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 License: GPL ExclusiveArch: %{arm} -BuildRoot: %{_tmppath}/%{name}-%{version}-root Patch0: 0001-ARMV7-OMAP-Add-new-mmc-driver-compatible-with-CONFIG.patch Patch1: 0002-env_mmc-Fix-broken-build-due-to-set_default_env-chan.patch @@ -32,52 +31,13 @@ Patch4: 0005-mmc-omap-timeout-counter-fix.patch Patch5: 0006-ARMV7-hardfp-build-fix.patch -%define TARGET_BOARD omap4_panda -%define TARGET_CPU arm - -# Add board specific .scr files if any (generated from cmd files with the Makefile) -%define TARGET_SCRIPT meego_panda.scr - -%if "%{?TARGET_SCRIPT}" -Source1: %{TARGET_SCRIPT} -%endif - %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. -%define all_x86 i386 i586 i686 %{ix86} -%define all_arm %{arm} - -# Per arch tweaks -%ifarch %{all_x86} -%define hwarch i386 -%endif - -%ifarch %{all_arm} -%define hwarch arm -%endif - # What image and where should it go to? %define image_install_path boot %define boot_image u-boot.bin -%if "%{?CROSS_COMPILE}" -%define _CROSS %{CROSS_COMPILE} -%else -%define _CROSS " " -%endif - - -%if "%{?TARGET_BOARD}" -%package %{TARGET_BOARD} -Summary: The u-boot firmware for the %{TARGET_BOARD} %{TARGET_CPU} platform -Group: System/Boot - -%description %{TARGET_BOARD} -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 %{TARGET_BOARD} %{TARGET_CPU} platform. -%endif - %package tools Summary: Tools for the u-boot Firmware Group: System/Boot @@ -97,68 +57,24 @@ %prep %setup -q -# Any custom patches to be applied on top of mainline u-boot -%if "%{?TARGET_BOARD}" %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%endif sed -i "s|-idirafter|-I|" tools/Makefile %build -%if "%{?TARGET_BOARD}" -# Any Board specific custom patches to be applied -#%if "%{?TARGET_BOARD}" == "mainstone_rr" -# patch -p1 < %{PATCH3} -#%endif - -CROSS_COMPILE=%{_CROSS} ARCH=%{TARGET_CPU} make %{TARGET_BOARD}_config -# temporary disable of --build-id -#LDFLAGS=--build-id CROSS_COMPILE=%{_CROSS} ARCH=%{TARGET_CPU} make all -CROSS_COMPILE=%{_CROSS} ARCH=%{TARGET_CPU} make all -CROSS_COMPILE=%{_CROSS} ARCH=%{TARGET_CPU} make env - -%else -# configure for a fictituous target (only tools will be build) -%make TQM850L_config -%make CC=%{_target_platform}-gcc tools -%endif +make omap4_panda_config +make all +make env %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} install -D -m 0755 tools/mkimage %{buildroot}%{_bindir}/mkimage -#install -D -m 0755 tools/env/fw_printenv %{buildroot}%{_bindir}/fw_printenv install -D -m 0644 doc/mkimage.1 %{buildroot}%{_mandir}/man1/mkimage.1 gzip %{buildroot}%{_mandir}/man1/* -#install -d -m 0755 tools/img2srec %{buildroot}%{_bindir}/img2srec -%if "%{?TARGET_BOARD}" -#gzip u-boot -#install -D -m 0644 u-boot.gz %{buildroot}/boot/u-boot.gz -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin -install -D -m 0644 u-boot.map %{buildroot}/boot/u-boot.map - -%if "%{?TARGET_SCRIPT}" -install -D -m 0644 %{SOURCE1} %{buildroot}/boot/boot.scr -%endif - -%endif - -%clean -[ "%{buildroot}" != / ] && rm -rf %{buildroot} - -%if "%{?TARGET_BOARD}" -%files %{TARGET_BOARD} -%defattr(-,root,root) -/boot/u-boot.bin -/boot/u-boot.map -#/boot/u-boot.gz -%if "%{?TARGET_SCRIPT}" -/boot/boot.scr -%endif -%endif %files tools %defattr(-,root,root) ++++++ deleted spec files: --- u-boot-omap3beagle.spec --- u-boot-omap4panda.spec other changes: -------------- ++++++ deleted files: --- Makefile --- makespec.pl --- meego_panda.cmd --- meego_panda.scr --- series --- u-boot.changes.in --- u-boot.spec.in
