tizen: rpi: move bootscripts to tizen specific directory

Move bootscripts from board/raspberrypi/rpi to tizen/bootscript/.
And combine to one script, because those are duplicated almost codes.

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

diff --git a/board/raspberrypi/rpi/tizen-boot-rpi3.scr b/board/raspberrypi/rpi/tizen-boot-rpi3.scr
deleted file mode 100644 (file)
index cde861a..0000000
--- a/board/raspberrypi/rpi/tizen-boot-rpi3.scr
+++ /dev/null
@@ -1,76 +0,0 @@
-# U-boot script for tizen RPI3
-
-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 bootmode fota
-       elif itest.l *${rebootparam_addr} == ${recovery_val}; then;
-               setenv ramdiskpart 8
-               setenv bootmode recovery
-       elif itest.l *${rebootparam_addr} == ${download_val}; then;
-               setenv ramdiskpart 8
-               setenv bootmode flash
-       elif itest.l *${rebootparam_addr} == ${nodef_val}; then;
-               echo "This reboot parameter is not supported...";
-       fi
-fi
-
-# This is for jumping to flash mode on u-boot.
-if test "${bootmode}" = "download"; then;
-       setenv ramdiskpart 8
-       setenv bootmode flash
-fi
-
-if test "${bootmode}" = "flash"; then;
-       if test -n "${ipaddr}"; then;
-               ip_opt=\"ip=${ipaddr}::${gateway}:${netmask}\"
-       fi
-fi
-
-# boot from ram0 if there is sbin
-if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then;
-       setenv rootdev ram0
-else
-       setenv rootdev mmcblk${mmcrootdev}p${mmcrootpart}
-       setenv bootmode normal
-fi
-
-# setting console device if noting is set
-if test -z "${console}"; then;
-       setenv console "console=ttyS0,115200n8 earlycon=uart8250,mmio32,0x3f215040"
-fi
-echo "console: ${console}"
-
-# Kernel image
-kernel=Image
-# DT image by model
-if itest.l ${board_rev} == 0xd; then;
-       setenv fdtfile \"bcm2710-rpi-3-b-plus.dtb\"
-else
-       setenv fdtfile \"bcm2710-rpi-3-b.dtb\"
-fi
-setenv boot_prefixes \"/\"
-
-# To use cmdline for using serial console. /* Normal mode */
-setenv bootargs \"${tizen_bootarg} smsc95xx.macaddr=${ethaddr} root=/dev/${rootdev} rw bootmode=${bootmode} rootwait ${console} ${opts} ${ip_opt}\"
-
-# Find the ramdisk offset and block count
-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";
-       load $bootdev $mmcbootdev:$mmcbootpart $fdt_addr_r $fdtfile;
-       if test -e mmc $mmcrootdev:$ramdiskpart sbin/init; then;
-               echo "Loading Ramdisk from partition"${ramdiskpart};
-               mmc read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
-       fi
-       booti $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr_r;
-fi
-done

diff --git a/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr b/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr
deleted file mode 100644 (file)
index 194793f..0000000
--- a/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr
+++ /dev/null
@@ -1,73 +0,0 @@
-# U-boot script for tizen RPI4 32B
-
-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 bootmode fota
-       elif itest.l *${rebootparam_addr} == ${recovery_val}; then;
-               setenv ramdiskpart 8
-               setenv bootmode recovery
-       elif itest.l *${rebootparam_addr} == ${download_val}; then;
-               setenv ramdiskpart 8
-               setenv bootmode flash
-       elif itest.l *${rebootparam_addr} == ${nodef_val}; then;
-               echo "This reboot parameter is not supported...";
-       fi
-fi
-
-# This is for jumping to flash mode on u-boot.
-if test "${bootmode}" = "download"; then;
-       setenv ramdiskpart 8
-       setenv bootmode flash
-fi
-
-if test "${bootmode}" = "flash"; then;
-       if test -n "${ipaddr}"; then;
-               ip_opt=\"ip=${ipaddr}::${gateway}:${netmask}\"
-       fi
-fi
-
-# boot from ram0 if there is sbin
-if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then;
-       setenv rootdev ram0
-else
-       setenv rootdev mmcblk${mmcrootdev}p${mmcrootpart}
-       setenv bootmode normal
-fi
-
-#setting console device if noting is set
-if test -z "${console}"; then;
-       setenv console "console=ttyS0,115200n8 earlycon=uart8250,mmio32,0xfe215040"
-fi
-echo "console: ${console}"
-
-# Kernel image
-kernel=zImage
-# DT image by model
-setenv fdtfile \"bcm2711-rpi-4-b.dtb\"
-setenv boot_prefixes \"/\"
-
-# To use cmdline for using serial console. /* Normal mode */
-setenv bootargs \"${tizen_bootarg} root=/dev/${rootdev} rw bootmode=${bootmode} rootwait ${console} ${opts} ${ip_opt}\"
-
-# Find the ramdisk offset and block count
-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";
-       load $bootdev $mmcbootdev:$mmcbootpart $fdt_addr $fdtfile;
-       if test -e mmc $mmcrootdev:$ramdiskpart sbin/init; then;
-               echo "Loading Ramdisk from partition"${ramdiskpart};
-               mmc read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
-       fi
-
-       bootz $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr;
-fi
-done

