From 906fd8c46b27f2826fb7e7108f9dd20b9c48b62c Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Thu, 18 Jun 2020 13:04:18 +0900 Subject: [PATCH] rpi: tizen-boot-rpi3: fix hard-coding value about ramdisksize Current ramdisksize is set to hard-condig value as 0xc00000 or 0x800000. If ramdisk's size is changed to other, it also needs to change. But we're getting the number of block about ramdisk partition. Use its value to load a ramdisk image. Then it's more clear than now. Change-Id: I59e4ed5d1c49e82c2bd76474b1d4bc086fb600e1 Signed-off-by: Jaehoon Chung --- board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr | 6 ++---- board/raspberrypi/rpi/tizen-boot-rpi3.scr | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr b/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr index deb7231d2f..ccb75bfe64 100644 --- a/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr +++ b/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr @@ -4,15 +4,12 @@ if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then; ext4load $bootdev $mmcbootdev:$mmcinformpart $rebootparam_addr $rebootparamfile; if itest.l *${rebootparam_addr} == ${upgrade_val}; then; setenv ramdiskpart 8 - setenv ramdisksize c00000 setenv bootmode fota elif itest.l *${rebootparam_addr} == ${recovery_val}; then; setenv ramdiskpart 8 - setenv ramdisksize c00000 setenv bootmode recovery elif itest.l *${rebootparam_addr} == ${download_val}; then; setenv ramdiskpart 8 - setenv ramdisksize c00000 setenv bootmode flash elif itest.l *${rebootparam_addr} == ${nodef_val}; then; echo "This reboot parameter is not supported..."; @@ -22,7 +19,6 @@ fi # This is for jumping to flash mode on u-boot. if test "${bootmode}" = "download"; then; setenv ramdiskpart 8 - setenv ramdisksize c00000 setenv bootmode flash fi @@ -71,6 +67,8 @@ 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 52b45c947e..7f99d97dd6 100644 --- a/board/raspberrypi/rpi/tizen-boot-rpi3.scr +++ b/board/raspberrypi/rpi/tizen-boot-rpi3.scr @@ -4,15 +4,12 @@ if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then; ext4load $bootdev $mmcbootdev:$mmcinformpart $rebootparam_addr $rebootparamfile; if itest.l *${rebootparam_addr} == ${upgrade_val}; then; setenv ramdiskpart 8 - setenv ramdisksize c00000 setenv bootmode fota elif itest.l *${rebootparam_addr} == ${recovery_val}; then; setenv ramdiskpart 8 - setenv ramdisksize c00000 setenv bootmode recovery elif itest.l *${rebootparam_addr} == ${download_val}; then; setenv ramdiskpart 8 - setenv ramdisksize c00000 setenv bootmode flash elif itest.l *${rebootparam_addr} == ${nodef_val}; then; echo "This reboot parameter is not supported..."; @@ -22,7 +19,6 @@ fi # This is for jumping to flash mode on u-boot. if test "${bootmode}" = "download"; then; setenv ramdiskpart 8 - setenv ramdisksize c00000 setenv bootmode flash fi @@ -71,6 +67,8 @@ 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 -- 2.34.1