Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2014-07-11 06:45:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-17 21:45:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xevm.changes 2014-07-11 06:45:51.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Jun 14 11:58:43 UTC 2014 - [email protected] + +- add u-boot-cubietruck for Cubietruck (Cubieboard 3) + +------------------------------------------------------------------- +Thu Jun 12 18:52:26 UTC 2014 - [email protected] + +- add u-boot-mx6cubox-i for Cubox-i and Hummingboard + * currently conflicts with mlo-ext2 patch for omap4 + so only for cubox-i target mlo-ext2.patch is skipped + and cubox-i patches are applied + * patch source: https://github.com/vorlonofportland/u-boot/ + cubox-i-v2014.04-port.patch + cubox-i-enable_raw_rd.patch + +------------------------------------------------------------------- u-boot-arndale.changes: same change u-boot-colibrit20iris.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change New Changes file: --- /dev/null 2014-06-12 08:28:52.960034756 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-cubietruck.changes 2014-07-11 06:45:52.000000000 +0200 @@ -0,0 +1,466 @@ +------------------------------------------------------------------- +Sat Jun 14 11:58:43 UTC 2014 - [email protected] + +- add u-boot-cubietruck for Cubietruck (Cubieboard 3) + +------------------------------------------------------------------- +Thu Jun 12 18:52:26 UTC 2014 - [email protected] + +- add u-boot-mx6cubox-i for Cubox-i and Hummingboard + * currently conflicts with mlo-ext2 patch for omap4 + so only for cubox-i target mlo-ext2.patch is skipped + and cubox-i patches are applied + * patch source: https://github.com/vorlonofportland/u-boot/ + cubox-i-v2014.04-port.patch + cubox-i-enable_raw_rd.patch + +------------------------------------------------------------------- +Tue Apr 29 13:41:18 UTC 2014 - [email protected] + +- Enhance pre_checkin.sh script to handle arch restrictions + +------------------------------------------------------------------- +Tue Apr 29 13:18:48 UTC 2014 - [email protected] + +- Fix builds : + * 'tools' target is now 'tools-only' + * kermit scripts moved from 'tools/scripts' to 'tools/kermit/' + * Enhanced pre_checkin.sh script to handle uppercases in config name + * Renamed config from cubieboard to Cubieboard + * Renamed config from cubieboard2 to Cubieboard2 + * Renamed config from hyundai_a7hd to Hyundai_A7HD + * Renamed config from mele_a1000 to Mele_A1000 + +------------------------------------------------------------------- +Tue Apr 29 13:06:57 UTC 2014 - [email protected] + +- Add vexpress_aemv8a board + +------------------------------------------------------------------- +Tue Apr 29 08:33:48 UTC 2014 - [email protected] + +- Update to v2014.04 + * Update mlo-ext2.patch + * Update mx53loco-bootscr.patch + * Update origen-ext2.patch + * Dropped v2014.01-sunxi.patch and created + v2014.04-sunxi.patch by diffing u-boot-2014.04 with + u-boot-sunxi.git d9fe0a1e061e2bde6c24a0f7cef4f5023f3bd579 + * Update rpi_b-bootscr.patch + * Drop gnuhash.patch (upstreamed) + +------------------------------------------------------------------- +Thu Mar 27 14:22:23 UTC 2014 - [email protected] + +- add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) + +------------------------------------------------------------------- +Wed Feb 5 15:07:30 UTC 2014 - [email protected] + +- add u-boot-snow (for Chromebook ARM) + +------------------------------------------------------------------- +Wed Feb 5 14:59:29 UTC 2014 - [email protected] + +- Fix boot.scr location for beagle and origen + +------------------------------------------------------------------- +Thu Jan 30 14:28:34 UTC 2014 - [email protected] + +- add u-boot-cubieboard2 + +------------------------------------------------------------------- +Thu Jan 30 06:46:45 UTC 2014 - [email protected] + +- Drop 0006-ARMV7-hardfp-build-fix.patch: + v2014.01 checks if -msoft-float compiles okay, and + U-Boot is soft-float according to Tom Rini + +------------------------------------------------------------------- +Tue Jan 28 15:29:14 UTC 2014 - [email protected] + +- Disable CONFIG_SPL_OS_BOOT for ti armv7 configs with +fix_spl_build_for_am335x.patch to reduce size of am335x SPL + +------------------------------------------------------------------- +Sat Jan 26 22:46:44 UTC 2014 - [email protected] + +- Update to v2014.01 +* Manually updated 0006-ARMV7-hardfp-build-fix.patch +* Dropped v2013.10-sunxi.patch and created + v2014.01-sunxi.patch by merging u-boot.git v2014.01 onto + u-boot-sunxi.git e4a0232e173577893604b94fc3af7c047570970b +* Added gnuhash.patch to fix .gnu.hash section handling in ldscripts +* Rebased mlo-ext2.patch: + omap4_common.h CONFIG_SUPPORT_RAW_INITRD hunk is now covered by + ti_common_initrd_support.patch. + am335xevm build is known breaking due to size constraints not + trivially solvable without dropping our patch. + +------------------------------------------------------------------- +Sun Jan 26 12:14:10 UTC 2014 - [email protected] + +- Fix regression in packaging u-boot-dtb-tegra.bin: + There is in fact a u-boot-spl.bin SPL being built, + but it is 0xff-padded as u-boot-spl-pad.bin and then + prepended to u-boot.bin and the .dtb. + u-boot-dtb.bin exists independently as just u-boot.bin and .dtb, + so give preference to u-boot-dtb-tegra.bin over u-boot-dtb.bin. + +------------------------------------------------------------------- +Mon Jan 20 14:05:13 UTC 2014 - [email protected] + +- The "Tegra SPL" is not an SPL but a differently named u-boot.bin + file. Fix up the generation scripts. + +------------------------------------------------------------------- +Sun Jan 19 00:09:41 UTC 2014 - [email protected] + +- Include Tegra SPL for Colibri T20 + +------------------------------------------------------------------- +Wed Jan 8 17:26:10 UTC 2014 - [email protected] + +- switch raspberry to ext2 + +------------------------------------------------------------------- +Wed Jan 8 13:41:32 UTC 2014 - [email protected] + +- am335x_evm-bootscr.patch: Search for files in /boot, not in /boot/boot + +------------------------------------------------------------------- +Wed Jan 8 02:07:44 UTC 2014 - [email protected] + +- rpi_b-bootscr.patch: Change rpi_b to use boot.scr + +------------------------------------------------------------------- +Tue Jan 7 16:01:13 UTC 2014 - [email protected] + +- remove origin flavor + +------------------------------------------------------------------- +Mon Jan 6 22:57:05 UTC 2014 - [email protected] + +- Enable paz00 config (Toshiba AC100) + +------------------------------------------------------------------- +Mon Jan 6 21:34:03 UTC 2014 - [email protected] + +- Enable colibri_t20_iris config (Toradex Colibri-T20 on Iris) +- Update u-boot.spec.in copyright and fix typo in comment + +------------------------------------------------------------------- +Sat Jan 4 01:47:50 UTC 2014 - [email protected] + +- prefer u-boot-dtb.bin over u-boot.bin +- simplify files section + +------------------------------------------------------------------- +Fri Jan 3 16:54:30 UTC 2014 - [email protected] + +- mlo-ext2.patch: Search for files in /boot, not in /boot/boot + +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - [email protected] + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + +------------------------------------------------------------------- +Tue Dec 17 14:33:52 UTC 2013 - [email protected] + +- Remove old unused patches: + * v2013.04-sunxi.patch + * loadaddr-defaults.patch + +------------------------------------------------------------------- +Tue Dec 17 14:10:51 UTC 2013 - [email protected] + +- Add ti_common_initrd_support.patch to enable initrd support for + AM335x boards + +------------------------------------------------------------------- +Tue Dec 17 14:03:50 UTC 2013 - [email protected] + +- Add am335x_evm support which includes: Beagle Bone, + Beagle Bone Black, TI AM335x EVM, TI AM335x EVM-SK + +------------------------------------------------------------------- +Tue Nov 26 13:46:22 UTC 2013 - [email protected] + +- Add Arndale support + +------------------------------------------------------------------- +Tue Nov 26 13:05:10 UTC 2013 - [email protected] + +- Update v2013.04-sunxi.patch to v2013.10-sunxi.patch + ++++ 269 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-cubietruck.changes --- /work/SRC/openSUSE:Factory/u-boot/u-boot-highbank.changes 2014-05-17 21:45:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-highbank.changes 2014-07-11 06:45:52.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Jun 14 11:58:43 UTC 2014 - [email protected] + +- add u-boot-cubietruck for Cubietruck (Cubieboard 3) + +------------------------------------------------------------------- +Thu Jun 12 18:52:26 UTC 2014 - [email protected] + +- add u-boot-mx6cubox-i for Cubox-i and Hummingboard + * currently conflicts with mlo-ext2 patch for omap4 + so only for cubox-i target mlo-ext2.patch is skipped + and cubox-i patches are applied + * patch source: https://github.com/vorlonofportland/u-boot/ + cubox-i-v2014.04-port.patch + cubox-i-enable_raw_rd.patch + +------------------------------------------------------------------- u-boot-hyundaia7hd.changes: same change u-boot-melea1000.changes: same change u-boot-mx53loco.changes: same change New Changes file: --- /dev/null 2014-06-12 08:28:52.960034756 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-mx6cubox-i.changes 2014-07-11 06:45:52.000000000 +0200 @@ -0,0 +1,466 @@ +------------------------------------------------------------------- +Sat Jun 14 11:58:43 UTC 2014 - [email protected] + +- add u-boot-cubietruck for Cubietruck (Cubieboard 3) + +------------------------------------------------------------------- +Thu Jun 12 18:52:26 UTC 2014 - [email protected] + +- add u-boot-mx6cubox-i for Cubox-i and Hummingboard + * currently conflicts with mlo-ext2 patch for omap4 + so only for cubox-i target mlo-ext2.patch is skipped + and cubox-i patches are applied + * patch source: https://github.com/vorlonofportland/u-boot/ + cubox-i-v2014.04-port.patch + cubox-i-enable_raw_rd.patch + +------------------------------------------------------------------- +Tue Apr 29 13:41:18 UTC 2014 - [email protected] + +- Enhance pre_checkin.sh script to handle arch restrictions + +------------------------------------------------------------------- +Tue Apr 29 13:18:48 UTC 2014 - [email protected] + +- Fix builds : + * 'tools' target is now 'tools-only' + * kermit scripts moved from 'tools/scripts' to 'tools/kermit/' + * Enhanced pre_checkin.sh script to handle uppercases in config name + * Renamed config from cubieboard to Cubieboard + * Renamed config from cubieboard2 to Cubieboard2 + * Renamed config from hyundai_a7hd to Hyundai_A7HD + * Renamed config from mele_a1000 to Mele_A1000 + +------------------------------------------------------------------- +Tue Apr 29 13:06:57 UTC 2014 - [email protected] + +- Add vexpress_aemv8a board + +------------------------------------------------------------------- +Tue Apr 29 08:33:48 UTC 2014 - [email protected] + +- Update to v2014.04 + * Update mlo-ext2.patch + * Update mx53loco-bootscr.patch + * Update origen-ext2.patch + * Dropped v2014.01-sunxi.patch and created + v2014.04-sunxi.patch by diffing u-boot-2014.04 with + u-boot-sunxi.git d9fe0a1e061e2bde6c24a0f7cef4f5023f3bd579 + * Update rpi_b-bootscr.patch + * Drop gnuhash.patch (upstreamed) + +------------------------------------------------------------------- +Thu Mar 27 14:22:23 UTC 2014 - [email protected] + +- add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) + +------------------------------------------------------------------- +Wed Feb 5 15:07:30 UTC 2014 - [email protected] + +- add u-boot-snow (for Chromebook ARM) + +------------------------------------------------------------------- +Wed Feb 5 14:59:29 UTC 2014 - [email protected] + +- Fix boot.scr location for beagle and origen + +------------------------------------------------------------------- +Thu Jan 30 14:28:34 UTC 2014 - [email protected] + +- add u-boot-cubieboard2 + +------------------------------------------------------------------- +Thu Jan 30 06:46:45 UTC 2014 - [email protected] + +- Drop 0006-ARMV7-hardfp-build-fix.patch: + v2014.01 checks if -msoft-float compiles okay, and + U-Boot is soft-float according to Tom Rini + +------------------------------------------------------------------- +Tue Jan 28 15:29:14 UTC 2014 - [email protected] + +- Disable CONFIG_SPL_OS_BOOT for ti armv7 configs with +fix_spl_build_for_am335x.patch to reduce size of am335x SPL + +------------------------------------------------------------------- +Sat Jan 26 22:46:44 UTC 2014 - [email protected] + +- Update to v2014.01 +* Manually updated 0006-ARMV7-hardfp-build-fix.patch +* Dropped v2013.10-sunxi.patch and created + v2014.01-sunxi.patch by merging u-boot.git v2014.01 onto + u-boot-sunxi.git e4a0232e173577893604b94fc3af7c047570970b +* Added gnuhash.patch to fix .gnu.hash section handling in ldscripts +* Rebased mlo-ext2.patch: + omap4_common.h CONFIG_SUPPORT_RAW_INITRD hunk is now covered by + ti_common_initrd_support.patch. + am335xevm build is known breaking due to size constraints not + trivially solvable without dropping our patch. + +------------------------------------------------------------------- +Sun Jan 26 12:14:10 UTC 2014 - [email protected] + +- Fix regression in packaging u-boot-dtb-tegra.bin: + There is in fact a u-boot-spl.bin SPL being built, + but it is 0xff-padded as u-boot-spl-pad.bin and then + prepended to u-boot.bin and the .dtb. + u-boot-dtb.bin exists independently as just u-boot.bin and .dtb, + so give preference to u-boot-dtb-tegra.bin over u-boot-dtb.bin. + +------------------------------------------------------------------- +Mon Jan 20 14:05:13 UTC 2014 - [email protected] + +- The "Tegra SPL" is not an SPL but a differently named u-boot.bin + file. Fix up the generation scripts. + +------------------------------------------------------------------- +Sun Jan 19 00:09:41 UTC 2014 - [email protected] + +- Include Tegra SPL for Colibri T20 + +------------------------------------------------------------------- +Wed Jan 8 17:26:10 UTC 2014 - [email protected] + +- switch raspberry to ext2 + +------------------------------------------------------------------- +Wed Jan 8 13:41:32 UTC 2014 - [email protected] + +- am335x_evm-bootscr.patch: Search for files in /boot, not in /boot/boot + +------------------------------------------------------------------- +Wed Jan 8 02:07:44 UTC 2014 - [email protected] + +- rpi_b-bootscr.patch: Change rpi_b to use boot.scr + +------------------------------------------------------------------- +Tue Jan 7 16:01:13 UTC 2014 - [email protected] + +- remove origin flavor + +------------------------------------------------------------------- +Mon Jan 6 22:57:05 UTC 2014 - [email protected] + +- Enable paz00 config (Toshiba AC100) + +------------------------------------------------------------------- +Mon Jan 6 21:34:03 UTC 2014 - [email protected] + +- Enable colibri_t20_iris config (Toradex Colibri-T20 on Iris) +- Update u-boot.spec.in copyright and fix typo in comment + +------------------------------------------------------------------- +Sat Jan 4 01:47:50 UTC 2014 - [email protected] + +- prefer u-boot-dtb.bin over u-boot.bin +- simplify files section + +------------------------------------------------------------------- +Fri Jan 3 16:54:30 UTC 2014 - [email protected] + +- mlo-ext2.patch: Search for files in /boot, not in /boot/boot + +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - [email protected] + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + +------------------------------------------------------------------- +Tue Dec 17 14:33:52 UTC 2013 - [email protected] + +- Remove old unused patches: + * v2013.04-sunxi.patch + * loadaddr-defaults.patch + +------------------------------------------------------------------- +Tue Dec 17 14:10:51 UTC 2013 - [email protected] + +- Add ti_common_initrd_support.patch to enable initrd support for + AM335x boards + +------------------------------------------------------------------- +Tue Dec 17 14:03:50 UTC 2013 - [email protected] + +- Add am335x_evm support which includes: Beagle Bone, + Beagle Bone Black, TI AM335x EVM, TI AM335x EVM-SK + +------------------------------------------------------------------- +Tue Nov 26 13:46:22 UTC 2013 - [email protected] + +- Add Arndale support + +------------------------------------------------------------------- +Tue Nov 26 13:05:10 UTC 2013 - [email protected] + +- Update v2013.04-sunxi.patch to v2013.10-sunxi.patch + ++++ 269 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-mx6cubox-i.changes --- /work/SRC/openSUSE:Factory/u-boot/u-boot-mx6qsabrelite.changes 2014-05-17 21:45:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-mx6qsabrelite.changes 2014-07-11 06:45:52.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Jun 14 11:58:43 UTC 2014 - [email protected] + +- add u-boot-cubietruck for Cubietruck (Cubieboard 3) + +------------------------------------------------------------------- +Thu Jun 12 18:52:26 UTC 2014 - [email protected] + +- add u-boot-mx6cubox-i for Cubox-i and Hummingboard + * currently conflicts with mlo-ext2 patch for omap4 + so only for cubox-i target mlo-ext2.patch is skipped + and cubox-i patches are applied + * patch source: https://github.com/vorlonofportland/u-boot/ + cubox-i-v2014.04-port.patch + cubox-i-enable_raw_rd.patch + +------------------------------------------------------------------- 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 New: ---- cubox-i-enable_raw_rd.patch cubox-i-v2014.04-port.patch u-boot-cubietruck.changes u-boot-cubietruck.spec u-boot-mx6cubox-i.changes u-boot-mx6cubox-i.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-am335xevm.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:56.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:56.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 0 +%define cuboxi_spl 0 Name: u-boot-am335xevm Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) ++++++ u-boot-arndale.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:56.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:56.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 1 +%define cuboxi_spl 0 Name: u-boot-arndale Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) ++++++ u-boot-colibrit20iris.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:56.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:56.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 0 +%define cuboxi_spl 0 Name: u-boot-colibrit20iris Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) ++++++ u-boot-cubieboard.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:56.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:56.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 1 %define arndale_spl 0 +%define cuboxi_spl 0 Name: u-boot-cubieboard Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) u-boot-cubieboard2.spec: same change ++++++ u-boot-cubietruck.spec ++++++ # # spec file for package u-boot-cubietruck # # Copyright (c) 2014 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 %define sunxi_spl 1 %define arndale_spl 0 %define cuboxi_spl 0 Name: u-boot-cubietruck Version: 2014.04 Release: 0 Summary: The u-boot firmware for the cubietruck 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 Source1: openSUSE_panda.txt Source2: arndale-bl1.img Source300: rpmlintrc Patch2: mlo-ext2.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch Patch5: mx53loco-bootscr.patch Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2014.04-sunxi.patch Patch9: am335x_evm-bootscr.patch Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch Patch14: cubox-i-v2014.04-port.patch Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-cubietruck Provides: x-loader-cubietruck %endif ExclusiveArch: armv7l armv7hl %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 cubietruck 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 %if "%{name}" != "u-boot-mx6cubox-i" # conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 %endif %patch3 %patch4 %patch5 %patch6 %patch7 %patch8 -p1 %patch9 -p1 %patch10 %patch12 %patch13 %if "%{name}" == "u-boot-mx6cubox-i" # Conflicts with mlo-ext2.patch, so apply only for cubox-i now %patch14 -p1 %patch15 -p1 %endif %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 %patch21 %patch22 %endif %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubietruck_config # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif %install install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin elif [ -f u-boot-dtb.bin ]; then install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin else install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin fi %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 %if %arndale_spl == 1 install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin %endif %files %defattr(-,root,root) /boot/* %doc Licenses/gpl-2.0.txt 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/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-SoC doc/README.ARM-memory-map %changelog ++++++ u-boot-highbank.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:56.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:56.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 0 +%define cuboxi_spl 0 Name: u-boot-highbank Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) ++++++ u-boot-hyundaia7hd.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:56.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:56.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 1 %define arndale_spl 0 +%define cuboxi_spl 0 Name: u-boot-hyundaia7hd Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) u-boot-melea1000.spec: same change ++++++ u-boot-mx53loco.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:56.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:56.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 0 +%define cuboxi_spl 0 Name: u-boot-mx53loco Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) ++++++ u-boot-mx6cubox-i.spec ++++++ # # spec file for package u-boot-mx6cubox-i # # Copyright (c) 2014 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 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 1 Name: u-boot-mx6cubox-i Version: 2014.04 Release: 0 Summary: The u-boot firmware for the mx6cubox-i 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 Source1: openSUSE_panda.txt Source2: arndale-bl1.img Source300: rpmlintrc Patch2: mlo-ext2.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch Patch5: mx53loco-bootscr.patch Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2014.04-sunxi.patch Patch9: am335x_evm-bootscr.patch Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch Patch14: cubox-i-v2014.04-port.patch Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-mx6cubox-i Provides: x-loader-mx6cubox-i %endif ExclusiveArch: armv7l armv7hl %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 mx6cubox-i 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 %if "%{name}" != "u-boot-mx6cubox-i" # conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 %endif %patch3 %patch4 %patch5 %patch6 %patch7 %patch8 -p1 %patch9 -p1 %patch10 %patch12 %patch13 %if "%{name}" == "u-boot-mx6cubox-i" # Conflicts with mlo-ext2.patch, so apply only for cubox-i now %patch14 -p1 %patch15 -p1 %endif %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 %patch21 %patch22 %endif %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx6_cubox-i_config # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif %install install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img elif [ -f u-boot-dtb.img ]; then install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %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 %if %arndale_spl == 1 install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin %endif %files %defattr(-,root,root) /boot/* %doc Licenses/gpl-2.0.txt 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/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-SoC doc/README.ARM-memory-map %changelog ++++++ u-boot-mx6qsabrelite.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:56.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:56.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 0 +%define cuboxi_spl 0 Name: u-boot-mx6qsabrelite Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) u-boot-omap3beagle.spec: same change u-boot-omap4panda.spec: same change u-boot-paz00.spec: same change u-boot-rpib.spec: same change ++++++ u-boot-snow.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:57.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:57.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 0 +%define cuboxi_spl 0 Name: u-boot-snow Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) ++++++ u-boot-vexpressaemv8a.spec ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:57.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:57.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 0 +%define cuboxi_spl 0 Name: u-boot-vexpressaemv8a Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) ++++++ cubox-i-enable_raw_rd.patch ++++++ diff --git a/include/configs/mx6_cubox-i.h b/include/configs/mx6_cubox-i.h index 49b029f..dfd2e46 100644 --- a/include/configs/mx6_cubox-i.h +++ b/include/configs/mx6_cubox-i.h @@ -355,6 +355,8 @@ extern char *config_sys_prompt; #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE + +#define CONFIG_SUPPORT_RAW_INITRD #endif #endif /* __CONFIG_H * */ ++++++ cubox-i-v2014.04-port.patch ++++++ ++++ 4119 lines (skipped) ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:57.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:57.000000000 +0200 @@ -5,7 +5,7 @@ ARCH_RESTRICTIONS="$3 $4" armv6_boards="rpi_b" -armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6qsabrelite Cubieboard Cubieboard2 Hyundai_A7HD Mele_A1000 colibri_t20_iris paz00 snow" +armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6qsabrelite Cubieboard Cubieboard2 Cubietruck Hyundai_A7HD Mele_A1000 colibri_t20_iris paz00 snow mx6_cubox-i" aarch64_boards="vexpress_aemv8a" if [ ! "$1" -o ! "$2" -o ! "$3" ]; then @@ -37,19 +37,22 @@ ORIGEN_SPL=0 SUNXI_SPL=0 ARNDALE_SPL=0 +CUBOXI_SPL=0 case "$BOARDCONFIG" in -mx*|efika*) BINEND=imx ;; +mx53loco*|mx6qsabrelite*|efika*) BINEND=imx ;; *omap*|*am335x*) BINEND=bin XLOADER=1 ;; *arndale*) BINEND=bin ARNDALE_SPL=1 ;; -*Cubieboard*) BINEND=bin +*Cubieboard*|Cubietruck*) BINEND=bin SUNXI_SPL=1 ;; *Mele_A1000*) BINEND=bin SUNXI_SPL=1 ;; *Hyundai_A7HD*) BINEND=bin SUNXI_SPL=1 ;; *snow*) BINEND=img ;; +mx6_cubox-i*) BINEND=img + CUBOXI_SPL=1 ;; *) BINEND=bin ;; esac @@ -61,6 +64,7 @@ s/ARNDALE_SPL/$ARNDALE_SPL/g s/SUNXI_SPL/$SUNXI_SPL/g s/TEGRA_SPL/$TEGRA_SPL/g +s/CUBOXI_SPL/$CUBOXI_SPL/g s/XLOADER/$XLOADER/g" < u-boot.spec.in > u-boot-$BOARDNAME.spec cp u-boot.changes u-boot-$BOARDNAME.changes ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.leQ73f/_old 2014-07-11 06:45:57.000000000 +0200 +++ /var/tmp/diff_new_pack.leQ73f/_new 2014-07-11 06:45:57.000000000 +0200 @@ -22,6 +22,7 @@ %define origen_spl ORIGEN_SPL %define sunxi_spl SUNXI_SPL %define arndale_spl ARNDALE_SPL +%define cuboxi_spl CUBOXI_SPL Name: u-boot-BOARDNAME Version: 2014.04 @@ -45,6 +46,8 @@ Patch10: rpi_b-bootscr.patch Patch12: fix_spl_build_for_am335x.patch Patch13: fix_sabrelite_boot.scr.patch +Patch14: cubox-i-v2014.04-port.patch +Patch15: cubox-i-enable_raw_rd.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch @@ -76,7 +79,10 @@ # 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 +%if "%{name}" != "u-boot-mx6cubox-i" +# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i %patch2 +%endif %patch3 %patch4 %patch5 @@ -87,6 +93,11 @@ %patch10 %patch12 %patch13 +%if "%{name}" == "u-boot-mx6cubox-i" +# Conflicts with mlo-ext2.patch, so apply only for cubox-i now +%patch14 -p1 +%patch15 -p1 +%endif %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 @@ -129,6 +140,9 @@ %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin %endif +%if %cuboxi_spl == 1 +install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin +%endif %files %defattr(-,root,root) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
