Skip to contentSkip to conversation

x264: Disable asm for raspberrypi0-wifi

PATCH In review Andrei Gherzan 1 participant 6 messages Nov 2, 2017 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 x264: Disable asm for raspberrypi0-wifi

This used to work in the past because this machine was based on raspberrypi one. Now that they are separate, we need a configuration for it too otherwise:

| common/arm/quant-a.S: Assembler messages:
| common/arm/quant-a.S:362: Error: selected processor does not support `rbit r1,r1' in ARM mode
| common/arm/quant-a.S:363: Error: selected processor does not support `rbit r1,r1' in ARM mode

---
 recipes-multimedia/x264/x264_git.bbappend | 1 +
 1 file changed, 1 insertion(+)
recipes-multimedia/x264/x264_git.bbappend +1 -0
index c1cb3bc..505719e 100644
@@ -1 +1,2 @@
 EXTRA_OECONF_append_raspberrypi = " --disable-asm"
+EXTRA_OECONF_append_raspberrypi0-wifi = " --disable-asm"
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/5 linux-raspberrypi: Update 4.9 recipe to 4.9.59

---
 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 dd9afe2..061e893 100644
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-LINUX_VERSION ?= "4.9.50"
+LINUX_VERSION ?= "4.9.59"
 
-SRCREV = "46e2d4d1bd2c17e2f84dd90768321ee0bbaa6b8a"
+SRCREV = "e7976b2affa8c05bd299ead0ad9c36ddaf135b9d"
 SRC_URI = "git://github.com/raspberrypi/linux.git;branch=rpi-4.9.y"
 
 require linux-raspberrypi.inc
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/5 pi-blaster: An .inc file looks too much for this small recipe

In reply to Andrei Gherzan
---
 recipes-devtools/pi-blaster/pi-blaster.inc    | 21 ---------------------
 recipes-devtools/pi-blaster/pi-blaster_git.bb | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 recipes-devtools/pi-blaster/pi-blaster.inc
recipes-devtools/pi-blaster/pi-blaster.inc deleted +0 -21
deleted file mode 100644
index 3cb79cc..0000000
@@ -1,21 +0,0 @@
-DESCRIPTION = "This project enables PWM on the GPIO pins you request of a Raspberry Pi."
-HOMEPAGE = "https://github.com/sarfata/pi-blaster/"
-SECTION = "devel/libs"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://README.md;beginline=225;endline=252;md5=a012868ef5f83b9f257af253d7cb07a3"
-
-SRC_URI = "git://github.com/sarfata/pi-blaster \
-           file://remove-initscript-lsb-dependency.patch \
-"
-
-S = "${WORKDIR}/git"
-
-inherit update-rc.d autotools
-
-INITSCRIPT_PACKAGES = "${PN}"
-INITSCRIPT_NAME_${PN} = "${PN}.boot.sh"
-INITSCRIPT_PARAMS_${PN} = "defaults 15 85"
-
-COMPATIBLE_MACHINE = "^rpi$"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
recipes-devtools/pi-blaster/pi-blaster_git.bb +21 -1
index 730f9d3..2748459 100644
@@ -1,3 +1,23 @@
-require pi-blaster.inc
+DESCRIPTION = "This project enables PWM on the GPIO pins you request of a Raspberry Pi."
+HOMEPAGE = "https://github.com/sarfata/pi-blaster/"
+SECTION = "devel/libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://README.md;beginline=225;endline=252;md5=a012868ef5f83b9f257af253d7cb07a3"
+
+SRC_URI = "git://github.com/sarfata/pi-blaster \
+           file://remove-initscript-lsb-dependency.patch \
+"
+
+S = "${WORKDIR}/git"
 
 SRCREV = "1035ad7dffb270c40eec1bb3a654171a755fba98"
+
+inherit update-rc.d autotools
+
+INITSCRIPT_PACKAGES = "${PN}"
+INITSCRIPT_NAME_${PN} = "${PN}.boot.sh"
+INITSCRIPT_PARAMS_${PN} = "defaults 15 85"
+
+COMPATIBLE_MACHINE = "^rpi$"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
2.7.4
#3 lore raw

PATCH 4/5 rpi-base.inc: KERNEL_IMAGETYPE default to zzImage

In reply to Andrei Gherzan

We used to have this as the default but there was a bug at some point in the firmware which didn't work with compressed kernel images. We switched to Image and never changed it back even though that bug is long history.

In this way we will stop carrying 15M of a kernel image. 4M looks much better.

---
 conf/machine/include/rpi-base.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/machine/include/rpi-base.inc +1 -1
index 688227c..71c63cb 100644
@@ -51,7 +51,7 @@ KERNEL_DEVICETREE ?= " \
 #   within u-boot to load the kernel.
 KERNEL_BOOTCMD ??= "bootm"
 KERNEL_IMAGETYPE_UBOOT ??= "uImage"
-KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', '${KERNEL_IMAGETYPE_UBOOT}', 'Image', d)}"
+KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', '${KERNEL_IMAGETYPE_UBOOT}', 'zImage', d)}"
 
 MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
 
Signature · 1 line
2.7.4
#4 lore raw

PATCH 5/5 firmware.in: Update to 20170811

In reply to Andrei Gherzan
---
 recipes-bsp/common/firmware.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
recipes-bsp/common/firmware.inc +3 -4
index ac2bd82..67078c1 100644
@@ -1,10 +1,9 @@
-RPIFW_DATE ?= "20170811"
+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] = "afd09f9a6df14e32b6d832fd9f51d087"
-SRC_URI[sha256sum] = "a25f6281d64732892a2e838cc2346f1a88505b5c77a57a6540755362ea64043a"
-
+SRC_URI[md5sum] = "4d27c1888a7bab3097471906e7b4a319"
+SRC_URI[sha256sum] = "46ce28c8d87ef22bdcc57ac1836ca3f04d1ec6f46580ff5a30bf76b3c0822117"
 PV = "${RPIFW_DATE}"
 
Signature · 1 line
2.7.4
#5 lore raw
In reply to Andrei Gherzan

Hi all,

Quoted 26 lines · Andrei Gherzan

This used to work in the past because this machine was based on raspberrypi one. Now that they are separate, we need a configuration for it too otherwise:

| common/arm/quant-a.S: Assembler messages:
| common/arm/quant-a.S:362: Error: selected processor does not support `rbit
r1,r1' in ARM mode
| common/arm/quant-a.S:363: Error: selected processor does not support `rbit
r1,r1' in ARM mode

---
 recipes-multimedia/x264/x264_git.bbappend | 1 +
 1 file changed, 1 insertion(+)
recipes-multimedia/x264/x264_git.bbappend +1 -1
index c1cb3bc..505719e 100644
@@ -1 +1,2 @@
 EXTRA_OECONF_append_raspberrypi = " --disable-asm"
+EXTRA_OECONF_append_raspberrypi0-wifi = " --disable-asm"
--
Quoted 3 lines

2.7.4

Pushed a PR to github too:
https://github.com/agherzan/meta-raspberrypi/pull/149 in which I fixed the two typos in this series: "firmware.in" and "zzImage".

Andrei