diff --git a/include/samsung/tizen_rpi.h b/include/samsung/tizen_rpi.h
index f00e03f..268fbe8 100644 (file)
--- a/include/samsung/tizen_rpi.h
+++ b/include/samsung/tizen_rpi.h
@@ -44,6 +44,12 @@
 /* SD/MMC configuration */
 #define CONFIG_MMC_DEFAULT_DEV 0
 
+#ifdef CONFIG_ARM64
+#define KERNEL_NAME    "Image"
+#else
+#define KERNEL_NAME    "zImage"
+#endif
+
 /*
 # use the ram address of ramdisk before loading ramdisk image
 # 0x72677075 is ascii code for representing string "upgr"
@@ -52,6 +58,7 @@
 # 0x6c6e7764 is ascii code for representing string "dwnl"
 */
 #define TIZEN_ENV_SETTING \
+       "kernel=" KERNEL_NAME "\0"              \
        "mmcbootdev=0\0"                        \
        "mmcbootpart=1\0"                       \
        "mmcrootdev=0\0"                        \

diff --git a/packaging/u-boot-rpi3-32b.spec b/packaging/u-boot-rpi3-32b.spec
index c5b4a2b..16e8c8b 100644 (file)
--- a/packaging/u-boot-rpi3-32b.spec
+++ b/packaging/u-boot-rpi3-32b.spec
@@ -61,7 +61,7 @@ mkenvimage -s 16384 -o uboot.env default_envs.txt
 rm copy_env_common.o default_envs.txt
 
 # Build boot.scr
-mkimage -A arm -T script -C none -n "Tizen RPI3 u-boot helper" -d ./board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr ./boot.scr.uimg
+mkimage -A arm -T script -C none -n "Tizen RPI3 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi3.scr ./boot.scr.uimg
 
 %install
 rm -rf %{buildroot}

diff --git a/packaging/u-boot-rpi3.spec b/packaging/u-boot-rpi3.spec
index c9ffcb7..ca404c4 100644 (file)
--- a/packaging/u-boot-rpi3.spec
+++ b/packaging/u-boot-rpi3.spec
@@ -61,7 +61,7 @@ mkenvimage -s 16384 -o uboot.env default_envs.txt
 rm copy_env_common.o default_envs.txt
 
 # Build boot.scr
-mkimage -A arm64 -T script -C none -n "Tizen RPI3 u-boot helper" -d ./board/raspberrypi/rpi/tizen-boot-rpi3.scr ./boot.scr.uimg
+mkimage -A arm64 -T script -C none -n "Tizen RPI3 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi3.scr ./boot.scr.uimg
 
 %install
 rm -rf %{buildroot}

diff --git a/packaging/u-boot-rpi4-32b.spec b/packaging/u-boot-rpi4-32b.spec
index 32e8287..51db46c 100644 (file)
--- a/packaging/u-boot-rpi4-32b.spec
+++ b/packaging/u-boot-rpi4-32b.spec
@@ -50,7 +50,7 @@ mkenvimage -s 16384 -o uboot.env default_envs.txt
 rm copy_env_common.o default_envs.txt
 
 # Build boot.scr
