diff --git a/conf/machine/pinetabv.conf b/conf/machine/pinetabv.conf index a9b6324..bba3a00 100644 --- a/conf/machine/pinetabv.conf +++ b/conf/machine/pinetabv.conf @@ -15,7 +15,7 @@ UBOOT_MACHINE = "pine64_pinetabv_defconfig" UBOOT_DTB_BINARY = "pine64_pinetabv.dtb" IMAGE_BOOT_FILES = " \ - fitImage-star64-image-initramfs-pinetabv-pinetabv;${KERNEL_IMAGETYPE} \ + ${KERNEL_IMAGETYPE} \ uEnv.txt \ " diff --git a/conf/machine/star64.conf b/conf/machine/star64.conf index 4bb02e9..2399ac3 100644 --- a/conf/machine/star64.conf +++ b/conf/machine/star64.conf @@ -15,7 +15,7 @@ UBOOT_MACHINE = "pine64_star64_defconfig" UBOOT_DTB_BINARY = "pine64_star64.dtb" IMAGE_BOOT_FILES = " \ - fitImage-star64-image-initramfs-star64-star64;${KERNEL_IMAGETYPE} \ + ${KERNEL_IMAGETYPE} \ vf2_uEnv.txt \ " MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:remove = "vdec-module" diff --git a/recipes-bsp/u-boot/u-boot-starfive/uEnv-pinetabv.txt b/recipes-bsp/u-boot/u-boot-starfive/uEnv-pinetabv.txt index e09dc72..e9b0580 100644 --- a/recipes-bsp/u-boot/u-boot-starfive/uEnv-pinetabv.txt +++ b/recipes-bsp/u-boot/u-boot-starfive/uEnv-pinetabv.txt @@ -1,16 +1,10 @@ -# This is the sample jh7110_uEnv.txt file for starfive visionfive U-boot -# The current convention (SUBJECT TO CHANGE) is that this file -# will be loaded from the third partition on the -# MMC card. -#devnum=1 partnum=3 # The FIT file to boot from 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 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 +bootargs_ext=if test ${devnum} = 0; then setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait splash quiet earlycon=sbi root=/dev/mmcblk0p4"; else setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait splash quiet earlycon=sbi root=/dev/mmcblk1p4"; fi; # for addr info fileaddr=0xa0000000 diff --git a/recipes-bsp/u-boot/u-boot-starfive/uEnv-star64.txt b/recipes-bsp/u-boot/u-boot-starfive/uEnv-star64.txt index e09dc72..e9b0580 100644 --- a/recipes-bsp/u-boot/u-boot-starfive/uEnv-star64.txt +++ b/recipes-bsp/u-boot/u-boot-starfive/uEnv-star64.txt @@ -1,16 +1,10 @@ -# This is the sample jh7110_uEnv.txt file for starfive visionfive U-boot -# The current convention (SUBJECT TO CHANGE) is that this file -# will be loaded from the third partition on the -# MMC card. -#devnum=1 partnum=3 # The FIT file to boot from 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 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 +bootargs_ext=if test ${devnum} = 0; then setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait splash quiet earlycon=sbi root=/dev/mmcblk0p4"; else setenv bootargs "earlyprintk console=tty1 console=ttyS0,115200 rootwait splash quiet earlycon=sbi root=/dev/mmcblk1p4"; fi; # for addr info fileaddr=0xa0000000 diff --git a/recipes-kernel/linux/linux-starfive-dev.bb b/recipes-kernel/linux/linux-starfive-dev.bb index bf80e4f..53b1395 100644 --- a/recipes-kernel/linux/linux-starfive-dev.bb +++ b/recipes-kernel/linux/linux-starfive-dev.bb @@ -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 = "a37452d91cd8ed50041459b85e6395b42a8efbd3" -SRCREV:pinetabv = "a37452d91cd8ed50041459b85e6395b42a8efbd3" +SRCREV:star64 = "1456c984f15e21e28fb8a9ce96d0ca10e61a71c4" +SRCREV:pinetabv = "1456c984f15e21e28fb8a9ce96d0ca10e61a71c4" BRANCH = "visionfive" BRANCH:visionfive2 = "JH7110_VisionFive2_devel"