From 1ed2cd29af5a5e01e43574038fb852a20d70e2fe Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 30 Mar 2015 08:08:20 -0500
Subject: [PATCH] add patch to fix booting on omap4 devices

- refeactor spec file
- add all sunxi boards
- add odroid and odroid-xu3
---
 0001-omap4-distro-boot-partition-fixup.patch |  25 ++
 armv7-boards                                 |  75 ++++
 uboot-tools.spec                             | 397 ++-----------------
 3 files changed, 136 insertions(+), 361 deletions(-)
 create mode 100644 0001-omap4-distro-boot-partition-fixup.patch
 create mode 100644 armv7-boards

diff --git a/0001-omap4-distro-boot-partition-fixup.patch b/0001-omap4-distro-boot-partition-fixup.patch
new file mode 100644
index 0000000..5bc8700
--- /dev/null
+++ b/0001-omap4-distro-boot-partition-fixup.patch
@@ -0,0 +1,25 @@
+From eb905357f4cbe0d6bf8346a20d5b3bb36a8887c6 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Sun, 29 Mar 2015 12:56:03 -0500
+Subject: [PATCH] omap4 distro boot partition fixup
+
+---
+ include/configs/ti_omap4_common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
+index 5402793..31dd1f0 100644
+--- a/include/configs/ti_omap4_common.h
++++ b/include/configs/ti_omap4_common.h
+@@ -101,7 +101,7 @@
+ 	DEFAULT_LINUX_BOOT_ENV \
+ 	"console=ttyO2,115200n8\0" \
+ 	"fdtfile=undefined\0" \
+-	"bootpart=0:2\0" \
++	"bootpart=1\0" \
+ 	"bootdir=/boot\0" \
+ 	"bootfile=zImage\0" \
+ 	"usbtty=cdc_acm\0" \
+-- 
+2.3.2
+
diff --git a/armv7-boards b/armv7-boards
new file mode 100644
index 0000000..50df84a
--- /dev/null
+++ b/armv7-boards
@@ -0,0 +1,75 @@
+A10-OLinuXino-Lime
+A10s-OLinuXino-M
+A13-OLinuXino
+A13-OLinuXinoM
+A20-OLinuXino-Lime
+A20-OLinuXino-Lime2
+A20-OLinuXino_MICRO
+am335x_boneblack
+Ampe_A76
+arndale
+Auxtek-T004
+ba10_tv_box
+Bananapi
+Bananapro
+Chuwi_V7_CW0825
+cm_fx6
+Colombus
+CSQ_CS908
+Cubieboard
+Cubieboard2
+Cubietruck
+db-mv784mp-gp
+forfun_q88db
+highbank
+Hummingbird_A31
+hummingboard_solo
+Hyundai_A7HD
+i12-tvbox
+Inet_86VS
+Ippo_q8h_v1_2
+Ippo_q8h_v5
+jesurun_q5
+jetson-tk1
+Linksprite_pcDuino
+Linksprite_pcDuino3
+Linksprite_pcDuino3_fdt
+Linksprite_pcDuino3_Nano
+Marsboard_A10
+Mele_A1000
+Mele_I7
+Mele_M3
+Mele_M5
+Mele_M9
+Mini-X
+mk802
+mk802_a10s
+mk802ii
+MK808C
+MSI_Primo73
+MSI_Primo81
+novena
+odroid
+odroid-xu3
+omap3_beagle
+omap4_panda
+omap5_uevm
+Orangepi
+Orangepi_mini
+origen
+paz00
+r7-tv-dongle
+riotboard
+smdkv310
+snow
+snowball
+sunxi_Gemei_G9
+trimslice
+TZX-Q8-713B7
+udoo_quad
+UTOO_P66
+wandboard_dl
+wandboard_quad
+wandboard_solo
+Wexler_TAB7200
+Wits_Pro_A20_DKT
diff --git a/uboot-tools.spec b/uboot-tools.spec
index b07e7b1..3dc2dc2 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -2,13 +2,14 @@
 
 Name:           uboot-tools
 Version:        2015.04
