Skip to contentSkip to conversation

configs/raspberrypi_defconfig: bump kernel version to 4.9.13

PATCH New Martin Bark 4 participants 14 messages Mar 5, 2017 – Mar 13, 2017 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore

Martin Bark

author
#0 lore raw

PATCH 1/8 configs/raspberrypi_defconfig: bump kernel version to 4.9.13

Signed-off-by Martin Bark <[email protected]>
---
 configs/raspberrypi_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/raspberrypi_defconfig +3 -3
index 6af9fb3..8c9635f 100644
@@ -4,15 +4,15 @@ BR2_ARM_EABIHF=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1ebe8d4a4c96cd6a90805c74233a468854960f67"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="935c7ce84c982a26f567a03a58a1537424569938"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 
 # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/8 configs/raspberrypi0_defconfig: bump kernel version to 4.9.13

Signed-off-by Martin Bark <[email protected]>
---
 configs/raspberrypi0_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/raspberrypi0_defconfig +3 -3
index 736143f..d93484f 100644
@@ -2,15 +2,15 @@ BR2_arm=y
 BR2_arm1176jzf_s=y
 BR2_ARM_EABIHF=y
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1ebe8d4a4c96cd6a90805c74233a468854960f67"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="935c7ce84c982a26f567a03a58a1537424569938"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 
 # Build the DTBs for A/B from the kernel sources: the zero is the same
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 3/8 configs/raspberrypi2_defconfig: bump kernel version to 4.9.13

In reply to Martin Bark
Signed-off-by Martin Bark <[email protected]>
---
 configs/raspberrypi2_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/raspberrypi2_defconfig +3 -3
index 1ec92e7..55765b3 100644
@@ -7,13 +7,13 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1ebe8d4a4c96cd6a90805c74233a468854960f67"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="935c7ce84c982a26f567a03a58a1537424569938"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH 4/8 configs/raspberrypi3_defconfig: bump kernel version to 4.9.13

In reply to Martin Bark
Signed-off-by Martin Bark <[email protected]>
---
 configs/raspberrypi3_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/raspberrypi3_defconfig +3 -3
index 6fceaa0..0d8c079 100644
@@ -7,13 +7,13 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1ebe8d4a4c96cd6a90805c74233a468854960f67"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="935c7ce84c982a26f567a03a58a1537424569938"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH 5/8 package/rpi-firmware: bump version

In reply to Martin Bark
Signed-off-by Martin Bark <[email protected]>
---
 package/rpi-firmware/rpi-firmware.hash | 2 +-
 package/rpi-firmware/rpi-firmware.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/rpi-firmware/rpi-firmware.hash +1 -1
index 8161d7a..f6dd03a 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 144de63ee1999155fc1ff597630f1a13f798e597e7c4d144b8b625fa774c1f9b rpi-firmware-7f8ac8dac0b80291cbf5e56580139034a0a42070.tar.gz
+sha256 0797a034b33a0218fd6fb3c5bb1473959e209a8fe676f3c215f954806601aa78 rpi-firmware-78c4983379de0537f49a97fb37ceaaf42632b28c.tar.gz
package/rpi-firmware/rpi-firmware.mk +1 -1
index d2cd481..b73ef53 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 7f8ac8dac0b80291cbf5e56580139034a0a42070
+RPI_FIRMWARE_VERSION = 78c4983379de0537f49a97fb37ceaaf42632b28c
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/8 package/rpi-firmware: bump version

Hi,

package/rpi-firmware/rpi-firmware.mk line 7

Quoted 2 lines · Martin Bark
package/rpi-firmware/rpi-firmware.mk +1 -1
-RPI_FIRMWARE_VERSION = 7f8ac8dac0b80291cbf5e56580139034a0a42070
+RPI_FIRMWARE_VERSION = 78c4983379de0537f49a97fb37ceaaf42632b28c

New firmware version does not get along with projects that still use 4.4.x kernel.
It seems that projects that still use 4.4.x are now supposed to use the firmware branch called "stable"

Perhaps we should introduce a config option for firmware version, like we have for kernel version?

Yours sincerely,

Floris Bos

#6 lore raw

PATCH 5/8 package/rpi-firmware: bump version

Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Floris" == Floris Bos <[email protected]> writes:

Hi,

package/rpi-firmware/rpi-firmware.mk line 7

Quoted 2 lines · Martin Bark
package/rpi-firmware/rpi-firmware.mk +1 -1
-RPI_FIRMWARE_VERSION = 7f8ac8dac0b80291cbf5e56580139034a0a42070
+RPI_FIRMWARE_VERSION = 78c4983379de0537f49a97fb37ceaaf42632b28c

