From: Jaehoon Chung <jh80.chung@samsung.com>
Date: Fri, 19 Jun 2020 03:56:33 +0000 (+0900)
Subject: rpi: tizen-boot-rpi4: calculate tizen_kernel_addr_r with ramdisk's size
X-Git-Tag: submit/tizen/20200622.213607~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afd05b07c1f1f820f9da9b5f7dcffe7d06c0e3fd;p=platform%2Fkernel%2Fu-boot.git

rpi: tizen-boot-rpi4: calculate tizen_kernel_addr_r with ramdisk's size

Calculate tizen_kernel_addr_r with ramdisk's size.
When ramdisk size is increased, kernel loading offset will be also
increased. It can prevent to overwrite the images.

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

diff --git a/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr b/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr
index 35bfb05b98..194793fe3e 100644
--- a/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr
+++ b/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr
@@ -55,6 +55,10 @@ setenv bootargs \"${tizen_bootarg} root=/dev/${rootdev} rw bootmode=${bootmode}
 part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start
 part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size
 
+# Set to ramdisksize with real partition size. (Need to multiply block-size 0x200)
+setexpr ramdisksize $ramdisk_size * 200
+setexpr tizen_kernel_addr_r $ramdisk_addr_r + $ramdisksize
+
 echo "Searching for kernel in"; for prefix in $boot_prefixes; do
 if load $bootdev $mmcbootdev:$mmcbootpart $tizen_kernel_addr_r $prefix$kernel; then;
 	echo ${bootmode} "boot";
@@ -63,8 +67,7 @@ if load $bootdev $mmcbootdev:$mmcbootpart $tizen_kernel_addr_r $prefix$kernel; t
 		echo "Loading Ramdisk from partition"${ramdiskpart};
 		mmc read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
 	fi
-# Set to ramdisksize with real partition size. (Need to multiply block-size 0x200)
-	setexpr ramdisksize $ramdisk_size * 200
+
 	bootz $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr;
 fi
 done
diff --git a/board/raspberrypi/rpi/tizen-boot-rpi4.scr b/board/raspberrypi/rpi/tizen-boot-rpi4.scr
index 078533958f..a21366830c 100644
--- a/board/raspberrypi/rpi/tizen-boot-rpi4.scr
+++ b/board/raspberrypi/rpi/tizen-boot-rpi4.scr
@@ -55,6 +55,10 @@ setenv bootargs \"${tizen_bootarg} root=/dev/${rootdev} rw bootmode=${bootmode}
 part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start
 part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size
 
+# Set to ramdisksize with real partition size. (Need to multiply block-size 0x200)
+setexpr ramdisksize $ramdisk_size * 200
+setexpr tizen_kernel_addr_r $ramdisk_addr_r + $ramdisksize
+
 echo "Searching for kernel in"; for prefix in $boot_prefixes; do
 if load $bootdev $mmcbootdev:$mmcbootpart $tizen_kernel_addr_r $prefix$kernel; then;
 	echo ${bootmode} "boot";
@@ -63,8 +67,7 @@ if load $bootdev $mmcbootdev:$mmcbootpart $tizen_kernel_addr_r $prefix$kernel; t
 		echo "Loading Ramdisk from partition"${ramdiskpart};
 		mmc read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
 	fi
-# Set to ramdisksize with real partition size. (Need to multiply block-size 0x200)
-	setexpr ramdisksize $ramdisk_size * 200
+
 	booti $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr_r;
 fi
 done