dany/meta-rpi-diya
1
0
Fork 0
mirror of https://github.com/lxsang/meta-rpi-diya.git synced 2025-02-13 21:32:47 +01:00
Code Issues Projects Releases Wiki Activity

switch to yocto 4.2 + update waveshare overlay

Browse Source
This commit is contained in:
DanyLE 2023-07-07 10:48:28 +02:00
parent fbd95bb8a3
commit daefedaef6
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
conf/layer.conf
View File

@ -5,12 +5,12 @@ BBPATH .= ":${LAYERDIR}"
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend" ${LAYERDIR}/recipes-*/*/*.bbappend"
BBFILE_COLLECTIONS += "meta-rpi-pharo" BBFILE_COLLECTIONS += "meta-rpi-diya"
BBFILE_PATTERN_meta-rpi-pharo = "^${LAYERDIR}/" BBFILE_PATTERN_meta-rpi-diya = "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-rpi-pharo = "11" BBFILE_PRIORITY_meta-rpi-diya = "11"
LAYERDEPENDS_meta-rpi-pharo = "core raspberrypi" LAYERDEPENDS_meta-rpi-diya = "core raspberrypi"
LAYERSERIES_COMPAT_meta-rpi-pharo = "honister" LAYERSERIES_COMPAT_meta-rpi-diya = "mickledore"
PACKAGE_CLASSES = "package_ipk" PACKAGE_CLASSES = "package_ipk"
INHERIT += "rm_work" INHERIT += "rm_work"
@ -40,23 +40,21 @@ ENABLE_SPI_BUS = "0"
ENABLE_I2C = "0" ENABLE_I2C = "0"
KERNEL_MODULE_AUTOLOAD:rpi += " i2c-dev " 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\ RPI_EXTRA_CONFIG += "${@['','\n\
dtoverlay=vc4-kms-dpi-generic,hactive=480,hfp=26,hsync=16,hbp=10 \n\ dtoverlay=vc4-kms-v3d \n\
dtparam=vactive=640,vfp=25,vsync=10,vbp=15 \n\ dtoverlay=vc4-kms-DPI-28inch \n\
dtparam=clock-frequency=32000000,rgb666-padhi \n\
dtoverlay=waveshare-28dpi-3b-4b \n\ dtoverlay=waveshare-28dpi-3b-4b \n\
dtoverlay=waveshare-28dpi-3b \n\ dtoverlay=waveshare-28dpi-3b \n\
dtoverlay=waveshare-28dpi-4b \n\ dtoverlay=waveshare-28dpi-4b \n']['${RPI_USE_wS_28_DPI_LCD}' == '1']}"
display_rotate=1 #1：90；2: 180； 3: 270 \n']['${RPI_USE_wS_28_DPI_LCD}' == '1']}"
RPI_EXTRA_CONFIG += '\n\ RPI_EXTRA_CONFIG += '\n\
start_x=1 # essential \n\ #start_x=1 # essential \n\
dtparam=audio=on \n\ #dtparam=audio=on \n\
gpu_mem=128 # at least, or maybe more if you wish \n\ gpu_mem=128 # at least, or maybe more if you wish \n\
disable_camera_led=1 # optional \n\ disable_camera_led=1 # optional \n\
' '

BIN
recipes-bsp/waveshare-2.8-lcd/files/vc4-kms-DPI-28inch.dtbo Normal file
View File

Binary file not shown.

1
recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb
View File

@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
do_deploy () { do_deploy () {
install -d ${DEPLOY_DIR_IMAGE} 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-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-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 install -m 0755 ${THISDIR}/files/waveshare-28dpi-4b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-4b.dtbo

16
recipes-core/images/core-image-minimal.bbappend
View File

@ -1,6 +1,6 @@
inherit extrausers 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; \ 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 video diya; \
usermod -a -G tty diya; \ usermod -a -G tty diya; \
usermod -a -G input diya; \ usermod -a -G input diya; \
usermod -a -G dialout diya; \ usermod -a -G dialout diya \
usermod -a -G audio diya; \
usermod -a -G avahi diya \
" "
#; \
#usermod -a -G audio diya; \
#usermod -a -G avahi diya \
IMAGE_BOOT_FILES:append = "fs_resize" 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 \ IMAGE_INSTALL:append = "libcurl \
libcurl \
libdrm \ libdrm \
libgbm \ libgbm \
libgles2 \ libgles2 \
@ -38,4 +37,5 @@ IMAGE_INSTALL:append = "mpg123 \
realtekfw \ realtekfw \
diya-overlay \ diya-overlay \
" "
# \ opensmalltalk-cog-vm # \ opensmalltalk-cog-vm
# mpg123 \