From: Jaehoon Chung <jh80.chung@samsung.com>
Date: Wed, 25 Nov 2020 10:19:55 +0000 (+0900)
Subject: tizen: bootscript: remove fdtfile in boot script
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9467d51668e85cbaecc3099b82ce621d7df953c2;p=platform%2Fkernel%2Fu-boot.git

tizen: bootscript: remove fdtfile in boot script

Remove fdtfile in boot script file.
Move fdtfile variable from bootscript to tizen_amlogic header.

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

diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h
index e19b0cf..cf5df1e 100644
--- a/include/samsung/tizen_amlogic.h
+++ b/include/samsung/tizen_amlogic.h
@@ -78,18 +78,23 @@
 #ifdef CONFIG_TIZEN_KHADAS_VIM3
 #define TIZEN_BOOT_PREFIX "/vim3/ /"
 #define DFU_ALT_BOOT	DFU_ALT_BOOT_VIM3
+#define DEVICE_TREE_NAME	"kvim3_linux.dtb"
 #elif CONFIG_TIZEN_KHADAS_VIM3L
 #define TIZEN_BOOT_PREFIX "/vim3l/ /"
 #define DFU_ALT_BOOT	DFU_ALT_BOOT_VIM3L
+#define DEVICE_TREE_NAME	"kvim3l_linux.dtb"
 #elif CONFIG_TIZEN_ODROID_N2
 #define TIZEN_BOOT_PREFIX "/odroid-n2/ /"
 #define DFU_ALT_BOOT	DFU_ALT_BOOT_ODROID_N2
+#define DEVICE_TREE_NAME	"meson64_odroidn2_drm.dtb"
 #elif CONFIG_TIZEN_ODROID_C4
 #define TIZEN_BOOT_PREFIX "/odroid-c4/ /"
 #define DFU_ALT_BOOT	DFU_ALT_BOOT_ODROID_C4
+#define DEVICE_TREE_NAME	"meson64_odroidc4.dtb"
 #else
 #define TIZEN_BOOT_PREFIX "/ /boot/"
 #define DFU_ALT_BOOT	"u-boot.bin skip 0 0"
+#define DEVICE_TREE_NAME	CONFIG_DEFAULT_DEVICE_TREE
 #endif
 
 #define TIZEN_ENV_SETTING \
@@ -105,6 +110,7 @@
 	"opts=loglevel=4\0"			\
 	"dfu_usb_con=0\0"			\
 	"dfu_interface=mmc\0"			\
+	"fdtfile=" DEVICE_TREE_NAME "\0"	\
 	"boot_prefixes=" TIZEN_BOOT_PREFIX "\0"
 
 #define CONFIG_TIZEN
diff --git a/tizen/bootscript/tizen-boot-khadas-vim3-64b.scr b/tizen/bootscript/tizen-boot-khadas-vim3-64b.scr
index 186837a..af8cec5 100644
--- a/tizen/bootscript/tizen-boot-khadas-vim3-64b.scr
+++ b/tizen/bootscript/tizen-boot-khadas-vim3-64b.scr
@@ -65,8 +65,6 @@ echo "console: ${console}"
 
 # Kernel image
 kernel=Image.gz
-# DT image by model
-setenv fdtfile \"kvim3_linux.dtb\"
 
 # 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}\"
diff --git a/tizen/bootscript/tizen-boot-khadas-vim3l-64b.scr b/tizen/bootscript/tizen-boot-khadas-vim3l-64b.scr
index b54f1ff..7a3fe2c 100644
--- a/tizen/bootscript/tizen-boot-khadas-vim3l-64b.scr
+++ b/tizen/bootscript/tizen-boot-khadas-vim3l-64b.scr
@@ -65,8 +65,6 @@ echo "console: ${console}"
 
 # Kernel image
 kernel=Image.gz
-# DT image by model
-setenv fdtfile \"kvim3l_linux.dtb\"
 
 # 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}\"
diff --git a/tizen/bootscript/tizen-boot-odroid-c4-64b.scr b/tizen/bootscript/tizen-boot-odroid-c4-64b.scr
index 28ce7e9..65d3e05 100644
--- a/tizen/bootscript/tizen-boot-odroid-c4-64b.scr
+++ b/tizen/bootscript/tizen-boot-odroid-c4-64b.scr
@@ -41,8 +41,6 @@ echo "console: ${console}"
 
 # Kernel image
 kernel=Image.gz
-# DT image by model
-setenv fdtfile \"meson64_odroidc4.dtb\"
 
 # 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}\"
diff --git a/tizen/bootscript/tizen-boot-odroid-n2-64b.scr b/tizen/bootscript/tizen-boot-odroid-n2-64b.scr
index 9ebc49d..c8f1f98 100644
--- a/tizen/bootscript/tizen-boot-odroid-n2-64b.scr
+++ b/tizen/bootscript/tizen-boot-odroid-n2-64b.scr
@@ -113,8 +113,6 @@ echo "console: ${console}"
 
 # Kernel image
 kernel=Image.gz
-# DT image by model
-setenv fdtfile \"meson64_odroidn2_drm.dtb\"
 
 # 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}\"