Revert "packaging: u-boot: build only u-boot-tools for arm64"

This reverts commit c5bc33d34714a936013cdfedf30800e9d4d4a890.

Now, u-boot tools for arm64 is built from u-boot-rpi3.spec, so it
is not required to build from this spec file.

Change-Id: Ic5d6f9caef8ec31cbce88bbb79e6e4305d9896e3
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/packaging/u-boot.spec b/packaging/u-boot.spec
index 7689a6cb8e4a566e56c28ffaebd084168478abb1..4a8a3d7d828d8cc0c9f91c43fe6b61f4e1b44e47 100644 (file)
--- a/packaging/u-boot.spec
+++ b/packaging/u-boot.spec
@@ -4,7 +4,7 @@ Release: 0
 Summary: Das U-Boot - Tizen bootloader
 Group: System/Kernel
 License: GPL-2.0+
-ExclusiveArch: %{arm} aarch64
+ExclusiveArch: %{arm}
 URL: http://git.denx.de/u-boot.git
 Source0: %{name}-%{version}.tar.bz2
 Source1001: u_boot.manifest
@@ -43,12 +43,6 @@ and modify U-Boot's environment.
 %global use_mmc_storage 1
 %endif
 
-%ifarch aarch64
-%define tool tools-only
-%else
-%define tool tools
-%endif
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -67,7 +61,7 @@ make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc
 make $CONFIG
 
 # Build tools
-make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true %{tool}
+make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools
 
 %if 1%{?use_mmc_storage}
 make HOSTCC="gcc $RPM_OPT_FLAGS" CONFIG_ENV_IS_IN_MMC=y env
@@ -75,7 +69,6 @@ make HOSTCC="gcc $RPM_OPT_FLAGS" CONFIG_ENV_IS_IN_MMC=y env
 make HOSTCC="gcc $RPM_OPT_FLAGS" env
 %endif
 
-%ifarch %{arm}
 # Build u-boot
 export PATH="$PATH:tools:tools/dtc/"
 make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'`
@@ -94,7 +87,6 @@ objcopy -O binary --only-section=.rodata.default_environment `find . -name "copy
 tr '\0' '\n' < copy_env_common.o > default_envs.txt
 mkenvimage -s 16384 -o params.bin default_envs.txt
 rm copy_env_common.o default_envs.txt
-%endif
 
 %install
 rm -rf %{buildroot}
@@ -107,22 +99,18 @@ install -p -m 0755 tools/dtc/dtc %{buildroot}%{_bindir}
 ( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv )
 
 # u-boot installation
-%ifarch %{arm}
 mkdir -p %{buildroot}/var/tmp/u-boot
 install -d %{buildroot}/var/tmp/u-boot
 install -m 755 u-boot.bin %{buildroot}/var/tmp/u-boot
 install -m 755 u-boot-mmc.bin %{buildroot}/var/tmp/u-boot
 install -m 755 params.bin %{buildroot}/var/tmp/u-boot
-%endif
 
 %clean
 
-%ifarch %{arm}
 %files
 %manifest u_boot.manifest
 %defattr(-,root,root,-)
 /var/tmp/u-boot
-%endif
 
 %files -n u-boot-tools
 %manifest u_boot.manifest