-Release:        0.3%{?candidate:.%{candidate}}%{?dist}
+Release:        0.4%{?candidate:.%{candidate}}%{?dist}
 Summary:        U-Boot utilities
 
 Group:          Development/Tools
 License:        GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:            http://www.denx.de/wiki/U-Boot
 Source0:        ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
+Source1:        armv7-boards
 
 Patch1:   0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
 Patch2:   0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
@@ -24,10 +25,11 @@ Patch11:  0011-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
 Patch12:  0012-beagle-board-use-ext-support-in-the-SPL.patch
 Patch13:  0013-WANDBOARD-run-the-dsitro-bootcmd-first-before-fallin.patch
 Patch14:  0014-BBB-tell-u-boot-to-look-in-the-first-partition-to-lo.patch
+Patch15:  0001-omap4-distro-boot-partition-fixup.patch
 
 BuildRequires:  dtc, openssl-devel
 BuildRequires:  fedora-logos, netpbm-progs
-BuildRequires:  git
+BuildRequires:  git, bc
 Requires:       dtc
 
 %description
@@ -38,6 +40,7 @@ and fw_printenv/fw_setenv for manipulating the boot environment variables.
 %package     -n uboot-images-armv8
 Summary:     u-boot bootloader images for armv8 boards
 Requires:    uboot-tools
+BuildArch:   noarch
 
 %description -n uboot-images-armv8
 u-boot bootloader binaries for the aarch64 vexpress_aemv8a
@@ -47,6 +50,7 @@ u-boot bootloader binaries for the aarch64 vexpress_aemv8a
 %package     -n uboot-images-armv7
 Summary:     u-boot bootloader images for armv7 boards
 Requires:    uboot-tools
+BuildArch:   noarch
 
 Obsoletes: uboot-arndale < %{version}-%{release}
 Provides:  uboot-arndale = %{version}-%{release}
@@ -110,411 +114,82 @@ done
 
 %build
 %ifarch aarch64
-make vexpress_aemv8a_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.bin builds/u-boot.bin.vexpress_aemv8a
-make mrproper
-
+make vexpress_aemv8a_config O=builds/vexpress_aemv8a/
+make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/vexpress_aemv8a/
 %endif
 
 %ifarch %{arm}
