From: Jaehoon Chung Date: Wed, 25 Nov 2020 23:12:45 +0000 (+0900) Subject: tizen: bootscript: create one bootscript for amlogic boards X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de339f19564c1d27801da2b8981e3d83d3879ddc;p=platform%2Fkernel%2Fu-boot.git tizen: bootscript: create one bootscript for amlogic boards Create one bootscript for amlogic boards. There is a common variable to use about each boards. So it can be reused. Remove each bootscript files. Instead, use one script file with board_name. Change-Id: If50529fc1f34f3ac274ce8a0955499f3e3e12d22 Signed-off-by: Jaehoon Chung --- diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h index cf5df1eaf4..da1c8b6ada 100644 --- a/include/samsung/tizen_amlogic.h +++ b/include/samsung/tizen_amlogic.h @@ -79,18 +79,22 @@ #define TIZEN_BOOT_PREFIX "/vim3/ /" #define DFU_ALT_BOOT DFU_ALT_BOOT_VIM3 #define DEVICE_TREE_NAME "kvim3_linux.dtb" +#define BOARD_NAME "khadas-vim3" #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" +#define BOARD_NAME "khadas-vim3l" #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" +#define BOARD_NAME "odrond-n2" #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" +#define BOARD_NAME "odroid-c4" #else #define TIZEN_BOOT_PREFIX "/ /boot/" #define DFU_ALT_BOOT "u-boot.bin skip 0 0" @@ -111,6 +115,7 @@ "dfu_usb_con=0\0" \ "dfu_interface=mmc\0" \ "fdtfile=" DEVICE_TREE_NAME "\0" \ + "board_name=" BOARD_NAME "\0" \ "boot_prefixes=" TIZEN_BOOT_PREFIX "\0" #define CONFIG_TIZEN diff --git a/packaging/u-boot-c4.spec b/packaging/u-boot-c4.spec index acfb00750a..c5a1de9a22 100644 --- a/packaging/u-boot-c4.spec +++ b/packaging/u-boot-c4.spec @@ -70,7 +70,7 @@ mkenvimage -s 16384 -o params.bin default_envs.txt rm copy_env_common.o default_envs.txt # 1-7. Build Boot script -mkimage -A arm64 -T script -C none -n "Tizen ODROID-c4 u-boot helper" -d ./tizen/bootscript/tizen-boot-odroid-c4-64b.scr ./boot.scr.uimg +mkimage -A arm64 -T script -C none -n "Tizen ODROID-c4 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg %install diff --git a/packaging/u-boot-kvim3.spec b/packaging/u-boot-kvim3.spec index eadc3ad15a..ce08e89431 100644 --- a/packaging/u-boot-kvim3.spec +++ b/packaging/u-boot-kvim3.spec @@ -70,7 +70,7 @@ mkenvimage -s 16384 -o params.bin default_envs.txt rm copy_env_common.o default_envs.txt # Build Boot script -mkimage -A arm64 -T script -C none -n "Tizen KVIM3 u-boot helper" -d ./tizen/bootscript/tizen-boot-khadas-vim3-64b.scr ./boot.scr.uimg +mkimage -A arm64 -T script -C none -n "Tizen KVIM3 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg %install rm -rf %{buildroot} diff --git a/packaging/u-boot-n2.spec b/packaging/u-boot-n2.spec index f406bcc622..599ba14594 100644 --- a/packaging/u-boot-n2.spec +++ b/packaging/u-boot-n2.spec @@ -70,7 +70,7 @@ mkenvimage -s 16384 -o params.bin default_envs.txt rm copy_env_common.o default_envs.txt # 1-7. Build Boot script -mkimage -A arm64 -T script -C none -n "Tizen ODROID-N2 u-boot helper" -d ./tizen/bootscript/tizen-boot-odroid-n2-64b.scr ./boot.scr.uimg +mkimage -A arm64 -T script -C none -n "Tizen ODROID-N2 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg %install diff --git a/tizen/bootscript/tizen-boot-amlogic-64b.scr b/tizen/bootscript/tizen-boot-amlogic-64b.scr new file mode 100644 index 0000000000..eb1ba2aa93 --- /dev/null +++ b/tizen/bootscript/tizen-boot-amlogic-64b.scr @@ -0,0 +1,111 @@ +# U-boot script for tizen Amlogic (Odroid-C4/N2, VIM3/VIM3L) +# Auto Detection of Monitor settings based on your Screen information +# Below values are from Hardkernel ubuntu-20.04.4.0-mate-odroid-c4-hc4-20201020.img +# (Hardkernel / Odroid-c4) +if test $board_name == odroid-c4; then + echo "ODROID-C4" + setenv display_autodetect "true" + setenv monitor_onoff "false" # true or false + setenv overscan "100" + setenv sdrmode "auto" + setenv voutmode "hdmi" + setenv disablehpd "false" + setenv cec "true" + setenv max_freq_a55 "1908" # 1.908 GHz, default value + setenv enable_wol "0" + + # (Hardkernel) Normal HDMI Monitors + if test "${cec}" = "true"; then setenv cec_enable "hdmitx=cec3f"; fi + + # Odroid-C4 Specific + setenv boot_args \"voutmode=${voutmode} disablehpd=${disablehpd} overscan=${overscan} monitor_onoff=${monitor_onoff} \" + +elif test $board_name == odroid-n2; then + # (Hardkernel / Odroid-n2) + # Auto Detection of Monitor settings based on your Screen information + setenv display_autodetect "true" + + # Monitor output + # Controls if HDMI PHY should output anything to the monitor + setenv monitor_onoff "false" # true or false + + # Overscan percentage + # This value scales down the actual screen size by the percentage below + # valid range is 80 to 100 + setenv overscan "100" + + ### voutmode : hdmi or dvi + setenv voutmode "hdmi" + # setenv voutmode "dvi" + + # HPD enable/disable option + setenv disablehpd "false" + + # max cpu frequency for big core, A73 in MHz unit + # setenv max_freq_a73 "2004" # 2.004 GHz + # setenv max_freq_a73 "1992" # 1.992 GHz + # setenv max_freq_a73 "1908" # 1.908 GHz + setenv max_freq_a73 "1800" # 1.8 GHz, default value + # setenv max_freq_a73 "1704" # 1.704 GHz + + # max cpu frequency for little core, A53 in MHz unit + # setenv max_freq_a53 "1992" # 1.992 GHz + setenv max_freq_a53 "1896" # 1.896 GHz, default value + # setenv max_freq_a53 "1704" # 1.704 GHz + + # max cpu-cores + # Note: + # CPU's 0 and 1 are the A53 (small cores) + # CPU's 2 to 5 are the A73 (big cores) + # Lowering this value disables only the bigger cores (the last cores). + # setenv maxcpus "4" + # setenv maxcpus "5" + setenv maxcpus "6" + + # Odroid-N2 specific + setenv boot_args \"max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} voutmode=${voutmode} disablehpd=${disablehpd} overscan=${overscan} monitor_onoff=${monitor_onoff} \" +fi + +setenv fdt_addr_r "0x1000000" +setenv tizen_kernel_addr_r "0x2400000" +setenv tizen_tmp_kernel_addr_r "0x1000000" +setenv ramdisk_addr_r "0x1b00000" + +# 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=aml-uart,0xff803000" +fi +echo "console: ${console}" + +# Kernel image +kernel=Image.gz + +# 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 voutmode=${voutmode} ${cmode} usb-xhci.tablesize=2 logo=osd0,loaded ${console} ${boot_args}\" + +# Find the ramdisk offset and block count +part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start +part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size + +echo "Searching for kernel in" $boot_prefixes; for prefix in $boot_prefixes; do +if load $bootdev $mmcbootdev:$mmcbootpart $tizen_tmp_kernel_addr_r $prefix$kernel; then; + echo ${bootmode} "boot"; + echo "Found kernel ${kernel} in ${prefix}"; + unzip ${tizen_tmp_kernel_addr_r} ${tizen_kernel_addr_r}; + 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/tizen/bootscript/tizen-boot-khadas-vim3-64b.scr b/tizen/bootscript/tizen-boot-khadas-vim3-64b.scr deleted file mode 100644 index af8cec5c4a..0000000000 --- a/tizen/bootscript/tizen-boot-khadas-vim3-64b.scr +++ /dev/null @@ -1,89 +0,0 @@ -# U-boot script for tizen VIM3 - -# HDMI Mode -# Resolution Configuration -# Symbol | Resolution -# ----------------------+------------- -# "480x272p60hz" | 480x272 Progressive 60Hz -# "480x320p60hz" | 480x320 Progressive 60Hz -# "480p60hz" | 720x480 Progressive 60Hz -# "576p50hz" | 720x576 Progressive 50Hz -# "720p60hz" | 1280x720 Progressive 60Hz -# "720p50hz" | 1280x720 Progressive 50Hz -# "1080p60hz" | 1920x1080 Progressive 60Hz -# "1080p50hz" | 1920x1080 Progressive 50Hz -# "1080p30hz" | 1920x1080 Progressive 30Hz -# "1080p24hz" | 1920x1080 Progressive 24Hz -# "1080i60hz" | 1920x1080 Interlaced 60Hz -# "1080i50hz" | 1920x1080 Interlaced 50Hz -# "2160p60hz" | 3840x2160 Progressive 60Hz -# "2160p50hz" | 3840x2160 Progressive 50Hz -# "2160p30hz" | 3840x2160 Progressive 30Hz -# "2160p25hz" | 3840x2160 Progressive 25Hz -# "2160p24hz" | 3840x2160 Progressive 24Hz -# "smpte24hz" | 3840x2160 Progressive 24Hz SMPTE -# "2160p60hz420" | 3840x2160 Progressive 60Hz YCbCr 4:2:0 -# "2160p50hz420" | 3840x2160 Progressive 50Hz YCbCr 4:2:0 -# "640x480p60hz" | 640x480 Progressive 60Hz -# "800x480p60hz" | 800x480 Progressive 60Hz -# "800x600p60hz" | 800x600 Progressive 60Hz -# "1024x600p60hz" | 1024x600 Progressive 60Hz -# "1024x768p60hz" | 1024x768 Progressive 60Hz -# "1280x800p60hz" | 1280x800 Progressive 60Hz -# "1280x1024p60hz" | 1280x1024 Progressive 60Hz -# "1360x768p60hz" | 1360x768 Progressive 60Hz -# "1440x900p60hz" | 1440x900 Progressive 60Hz -# "1600x900p60hz" | 1600x900 Progressive 60Hz -# "1600x1200p60hz" | 1600x1200 Progressive 60Hz -# "1680x1050p60hz" | 1680x1050 Progressive 60Hz -# "1920x1200p60hz" | 1920x1200 Progressive 60Hz -# "2560x1080p60hz" | 2560x1080 Progressive 60Hz -# "2560x1440p60hz" | 2560x1440 Progressive 60Hz -# "2560x1600p60hz" | 2560x1600 Progressive 60Hz -# "3440x1440p60hz" | 3440x1440 Progressive 60Hz -setenv hdmimode "1080p60hz" - -# Set load addresses -setenv fdt_addr_r "0x1000000" -setenv tizen_kernel_addr_r "0x2400000" -setenv tizen_tmp_kernel_addr_r "0x1000000" -setenv ramdisk_addr_r "0x1b00000" - -# 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=aml-uart,0xff803000" -fi -echo "console: ${console}" - -# Kernel image -kernel=Image.gz - -# 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}\" - -# Find the ramdisk offset and block count -part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start -part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size - -echo "Searching for kernel in" $boot_prefixes; for prefix in $boot_prefixes; do -if load $bootdev $mmcbootdev:$mmcbootpart $tizen_tmp_kernel_addr_r $prefix$kernel; then; - echo ${bootmode} "boot"; - echo "Found kernel ${kernel} in ${prefix}"; - unzip ${tizen_tmp_kernel_addr_r} ${tizen_kernel_addr_r}; - 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/tizen/bootscript/tizen-boot-odroid-c4-64b.scr b/tizen/bootscript/tizen-boot-odroid-c4-64b.scr deleted file mode 100644 index 65d3e05b85..0000000000 --- a/tizen/bootscript/tizen-boot-odroid-c4-64b.scr +++ /dev/null @@ -1,65 +0,0 @@ -# U-boot script for tizen Odroid C4 -# Auto Detection of Monitor settings based on your Screen information -# Below values are from Hardkernel ubuntu-20.04.4.0-mate-odroid-c4-hc4-20201020.img -# (Hardkernel) -setenv display_autodetect "true" -setenv hdmimode "1080p60hz" -setenv monitor_onoff "false" # true or false -setenv overscan "100" -setenv sdrmode "auto" -setenv voutmode "hdmi" -setenv disablehpd "false" -setenv cec "true" -setenv disable_vu7 "true" -setenv max_freq_a55 "1908" # 1.908 GHz, default value -setenv enable_wol "0" - -# (Hardkernel) Normal HDMI Monitors -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 - -# Set load addresses -setenv fdt_addr_r "0x1000000" -setenv tizen_kernel_addr_r "0x2400000" -setenv tizen_tmp_kernel_addr_r "0x1000000" -setenv ramdisk_addr_r "0x1b00000" - -# 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=aml-uart,0xff803000" -fi -echo "console: ${console}" - -# Kernel image -kernel=Image.gz - -# 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}\" - -# Find the ramdisk offset and block count -part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start -part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size - -echo "Searching for kernel in" $boot_prefixes; for prefix in $boot_prefixes; do -if load $bootdev $mmcbootdev:$mmcbootpart $tizen_tmp_kernel_addr_r $prefix$kernel; then; - echo ${bootmode} "boot"; - echo "Found kernel ${kernel} in ${prefix}"; - unzip ${tizen_tmp_kernel_addr_r} ${tizen_kernel_addr_r}; - 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/tizen/bootscript/tizen-boot-odroid-n2-64b.scr b/tizen/bootscript/tizen-boot-odroid-n2-64b.scr deleted file mode 100644 index c8f1f987ce..0000000000 --- a/tizen/bootscript/tizen-boot-odroid-n2-64b.scr +++ /dev/null @@ -1,137 +0,0 @@ -# U-boot script for tizen Odroid N2 -# Auto Detection of Monitor settings based on your Screen information -setenv display_autodetect "true" - -# HDMI Mode -# Resolution Configuration -# Symbol | Resolution -# ----------------------+------------- -# "480x272p60hz" | 480x272 Progressive 60Hz -# "480x320p60hz" | 480x320 Progressive 60Hz -# "480p60hz" | 720x480 Progressive 60Hz -# "576p50hz" | 720x576 Progressive 50Hz -# "720p60hz" | 1280x720 Progressive 60Hz -# "720p50hz" | 1280x720 Progressive 50Hz -# "1080p60hz" | 1920x1080 Progressive 60Hz -# "1080p50hz" | 1920x1080 Progressive 50Hz -# "1080p30hz" | 1920x1080 Progressive 30Hz -# "1080p24hz" | 1920x1080 Progressive 24Hz -# "1080i60hz" | 1920x1080 Interlaced 60Hz -# "1080i50hz" | 1920x1080 Interlaced 50Hz -# "2160p60hz" | 3840x2160 Progressive 60Hz -# "2160p50hz" | 3840x2160 Progressive 50Hz -# "2160p30hz" | 3840x2160 Progressive 30Hz -# "2160p25hz" | 3840x2160 Progressive 25Hz -# "2160p24hz" | 3840x2160 Progressive 24Hz -# "smpte24hz" | 3840x2160 Progressive 24Hz SMPTE -# "2160p60hz420" | 3840x2160 Progressive 60Hz YCbCr 4:2:0 -# "2160p50hz420" | 3840x2160 Progressive 50Hz YCbCr 4:2:0 -# "640x480p60hz" | 640x480 Progressive 60Hz -# "800x480p60hz" | 800x480 Progressive 60Hz -# "800x600p60hz" | 800x600 Progressive 60Hz -# "1024x600p60hz" | 1024x600 Progressive 60Hz -# "1024x768p60hz" | 1024x768 Progressive 60Hz -# "1280x800p60hz" | 1280x800 Progressive 60Hz -# "1280x1024p60hz" | 1280x1024 Progressive 60Hz -# "1360x768p60hz" | 1360x768 Progressive 60Hz -# "1440x900p60hz" | 1440x900 Progressive 60Hz -# "1600x900p60hz" | 1600x900 Progressive 60Hz -# "1600x1200p60hz" | 1600x1200 Progressive 60Hz -# "1680x1050p60hz" | 1680x1050 Progressive 60Hz -# "1920x1200p60hz" | 1920x1200 Progressive 60Hz -# "2560x1080p60hz" | 2560x1080 Progressive 60Hz -# "2560x1440p60hz" | 2560x1440 Progressive 60Hz -# "2560x1600p60hz" | 2560x1600 Progressive 60Hz -# "3440x1440p60hz" | 3440x1440 Progressive 60Hz -setenv hdmimode "1080p60hz" - -# Monitor output -# Controls if HDMI PHY should output anything to the monitor -setenv monitor_onoff "false" # true or false - -# Overscan percentage -# This value scales down the actual screen size by the percentage below -# valid range is 80 to 100 -setenv overscan "100" - -### voutmode : hdmi or dvi -setenv voutmode "hdmi" -# setenv voutmode "dvi" - -# HPD enable/disable option -setenv disablehpd "false" - -# Hardkernel ODROID-VU7 support -# By default VU7 support is disabled -setenv disable_vu7 "true" -# setenv disable_vu7 "false" - -# max cpu frequency for big core, A73 in MHz unit -# setenv max_freq_a73 "2004" # 2.004 GHz -# setenv max_freq_a73 "1992" # 1.992 GHz -# setenv max_freq_a73 "1908" # 1.908 GHz -setenv max_freq_a73 "1800" # 1.8 GHz, default value -# setenv max_freq_a73 "1704" # 1.704 GHz - -# max cpu frequency for little core, A53 in MHz unit -# setenv max_freq_a53 "1992" # 1.992 GHz -setenv max_freq_a53 "1896" # 1.896 GHz, default value -# setenv max_freq_a53 "1704" # 1.704 GHz - - -# max cpu-cores -# Note: -# CPU's 0 and 1 are the A53 (small cores) -# CPU's 2 to 5 are the A73 (big cores) -# Lowering this value disables only the bigger cores (the last cores). -# setenv maxcpus "4" -# setenv maxcpus "5" -setenv maxcpus "6" - -# VU7 Settings -if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi - -# Set load addresses -setenv fdt_addr_r "0x1000000" -setenv tizen_kernel_addr_r "0x2400000" -setenv tizen_tmp_kernel_addr_r "0x1000000" -setenv ramdisk_addr_r "0x1b00000" - -# 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=aml-uart,0xff803000" -fi -echo "console: ${console}" - -# Kernel image -kernel=Image.gz - -# 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}\" - -# Find the ramdisk offset and block count -part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start -part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size - -echo "Searching for kernel in" $boot_prefixes; for prefix in $boot_prefixes; do -if load $bootdev $mmcbootdev:$mmcbootpart $tizen_tmp_kernel_addr_r $prefix$kernel; then; - echo ${bootmode} "boot"; - echo "Found kernel ${kernel} in ${prefix}"; - unzip ${tizen_tmp_kernel_addr_r} ${tizen_kernel_addr_r}; - 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/tizen/build-kvim3.sh b/tizen/build-kvim3.sh index 29a08f590c..db588c1808 100755 --- a/tizen/build-kvim3.sh +++ b/tizen/build-kvim3.sh @@ -34,7 +34,7 @@ build_uboot() fi make CROSS_COMPILE="$CCACHE $CROSS_COMPILE" $JOBS - ./tools/mkimage -A arm64 -T script -C none -n "Tizen Khadas $BOARD u-boot helper" -d ./tizen/bootscript/tizen-boot-khadas-vim3-64b.scr ./output/$BOARD/boot.scr.uimg + ./tools/mkimage -A arm64 -T script -C none -n "Tizen Khadas $BOARD u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./output/$BOARD/boot.scr.uimg } diff --git a/tizen/build-odroid-c4.sh b/tizen/build-odroid-c4.sh index 312dda5b0e..8aec257655 100755 --- a/tizen/build-odroid-c4.sh +++ b/tizen/build-odroid-c4.sh @@ -25,7 +25,7 @@ build_uboot() make ARCH=arm64 odroid-c4_defconfig fi make CROSS_COMPILE="$CCACHE $CROSS_COMPILE" $JOBS - ./tools/mkimage -A arm64 -T script -C none -n "Tizen ODROID-C4 u-boot helper" -d ./tizen/bootscript/tizen-boot-odroid-c4-64b.scr ./output/odroid-c4/boot.scr.uimg + ./tools/mkimage -A arm64 -T script -C none -n "Tizen ODROID-C4 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./output/odroid-c4/boot.scr.uimg } diff --git a/tizen/build-odroid-n2.sh b/tizen/build-odroid-n2.sh index 04f4e55847..0e0634cfd7 100755 --- a/tizen/build-odroid-n2.sh +++ b/tizen/build-odroid-n2.sh @@ -25,7 +25,7 @@ build_uboot() make ARCH=arm64 odroid-n2_defconfig fi make CROSS_COMPILE="$CCACHE $CROSS_COMPILE" $JOBS - ./tools/mkimage -A arm64 -T script -C none -n "Tizen ODROID-N2 u-boot helper" -d ./tizen/bootscript/tizen-boot-odroid-n2-64b.scr ./output/odroid-n2/boot.scr.uimg + ./tools/mkimage -A arm64 -T script -C none -n "Tizen ODROID-N2 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./output/odroid-n2/boot.scr.uimg }