packaging: Use the u-boot.spec for u-boot-rpi4-32b

xu3 didn't support anymore on Tizen. So it doesn't need to build
anymore. Instead, move the u-boot-rpi4-32b into u-boot.spec.
It will be created same rpm packages like below.

- u-boot-rpi4-32b-2024.10-0.armv7l.rpm
- u-boot-rpi4-32b-debugsource-2024.10-0.armv7l.rpm
- u-boot-tools-2024.10-0.armv7l.rpm
- u-boot-tools-debuginfo-2024.10-0.armv7l.rpm

Change-Id: If53dce0db499137396380bd8c6d3a8c39b2c12e6
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/packaging/u-boot-rpi4-32b.spec b/packaging/u-boot-rpi4-32b.spec
deleted file mode 100644 (file)
index fbea4e3..0000000
--- a/packaging/u-boot-rpi4-32b.spec
+++ /dev/null
@@ -1,92 +0,0 @@
-Name: u-boot-rpi4-32b
-Version: 2024.10
-Release: 0
-Summary: Das U-Boot - Tizen bootloader
-Group: System/Kernel
-License: GPL-2.0+
-ExclusiveArch: %{arm}
-URL: https://source.denx.de/u-boot/u-boot.git
-Source0: u-boot-%{version}.tar.bz2
-Source1001: u_boot_rpi4.manifest
-
-BuildRequires: gcc >= 6.0
-BuildRequires: bc
-BuildRequires: flex
-BuildRequires: bison
-BuildRequires: pkgconfig(openssl3)
-
-%description
-u-boot - Tizen bootloader for RPI4 boards based
-
-%package -n u-boot-tools
-Summary: Companion tools for Das U-Boot bootloader
-Group: System/Kernel
-
-%description -n u-boot-tools
-This package includes the mkimage program, which allows generation of U-Boot
-images in various formats, and the fw_printenv and fw_setenv programs to read
-and modify U-Boot's environment.
-
-%prep
-%setup -q -n u-boot-%{version}
-
-%build
-%{?asan:/usr/bin/gcc-unforce-options}
-cp %{SOURCE1001} .
-
-CONFIG=tizen_rpi_4_32b_defconfig
-
-make mrproper
-
-# Set configuration
-make $CONFIG
-
-# Build tools
-make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools
-
-make HOSTCC="gcc $RPM_OPT_FLAGS" envtools
-
-# Build u-boot
-export PATH="$PATH:tools"
-make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'`
-
-# Generate uboot.env
-./scripts/get_default_envs.sh > default_envs.txt
-mkenvimage -s 16384 -o uboot.env default_envs.txt
-rm default_envs.txt
-
-# Build boot.scr
-mkimage -A arm -T script -C none -n "Tizen RPI4 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi4.scr ./boot.scr.uimg
-
-%install
-rm -rf %{buildroot}
-
-# Tools installation
-mkdir -p %{buildroot}%{_bindir}
-install -p -m 0755 tools/mkimage %{buildroot}%{_bindir}
-install -p -m 0755 tools/env/fw_printenv %{buildroot}%{_bindir}
-install -p -m 0755 scripts/dtc/dtc %{buildroot}%{_bindir}
-( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv )
-
-# u-boot installation
-mkdir -p %{buildroot}/boot
-install -m 755 u-boot.bin %{buildroot}/boot/
-install -m 755 uboot.env %{buildroot}/boot/
-install -m 755 boot.scr.uimg %{buildroot}/boot/
-
-%clean
-
-%files
-%manifest u_boot_rpi4.manifest
-%defattr(-,root,root,-)
-/boot/u-boot.bin
-/boot/uboot.env
-/boot/boot.scr.uimg
-
-%files -n u-boot-tools
-%manifest u_boot_rpi4.manifest
-%defattr(-,root,root,-)
-%{_bindir}/mkimage
-%{_bindir}/fw_printenv
-%{_bindir}/fw_setenv
-%{_bindir}/dtc

diff --git a/packaging/u-boot.spec b/packaging/u-boot.spec
index b1dc9d933bdec5795da2492dd419f73bfa36f9a3..9f375302140c2da28ca9067f49f8c510142e6959 100644 (file)
--- a/packaging/u-boot.spec
+++ b/packaging/u-boot.spec
@@ -7,7 +7,7 @@ License: GPL-2.0+
 ExclusiveArch: %{arm}
 URL: https://source.denx.de/u-boot/u-boot.git
 Source0: %{name}-%{version}.tar.bz2