-make db-mv784mp-gp_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.img builds/u-boot.img.db-mv784mp-gp
-cp -p u-boot-spl.kwb builds/u-boot-spl.kwb.db-mv784mp-gp
-make mrproper
-
-# AllWinner devices
-make Bananapi_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Bananapi
-make mrproper
-
-make Bananapro_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Bananapro
-make mrproper
-
-make Cubieboard_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Cubieboard
-make mrproper
-
-make Cubieboard2_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Cubieboard2
-make mrproper
-
-make Cubietruck_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Cubietruck
-make mrproper
-
-make Mele_A1000_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Mele_A1000
-make mrproper
-
-make Mele_M3_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Mele_M3
-make mrproper
-
-make Mini-X_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.Mini-X
-make mrproper
-
-make A10-OLinuXino-Lime_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A10-OLinuXino-Lime
-make mrproper
-
-make A20-OLinuXino-Lime_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A20-OLinuXino-Lime
-make mrproper
-
-make A20-OLinuXino-Lime2_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A20-OLinuXino-Lime2
-make mrproper
-
-make A10s-OLinuXino-M_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A10s-OLinuXino-M
-make mrproper
-
-make A13-OLinuXino_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A13-OLinuXino
-make mrproper
-
-make A13-OLinuXinoM_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A13-OLinuXinoM
-make mrproper
-
-make A20-OLinuXino_MICRO_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-sunxi-with-spl.bin builds/u-boot-sunxi-with-spl.bin.A20-OLinuXino_MICRO
-make mrproper
-
-# Calxeda
-make highbank_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.bin builds/u-boot.bin.highbank
-make mrproper
-
-# Freescale i.MX6
-make cm_fx6_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.img builds/u-boot.img.cm_fx6
-cp -p SPL builds/SPL.cm_fx6
-make mrproper
-
-make hummingboard_solo_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.imx builds/u-boot.imx.hummingboard
-make mrproper
-
-make novena_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.img builds/u-boot.imx.novena
-make mrproper
-
-make riotboard_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.imx builds/u-boot.imx.riotboard
-make mrproper
-
-make udoo_quad_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.imx builds/u-boot.imx.udoo_quad
-make mrproper
-
-make wandboard_dl_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.imx builds/u-boot.imx.wandboard_dl
-make mrproper
-
-make wandboard_quad_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.imx builds/u-boot.imx.wandboard_quad
-make mrproper
-
-make wandboard_solo_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.imx builds/u-boot.imx.wandboard_solo
-make mrproper
-
-# NVidia Tegra devices
-make jetson-tk1_defconfig
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-dtb-tegra.bin builds/u-boot-dtb-tegra.bin.jetson-tk1
-cp -p u-boot-nodtb-tegra.bin builds/u-boot-nodtb-tegra.bin.jetson-tk1
-cp -p u-boot.map builds/u-boot.map.jetson-tk1
-cp -p u-boot.dtb builds/u-boot.dtb.jetson-tk1
-make mrproper
-
-make paz00_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-dtb-tegra.bin builds/u-boot-dtb-tegra.bin.paz00
-cp -p u-boot-nodtb-tegra.bin builds/u-boot-nodtb-tegra.bin.paz00
-cp -p u-boot.map builds/u-boot.map.paz00
-cp -p u-boot.dtb builds/u-boot.dtb.paz00
-make mrproper
-
-make trimslice_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-dtb-tegra.bin builds/u-boot-dtb-tegra.bin.trimslice
-cp -p u-boot-nodtb-tegra.bin builds/u-boot-nodtb-tegra.bin.trimslice
-cp -p u-boot.map builds/u-boot.map.trimslice
-cp -p u-boot.dtb builds/u-boot.dtb.trimslice
-make mrproper
-
-# Samsung Exynos devices
-make arndale_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p spl/arndale-spl.bin builds/arndale-spl.bin.arndale
-cp -p u-boot-dtb.bin builds/u-boot-dtb.bin.arndale
-make mrproper
-
-make origen_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p spl/origen-spl.bin builds/origen-spl.bin.origen
-cp -p u-boot.bin builds/u-boot.bin.origen
-cp -p u-boot-dtb.bin builds/u-boot-dtb.bin.origen
-make mrproper
-
-make smdkv310_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p spl/smdkv310-spl.bin builds/smdkv310-spl.bin.smdkv310
-cp -p u-boot.bin builds/u-boot.bin.smdkv310
-make mrproper
-
-make snow_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot-dtb.bin builds/u-boot-dtb.bin.snow
-make mrproper
-
-# ST Erikson
-make snowball_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p u-boot.bin builds/u-boot.bin.snowball
-make mrproper
-
-# TI devices
-make am335x_boneblack_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p MLO builds/MLO.beaglebone
-cp -p u-boot.img builds/u-boot.img.beaglebone
-make mrproper
-
-make omap3_beagle_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p MLO builds/MLO.beagle
-cp -p u-boot.img builds/u-boot.img.beagle
-make mrproper
-
-make omap4_panda_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p MLO builds/MLO.panda
-cp -p u-boot.img builds/u-boot.img.panda
-make mrproper
-
-make omap5_uevm_config
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
-cp -p MLO builds/MLO.uevm
-cp -p u-boot.img builds/u-boot.img.uevm
-make mrproper
+for board in $(cat %SOURCE1)
+do
+make $(echo $board)_defconfig V=1 O=builds/$(echo $board)/
+make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/$(echo $board)/
+done
 
 %endif
 
-make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" defconfig V=1
-make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" silentoldconfig V=1
-make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" tools-only V=1
-
-%ifarch %{arm}
-make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" sheevaplug_config V=1
-make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" env V=1
-%endif
+make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" defconfig V=1 O=builds/
+make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" tools-all V=1 O=builds/
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
 
 %ifarch aarch64
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/vexpress_aemv8a/
 
-install -p -m 0644 builds/u-boot.bin.vexpress_aemv8a $RPM_BUILD_ROOT%{_datadir}/uboot/vexpress_aemv8a/u-boot.bin
+install -p -m 0644 builds/vexpress_aemv8a/u-boot.bin $RPM_BUILD_ROOT%{_datadir}/uboot/vexpress_aemv8a/
 %endif
 
 %ifarch %{arm}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
