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

rpi: tizen-boot-rpi3: 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: Ibbec03b4e3380028841d10eee7157c5e86fa8756
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---

diff --git a/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr b/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr
index ccb75bfe64..7730461fd3 100644
--- a/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr
+++ b/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr
@@ -59,6 +59,10 @@ setenv bootargs \"${tizen_bootarg} smsc95xx.macaddr=${ethaddr} root=/dev/${rootd
 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";
@@ -67,8 +71,6 @@ 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-rpi3.scr b/board/raspberrypi/rpi/tizen-boot-rpi3.scr
index 7f99d97dd6..cde861ac45 100644
--- a/board/raspberrypi/rpi/tizen-boot-rpi3.scr
+++ b/board/raspberrypi/rpi/tizen-boot-rpi3.scr
@@ -59,6 +59,10 @@ setenv bootargs \"${tizen_bootarg} smsc95xx.macaddr=${ethaddr} root=/dev/${rootd
 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";
@@ -67,8 +71,6 @@ 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