linux-raspberrypi_4.9.bb: Upgrade to 4.9.50

PATCH New Khem Raj 1 participant 4 messages Sep 19, 2017 Broadcom BCM2711/BCM2835 Arm architecture

lore

Share & tools

lore

Khem Raj

author

2017-09-19 16:22 UTC #0 lore raw

PATCH v2 1/4 linux-raspberrypi_4.9.bb: Upgrade to 4.9.50

Signed-off-by Khem Raj <[email protected]>

---
Changes in v2: None

 recipes-kernel/linux/linux-raspberrypi_4.9.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

recipes-kernel/linux/linux-raspberrypi_4.9.bb +2 -2

index ba17020..068965f 100644
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-LINUX_VERSION ?= "4.9.41"
+LINUX_VERSION ?= "4.9.50"
 
-SRCREV = "4153f509b449f1c1c816cf124c314975c3daa824"
+SRCREV = "46e2d4d1bd2c17e2f84dd90768321ee0bbaa6b8a"
 SRC_URI = "git://github.com/raspberrypi/linux.git;branch=rpi-4.9.y"
 
 require linux-raspberrypi.inc

Signature · 1 line

2.14.1

Khem Raj

author

2017-09-19 16:22 UTC #1 lore raw

PATCH v2 2/4 raspberrypi3-64: Use vc4-fkms-v3d overlay for rpi64

Use correct overlay for enabled vc4 accelaration This enable 3D accelaration over dispmanx on vc4/rpi64 Enable audio over HDMI
Disable overscan to avoid graphics glitches

Signed-off-by Khem Raj <[email protected]>

---
Changes in v2: None

 conf/machine/raspberrypi3-64.conf       |  1 +
 recipes-bsp/bootfiles/rpi-config_git.bb | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

conf/machine/raspberrypi3-64.conf +1 -0

index e3d11f2..237684a 100644
@@ -31,6 +31,7 @@ KERNEL_DEVICETREE = " \
     overlays/pi3-disable-bt.dtbo \
     overlays/pi3-miniuart-bt.dtbo \
     overlays/vc4-kms-v3d.dtbo \
+    overlays/vc4-fkms-v3d.dtbo \
     "
 
 SERIAL_CONSOLE ?= "115200 ttyS0"

recipes-bsp/bootfiles/rpi-config_git.bb +12 -2

index 38a1237..4353061 100644
@@ -21,7 +21,8 @@ PITFT28r="${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "1", "0", d)}"
 PITFT35r="${@bb.utils.contains("MACHINE_FEATURES", "pitft35r", "1", "0", d)}"
 
 VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}"
-
+VC4DTBO_raspberrypi3-64 = "vc4-fkms-v3d"
+VC4DTBO ?= "vc4-kms-v3d"
 inherit deploy
 
 do_deploy() {

@@ -114,7 +115,7 @@ do_deploy() {
     # VC4 Graphics support
     if [ "${VC4GRAPHICS}" = "1" ]; then
         echo "# Enable VC4 Graphics" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-        echo "dtoverlay=vc4-kms-v3d,${VC4_CMA_SIZE}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "dtoverlay=${VC4DTBO},${VC4_CMA_SIZE}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     fi
 
     # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)

@@ -129,6 +130,15 @@ do_deploy() {
 }
 
 do_deploy_append_raspberrypi3-64() {
+    echo "# have a properly sized image" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    echo "disable_overscan=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+
+    echo "# for sound over HDMI" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    echo "hdmi_drive=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+
+    echo "# Enable audio (loads snd_bcm2835)" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    echo "dtparam=audio=on" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+
     # Device Tree support
     echo "# Load correct Device Tree for Aarch64" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     echo "device_tree=bcm2710-rpi-3-b.dtb" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt

Signature · 1 line

2.14.1

Khem Raj

author

2017-09-19 16:22 UTC #2 lore raw

PATCH v2 3/4 linux-raspberrypi: Build dtbs with dtbs make target for rpi64

In reply to Khem Raj

OE currently builds dtb files with its own custom targets by specifying each dtb file as makefile target, this creates bad dtb for rpi64 bit. This patch calles 'make dtbs' at the end which regenerates the correct dtb files

This makes the vc4 initialize properly on rpi64

Signed-off-by Khem Raj <[email protected]>

---
Changes in v2: Use KERNEL_CC and KERNEL_LD

 recipes-kernel/linux/linux-raspberrypi.inc | 5 +++++
 1 file changed, 5 insertions(+)

recipes-kernel/linux/linux-raspberrypi.inc +5 -0

index f336490..b348a9d 100644
@@ -38,6 +38,11 @@ python __anonymous () {
     d.setVar("KERNEL_DEVICETREE", kerneldt)
 }
 
+do_compile_append_raspberrypi3-64() {
+    cc_extra=$(get_cc_option)
+    oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
+}
+
 do_install_prepend() {
     install -d ${D}/lib/firmware
 }

Signature · 1 line

2.14.1

Khem Raj

author

2017-09-19 16:22 UTC #3 lore raw

PATCH v2 4/4 xserver-xf86-config: Disable glamor for the modesetting driver on pi64

In reply to Khem Raj

Fixes a xorg server crash with musl see details
https://github.com/voidlinux/void-packages/issues/6091

Signed-off-by Khem Raj <[email protected]>

---
 .../xserver-xf86-config/rpi/xorg.conf.d/10-noglamor.conf         | 6 ++++++
 recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend   | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-noglamor.conf

recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-noglamor.conf new file +6 -0

new file mode 100644
index 0000000..1a562ea
@@ -0,0 +1,6 @@
+# 
+Section "Device"
+	Identifier "modeset"
+	Driver "modesetting"
+	Option "AccelMethod" "None"
+EndSection

recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +7 -2

index b361eef..7902f20 100644
@@ -4,7 +4,9 @@ SRC_URI_append_rpi = " \
     file://xorg.conf.d/98-pitft.conf \
     file://xorg.conf.d/99-calibration.conf \
 "
-
+SRC_URI_append_libc-musl_raspberrypi3-64 = " \
+    file://xorg.conf.d/10-noglamor.conf \
+"
 do_install_append_rpi () {
     PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
     if [ "${PITFT}" = "1" ]; then

@@ -13,5 +15,8 @@ do_install_append_rpi () {
         install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
     fi
 }
-
+do_install_append_libc-musl_raspberrypi3-64 () {
+    install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
+    install -m 0644 ${WORKDIR}/xorg.conf.d/10-noglamor.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
+}
 FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*"

Signature · 1 line

2.14.1