-for board in A10-OLinuXino-Lime A10s-OLinuXino-M A13-OLinuXino A13-OLinuXinoM A20-OLinuXino_MICRO A20-OLinuXino-Lime A20-OLinuXino-Lime2 arndale Bananapi Bananapro beagle beaglebone cm_fx6 Cubieboard Cubieboard2 Cubietruck highbank jetson-tk1 Mele_A1000 Mele_M3 Mini-X origen panda paz00 riotboard smdkv310 snow snowball trimslice udoo_quad uevm vexpress wandboard_dl wandboard_quad wandboard_solo db-mv784mp-gp
+for board in $(cat %SOURCE1)
 do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
-done
-
-# AllWinner
-for board in Bananapi Bananapro Cubieboard Cubieboard2 Cubietruck Mele_A1000 Mele_M3 Mini-X A10-OLinuXino-Lime A10s-OLinuXino-M A13-OLinuXino A13-OLinuXinoM A20-OLinuXino_MICRO A20-OLinuXino-Lime A20-OLinuXino-Lime2
-do
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
-install -p -m 0644 builds/u-boot-sunxi-with-spl.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-sunxi-with-spl.bin
-done
-
-# Calxeda
-install -p -m 0644 builds/u-boot.bin.highbank $RPM_BUILD_ROOT%{_datadir}/uboot/highbank/u-boot.bin
-
-# FreeScale
-for board in cm_fx6
-do
-install -p -m 0644 builds/u-boot.img.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.img
-install -p -m 0644 builds/SPL.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/SPL
-done
-
-for board in hummingboard novena riotboard udoo_quad wandboard_dl wandboard_quad wandboard_solo
-do
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
-install -p -m 0644 builds/u-boot.imx.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.imx
-done
-
-# NVidia
-for board in paz00 trimslice jetson-tk1
-do
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
-install -p -m 0644 builds/u-boot-nodtb-tegra.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-nodtb-tegra.bin
-install -p -m 0644 builds/u-boot-dtb-tegra.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-dtb-tegra.bin
-install -p -m 0644 builds/u-boot.map.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.map
-install -p -m 0644 builds/u-boot.dtb.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.dtb
-done
-
-# Samsung
-#without dtb
-for board in smdkv310
-do
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
-install -p -m 0644 builds/$(echo $board)-spl.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/$(echo $board)-spl.bin
-install -p -m 0644 builds/u-boot.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.bin
-done
-#with dtb
-for board in arndale origen
-do
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
-install -p -m 0644 builds/$(echo $board)-spl.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/$(echo $board)-spl.bin
-install -p -m 0644 builds/u-boot-dtb.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-dtb.bin
-done
-
-install -p -m 0644 builds/u-boot-dtb.bin.snow $RPM_BUILD_ROOT%{_datadir}/uboot/snow/u-boot-dtb.bin
-
-# STE
-install -p -m 0644 builds/u-boot.bin.snowball $RPM_BUILD_ROOT%{_datadir}/uboot/snowball/u-boot.bin
-
-# TI
-for board in beaglebone beagle panda uevm
-do
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
-install -p -m 0644 builds/u-boot.img.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.img
-install -p -m 0644 builds/MLO.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/MLO
-done
-
-for board in db-mv784mp-gp
-do
-install -p -m 0644 builds/u-boot.img.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.img
-install -p -m 0644 builds/u-boot-spl.kwb.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.kwb
+for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/smdkv310-spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-nodtb-tegra.bin u-boot-spl.kwb u-boot-sunxi-with-spl.bin
+if [ -f builds/$(echo $board)/$(echo $file) ]; then
+    install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
+fi
 done
 
 %endif
 
-install -p -m 0755 tools/mkimage $RPM_BUILD_ROOT%{_bindir}
+for tool in bmp_logo dumpimage easylogo/easylogo env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr img2srec mkenvimage mkimage ncb proftool ubsha1 xway-swap-bytes
+do
+install -p -m 0755 builds/tools/$tool $RPM_BUILD_ROOT%{_bindir}
+done
 install -p -m 0644 doc/mkimage.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 0755 tools/mkenvimage $RPM_BUILD_ROOT%{_bindir}