-mkimage -A arm -T script -C none -n "Tizen RPI4 u-boot helper" -d ./board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr ./boot.scr.uimg
+mkimage -A arm -T script -C none -n "Tizen RPI4 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi4.scr ./boot.scr.uimg
 
 %install
 rm -rf %{buildroot}

diff --git a/packaging/u-boot-rpi4.spec b/packaging/u-boot-rpi4.spec
index ced7c71..f2bf656 100644 (file)
--- a/packaging/u-boot-rpi4.spec
+++ b/packaging/u-boot-rpi4.spec
@@ -50,7 +50,7 @@ mkenvimage -s 16384 -o uboot.env default_envs.txt
 rm copy_env_common.o default_envs.txt
 
 # Build boot.scr
-mkimage -A arm64 -T script -C none -n "Tizen RPI4 u-boot helper" -d ./board/raspberrypi/rpi/tizen-boot-rpi4.scr ./boot.scr.uimg
+mkimage -A arm64 -T script -C none -n "Tizen RPI4 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi4.scr ./boot.scr.uimg
 
 %install
 rm -rf %{buildroot}

diff --git a/board/raspberrypi/rpi/tizen-boot-rpi2.scr b/tizen/bootscript/tizen-boot-rpi2.scr
similarity index 100%
rename from board/raspberrypi/rpi/tizen-boot-rpi2.scr
rename to tizen/bootscript/tizen-boot-rpi2.scr

diff --git a/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr b/tizen/bootscript/tizen-boot-rpi3.scr
similarity index 91%
rename from board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr
rename to tizen/bootscript/tizen-boot-rpi3.scr
index 7730461..a63647f 100644 (file)
--- a/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr
+++ b/tizen/bootscript/tizen-boot-rpi3.scr
@@ -1,4 +1,4 @@
-# U-boot script for tizen RPI3 32B
+# U-boot script for tizen RPI3
 
 if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then;
        ext4load $bootdev $mmcbootdev:$mmcinformpart $rebootparam_addr $rebootparamfile;
@@ -42,8 +42,6 @@ if test -z "${console}"; then;
 fi
 echo "console: ${console}"
 
-# Kernel image
-kernel=zImage
 # DT image by model
 if itest.l ${board_rev} == 0xd; then;
        setenv fdtfile \"bcm2710-rpi-3-b-plus.dtb\"
@@ -71,6 +69,10 @@ 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
-       bootz $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr;
+       if test "$kernel" = "zImage"; then;
+               booti $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr;
+       else
+               booti $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr;
+       fi
 fi
 done

diff --git a/board/raspberrypi/rpi/tizen-boot-rpi4.scr b/tizen/bootscript/tizen-boot-rpi4.scr
similarity index 90%
rename from board/raspberrypi/rpi/tizen-boot-rpi4.scr
rename to tizen/bootscript/tizen-boot-rpi4.scr
index a213668..a914eed 100644 (file)
--- a/board/raspberrypi/rpi/tizen-boot-rpi4.scr
+++ b/tizen/bootscript/tizen-boot-rpi4.scr
@@ -42,8 +42,6 @@ if test -z "${console}"; then;
 fi
 echo "console: ${console}"
 
-# Kernel image
-kernel=Image
 # DT image by model
 setenv fdtfile \"bcm2711-rpi-4-b.dtb\"
 setenv boot_prefixes \"/\"
@@ -62,12 +60,16 @@ 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";
-       load $bootdev $mmcbootdev:$mmcbootpart $fdt_addr_r $fdtfile;
+       load $bootdev $mmcbootdev:$mmcbootpart $fdt_addr $fdtfile;
        if test -e mmc $mmcrootdev:$ramdiskpart sbin/init; then;
                echo "Loading Ramdisk from partition"${ramdiskpart};
                mmc read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
        fi
 
-       booti $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr_r;
+       if test "$kernel" = "zImage"; then;
+               bootz $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr;
+       else
+               booti $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr;
+       fi
 fi
 done