Fix up splash screen commandline and bump kernel with new v4l2-m2m wave5 driver

This commit is contained in:
Justin Hammond 2023-09-09 00:49:45 +08:00
parent ea2bc5eb8f
commit 7ad189c76f
6 changed files with 18 additions and 7 deletions

View file

@ -25,4 +25,6 @@ WKS_FILE_DEPENDS = " \
bmap-tools-native \
"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:remove = "vdec-module"
WKS_FILE = "pinetabv.wks"

View file

@ -18,7 +18,7 @@ IMAGE_BOOT_FILES = " \
fitImage-star64-image-initramfs-star64-star64;${KERNEL_IMAGETYPE} \
vf2_uEnv.txt \
"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:remove = "vdec-module"
#UBOOT_ENV_SUFFIX:remove = "scr.uimg"

View file

@ -9,7 +9,7 @@ partnum=3
fitfile=fitImage
# for debugging boot
bootargs_ext=if test ${devnum} = 0; then setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait earlycon=sbi root=/dev/mmcblk0p4"; else setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait earlycon=sbi root=/dev/mmcblk1p4"; fi;
bootargs_ext=if test ${devnum} = 0; then setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait earlycon=sbi root=/dev/mmcblk0p4 quiet splash"; else setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait earlycon=sbi root=/dev/mmcblk1p4 quiet splash"; fi;
#bootargs=earlyprintk console=ttyS0,115200 debug rootwait earlycon=sbi root=/dev/mmcblk1p4
# for addr info

View file

@ -9,7 +9,7 @@ partnum=3
fitfile=fitImage
# for debugging boot
bootargs_ext=if test ${devnum} = 0; then setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait earlycon=sbi root=/dev/mmcblk0p4"; else setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait earlycon=sbi root=/dev/mmcblk1p4"; fi;
bootargs_ext=if test ${devnum} = 0; then setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait earlycon=sbi root=/dev/mmcblk0p4 quiet splash"; else setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait earlycon=sbi root=/dev/mmcblk1p4 quiet splash"; fi;
#bootargs=earlyprintk console=ttyS0,115200 debug rootwait earlycon=sbi root=/dev/mmcblk1p4
# for addr info

View file

@ -70,6 +70,15 @@ do_deploy:append:pinetabv() {
ln -sf ${SPL_IMAGE}.normal.out ${DEPLOYDIR}/${SPL_SYMLINK}.normal.out
}
do_install:append:pinetabv() {
install -d ${D}/boot
install -m 644 ${WORKDIR}/uEnv-pinetabv.txt ${D}/boot/uEnv.txt
}
FILES:${PN}:append:pinetabv = " /boot/uEnv.txt"
FILES:${PN}:append:star64 = " /boot/vf2_uEnv.txt"
CONFFILES:${PN}:append:pinetabv = " /boot/uEnv.txt"
CONFFILES:${PN}:append:star64 = " /boot/vf2_uEnv.txt"
COMPATIBLE_MACHINE = "jh7110"

View file

@ -10,8 +10,8 @@ SRCREV = "${AUTOREV}"
# pin srcrev for now to have a fixed target
# release VF2_v2.11.5
SRCREV:visionfive2 = "d9eee31aaec51ade1641391836c1f07dd2151a4a"
SRCREV:star64 = "e9ae40dd4b7eb2d5083e318ce65f81e8f01d8118"
SRCREV:pinetabv = "e9ae40dd4b7eb2d5083e318ce65f81e8f01d8118"
SRCREV:star64 = "c7d5e25012314b25a8ca1237f14385122c530d6e"
SRCREV:pinetabv = "c7d5e25012314b25a8ca1237f14385122c530d6e"
BRANCH = "visionfive"
BRANCH:visionfive2 = "JH7110_VisionFive2_devel"
@ -42,8 +42,8 @@ SRC_URI:append:jh7110 = " \
LINUX_VERSION ?= "6.2.0"
LINUX_VERSION:visionfive2 = "5.15.0"
LINUX_VERSION:star64 = "5.15.128"
LINUX_VERSION:pinetabv = "5.15.128"
LINUX_VERSION:star64 = "5.15.130"
LINUX_VERSION:pinetabv = "5.15.130"
LINUX_VERSION_EXTENSION:append:beaglev-starlight-jh7100 = "-starlight"
KBUILD_DEFCONFIG:beaglev-starlight-jh7100 = "starfive_jh7100_fedora_defconfig"