board: amlogic: remove prefixes in boot scripts

Remove prefixes in boot scripts. Instead, use boot_prefixes about each
boards.
Add a debug message for checking a directory.
If there is no kernel image under odroid-c4 directory, then it will
search for kernel image under /.

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

diff --git a/board/amlogic/odroid-n2/tizen-boot-odroid-c4-64b.scr b/board/amlogic/odroid-n2/tizen-boot-odroid-c4-64b.scr
index 42ad8e1..b5d3f6b 100644 (file)
--- a/board/amlogic/odroid-n2/tizen-boot-odroid-c4-64b.scr
+++ b/board/amlogic/odroid-n2/tizen-boot-odroid-c4-64b.scr
@@ -15,7 +15,6 @@ setenv max_freq_a55 "1908"    # 1.908 GHz, default value
 setenv enable_wol "0"
 
 # (Hardkernel) Normal HDMI Monitors
-if test "${display_autodetect}" = "true"; then hdmitx edid; fi
 if test "${hdmimode}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
 if test "${cec}" = "true"; then setenv cec_enable "hdmitx=cec3f"; fi
 if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
@@ -57,8 +56,6 @@ kernel=Image
 # DT image by model
 setenv fdtfile \"meson64_odroidc4.dtb\"
 
-setenv prefixes \"/odroid-c4\/\"
-
 # To use comdline for using serial console. /* Normal mode */
 setenv bootargs \"root=/dev/${rootdev} rootwait rw no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=1080p60hz cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan} ${hid_quirks} monitor_onoff=${monitor_onoff} usb-xhci.tablesize=2 logo=osd0,loaded ${console}\"
 
@@ -66,9 +63,10 @@ setenv bootargs \"root=/dev/${rootdev} rootwait rw no_console_suspend fsck.repai
 part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start
 part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size
 
-echo "Searching for kernel in"; for prefix in $prefixes; do
+echo "Searching for kernel in" $boot_prefixes; for prefix in $boot_prefixes; do
 if load $bootdev $mmcbootdev:$mmcbootpart $tizen_kernel_addr_r $prefix$kernel; then;
        echo ${bootmode} "boot";
+       echo "Found kernel Image in" $prefix;
        load $bootdev $mmcbootdev:$mmcbootpart $fdt_addr_r $fdtfile;
        if test -e mmc $mmcrootdev:$ramdiskpart sbin/init; then;
                echo "Loading Ramdisk from partition"${ramdiskpart};

diff --git a/board/amlogic/w400/tizen-boot-khadas-vim3-64b.scr b/board/amlogic/w400/tizen-boot-khadas-vim3-64b.scr
index 4f15f56..29e5da5 100644 (file)
--- a/board/amlogic/w400/tizen-boot-khadas-vim3-64b.scr
+++ b/board/amlogic/w400/tizen-boot-khadas-vim3-64b.scr
@@ -80,8 +80,6 @@ kernel=Image
 # DT image by model
 setenv fdtfile \"kvim3_linux.dtb\"
 
-setenv prefixes \"/vim3\/\"
-
 # To use comdline for using serial console. /* Normal mode */
 setenv bootargs \"root=/dev/${rootdev} rootwait rw no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=1080p60hz cvbsmode=576cvbs usb-xhci.tablesize=2 logo=osd0,loaded ${console}\"
 
@@ -89,9 +87,10 @@ setenv bootargs \"root=/dev/${rootdev} rootwait rw no_console_suspend fsck.repai
 part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start
 part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size
 
-echo "Searching for kernel in"; for prefix in $prefixes; do
+echo "Searching for kernel in" $boot_prefixes; for prefix in $boot_prefixes; do
 if load $bootdev $mmcbootdev:$mmcbootpart $tizen_kernel_addr_r $prefix$kernel; then;
        echo ${bootmode} "boot";
+       echo "Found kernel Image in" $prefix;
        load $bootdev $mmcbootdev:$mmcbootpart $fdt_addr_r $fdtfile;
        if test -e mmc $mmcrootdev:$ramdiskpart sbin/init; then;
                echo "Loading Ramdisk from partition"${ramdiskpart};

diff --git a/board/amlogic/w400/tizen-boot-odroid-n2-64b.scr b/board/amlogic/w400/tizen-boot-odroid-n2-64b.scr
index 30694e8..e2fd47c 100644 (file)
--- a/board/amlogic/w400/tizen-boot-odroid-n2-64b.scr
+++ b/board/amlogic/w400/tizen-boot-odroid-n2-64b.scr
@@ -1,4 +1,4 @@
-# U-boot script for tizen RPI3
+# U-boot script for tizen Odroid N2
 # Auto Detection of Monitor settings based on your Screen information
 setenv display_autodetect "true"
 
@@ -128,8 +128,6 @@ kernel=Image
 # DT image by model
 setenv fdtfile \"meson64_odroidn2_drm.dtb\"
 
-setenv prefixes \"/odroid-n2\/\"
-
 # To use comdline for using serial console. /* Normal mode */
 setenv bootargs \"root=/dev/${rootdev} rootwait rw no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=1080p60hz cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan} ${hid_quirks} monitor_onoff=${monitor_onoff} usb-xhci.tablesize=2 logo=osd0,loaded ${console}\"
 
@@ -137,9 +135,10 @@ setenv bootargs \"root=/dev/${rootdev} rootwait rw no_console_suspend fsck.repai
 part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start
 part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size
 
-echo "Searching for kernel in"; for prefix in $prefixes; do
+echo "Searching for kernel in" $boot_prefixes; for prefix in $boot_prefixes; do
 if load $bootdev $mmcbootdev:$mmcbootpart $tizen_kernel_addr_r $prefix$kernel; then;
        echo ${bootmode} "boot";
+       echo "Found kernel Image in" $prefix;
        load $bootdev $mmcbootdev:$mmcbootpart $fdt_addr_r $fdtfile;
        if test -e mmc $mmcrootdev:$ramdiskpart sbin/init; then;
                echo "Loading Ramdisk from partition"${ramdiskpart};