mirror of
https://github.com/agherzan/meta-raspberrypi.git
synced 2025-12-06 06:19:11 +00:00
Compare commits
26 Commits
gatesgarth
...
pyro
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6786c0709d | ||
|
|
3fa61f096f | ||
|
|
89a9e2d88d | ||
|
|
b7defa119a | ||
|
|
d4ce736c91 | ||
|
|
b0acfb8dd3 | ||
|
|
8bd0459044 | ||
|
|
40447de478 | ||
|
|
a6ebf95260 | ||
|
|
9bb89a75c0 | ||
|
|
015999bc02 | ||
|
|
093286dae8 | ||
|
|
ed3b254454 | ||
|
|
1220c461d8 | ||
|
|
c981f01a2c | ||
|
|
8291756c3f | ||
|
|
6521c4db7d | ||
|
|
6b38f3c6f9 | ||
|
|
62ecc5a45b | ||
|
|
8ba2d6fc80 | ||
|
|
ff59ad9d4b | ||
|
|
c750b0ac5d | ||
|
|
31a813c069 | ||
|
|
f6764c85e3 | ||
|
|
7f88c39eeb | ||
|
|
b32257c841 |
@@ -33,12 +33,12 @@ OpenEmbedded/Yocto distributions and layer stacks, such as:
|
||||
This layer depends on:
|
||||
|
||||
* URI: git://git.yoctoproject.org/poky
|
||||
* branch: master
|
||||
* branch: pyro
|
||||
* revision: HEAD
|
||||
|
||||
* URI: git://git.openembedded.org/meta-openembedded
|
||||
* layers: meta-oe, meta-multimedia, meta-networking, meta-python
|
||||
* branch: master
|
||||
* branch: pyro
|
||||
* revision: HEAD
|
||||
|
||||
## Quick Start
|
||||
|
||||
@@ -72,6 +72,10 @@ SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg"
|
||||
# Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
|
||||
FATPAYLOAD ?= ""
|
||||
|
||||
# SD card vfat partition image name
|
||||
SDIMG_VFAT = "${IMAGE_NAME}.vfat"
|
||||
SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat"
|
||||
|
||||
IMAGE_CMD_rpi-sdimg () {
|
||||
|
||||
# Align partitions
|
||||
@@ -145,6 +149,16 @@ IMAGE_CMD_rpi-sdimg () {
|
||||
echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
|
||||
mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}/image-version-info ::
|
||||
|
||||
# Deploy vfat partition (for u-boot case only)
|
||||
case "${KERNEL_IMAGETYPE}" in
|
||||
"uImage")
|
||||
cp ${WORKDIR}/boot.img ${IMGDEPLOYDIR}/${SDIMG_VFAT}
|
||||
ln -sf ${SDIMG_VFAT} ${SDIMG_LINK_VFAT}
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
# Burn Partitions
|
||||
dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
|
||||
# If SDIMG_ROOTFS_TYPE is a .xz file use xzcat
|
||||
|
||||
@@ -83,7 +83,13 @@ def make_dtb_boot_files(d):
|
||||
|
||||
IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \
|
||||
${@make_dtb_boot_files(d)} \
|
||||
${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE} \
|
||||
${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', \
|
||||
'${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \
|
||||
'${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
|
||||
"
|
||||
do_image_wic[depends] += " \
|
||||
bcm2835-bootfiles:do_deploy \
|
||||
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
|
||||
"
|
||||
|
||||
# The kernel image is installed into the FAT32 boot partition and does not need
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#@NAME: RaspberryPi 3 Development Board
|
||||
#@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode
|
||||
|
||||
MACHINEOVERRIDES = "raspberrypi3:raspberrypi:${MACHINE}"
|
||||
MACHINEOVERRIDES = "raspberrypi3:${MACHINE}"
|
||||
|
||||
MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430"
|
||||
|
||||
|
||||
@@ -58,9 +58,9 @@ author = 'meta-raspberrypi contributors'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = 'master'
|
||||
version = 'pyro'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = 'master'
|
||||
release = 'pyro'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
RPIFW_DATE ?= "20170405"
|
||||
RPIFW_DATE ?= "20171029"
|
||||
RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/1.${RPIFW_DATE}.tar.gz"
|
||||
RPIFW_S ?= "${WORKDIR}/firmware-1.${RPIFW_DATE}"
|
||||
|
||||
SRC_URI = "${RPIFW_SRC_URI}"
|
||||
SRC_URI[md5sum] = "ea82d14a7cd8cfae9b78e00d4e56bc71"
|
||||
SRC_URI[sha256sum] = "2f4e5bddbac1372590db203002c35cbba3fb9d6172a93c314ee27bf05ae13bff"
|
||||
|
||||
SRC_URI[md5sum] = "4d27c1888a7bab3097471906e7b4a319"
|
||||
SRC_URI[sha256sum] = "46ce28c8d87ef22bdcc57ac1836ca3f04d1ec6f46580ff5a30bf76b3c0822117"
|
||||
PV = "${RPIFW_DATE}"
|
||||
|
||||
|
||||
@@ -1,13 +1,28 @@
|
||||
Remove dependencies on LSB functions
|
||||
From 1338f98a279616f4e5e9ea30a25d1dfa0c7df5d6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se>
|
||||
Date: Sun, 4 Jun 2017 12:22:40 +0200
|
||||
Subject: [PATCH] Remove dependencies on LSB functions
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
See this as a rebase of the previous 'Remove dependencies on LSB
|
||||
functions patch' with only minor modifications from the original version,
|
||||
based on the work done by Alex Lennon <ajlennon@dynamicdevices.co.uk> in
|
||||
'25fd817 pi-blaster: Added recipe'.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Alex Lennon <ajlennon@dynamicdevices.co.uk>
|
||||
Signed-off-by: Petter Mabäcker <petter@technux.se>
|
||||
---
|
||||
debian/pi-blaster.init | 38 +++++++-------------------------------
|
||||
1 file changed, 7 insertions(+), 31 deletions(-)
|
||||
|
||||
diff -ur git.org/pi-blaster.boot.sh git/pi-blaster.boot.sh
|
||||
--- git.org/pi-blaster.boot.sh 2014-05-20 14:49:44.378582168 +0100
|
||||
+++ git/pi-blaster.boot.sh 2014-05-20 14:51:08.330582386 +0100
|
||||
@@ -28,12 +28,12 @@
|
||||
diff --git a/debian/pi-blaster.init b/debian/pi-blaster.init
|
||||
index b142d70..01a686c 100644
|
||||
--- a/debian/pi-blaster.init
|
||||
+++ b/debian/pi-blaster.init
|
||||
@@ -28,12 +28,12 @@ SCRIPTNAME=/etc/init.d/$NAME
|
||||
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
|
||||
|
||||
# Load the VERBOSE setting and other rcS variables
|
||||
@@ -22,7 +37,7 @@ diff -ur git.org/pi-blaster.boot.sh git/pi-blaster.boot.sh
|
||||
|
||||
#
|
||||
# Function that starts the daemon/service
|
||||
@@ -77,48 +77,23 @@
|
||||
@@ -77,48 +77,24 @@ do_stop()
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
@@ -52,6 +67,7 @@ diff -ur git.org/pi-blaster.boot.sh git/pi-blaster.boot.sh
|
||||
# 'force-reload' alias
|
||||
#
|
||||
- log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
+ echo "Restarting $DESC" "$NAME"
|
||||
do_stop
|
||||
- case "$?" in
|
||||
- 0|1)
|
||||
@@ -71,7 +87,10 @@ diff -ur git.org/pi-blaster.boot.sh git/pi-blaster.boot.sh
|
||||
;;
|
||||
*)
|
||||
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
|
||||
+ echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2
|
||||
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ DESCRIPTION = "This project enables PWM on the GPIO pins you request of a Raspbe
|
||||
HOMEPAGE = "https://github.com/sarfata/pi-blaster/"
|
||||
SECTION = "devel/libs"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://README.md;beginline=157;endline=170;md5=f20832f31126609af5a7bf2340014540"
|
||||
LIC_FILES_CHKSUM = "file://README.md;beginline=212;endline=239;md5=a012868ef5f83b9f257af253d7cb07a3"
|
||||
|
||||
SRC_URI = "git://github.com/sarfata/pi-blaster \
|
||||
file://remove-initscript-lsb-dependency.patch \
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
require pi-blaster.inc
|
||||
|
||||
SRCREV = "ec5e1b4c6191d8f9a538497dbbb86f9cf0de7016"
|
||||
SRCREV = "9f45eb23a8a3b2d1c08d08a6d68f206fe91ecf4c"
|
||||
|
||||
@@ -16,5 +16,10 @@ inherit setuptools
|
||||
|
||||
COMPATIBLE_MACHINE = "raspberrypi"
|
||||
|
||||
RDEPENDS_${PN} = "\
|
||||
python-logging \
|
||||
python-threading \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "cefc45422833dcafcd59b78dffc540f4"
|
||||
SRC_URI[sha256sum] = "b89f75dec9de354681209ebfaedfe22b7c178aacd91a604a7bd6d92024e4cf7e"
|
||||
|
||||
@@ -1,23 +1,18 @@
|
||||
From 4ed727aa9e528f130fdc8798df771037a1f22fc9 Mon Sep 17 00:00:00 2001
|
||||
From: Andrea Galbusera <gizero@gmail.com>
|
||||
Date: Mon, 3 Apr 2017 14:48:14 +0200
|
||||
Subject: [PATCH] =?UTF-8?q?Add=20initial=20cross=20compile=20support=20(re?=
|
||||
=?UTF-8?q?base=20from=20Petter=20Mab=C3=A4cker=20<petter@technux.se>=20ve?=
|
||||
=?UTF-8?q?rsion)?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
From ca25788e2563bad0d554deb9f4300d1e7d062825 Mon Sep 17 00:00:00 2001
|
||||
From: Aurelian Zanoschi <aurelian17@gmail.com>
|
||||
Date: Mon, 31 Jul 2017 20:25:15 +0300
|
||||
Subject: [PATCH] Add initial cross compile support
|
||||
|
||||
---
|
||||
devLib/Makefile | 54 +++++++++++++++++++++++++--------------------
|
||||
examples/Gertboard/Makefile | 20 +++++++++++------
|
||||
examples/Makefile | 20 +++++++++++------
|
||||
examples/PiFace/Makefile | 20 +++++++++++------
|
||||
examples/Gertboard/Makefile | 22 +++++++++++-------
|
||||
examples/Makefile | 22 +++++++++++-------
|
||||
examples/PiFace/Makefile | 22 +++++++++++-------
|
||||
examples/PiGlow/Makefile | 4 ++--
|
||||
examples/q2w/Makefile | 4 ++--
|
||||
gpio/Makefile | 29 ++++++++++++------------
|
||||
wiringPi/Makefile | 50 +++++++++++++++++++++++------------------
|
||||
8 files changed, 116 insertions(+), 85 deletions(-)
|
||||
wiringPi/Makefile | 52 ++++++++++++++++++++++++-------------------
|
||||
8 files changed, 120 insertions(+), 89 deletions(-)
|
||||
|
||||
diff --git a/devLib/Makefile b/devLib/Makefile
|
||||
index cf665d6..040c03a 100644
|
||||
@@ -132,11 +127,12 @@ index 1939ad6..98d1415 100644
|
||||
-CC = gcc
|
||||
-INCLUDE = -I/usr/local/include
|
||||
-CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
|
||||
+DESTDIR?=/usr
|
||||
+PREFIX?=/local
|
||||
|
||||
-
|
||||
-LDFLAGS = -L/usr/local/lib
|
||||
-LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm
|
||||
+DESTDIR?=/usr
|
||||
+PREFIX?=/local
|
||||
+
|
||||
+INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
|
||||
+LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
|
||||
+
|
||||
@@ -164,11 +160,12 @@ index 6d87885..8623816 100644
|
||||
-CC = gcc
|
||||
-INCLUDE = -I/usr/local/include
|
||||
-CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
|
||||
+DESTDIR?=/usr
|
||||
+PREFIX?=/local
|
||||
|
||||
-
|
||||
-LDFLAGS = -L/usr/local/lib
|
||||
-LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm -lcrypt -lrt
|
||||
+DESTDIR?=/usr
|
||||
+PREFIX?=/local
|
||||
+
|
||||
+INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
|
||||
+LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
|
||||
+
|
||||
@@ -196,11 +193,12 @@ index f937c14..ad030b3 100644
|
||||
-CC = gcc
|
||||
-INCLUDE = -I/usr/local/include
|
||||
-CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
|
||||
+DESTDIR?=/usr
|
||||
+PREFIX?=/local
|
||||
|
||||
-
|
||||
-LDFLAGS = -L/usr/local/lib
|
||||
-LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm
|
||||
+DESTDIR?=/usr
|
||||
+PREFIX?=/local
|
||||
+
|
||||
+INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
|
||||
+LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
|
||||
+
|
||||
@@ -305,10 +303,10 @@ index f41a005..22753ee 100644
|
||||
|
||||
.PHONY: depend
|
||||
diff --git a/wiringPi/Makefile b/wiringPi/Makefile
|
||||
index e1868b9..e39f75a 100644
|
||||
index e1868b9..750d290 100644
|
||||
--- a/wiringPi/Makefile
|
||||
+++ b/wiringPi/Makefile
|
||||
@@ -25,19 +25,23 @@ VERSION=$(shell cat ../VERSION)
|
||||
@@ -25,21 +25,25 @@ VERSION=$(shell cat ../VERSION)
|
||||
DESTDIR?=/usr
|
||||
PREFIX?=/local
|
||||
|
||||
@@ -336,19 +334,22 @@ index e1868b9..e39f75a 100644
|
||||
+CC ?= gcc
|
||||
+INCLUDE ?= -I.
|
||||
DEFS = -D_GNU_SOURCE
|
||||
CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
|
||||
-CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
|
||||
+CFLAGS = $(DEBUG) $(DEFS) $(INCLUDE) -Wformat=2 -Wall -Wextra -Winline -pipe -fPIC
|
||||
|
||||
LIBS = -lm -lpthread -lrt -lcrypt
|
||||
|
||||
@@ -78,17 +82,17 @@ $(STATIC): $(OBJ)
|
||||
|
||||
$(DYNAMIC): $(OBJ)
|
||||
$Q echo "[Link (Dynamic)]"
|
||||
- $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)
|
||||
+ $Q $(CC) $(LDFLAGS) -shared -Wl,-soname,$(BASE_NAME).so.$(DYN_VERS_MAJ) -o $(BASE_NAME).so $(LIBS) $(OBJ)
|
||||
+ $Q $(CC) $(LDFLAGS) -shared -Wl,-soname,$(BASE_NAME).so.$(DYN_VERS_MAJ) -o $(BASE_NAME).so $(OBJ) $(LIBS)
|
||||
|
||||
.c.o:
|
||||
$Q echo [Compile] $<
|
||||
- $Q $(CC) -c $(CFLAGS) $< -o $@
|
||||
+ $Q $(CC) -c $(CFLAGS) -fPIC $< -o $@
|
||||
+ $Q $(CC) $(CFLAGS) $(LIBS) -c $< -o $@
|
||||
|
||||
|
||||
.PHONY: clean
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From f6540119d5b064361ffcb370373794932f97bfdd Mon Sep 17 00:00:00 2001
|
||||
From e45bc677368d0f8d42720aad242f33f6e2687fb1 Mon Sep 17 00:00:00 2001
|
||||
From: Dom Cobley <dc4@broadcom.com>
|
||||
Date: Tue, 9 Jul 2013 09:26:26 -0400
|
||||
Subject: [PATCH 01/13] Allow applications to set next resource handle
|
||||
Subject: [PATCH 01/15] Allow applications to set next resource handle
|
||||
|
||||
This patch adds provisions in userland to
|
||||
let apps callers set the next rendereing dispmanx resource.
|
||||
@@ -204,5 +204,5 @@ index 8a5734c..51b3580 100644
|
||||
|
||||
FN(void, eglIntGetColorData_impl, (EGL_SURFACE_ID_T s, KHRN_IMAGE_FORMAT_T format, uint32_t width, uint32_t height, int32_t stride, uint32_t y_offset, void *data))
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 61a9d792ed774af43e592aa8fdb2a18488696d0f Mon Sep 17 00:00:00 2001
|
||||
From 15fb270f438f4ef1413192b5ce1e0dc784b45d9e Mon Sep 17 00:00:00 2001
|
||||
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
|
||||
Date: Tue, 1 Oct 2013 13:19:20 +0200
|
||||
Subject: [PATCH 02/13] wayland: Add support for the Wayland winsys
|
||||
Subject: [PATCH 02/15] wayland: Add support for the Wayland winsys
|
||||
|
||||
* Adds EGL_WL_bind_wayland_display extension
|
||||
* Adds wayland-egl library
|
||||
@@ -17,7 +17,7 @@ TODO: wl_dispmanx_server_buffer should probably be defined in a
|
||||
private header that can be included from EGL and vc_* instead of in
|
||||
vc_vchi_dispmanx.h
|
||||
---
|
||||
.gitignore | 2 +
|
||||
.gitignore | 1 +
|
||||
CMakeLists.txt | 11 +
|
||||
README.md | 4 +
|
||||
buildme | 10 +-
|
||||
@@ -47,7 +47,7 @@ vc_vchi_dispmanx.h
|
||||
interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++
|
||||
interface/wayland/dispmanx.xml | 123 +++++++++++
|
||||
makefiles/cmake/Wayland.cmake | 72 ++++++
|
||||
30 files changed, 1258 insertions(+), 98 deletions(-)
|
||||
30 files changed, 1257 insertions(+), 98 deletions(-)
|
||||
create mode 100644 interface/khronos/common/linux/khrn_wayland.c
|
||||
copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%)
|
||||
create mode 100644 interface/khronos/ext/egl_wayland.c
|
||||
@@ -58,14 +58,13 @@ vc_vchi_dispmanx.h
|
||||
create mode 100644 makefiles/cmake/Wayland.cmake
|
||||
|
||||
diff --git a/.gitignore b/.gitignore
|
||||
index 4a88665..5da71a9 100644
|
||||
index 63570f1..1459436 100644
|
||||
--- a/.gitignore
|
||||
+++ b/.gitignore
|
||||
@@ -13,3 +13,5 @@ build/
|
||||
*.lai
|
||||
*.la
|
||||
*.a
|
||||
+
|
||||
@@ -30,3 +30,4 @@ build/
|
||||
*.pts
|
||||
*.ppm
|
||||
*.mkv
|
||||
+*~
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cfc8ae5..673a5ad 100644
|
||||
@@ -808,16 +807,16 @@ index b8bb374..03fe67b 100644
|
||||
/*
|
||||
TODO: do an RPC call to make sure the Khronos vll is loaded (and that it stays loaded until eglTerminate)
|
||||
Also affects global image (and possibly others?)
|
||||
@@ -451,6 +444,9 @@ EGLAPI const char EGLAPIENTRY * eglQueryString(EGLDisplay dpy, EGLint name)
|
||||
@@ -450,6 +443,9 @@ EGLAPI const char EGLAPIENTRY * eglQueryString(EGLDisplay dpy, EGLint name)
|
||||
#ifdef EGL_KHR_fence_sync
|
||||
"EGL_KHR_fence_sync "
|
||||
#endif
|
||||
#endif
|
||||
+#endif
|
||||
+#if EGL_WL_bind_wayland_display
|
||||
+ "EGL_WL_bind_wayland_display "
|
||||
+#endif
|
||||
#endif
|
||||
;
|
||||
break;
|
||||
case EGL_VENDOR:
|
||||
@@ -655,8 +651,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig c
|
||||
false,
|
||||
EGL_NO_TEXTURE,
|
||||
@@ -1885,5 +1884,5 @@ index 0000000..ad90d30
|
||||
+ set(${_sources} ${${_sources}} PARENT_SCOPE)
|
||||
+endfunction()
|
||||
--
|
||||
2.12.2
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 08679675740d92f022e0fd46207a42589c9f6c51 Mon Sep 17 00:00:00 2001
|
||||
From b0437cf318a26c62119ad60649430903f58bbab4 Mon Sep 17 00:00:00 2001
|
||||
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
|
||||
Date: Tue, 1 Oct 2013 13:19:20 +0200
|
||||
Subject: [PATCH 03/13] wayland: Add Wayland example
|
||||
Subject: [PATCH 03/15] wayland: Add Wayland example
|
||||
|
||||
---
|
||||
.../linux/apps/hello_pi/CMakeLists.txt | 1 +
|
||||
@@ -862,5 +862,5 @@ index 8225dd5..0be6ce7 100755
|
||||
make -C libs/ilclient
|
||||
make -C libs/vgfont
|
||||
@@ -31,4 +32,4 @@ make -C hello_videocube
|
||||
make -C hello_teapot
|
||||
make -C hello_teapot
|
||||
make -C hello_fft
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From eb9d0eb386b9b3df519a299887b45962c03e732c Mon Sep 17 00:00:00 2001
|
||||
From cae4ff834eef23c8f23126ba4d630db395f13aee Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 10 Aug 2015 02:38:27 -0700
|
||||
Subject: [PATCH 04/13] wayland-egl: Add bcm_host to dependencies
|
||||
Subject: [PATCH 04/15] wayland-egl: Add bcm_host to dependencies
|
||||
|
||||
It uses headers like vcos_platform_types.h but does not
|
||||
depend on module which should add the required include paths
|
||||
@@ -24,5 +24,5 @@ index 8bafc15..fd259c9 100644
|
||||
Libs: -L${libdir} -lwayland-egl
|
||||
Cflags: -I${includedir}
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From ef3162e061a3231fbf836208f98c38c7c5581a9e Mon Sep 17 00:00:00 2001
|
||||
From 8ee4f6eedb81e9bfe0e603a21606c52f9501e609 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sat, 24 Jan 2015 22:07:19 +0100
|
||||
Subject: [PATCH 05/13] interface: remove faulty assert() to make weston happy
|
||||
Subject: [PATCH 05/15] interface: remove faulty assert() to make weston happy
|
||||
at runtime
|
||||
|
||||
This was removed after a discussion on IRC with the weston guys
|
||||
@@ -13,7 +13,7 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c
|
||||
index 45f4cff..5d0368c 100755
|
||||
index eab146e..29e0dee 100755
|
||||
--- a/interface/vmcs_host/vc_vchi_dispmanx.c
|
||||
+++ b/interface/vmcs_host/vc_vchi_dispmanx.c
|
||||
@@ -1306,7 +1306,6 @@ static void *dispmanx_notify_func( void *arg ) {
|
||||
@@ -25,5 +25,5 @@ index 45f4cff..5d0368c 100755
|
||||
}
|
||||
} else {
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 846e9271cf6a264e7e1f4e33be64df990ff39a74 Mon Sep 17 00:00:00 2001
|
||||
From 789b0b0c04b741c21dd573b78eded970721d14c2 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 6 Feb 2016 11:10:47 -0800
|
||||
Subject: [PATCH 06/13] zero-out wl buffers in egl_surface_free
|
||||
Subject: [PATCH 06/15] zero-out wl buffers in egl_surface_free
|
||||
|
||||
origins from buildroot
|
||||
|
||||
@@ -29,5 +29,5 @@ index 42350bf..1f923d9 100644
|
||||
#endif
|
||||
}
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 15510fdf1c753c967b509046616b1e1a11b5b772 Mon Sep 17 00:00:00 2001
|
||||
From 762dd3156775f167ff0dfd44322dbb19a85822a7 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 6 Feb 2016 11:11:41 -0800
|
||||
Subject: [PATCH 07/13] initialize front back wayland buffers
|
||||
Subject: [PATCH 07/15] initialize front back wayland buffers
|
||||
|
||||
origins from metrological wayland support
|
||||
|
||||
@@ -30,5 +30,5 @@ index 1f923d9..9a9582c 100644
|
||||
}
|
||||
#endif
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 1df080ab9528b82321cf87d71927314294ef7121 Mon Sep 17 00:00:00 2001
|
||||
From f8929adbf95ad3d44491cf6fc8a84a686b71193e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 6 Feb 2016 11:09:18 -0800
|
||||
Subject: [PATCH 08/13] Remove RPC_FLUSH
|
||||
Subject: [PATCH 08/15] Remove RPC_FLUSH
|
||||
|
||||
Origins from buildroot
|
||||
|
||||
@@ -23,5 +23,5 @@ index f9b7287..b04ffef 100644
|
||||
}
|
||||
#endif
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 11842307cc0e32bac6ef7622e7791ca7a0e9fa61 Mon Sep 17 00:00:00 2001
|
||||
From f53e028f33f261f85883c9168977dd5486e9b47c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 6 Feb 2016 13:12:47 -0800
|
||||
Subject: [PATCH 09/13] fix cmake dependency race
|
||||
Subject: [PATCH 09/15] fix cmake dependency race
|
||||
|
||||
Fixes errors like
|
||||
|
||||
@@ -74,5 +74,5 @@ index f0bae30..8c44c58 100644
|
||||
struct wl_resource *resource;
|
||||
struct wl_dispmanx *dispmanx;
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 532dc7dc11877a9dae0f3d101c9bfdacc50840ca Mon Sep 17 00:00:00 2001
|
||||
From 6559a57c66c5f55571a1aa29cf14d9130a9ef2c9 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 29 Mar 2016 20:38:30 -0700
|
||||
Subject: [PATCH 10/13] Fix for framerate with nested composition
|
||||
Subject: [PATCH 10/15] Fix for framerate with nested composition
|
||||
|
||||
frame rate appears irregular and lower than expected when using nested composition.
|
||||
|
||||
@@ -56,5 +56,5 @@ index 03fe67b..13a110c 100644
|
||||
#ifdef ANDROID
|
||||
CLIENT_UNLOCK();
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 37ff90075102407d3abb3899b8c6ef64f6230207 Mon Sep 17 00:00:00 2001
|
||||
From 3e396f0b514f3acf90c02f5d55b3816028367a55 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 2 Apr 2016 10:37:24 -0700
|
||||
Subject: [PATCH 11/13] build shared library for vchostif
|
||||
Subject: [PATCH 11/15] build shared library for vchostif
|
||||
|
||||
Fixes #149
|
||||
|
||||
@@ -24,5 +24,5 @@ index c415176..d0cca1a 100755
|
||||
#add_library(bufman vc_vchi_bufman.c )
|
||||
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From ce130bff946c3b78fc4dbbf98d9b16b5152f2e85 Mon Sep 17 00:00:00 2001
|
||||
From f5b2263c8d65e307cb085414e08118cbbe00a94c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 2 Apr 2016 10:54:59 -0700
|
||||
Subject: [PATCH 12/13] implement buffer wrapping interface for dispmanx
|
||||
Subject: [PATCH 12/15] implement buffer wrapping interface for dispmanx
|
||||
|
||||
Courtesy: Zan Dobersek
|
||||
|
||||
@@ -88,5 +88,5 @@ index c18626d..11ed1ef 100644
|
||||
|
||||
</protocol>
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 14d915a63a4e69290966543ce12edd615bfa9a25 Mon Sep 17 00:00:00 2001
|
||||
From 10ba55489002c2ccdf96d221301ec059c4574811 Mon Sep 17 00:00:00 2001
|
||||
From: Jeff Wannamaker <jeff_wannamaker@cable.comcast.com>
|
||||
Date: Thu, 19 Jan 2017 18:56:07 +0000
|
||||
Subject: [PATCH 13/13] Implement triple buffering for wayland
|
||||
Subject: [PATCH 13/15] Implement triple buffering for wayland
|
||||
|
||||
Change from double to triple buffering for wayland.
|
||||
This enables higher frame rates without tearing artifacts
|
||||
@@ -67,10 +67,11 @@ diff --git a/interface/khronos/egl/egl_client_surface.h b/interface/khronos/egl/
|
||||
index e328b77..58a3184 100644
|
||||
--- a/interface/khronos/egl/egl_client_surface.h
|
||||
+++ b/interface/khronos/egl/egl_client_surface.h
|
||||
@@ -313,6 +313,17 @@ typedef struct {
|
||||
@@ -312,6 +312,17 @@ typedef struct {
|
||||
*/
|
||||
struct wl_dispmanx_client_buffer *front_wl_buffer;
|
||||
|
||||
/*
|
||||
+ /*
|
||||
+ middle_wl_buffer
|
||||
+
|
||||
+ Validity:
|
||||
@@ -81,10 +82,9 @@ index e328b77..58a3184 100644
|
||||
+ */
|
||||
+ struct wl_dispmanx_client_buffer *middle_wl_buffer;
|
||||
+
|
||||
+ /*
|
||||
/*
|
||||
back_wl_buffer
|
||||
|
||||
Validity:
|
||||
--
|
||||
2.12.0
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 55a66f56a14eb8c3ae8294860e49efc9c9598c46 Mon Sep 17 00:00:00 2001
|
||||
From d750c738b5c23bba24531cb713292e4ab3f2ec56 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 10 May 2017 06:39:34 +0000
|
||||
Subject: [PATCH] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT
|
||||
Subject: [PATCH 14/15] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT
|
||||
|
||||
weston code uses these defines
|
||||
Upstream-Status: Pending
|
||||
@@ -26,5 +26,5 @@ index 4eacf7f..283e3e1 100644
|
||||
#ifndef GL_EXT_texture_type_2_10_10_10_REV
|
||||
#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368
|
||||
--
|
||||
1.9.1
|
||||
2.15.0
|
||||
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 827907f2223df93918e680101a1ac6228ba0f07e Mon Sep 17 00:00:00 2001
|
||||
From: Andrea Galbusera <gizero@gmail.com>
|
||||
Date: Fri, 14 Jul 2017 09:52:54 +0200
|
||||
Subject: [PATCH 15/15] EGL/glplatform.h: define EGL_CAST
|
||||
|
||||
C++ / C typecast macros for special EGL handle values: used by libepoxy code
|
||||
The definition comes from the updated version of this header in mesa.
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
interface/khronos/include/EGL/eglplatform.h | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/interface/khronos/include/EGL/eglplatform.h b/interface/khronos/include/EGL/eglplatform.h
|
||||
index 1f7c930..c39d425 100644
|
||||
--- a/interface/khronos/include/EGL/eglplatform.h
|
||||
+++ b/interface/khronos/include/EGL/eglplatform.h
|
||||
@@ -202,4 +202,11 @@ EGLAPI void EGLAPIENTRY BEGL_GetDefaultDriverInterfaces(BEGL_DriverInterfaces *i
|
||||
#include "interface/khronos/common/khrn_client_mangle.h"
|
||||
#endif
|
||||
|
||||
+/* C++ / C typecast macros for special EGL handle values */
|
||||
+#if defined(__cplusplus)
|
||||
+#define EGL_CAST(type, value) (static_cast<type>(value))
|
||||
+#else
|
||||
+#define EGL_CAST(type, value) ((type) (value))
|
||||
+#endif
|
||||
+
|
||||
#endif /* __eglplatform_h */
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@@ -10,13 +10,13 @@ PR = "r5"
|
||||
PROVIDES = "virtual/libgles2 \
|
||||
virtual/egl"
|
||||
|
||||
RPROVIDES_${PN} += "libgles2 egl"
|
||||
RPROVIDES_${PN} += "libgles2 egl libegl"
|
||||
|
||||
COMPATIBLE_MACHINE = "raspberrypi"
|
||||
|
||||
SRCBRANCH = "master"
|
||||
SRCFORK = "raspberrypi"
|
||||
SRCREV = "50d3cb5f4ee95a9513bb9f94d661947e9e6ac085"
|
||||
SRCREV = "bc3c52a51315399a9f31ed24049eb4bc81fd1c60"
|
||||
|
||||
SRC_URI = "\
|
||||
git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
|
||||
@@ -34,6 +34,7 @@ SRC_URI = "\
|
||||
file://0012-implement-buffer-wrapping-interface-for-dispmanx.patch \
|
||||
file://0013-Implement-triple-buffering-for-wayland.patch \
|
||||
file://0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch \
|
||||
file://0015-EGL-glplatform.h-define-EGL_CAST.patch \
|
||||
"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
BIN
recipes-kernel/linux-firmware/files/brcmfmac43430-sdio.bin
Normal file
BIN
recipes-kernel/linux-firmware/files/brcmfmac43430-sdio.bin
Normal file
Binary file not shown.
@@ -1,19 +1,20 @@
|
||||
# NVRAM file for BCM943430WLPTH
|
||||
# NVRAM file for BCM943430WLSELG
|
||||
# 2.4 GHz, 20 MHz BW mode
|
||||
|
||||
# The following parameter values are just placeholders, need to be updated.
|
||||
manfid=0x2d0
|
||||
prodid=0x0727
|
||||
prodid=0x0726
|
||||
vendid=0x14e4
|
||||
devid=0x43e2
|
||||
boardtype=0x0727
|
||||
boardrev=0x1101
|
||||
boardtype=0x0726
|
||||
boardrev=0x1202
|
||||
boardnum=22
|
||||
macaddr=00:90:4c:c5:12:38
|
||||
sromrev=11
|
||||
boardflags=0x00404201
|
||||
boardflags3=0x08000000
|
||||
xtalfreq=37400
|
||||
#xtalfreq=19200
|
||||
nocrc=1
|
||||
ag0=255
|
||||
aa2g=1
|
||||
@@ -21,6 +22,7 @@ ccode=ALL
|
||||
|
||||
pa0itssit=0x20
|
||||
extpagain2g=0
|
||||
|
||||
#PA parameters for 2.4GHz, measured at CHIP OUTPUT
|
||||
pa2ga0=-168,7161,-820
|
||||
AvVmid_c0=0x0,0xc8
|
||||
@@ -40,15 +42,9 @@ ofdmdigfilttypebe=18
|
||||
# PAPD mode:
|
||||
papdmode=1
|
||||
papdvalidtest=1
|
||||
pacalidx2g=42
|
||||
papdepsoffset=-22
|
||||
papdendidx=58
|
||||
|
||||
# LTECX flags
|
||||
ltecxmux=0
|
||||
ltecxpadnum=0x0102
|
||||
ltecxfnsel=0x44
|
||||
ltecxgcigpio=0x01
|
||||
pacalidx2g=32
|
||||
papdepsoffset=-36
|
||||
papdendidx=61
|
||||
|
||||
il0macaddr=00:90:4c:c5:12:38
|
||||
wl0id=0x431b
|
||||
@@ -61,6 +57,3 @@ muxenab=0x1
|
||||
|
||||
#VCO freq 326.4MHz
|
||||
spurconfig=0x3
|
||||
|
||||
edonthd20l=-75
|
||||
edoffthd20ul=-80
|
||||
|
||||
@@ -1,12 +1,26 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
|
||||
|
||||
SRC_URI += "file://brcmfmac43430-sdio.txt"
|
||||
SRC_URI += " \
|
||||
file://brcmfmac43430-sdio.bin \
|
||||
file://brcmfmac43430-sdio.txt \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
install -D -m 0644 ${WORKDIR}/brcmfmac43430-sdio.txt ${D}/lib/firmware/brcm/brcmfmac43430-sdio.txt
|
||||
# Overwrite v7.45.41.26 by the one we currently provide in this layer
|
||||
# (v7.45.41.46)
|
||||
local _firmware="brcmfmac43430-sdio.bin"
|
||||
local _oldmd5=9258986488eca9fe5343b0d6fe040f8e
|
||||
if [ "$(md5sum ${D}/lib/firmware/brcm/$_firmware | awk '{print $1}')" != "$_oldmd5" ]; then
|
||||
_firmware=""
|
||||
bbwarn "linux-firmware stopped providing brcmfmac43430 v7.45.41.26."
|
||||
else
|
||||
_firmware="${WORKDIR}/$_firmware"
|
||||
fi
|
||||
|
||||
mkdir -p ${D}/lib/firmware/brcm
|
||||
install -m 0644 $_firmware ${WORKDIR}/brcmfmac43430-sdio.txt ${D}/lib/firmware/brcm
|
||||
}
|
||||
|
||||
FILES_${PN}-bcm43430 += " \
|
||||
/lib/firmware/brcm/brcmfmac43430-sdio.txt \
|
||||
"
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
|
||||
|
||||
LINUX_VERSION ?= "4.9.27"
|
||||
LINUX_VERSION ?= "4.9.59"
|
||||
|
||||
SRCREV = "9a5f215eda12bad29b35040dff00d0346fe517e2"
|
||||
SRCREV = "e7976b2affa8c05bd299ead0ad9c36ddaf135b9d"
|
||||
SRC_URI = "git://github.com/raspberrypi/linux.git;branch=rpi-4.9.y"
|
||||
|
||||
require linux-raspberrypi.inc
|
||||
|
||||
Reference in New Issue
Block a user