-install -p -m 0755 tools/dumpimage $RPM_BUILD_ROOT%{_bindir}
-install -p -m 0755 tools/fit_info $RPM_BUILD_ROOT%{_bindir}
-install -p -m 0755 tools/fit_check_sign $RPM_BUILD_ROOT%{_bindir}
 
-%ifarch %{arm}
-install -p -m 0755 tools/env/fw_printenv $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 builds/tools/env/fw_printenv $RPM_BUILD_ROOT%{_bindir}
 ( cd $RPM_BUILD_ROOT%{_bindir}; ln -sf fw_printenv fw_setenv )
 
 install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
-%endif
 
 
 %files
 %doc README doc/README.imximage doc/README.kwbimage doc/uImage.FIT
-%{_bindir}/fit_check_sign
-%{_bindir}/fit_info
-%{_bindir}/mkimage
-%{_bindir}/mkenvimage
-%{_bindir}/dumpimage
+%{_bindir}/*
 %{_mandir}/man1/mkimage.1*
-%ifarch %{arm} aarch64
 %dir %{_datadir}/uboot/
-%endif
-%ifarch %{arm}
-%{_bindir}/fw_printenv
-%{_bindir}/fw_setenv
 %config(noreplace) %{_sysconfdir}/fw_env.config
-%endif
 
 %ifarch aarch64
 %files -n uboot-images-armv8
-%{_datadir}/uboot/vexpress_aemv8a/
+%{_datadir}/uboot/*
 %endif
 
 %ifarch %{arm}
 %files -n uboot-images-armv7
-# AllWinner
-%{_datadir}/uboot/Bananapi/
-%{_datadir}/uboot/Bananapro/
-%{_datadir}/uboot/Cubieboard/
-%{_datadir}/uboot/Cubieboard2/
-%{_datadir}/uboot/Cubietruck/
-%{_datadir}/uboot/Mele_A1000/
-%{_datadir}/uboot/Mele_M3/
-%{_datadir}/uboot/Mini-X/
-%{_datadir}/uboot/A10-OLinuXino-Lime/
-%{_datadir}/uboot/A10s-OLinuXino-M/
-%{_datadir}/uboot/A13-OLinuXino/
-%{_datadir}/uboot/A13-OLinuXinoM/
-%{_datadir}/uboot/A20-OLinuXino_MICRO/
-%{_datadir}/uboot/A20-OLinuXino-Lime/
-%{_datadir}/uboot/A20-OLinuXino-Lime2/
-# Calxeda
-%{_datadir}/uboot/highbank/
-# FreeScale
-%{_datadir}/uboot/cm_fx6/
-%{_datadir}/uboot/hummingboard/
-%{_datadir}/uboot/novena/
-%{_datadir}/uboot/riotboard/
-%{_datadir}/uboot/wandboard_dl/
-%{_datadir}/uboot/wandboard_quad/
-%{_datadir}/uboot/wandboard_solo/
-%{_datadir}/uboot/udoo_quad/
-# NVidia
-%{_datadir}/uboot/jetson-tk1/
-%{_datadir}/uboot/paz00/
-%{_datadir}/uboot/trimslice/
-# Samsung
-%{_datadir}/uboot/arndale/
-%{_datadir}/uboot/smdkv310/
-%{_datadir}/uboot/snow/
-# STE
-%{_datadir}/uboot/snowball/
-# TI
-%{_datadir}/uboot/beagle/
-%{_datadir}/uboot/beaglebone/
-%{_datadir}/uboot/origen/
-%{_datadir}/uboot/panda/
-%{_datadir}/uboot/uevm/
-#Marvell
-%{_datadir}/uboot/db-mv784mp-gp/
+%{_datadir}/uboot/*
 %endif
 
 %changelog
+* Mon Mar 30 2015 Dennis Gilmore <dennis@ausil.us> - 2015.04-0.4.rc4
+- add patch to fix booting on omap4 devices
+- refeactor spec file
+- add all sunxi boards
+- add odroid and odroid-xu3
+
 * Sat Mar 21 2015 Dennis Gilmore <dennis@ausil.us> - 2015.04-0.3.rc4
 - fix up bbb and wandboard to autoboot again