From 9d8eb4657219ad65b5e29298cf96d704804e7333 Mon Sep 17 00:00:00 2001
From: kernelzru <106839081+kernelzru@users.noreply.github.com>
Date: Sun, 19 May 2024 00:04:55 +0300
Subject: [PATCH] Update boot-odroid-c1.ini

-Clean, remove params for old kernel
-Add option to disable usb autosuspend
-Add display console
---
 config/bootscripts/boot-odroid-c1.ini | 109 ++++----------------------
 1 file changed, 15 insertions(+), 94 deletions(-)

diff --git a/config/bootscripts/boot-odroid-c1.ini b/config/bootscripts/boot-odroid-c1.ini
index 28f850f29d..27297fe8ab 100644
--- a/config/bootscripts/boot-odroid-c1.ini
+++ b/config/bootscripts/boot-odroid-c1.ini
@@ -1,108 +1,29 @@
 ODROIDC-UBOOT-CONFIG
 
-setenv rootdev "/dev/mmcblk0p1"
+setenv rootdev "LABEL=armbi_root"
 setenv rootfstype "ext4"
 
-# Possible screen resolutions
-# Uncomment only a single Line! The line with setenv written.
-# At least one mode must be selected.
-
-# setenv m "vga"          	# 640x480
-# setenv m "480p"         	# 720x480
-# setenv m "576p"         	# 720x576
-# setenv m "800x480p60hz" 	# 800x480
-# setenv m "800x600p60hz" 	# 800x600
-# setenv m "1024x600p60hz"	# 1024x600
-# setenv m "1024x768p60hz"	# 1024x768
-# setenv m "1360x768p60hz" 	# 1360x768
-# setenv m "1440x900p60hz"	# 1440x900
-# setenv m "1600x900p60hz"	# 1600x900
-# setenv m "1680x1050p60hz"	# 1680x1050
-# setenv m "720p"         	# 720p 1280x720
-# setenv m "800p"         	# 1280x800
-# setenv m "sxga"         	# 1280x1024
-# setenv m "1080i50hz"          # 1080I@50Hz
-# setenv m "1080p24hz"          # 1080P@24Hz
-# setenv m "1080p50hz"          # 1080P@50Hz
-setenv m "1080p"                # 1080P@60Hz
-# setenv m "1920x1200"    	# 1920x1200
-
-# HDMI DVI Mode Configuration
-setenv vout_mode "hdmi"
-# setenv vout_mode "dvi"
-# setenv vout_mode "vga"
-
-# HDMI BPP Mode
-setenv m_bpp "32"
-#setenv m_bpp "24"
-# setenv m_bpp "16"
-
-# Monitor output
-# Controls if HDMI PHY should output anything to the monitor
-setenv monitor_onoff "false" # true or false
-
-# HDMI Hotplug Force (HPD)
-# 1 = Enables HOTPlug Detection
-# 0 = Disables HOTPlug Detection and force the connected status
-setenv hpd "0"
-
-# CEC Enable/Disable (Requires Hardware Modification)
-# 1 = Enables HDMI CEC
-# 0 = Disables HDMI CEC
-setenv cec "0"
-
-# PCM5102 I2S Audio DAC
-# PCM5102 is an I2S Audio Dac Addon board for ODROID-C1+
-# Uncomment the line below to __ENABLE__ support for this Addon board.
-# setenv enabledac "enabledac"
-
-# UHS Card Configuration
-# Uncomment the line below to __DISABLE__ UHS-1 MicroSD support
-# This might break boot for some brand models of cards.
-setenv disableuhs "disableuhs"
-
-
-# Disable VPU (Video decoding engine, Saves RAM!!!)
-# 0 = disabled
-# 1 = enabled
-setenv vpu "1"
-
-# Disable HDMI Output (Again, saves ram!)
-# 0 = disabled
-# 1 = enabled
-setenv hdmioutput "1"
-
 # Default Console Device Setting
-setenv condev "console=ttyAML0,115200n8"
+setenv console "both"
+setenv verbosity "1"
 
-# Enable/Disable ODROID-VU7 Touchscreen
-setenv disable_vu7 "false" # false
-
-# CPU Max Frequency
-# Possible Values: 96 192 312 408 504 600 720 816
-# 1008 1200 1320 1488 1536 1632 1728 and 1824
-setenv max_freq "1536"
-# setenv max_freq "1632"
-# setenv max_freq "1728"
-# setenv max_freq "1824"
+# Enable/Disable USB autosuspend (seems broken on current (6.x) kernels)
+# 0 = disabled
+# 1 = enabled
+setenv usb_autosuspend "0"
 
 ###########################################
-
-if test "${hpd}" = "0"; then setenv hdmi_hpd "disablehpd=true"; fi
-if test "${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi
-if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
+if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
+if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyAML0,115200n8 ${consoleargs}"; fi
+setenv consoleargs "${consoleargs} no_console_suspend consoleblank=0"
+if test "${usb_autosuspend}" = "0"; then setenv extraargs "usbcore.autosuspend=-1"; fi
 
 # Boot Arguments
-setenv bootargs "root=${rootdev} rootwait rw ${condev} rootfstype=${rootfstype} loglevel=1 no_console_suspend consoleblank=0 vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac} monitor_onoff=${monitor_onoff} max_freq=${max_freq} ${hid_quirks} ${extraargs}"
+setenv bootargs "root=${rootdev} rootwait rw ${consoleargs} rootfstype=${rootfstype} loglevel=${verbosity} ${extraargs}"
 
 # Booting
-ext4load mmc 0:1 0x20800000 /boot/uImage || fatload mmc 0:1 0x20800000 uImage || ext4load mmc 0:1 0x20800000 uImage
-ext4load mmc 0:1 0x22000000 /boot/uInitrd || fatload mmc 0:1 0x22000000 uInitrd || ext4load mmc 0:1 0x22000000 uInitrd
-ext4load mmc 0:1 0x21800000 /boot/dtb/meson8b-odroidc1.dtb || fatload mmc 0:1 0x21800000 dtb/meson8b-odroidc1.dtb || ext4load mmc 0:1 0x21800000 dtb/meson8b-odroidc1.dtb
-
-fdt addr 21800000
-
-if test "${vpu}" = "0"; then fdt rm /mesonstream; fdt rm /vdec; fdt rm /ppmgr; fi
-if test "${hdmioutput}" = "0"; then fdt rm /mesonfb; fi
+fatload mmc 0:1 0x20800000 uImage
+fatload mmc 0:1 0x22000000 uInitrd
+fatload mmc 0:1 0x21800000 dtb/meson8b-odroidc1.dtb
 
 bootm 0x20800000 0x22000000 0x21800000