Merge branch 'dev' into start-doom-path-spaces

This commit is contained in:
travis134 2022-08-23 14:19:50 -07:00
commit fdf1e306d1
No known key found for this signature in database
GPG key ID: FB8B9EEA5CEF2984
3 changed files with 4 additions and 2 deletions

View file

@ -431,8 +431,10 @@ set_consolefont() {
then
setfont -C /dev/tty0 ter-v12n.psf
elif [ "${hres}" -ge "640" ] && [ "${hres}" -lt "720" ]
then
setfont -C /dev/tty0 ter-v14n.psf
elif [ "${hres}" -ge "720" ] && [ "${hres}" -lt "1080" ]
then
setfont -C /dev/tty0 ter-v18n.psf
else
setfont -C /dev/tty0 ter-v24n.psf

View file

@ -20,7 +20,7 @@ make_target() {
}
mksplash() {
SPLASH="${ROOT}/distributions/JELOS/splash/splash.png"
SPLASH="${ROOT}/distributions/${DISTRO}/splash/splash.png"
if [ -n "${DISPLAY_RESOLUTION}" ]
then
convert ${SPLASH} -background none -resize ${DISPLAY_RESOLUTION} -gravity center -extent ${DISPLAY_RESOLUTION} ${1}/splash.png

View file

@ -45,7 +45,7 @@
KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
# Display Resolution
DISPLAY_RESOLUTION="320x240"
DISPLAY_RESOLUTION="320x480"
# Mali GPU family
MALI_FAMILY="bifrost-g31"