mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
Non c4 meson64 fixes (#2967)
* Fix: use $fdtfile for legacy boot DTB, not hardcoded "amlogic/meson64_odroidc4.dtb" Signed-off-by: Ricardo Pardini <ricardo@pardini.net> * drop unused c4 bootscript Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
This commit is contained in:
Ricardo Pardini
@@ -100,7 +100,7 @@ if test -e ${devtype} ${devnum} ${prefix}zImage; then
|
||||
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 coherent_pool=2M loglevel=${verbosity} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a55=${max_freq_a55} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan} ${hid_quirks} monitor_onoff=${monitor_onoff} ${cec_enable} sdrmode=${sdrmode}"
|
||||
|
||||
load ${devtype} ${devnum} ${k_addr} boot/zImage
|
||||
load ${devtype} ${devnum} ${dtb_loadaddr} boot/dtb/amlogic/meson64_odroidc4.dtb
|
||||
load ${devtype} ${devnum} ${dtb_loadaddr} boot/dtb/${fdtfile}
|
||||
load ${devtype} ${devnum} ${initrd_loadaddr} boot/uInitrd
|
||||
fdt addr ${dtb_loadaddr}
|
||||
unzip ${k_addr} ${loadaddr}
|
||||
|
||||
@@ -1,130 +0,0 @@
|
||||
ODROIDC4-UBOOT-CONFIG
|
||||
|
||||
setenv rootdev "/dev/mmcblk0p1"
|
||||
setenv rootfstype "ext4"
|
||||
|
||||
# Default Console Device Setting
|
||||
setenv condev "console=ttyS0,115200n8 console=tty1 loglevel=1" # on both
|
||||
|
||||
# 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"
|
||||
|
||||
# SDR/HDR Configuration
|
||||
# This forces SDR or HDR modes
|
||||
# valid options are: sdr hdr auto
|
||||
setenv sdrmode "auto"
|
||||
|
||||
### voutmode : hdmi or dvi
|
||||
setenv voutmode "hdmi"
|
||||
# setenv voutmode "dvi"
|
||||
|
||||
# HPD enable/disable option
|
||||
setenv disablehpd "false"
|
||||
|
||||
# Enable/Disable CEC
|
||||
setenv cec "false"
|
||||
|
||||
# Hardkernel ODROID-VU7 support
|
||||
# By default VU7 support is disabled
|
||||
setenv disable_vu7 "true"
|
||||
# setenv disable_vu7 "false"
|
||||
|
||||
# max cpu frequency for A55 core in MHz unit
|
||||
# setenv max_freq_a55 "2100" # 2.1 Ghz, 10% overclock
|
||||
# setenv max_freq_a55 "2016" # 2.016 Ghz, mild overclock
|
||||
setenv max_freq_a55 "1908" # 1.908 GHz, default value
|
||||
# setenv max_freq_a55 "1800" # 1.8 Ghz
|
||||
# setenv max_freq_a55 "1704" # 1.704 GHz
|
||||
|
||||
# max cpu-cores
|
||||
setenv maxcpus "4"
|
||||
|
||||
# Display splash logo
|
||||
setenv bootlogo "false"
|
||||
|
||||
if test "${bootlogo}" = "true"; then setenv bootsplash "bootsplash.bootfile=bootsplash.armbian"; fi
|
||||
|
||||
|
||||
### 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
|
||||
|
||||
# VU7 Settings
|
||||
if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
|
||||
|
||||
# load armbianEnv.txt
|
||||
if ext4load mmc ${devno}:1 0x44000000 /boot/armbianEnv.txt || fatload mmc ${devno}:1 0x44000000 armbianEnv.txt || ext4load mmc ${devno}:1 0x44000000 armbianEnv.txt; then env import -t 0x44000000 ${filesize}; fi
|
||||
|
||||
# Boot Args
|
||||
setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a55=${max_freq_a55} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan} ${hid_quirks} monitor_onoff=${monitor_onoff} logo=osd0,loaded ${cec_enable} ${bootsplash} sdrmode=${sdrmode} consoleblank=0"
|
||||
|
||||
# Set load addresses
|
||||
setenv dtb_loadaddr "0x1000000"
|
||||
setenv k_addr "0x1100000"
|
||||
setenv loadaddr "0x1B00000"
|
||||
setenv initrd_loadaddr "0x4080000"
|
||||
|
||||
# Load kernel, dtb and initrd
|
||||
fatload mmc ${devno}:1 ${k_addr} zImage
|
||||
fatload mmc ${devno}:1 ${dtb_loadaddr} dtb/amlogic/meson64_odroidc4.dtb
|
||||
fatload mmc ${devno}:1 ${initrd_loadaddr} uInitrd
|
||||
fdt addr ${dtb_loadaddr}
|
||||
|
||||
# unzip the kernel
|
||||
unzip ${k_addr} ${loadaddr}
|
||||
|
||||
# boot
|
||||
booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}
|
||||
Reference in New Issue
Block a user