From daefedaef6bcfeac5b936e29e79edb572bc66df6 Mon Sep 17 00:00:00 2001 From: DanyLE Date: Fri, 7 Jul 2023 10:48:28 +0200 Subject: [PATCH] switch to yocto 4.2 + update waveshare overlay --- conf/layer.conf | 26 ++++++++---------- .../files/vc4-kms-DPI-28inch.dtbo | Bin 0 -> 2654 bytes .../waveshare-2.8-lcd/waveshare-2.8-lcd.bb | 1 + .../images/core-image-minimal.bbappend | 16 +++++------ 4 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 recipes-bsp/waveshare-2.8-lcd/files/vc4-kms-DPI-28inch.dtbo diff --git a/conf/layer.conf b/conf/layer.conf index f397b54..fa5b90a 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -5,12 +5,12 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS += "meta-rpi-pharo" -BBFILE_PATTERN_meta-rpi-pharo = "^${LAYERDIR}/" -BBFILE_PRIORITY_meta-rpi-pharo = "11" +BBFILE_COLLECTIONS += "meta-rpi-diya" +BBFILE_PATTERN_meta-rpi-diya = "^${LAYERDIR}/" +BBFILE_PRIORITY_meta-rpi-diya = "11" -LAYERDEPENDS_meta-rpi-pharo = "core raspberrypi" -LAYERSERIES_COMPAT_meta-rpi-pharo = "honister" +LAYERDEPENDS_meta-rpi-diya = "core raspberrypi" +LAYERSERIES_COMPAT_meta-rpi-diya = "mickledore" PACKAGE_CLASSES = "package_ipk" INHERIT += "rm_work" @@ -40,23 +40,21 @@ ENABLE_SPI_BUS = "0" ENABLE_I2C = "0" KERNEL_MODULE_AUTOLOAD:rpi += " i2c-dev " -VC4DTBO = "vc4-kms-v3d,nocomposite,noaudio" +VC4DTBO = "vc4-kms-v3d" -KERNEL_DEVICETREE:append = " overlays/vc4-kms-dpi-generic.dtbo " +# KERNEL_DEVICETREE:append = " overlays/vc4-kms-dpi-generic.dtbo " RPI_EXTRA_CONFIG += "${@['','\n\ -dtoverlay=vc4-kms-dpi-generic,hactive=480,hfp=26,hsync=16,hbp=10 \n\ -dtparam=vactive=640,vfp=25,vsync=10,vbp=15 \n\ -dtparam=clock-frequency=32000000,rgb666-padhi \n\ +dtoverlay=vc4-kms-v3d \n\ +dtoverlay=vc4-kms-DPI-28inch \n\ dtoverlay=waveshare-28dpi-3b-4b \n\ dtoverlay=waveshare-28dpi-3b \n\ -dtoverlay=waveshare-28dpi-4b \n\ -display_rotate=1 #1：90；2: 180； 3: 270 \n']['${RPI_USE_wS_28_DPI_LCD}' == '1']}" +dtoverlay=waveshare-28dpi-4b \n']['${RPI_USE_wS_28_DPI_LCD}' == '1']}" RPI_EXTRA_CONFIG += '\n\ -start_x=1 # essential \n\ -dtparam=audio=on \n\ +#start_x=1 # essential \n\ +#dtparam=audio=on \n\ gpu_mem=128 # at least, or maybe more if you wish \n\ disable_camera_led=1 # optional \n\ ' \ No newline at end of file diff --git a/recipes-bsp/waveshare-2.8-lcd/files/vc4-kms-DPI-28inch.dtbo b/recipes-bsp/waveshare-2.8-lcd/files/vc4-kms-DPI-28inch.dtbo new file mode 100644 index 0000000000000000000000000000000000000000..d8c9b51ff1a735a156424f211ac02b48334e8fa3 GIT binary patch literal 2654 zcma)8&x;&I6s}H;=7*6e5u%8o1d$}o%V5CkdsVNh=KHh%{>9ko zj~HV+jGg=t-`CNfML&m*cI+6&FFJYOZ!)0c_?{(s+UC`jXEm=x-Nd#ye$Wn`;2%-_Q5{iGP0a`V$ajy~md{faWrwT8b~ z!xaB2_J(VrFo5Rmzjm<4r%CQPY0*fh@VsvU$&bfBK)xH{pCEq_;one-&qtWzcoIEv z{;jN}o&!_!KL1X>d?&`Jwd7&YCr?3sF~a8|Q@s!N$;*%_2ahj7rsnZmNa1FLX|fk0 z{2t`kp7M$PPl2gLQ&o)W5^2s6r=Vy1OVn!2_4QcHv`np$d)y}!?(BYD8RJ?*jI zzxW%@#Wonh=27S3uo~ZZR)!jkV8y4V)i0a7I*z`@9bInPoG1qicq(=+_PBH~BgE8Sh%& z&V}7|uYz0KtKj?^IFrB$gBuon7u#vPGs=zT`#qR#2Vaz#o9`kxe@2`*|6RO6xouTC zc3y`XQ+3YO{_NmnRbuX4S%1?g9;)GMG%=d5-C*bL|8+Zezd0N4gYHghM?E{l_4CEw zFt#Zh8I3vH(;%pvv91h%fgmvRk2c#W0IzwNoRFiam!ppvsQfE37s!l$&uVbuyWSc z+NL-ydC5w%)H$NjtR%ntMhE`Fe`CAF%5D+axzT}Nh;)z|c|)jN?Rngasz`g zk1BT(63o=1z+(4L`|zyxAd{Nm8P9ZGh+e2W%jS)&X_;xDADrw=rOon&7p2TdJ7)g_ DbI2Br literal 0 HcmV?d00001 diff --git a/recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb b/recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb index 3cb909d..a46706a 100644 --- a/recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb +++ b/recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda do_deploy () { install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 ${THISDIR}/files/vc4-kms-DPI-28inch.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-DPI-28inch.dtbo install -m 0755 ${THISDIR}/files/waveshare-28dpi-3b-4b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-3b-4b.dtbo install -m 0755 ${THISDIR}/files/waveshare-28dpi-3b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-3b.dtbo install -m 0755 ${THISDIR}/files/waveshare-28dpi-4b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-4b.dtbo diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend index e994c29..20298e4 100644 --- a/recipes-core/images/core-image-minimal.bbappend +++ b/recipes-core/images/core-image-minimal.bbappend @@ -1,6 +1,6 @@ inherit extrausers -KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}" +KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/vc4-kms-DPI-28inch.dtbo overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}" EXTRA_USERS_PARAMS = "usermod -p BJpK8ADNDLsGg root; \ @@ -8,15 +8,14 @@ EXTRA_USERS_PARAMS = "usermod -p BJpK8ADNDLsGg root; \ usermod -a -G video diya; \ usermod -a -G tty diya; \ usermod -a -G input diya; \ - usermod -a -G dialout diya; \ - usermod -a -G audio diya; \ - usermod -a -G avahi diya \ + usermod -a -G dialout diya \ " + #; \ + #usermod -a -G audio diya; \ + #usermod -a -G avahi diya \ IMAGE_BOOT_FILES:append = "fs_resize" -# KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/vc4-kms-dpi-generic.dtbo overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}" -IMAGE_INSTALL:append = "mpg123 \ - libcurl \ +IMAGE_INSTALL:append = "libcurl \ libdrm \ libgbm \ libgles2 \ @@ -38,4 +37,5 @@ IMAGE_INSTALL:append = "mpg123 \ realtekfw \ diya-overlay \ " -# \ opensmalltalk-cog-vm \ No newline at end of file +# \ opensmalltalk-cog-vm +# mpg123 \ \ No newline at end of file