From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Thu, 26 Sep 2024 13:19:11 +0000 (+0200)
Subject: configs: remove unused qemu-riscv64 uboot target
X-Git-Tag: accepted/tizen/unified/20241126.175211~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=240ca40675af3e6e23979130d57076c8fd06840f;p=platform%2Fkernel%2Fu-boot.git

configs: remove unused qemu-riscv64 uboot target

u-boot built from the tizen_qemu-riscv64_defconfig is not used in any
of the possible QEMU use-case scenarios, so remove it to avoid possible
confusion. Keep only the tizen_qemu-riscv64_smode_defconfig based one,
which is used as target for starting Tizen in QEMU/RISCV64 environment.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Id5ca1947b0394ab544ed8a9b98c503cc3fd8fb0f
---

diff --git a/configs/tizen_qemu-riscv64_defconfig b/configs/tizen_qemu-riscv64_defconfig
deleted file mode 100644
index d5eae95c80..0000000000
--- a/configs/tizen_qemu-riscv64_defconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-CONFIG_RISCV=y
-CONFIG_SYS_MALLOC_LEN=0x800000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x20000
-CONFIG_DEFAULT_DEVICE_TREE="qemu-virt64"
-CONFIG_SYS_LOAD_ADDR=0x80200000
-CONFIG_TARGET_QEMU_VIRT=y
-CONFIG_ARCH_RV64I=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
-CONFIG_FIT=y
-CONFIG_DISPLAY_CPUINFO=y
-CONFIG_DISPLAY_BOARDINFO=y
-CONFIG_SYS_CBSIZE=256
-CONFIG_SYS_PBSIZE=276
-CONFIG_SYS_BOOTM_LEN=0x4000000
-CONFIG_CMD_BOOTEFI_SELFTEST=y
-CONFIG_CMD_NVEDIT_EFI=y
-# CONFIG_CMD_MII is not set
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_DM_MTD=y
-CONFIG_SYS_MAX_FLASH_BANKS=2
diff --git a/packaging/u-boot-qemu-riscv64.spec b/packaging/u-boot-qemu-riscv64.spec
index cb27f91dfa..d515336def 100644
--- a/packaging/u-boot-qemu-riscv64.spec
+++ b/packaging/u-boot-qemu-riscv64.spec
@@ -30,22 +30,20 @@ Tizen bootloader for QEMU emulating RISC-V
 %{?asan:/usr/bin/gcc-unforce-options}
 cp %{SOURCE1001} .
 
-for c in riscv64 riscv64_smode; do
-	CONFIG=tizen_qemu-${c}_defconfig
+CONFIG=tizen_qemu-riscv64_smode_defconfig
 
-	# Set configuration
-	make O=./build/${c} $CONFIG
+# Set configuration
+make $CONFIG
 
-	make O=./build/${c} %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" \
-		DTC=/usr/bin/dtc \
-		OPENSBI=/platform/generic/firmware/fw_dynamic.bin \
-		EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` \
-		u-boot.bin
-done
+make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" \
+	DTC=/usr/bin/dtc \
+	OPENSBI=/platform/generic/firmware/fw_dynamic.bin \
+	EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` \
+	u-boot.bin
 
 ## Generate uboot.env
-./scripts/get_default_envs.sh build/riscv64 > default_envs.txt
-./build/riscv64/tools/mkenvimage -s 16384 -o uboot.env default_envs.txt
+./scripts/get_default_envs.sh > default_envs.txt
+./tools/mkenvimage -s 16384 -o uboot.env default_envs.txt
 rm default_envs.txt
 
 # Build boot.scr
@@ -57,10 +55,8 @@ rm -rf %{buildroot}
 # u-boot installation
 install -m 644 -D uboot.env %{buildroot}/boot/uboot.env
 install -m 644 -D boot.scr.uimg %{buildroot}/boot/boot.scr.uimg
-install -m 644 -D build/riscv64/u-boot %{buildroot}/%{_libdir}/u-boot/qemu-riscv64/uboot.elf
-install -m 644 -D build/riscv64/u-boot.bin %{buildroot}/%{_libdir}/u-boot/qemu-riscv64/u-boot.bin
-install -m 644 -D build/riscv64_smode/u-boot %{buildroot}/%{_libdir}/u-boot/qemu-riscv64_smode/uboot.elf
-install -m 644 -D build/riscv64_smode/u-boot.bin %{buildroot}/%{_libdir}/u-boot/qemu-riscv64_smode/u-boot.bin
+install -m 644 -D u-boot %{buildroot}/%{_libdir}/u-boot/qemu-riscv64_smode/uboot.elf
+install -m 644 -D u-boot.bin %{buildroot}/%{_libdir}/u-boot/qemu-riscv64_smode/u-boot.bin
 
 %clean
 
@@ -69,7 +65,5 @@ install -m 644 -D build/riscv64_smode/u-boot.bin %{buildroot}/%{_libdir}/u-boot/
 %defattr(-,root,root,-)
 /boot/uboot.env
 /boot/boot.scr.uimg
-%{_libdir}/u-boot/qemu-riscv64/u-boot.bin
-%{_libdir}/u-boot/qemu-riscv64/uboot.elf
 %{_libdir}/u-boot/qemu-riscv64_smode/u-boot.bin
 %{_libdir}/u-boot/qemu-riscv64_smode/uboot.elf