-Source1001: u_boot.manifest
+Source1001: u_boot_rpi4.manifest
 
 BuildRequires: gcc >= 6.0
 BuildRequires: bc
@@ -18,18 +18,21 @@ BuildRequires: pkgconfig(openssl3)
 %description
 u-boot - Tizen bootloader for Embedded boards based on ARM processor
 
-#TODO: Describe rpm package information depending on board
-%package -n u-boot-pkg
-Summary: A bootloader for Embedded system
+%package -n u-boot-rpi4-32b
+Summary: Das U-Boot bootloader - Tizen RPi4 bootloader
 Group: System/Kernel
 
-%description -n u-boot-pkg
-A boot loader for embedded systems.
-Das U-Boot is a cross-platform bootloader for embedded systems,
-used as the default boot loader by several board vendors.  It is
-intended to be easy to port and to debug, and runs on many
-supported architectures, including PPC, ARM, MIPS, x86, m68k, NIOS,
-and Microblaze.
+%description -n u-boot-rpi4-32b
+u-boot - Tizen bootloader for RPI4 boards based
+
+%package -n u-boot-tools
+Summary: Companion tools for Das U-Boot bootloader
+Group: System/Kernel
+
+%description -n u-boot-tools
+This package includes the mkimage program, which allows generation of U-Boot
+images in various formats, and the fw_printenv and fw_setenv programs to read
+and modify U-Boot's environment.
 
 %prep
 %setup -q -n u-boot-%{version}
@@ -38,7 +41,7 @@ and Microblaze.
 %{?asan:/usr/bin/gcc-unforce-options}
 cp %{SOURCE1001} .
 
-CONFIG=odroid-xu3_defconfig
+CONFIG=tizen_rpi_4_32b_defconfig
 
 make mrproper
 
@@ -54,24 +57,43 @@ make HOSTCC="gcc $RPM_OPT_FLAGS" envtools
 export PATH="$PATH:tools"
 make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'`
 
-# Generate params.bin
+# Generate uboot.env
 ./scripts/get_default_envs.sh > default_envs.txt
-mkenvimage -s 16384 -o params.bin default_envs.txt
+mkenvimage -s 16384 -o uboot.env default_envs.txt
 rm default_envs.txt
 
+# Build boot.scr
+mkimage -A arm -T script -C none -n "Tizen RPI4 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi4.scr ./boot.scr.uimg
 
 %install
 rm -rf %{buildroot}
 
+# Tools installation
+mkdir -p %{buildroot}%{_bindir}
+install -p -m 0755 tools/mkimage %{buildroot}%{_bindir}
+install -p -m 0755 tools/env/fw_printenv %{buildroot}%{_bindir}
+install -p -m 0755 scripts/dtc/dtc %{buildroot}%{_bindir}
+( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv )
+
 # u-boot installation
-mkdir -p %{buildroot}/var/tmp/u-boot-xu3
-install -d %{buildroot}/var/tmp/u-boot-xu3
-install -m 755 u-boot.bin %{buildroot}/var/tmp/u-boot-xu3
-install -m 755 params.bin %{buildroot}/var/tmp/u-boot-xu3
+mkdir -p %{buildroot}/boot
+install -m 755 u-boot.bin %{buildroot}/boot/
+install -m 755 uboot.env %{buildroot}/boot/
+install -m 755 boot.scr.uimg %{buildroot}/boot/
 
 %clean
 
-%files
-%manifest u_boot.manifest
+%files -n u-boot-rpi4-32b
+%manifest u_boot_rpi4.manifest
+%defattr(-,root,root,-)
+/boot/u-boot.bin
+/boot/uboot.env
+/boot/boot.scr.uimg
+
+%files -n u-boot-tools
+%manifest u_boot_rpi4.manifest
 %defattr(-,root,root,-)
-/var/tmp/u-boot-xu3
+%{_bindir}/mkimage
+%{_bindir}/fw_printenv
+%{_bindir}/fw_setenv
+%{_bindir}/dtc

diff --git a/packaging/u_boot.manifest b/packaging/u_boot.manifest
deleted file mode 100644 (file)
index 017d22d..0000000
--- a/packaging/u_boot.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>