New firmware version does not get along with projects that still use 4.4.x kernel.
It seems that projects that still use 4.4.x are now supposed to use the firmware branch called "stable"

Quoted 2 lines

Perhaps we should introduce a config option for firmware version, like we have for kernel version?

Gaah :/ Have you brought this up with rpi upstream? What is their feedback?

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 5/8 package/rpi-firmware: bump version

Quoted 9 lines · Peter Korsgaard
Quoted 8 lines · Martin Bark

package/rpi-firmware/rpi-firmware.mk line 7

Quoted 2 lines
package/rpi-firmware/rpi-firmware.mk +1 -1
-RPI_FIRMWARE_VERSION = 7f8ac8dac0b80291cbf5e56580139034a0a42070
+RPI_FIRMWARE_VERSION = 78c4983379de0537f49a97fb37ceaaf42632b28c

New firmware version does not get along with projects that still use 4.4.x kernel.
It seems that projects that still use 4.4.x are now supposed to use the firmware branch called "stable"

Quoted 5 lines
Quoted 2 lines

Perhaps we should introduce a config option for firmware version, like we have for kernel version?

Gaah :/ Have you brought this up with rpi upstream? What is their feedback?

Ok, turns out the new firmware can still boot 4.4.x, as long as you compile the device tree files from kernel source.
The bundled binary ones only work for 4.9.

Should have known that, as I had already been burned by that before...

BTW is it possible to let buildroot compile dt overlays nowadays? As the overlays are now also starting to show changes between versions.

E.g.:

https://github.com/raspberrypi/linux/blob/rpi-4.4.y/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
versus
https://github.com/raspberrypi/linux/blob/rpi-4.9.y/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts

Yours sincerely,

Floris Bos

author
#8 lore raw

PATCH 5/8 package/rpi-firmware: bump version

Floris Bos,

Quoted 23 lines · Floris Bos
Quoted 9 lines · Peter Korsgaard
Quoted 8 lines · Martin Bark

package/rpi-firmware/rpi-firmware.mk line 7

Quoted 2 lines
package/rpi-firmware/rpi-firmware.mk +1 -1
-RPI_FIRMWARE_VERSION = 7f8ac8dac0b80291cbf5e56580139034a0a42070
+RPI_FIRMWARE_VERSION = 78c4983379de0537f49a97fb37ceaaf42632b28c

New firmware version does not get along with projects that still use 4.4.x kernel.
It seems that projects that still use 4.4.x are now supposed to use the firmware branch called "stable"

Quoted 6 lines
Quoted 2 lines

Perhaps we should introduce a config option for firmware version, like we have for kernel version?

Gaah :/ Have you brought this up with rpi upstream? What is their feedback?

Ok, turns out the new firmware can still boot 4.4.x, as long as you compile the device tree files from kernel source.
The bundled binary ones only work for 4.9.

Quoted 5 lines

Should have known that, as I had already been burned by that before...

BTW is it possible to let buildroot compile dt overlays nowadays? As the overlays are now also starting to show changes between versions.

You can build individual overlays by adding them
to BR2_LINUX_KERNEL_INTREE_DTS_NAME. For example adding overlays/gpio-poweroff-overlay to BR2_LINUX_KERNEL_INTREE_DTS_NAME will build gpio-poweroff-overlay.dtb into the output/images directory.

Thanks

Martin

Quoted 13 lines

E.g.:

https://github.com/raspberrypi/linux/blob/rpi-4.4.y/arch/
arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
versus
https://github.com/raspberrypi/linux/blob/rpi-4.9.y/arch/
arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts

Yours sincerely,

Quoted 8 lines

Floris Bos

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170312/2a1120a0/attachment.html>

#9 lore raw

PATCH 5/8 package/rpi-firmware: bump version

Quoted 40 lines · Martin Bark

Floris Bos,

On 10 March 2017 at 20:05, Floris Bos <[email protected] <mailto:[email protected]>> wrote:

On 03/10/2017 02:20 PM, Peter Korsgaard wrote:

> On 03/05/2017 05:06 PM, Martin Bark wrote:
>> -RPI_FIRMWARE_VERSION =
7f8ac8dac0b80291cbf5e56580139034a0a42070
>> +RPI_FIRMWARE_VERSION =
78c4983379de0537f49a97fb37ceaaf42632b28c

