mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
Khadas VIM1S & VIM4 - 5.15 kernel bump (#6201)
* meson-s4t7: bump u-boot to khadas-vims-u-boot-2019.01-v1.6-release * Use khadas default bootargs as much as possible * Add new hook to allow copying code into kernel * meson-s4t7: legacy: Switch to 5.15 kernel * meson-s4t7: add kernel-config for 5.15 kernel * device tree overlays for 5.15 kernel for vim1s and vim4 * restructure packaging of bsp files for vim1s/vim4 * silence vblank warning on boot * Remove display workaround as it doesn't work with 5.15 kernel * Remove 5.4 kernel patches
This commit is contained in:
@@ -8,12 +8,9 @@ setenv console "both"
|
||||
setenv verbosity "1"
|
||||
setenv earlycon "off"
|
||||
setenv bootlogo "false"
|
||||
setenv earlyconuart "0xfe078000"
|
||||
setenv displaymode "1080p60hz"
|
||||
setenv force_16x9_display "false"
|
||||
|
||||
if test "${board_name}" = "kvim1s"; then setenv earlyconuart "0xfe07a000"; fi
|
||||
|
||||
# Show what uboot default fdtfile is
|
||||
echo "U-boot default fdtfile: ${fdtfile}"
|
||||
|
||||
@@ -26,34 +23,22 @@ if test "${console}" = "both"; then setenv console_serial "true"; setenv console
|
||||
if test "${console}" = "serial"; then setenv console_serial "true"; fi
|
||||
if test "${console}" = "display"; then setenv console_display "true"; fi
|
||||
|
||||
if test "${console_serial}" = "true"; then setenv consoleargs "console=ttyS0,921600"; fi
|
||||
if test "${console_display}" = "true"; then setenv consoleargs "console=tty1 ${consoleargs}"; fi
|
||||
if test "${console_display}" = "true"; then setenv consoleargs "console=tty0"; fi
|
||||
if test "${console_serial}" = "true"; then setenv consoleargs "console=ttyS0,921600 ${consoleargs}"; fi
|
||||
|
||||
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon=aml-uart,${earlyconuart} ${consoleargs}"; fi
|
||||
if test "${earlycon}" != "on"; then
|
||||
setexpr bootargs sub " earlycon=\\S* " " " "${bootargs}"
|
||||
fi
|
||||
|
||||
if test "${bootlogo}" = "true"; then
|
||||
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
|
||||
setenv plymouthargs "splash plymouth.ignore-serial-consoles"
|
||||
else
|
||||
setenv consoleargs "splash=verbose ${consoleargs}"
|
||||
setenv plymouthargs "splash=verbose"
|
||||
fi
|
||||
|
||||
if test -n "${hdmimode}" ; then
|
||||
if test ${display_height} -ge 2160 ; then
|
||||
setenv displaymode "2160p60hz"
|
||||
elif test ${display_height} -ge 1080 ; then
|
||||
setenv displaymode "1080p60hz"
|
||||
else
|
||||
setenv displaymode "720p60hz"
|
||||
fi
|
||||
fi
|
||||
setexpr bootargs sub "rootfstype=\\S*" "rootfstype=${rootfstype}" "${bootargs}"
|
||||
|
||||
if test "${force_16x9_display}" = "true"; then
|
||||
setenv hdmimode ${displaymode}
|
||||
fi
|
||||
|
||||
setenv displayargs "logo=${display_layer},loaded,${fb_addr} vout=${hdmimode},${vout_init} panel_type=${panel_type} hdmitx=${cecconfig},${colorattribute} hdmimode=${hdmimode} hdmichecksum=${hdmichecksum} dolby_vision_on=${dolby_vision_on} hdr_policy=${hdr_policy} hdr_priority=${hdr_priority} frac_rate_policy=${frac_rate_policy} hdmi_read_edid=${hdmi_read_edid} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse}"
|
||||
|
||||
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} no_console_suspend ${displayargs} loglevel=${verbosity} mac=${eth_mac} khadas.serial=${usid} partition_type=generic ${extraargs} ${extraboardargs}"
|
||||
setenv bootargs "root=${rootdev} ${bootargs} ${consoleargs} partition_type=generic loglevel=${verbosity} ${plymouthargs} ${extraargs} ${extraboardargs}"
|
||||
|
||||
load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
|
||||
fdt addr ${fdt_addr_r}
|
||||
|
||||
Reference in New Issue
Block a user