From: Łukasz Stelmach <l.stelmach@samsung.com>
Date: Thu, 3 Aug 2023 05:38:05 +0000 (+0200)
Subject: tizen: bootscript: remove uEnv.txt from VisionFive2 package
X-Git-Tag: accepted/tizen/unified/riscv/20230821.130836~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63a190bd921f1f36667b8531bcccf08b280236d6;p=platform%2Fkernel%2Fu-boot.git

tizen: bootscript: remove uEnv.txt from VisionFive2 package

The file isn't loaded automatically and all the information it contains
are in the default environment compiled from appropriate header files.

Change-Id: I569bd0657c3246dc6bf50117b5d7567a557dbd68
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---

diff --git a/packaging/u-boot-visionfive2.spec b/packaging/u-boot-visionfive2.spec
index 4746e3377b..3989292667 100644
--- a/packaging/u-boot-visionfive2.spec
+++ b/packaging/u-boot-visionfive2.spec
@@ -85,7 +85,6 @@ mkdir -p %{buildroot}/boot
 mkdir -p %{buildroot}/var/tmp
 install -m 755 u-boot.itb %{buildroot}/var/tmp/
 install -m 755 uboot.env %{buildroot}/boot/
-install -m 755 tizen/bootscript/tizen-boot-vf2-uEnv.txt %{buildroot}/boot/uEnv.txt
 install -m 755 boot.scr.uimg %{buildroot}/boot/
 install -m 755 spl/u-boot-spl.bin.normal.out %{buildroot}/var/tmp/
 
@@ -98,7 +97,6 @@ install -m 755 spl/u-boot-spl.bin.normal.out %{buildroot}/var/tmp/
 /var/tmp/u-boot-spl.bin.normal.out
 /boot/uboot.env
 /boot/boot.scr.uimg
-/boot/uEnv.txt
 
 %files -n u-boot-tools
 %manifest u_boot_visionfive2.manifest
diff --git a/tizen/bootscript/tizen-boot-vf2-uEnv.txt b/tizen/bootscript/tizen-boot-vf2-uEnv.txt
deleted file mode 100644
index d52b00754a..0000000000
--- a/tizen/bootscript/tizen-boot-vf2-uEnv.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-prefix=/
-
-fdtfile=jh7110-starfive-visionfive-2-v1.3b.dtb
-fdt_addr_r=0x46000000
-fdt_high=0xffffffffffffffff
-
-scriptaddr=0x43900000
-script_offset_f=0x1fff000
-script_size_f=0x1000
-
-pxefile_addr_r=0x45900000
-
-ramdisk_addr_r=0x46100000
-initrd_high=0xffffffffffffffff
-
-kernel=Image
-kernel_addr_r=0x40200000
-kernel_comp_addr_r=0x4C200000
-kernel_comp_size=0x4000000
-
-# gateway=192.168.0.1
-# ipaddr=192.168.0.2
-# netmask=255.255.255.0
-
-target=mmc0
-mmcbootdev=1
-mmcbootpart=3
-mmcrootdev=1
-mmcrootpart=5
-mmcinformpart=b
-rebootparamfile=reboot-param.bin
-slotfile=partition-ab.info
-slot_addr=0x82200000
-rebootparam_addr=0x82100000
-upgrade_val=72677075
-recovery_val=72766372
-nodef_val=6665646e
-normal_val=6d726f6e
-download_val=6c6e7764
-ramdiskpart=9
-bootmode=ramdisk
-bootdev=mmc
-tfm=setenv bootmode download; run bootcmd
-tizen_bootarg=""
-opts=loglevel=7
-set_to_part_a=\
-    if test -e mmc ${mmcbootdev}:${mmcinformpart} ${slotfile}; then; \
-        load mmc ${mmcbootdev}:${mmcinformpart} ${slot_addr} /${slotfile} 2; \
-    fi; \
-    mw.b ${slot_addr} 0x61; \
-    ext4write mmc ${mmcbootdev}:${mmcinformpart} ${slot_addr} /${slotfile} 2;
-set_to_part_b=\
-    if test -e mmc ${mmcbootdev}:${mmcinformpart} ${slotfile}; then; \
-        load mmc ${mmcbootdev}:${mmcinformpart} ${slot_addr} /${slotfile} 2; \
-    fi; \
-    mw.b ${slot_addr} 0x62; \
-    ext4write mmc ${mmcbootdev}:${mmcinformpart} ${slot_addr} /${slotfile} 2;
-reboot_param_clear=\
-    mw.l ${rebootparam_addr} ${normal_val}; \
-    ext4write mmc ${mmcbootdev}:${mmcinformpart} ${rebootparam_addr} /${rebootparamfile} 8;
-
-script=boot.scr.uimg
-bootcmd=\
-    load mmc ${mmcrootdev}:${mmcbootpart} ${fdt_addr_r} ${prefix}${fdtfile}; \
-    load mmc ${mmcrootdev}:${mmcbootpart} ${scriptaddr} ${prefix}${script}; \
-    source ${scriptaddr}