> New firmware version does not get along with projects that
still use
> 4.4.x kernel.
> It seems that projects that still use 4.4.x are now
supposed to use
> the firmware branch called "stable"

> Perhaps we should introduce a config option for firmware
version, like
> we have for kernel version?

Gaah :/ Have you brought this up with rpi upstream? What is their feedback?

Ok, turns out the new firmware can still boot 4.4.x, as long as you compile the device tree files from kernel source. The bundled binary ones only work for 4.9.

Should have known that, as I had already been burned by that before...

BTW is it possible to let buildroot compile dt overlays nowadays? As the overlays are now also starting to show changes between versions.

Quoted 4 lines

You can build individual overlays by adding them
to BR2_LINUX_KERNEL_INTREE_DTS_NAME. For example adding overlays/gpio-poweroff-overlay to BR2_LINUX_KERNEL_INTREE_DTS_NAME will build gpio-poweroff-overlay.dtb into the output/images directory.

The firmware would expect that file to be called "overlays/gpio-poweroff.dtbo" though.
So would require a post-installation script to fix up the file names. Not the most ideal solution.

Yours sincerely,

Floris Bos

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170313/f738f596/attachment.html>

author
#10 lore raw

PATCH 6/8 package/rpi-userland: bump version

In reply to Martin Bark
Signed-off-by Martin Bark <[email protected]>
---
 package/rpi-userland/rpi-userland.hash | 2 +-
 package/rpi-userland/rpi-userland.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/rpi-userland/rpi-userland.hash +1 -1
index 24b6584..3e0dbfa 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 f229c29ceae611101bf4716b112251b2f2a33cfbb6636d736deda4e1314bb9d9 rpi-userland-c139376e9bc6fbd93f777c7fc3c7d7cf2cc35122.tar.gz
+sha256 9f7caa5fee77cef034551b23a7c12d78792ebd2feca7bcbc677da4daf2a98cf7 rpi-userland-f410ec051a3724934e3671315474d4b81424b0ef.tar.gz
package/rpi-userland/rpi-userland.mk +1 -1
index 4e3b4ec..aec721d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = c139376e9bc6fbd93f777c7fc3c7d7cf2cc35122
+RPI_USERLAND_VERSION = f410ec051a3724934e3671315474d4b81424b0ef
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
Signature · 1 line
2.7.4
author
#11 lore raw

PATCH 7/8 configs/raspberrypi0_defconfig: add raspberry pi zero w support

In reply to Martin Bark
Signed-off-by Martin Bark <[email protected]>
---
 board/raspberrypi/genimage-raspberrypi0.cfg | 1 +
 configs/raspberrypi0_defconfig              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
board/raspberrypi/genimage-raspberrypi0.cfg +1 -0
index a9d4c45..212c306 100644
@@ -2,6 +2,7 @@ image boot.vfat {
   vfat {
     files = {
       "bcm2708-rpi-b-plus.dtb",
+      "bcm2708-rpi-0-w.dtb",
       "rpi-firmware/bootcode.bin",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
configs/raspberrypi0_defconfig +1 -1
index d93484f..75b189a 100644
@@ -16,7 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 # Build the DTBs for A/B from the kernel sources: the zero is the same
 # as the A+ model, just in a different form-factor
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus bcm2708-rpi-0-w"
 
 BR2_PACKAGE_RPI_FIRMWARE=y
 # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set
Signature · 1 line
2.7.4
author
#12 lore raw

PATCH 8/8 configs/raspberrypi3_defconfig: add raspberry pi 3 compute module support

In reply to Martin Bark
Signed-off-by Martin Bark <[email protected]>
---
 board/raspberrypi/genimage-raspberrypi3.cfg | 1 +
 configs/raspberrypi3_defconfig              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
board/raspberrypi/genimage-raspberrypi3.cfg +1 -0
index 3c9f1e5..98ff709 100644
@@ -2,6 +2,7 @@ image boot.vfat {
   vfat {
     files = {
       "bcm2710-rpi-3-b.dtb",
+      "bcm2710-rpi-cm3.dtb",
       "rpi-firmware/bootcode.bin",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
configs/raspberrypi3_defconfig +1 -1
index 0d8c079..de0c42d 100644
@@ -18,7 +18,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3"
 
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y
Signature · 1 line
2.7.4
#13 lore raw

PATCH 1/8 configs/raspberrypi_defconfig: bump kernel version to 4.9.13

In reply to Martin Bark

Hello,

Quoted 4 lines · Martin Bark
Signed-off-by Martin Bark <[email protected]>
---
 configs/raspberrypi_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

All eight patches applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com