[Buildroot] [PATCH v1 0/4] Raspberry PI (raspberrypi/raspberrypi2) update

[Buildroot] [PATCH v1 0/4] Raspberry PI (raspberrypi/raspberrypi2) update

[Peter Seiderer]

Update rpi-firmware/rpi-userland and raspberrypi/raspberrypi2 kernel
versions.

Tested raspberrypi_defconfig on Raspberry Pi Model B Rev 2 hardware.

Peter Seiderer (4):
  rpi-firmware: bump version
  rpi-userland: bump version
  raspberrypi_defconfig: bump to kernel version 4.4.7
  raspberrypi2_defconfig: bump to kernel version 4.4.7

 configs/raspberrypi2_defconfig                     |  6 ++--
 configs/raspberrypi_defconfig                      |  6 ++--
 package/rpi-firmware/rpi-firmware.mk               |  2 +-
 ...make-vmcs.cmake-allow-to-override-VMCS_IN.patch | 27 -----------------
 ...6-dtmerge-add-missing-include-for-va_list.patch | 34 ++++++++++++++++++++++
 package/rpi-userland/rpi-userland.mk               |  2 +-
 6 files changed, 42 insertions(+), 35 deletions(-)
 delete mode 100644 package/rpi-userland/0002-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
 create mode 100644 package/rpi-userland/0006-dtmerge-add-missing-include-for-va_list.patch

-- 
2.1.4

[Buildroot] [PATCH v1 1/4] rpi-firmware: bump version

[Peter Seiderer]

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 8476678..cbacacd 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 951799bbcd795ddf27769d14acf4813fdcbe53dc
+RPI_FIRMWARE_VERSION = c5e131971c323f5658c7c5d4b1dd105d37903a99
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
-- 
2.1.4

[Buildroot] [PATCH v1 2/4] rpi-userland: bump version

[Peter Seiderer]

- remove upstream commited patch:
  0002-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch

- fix compile errror (missing include for va_list with uclibc-1.0.14):
  0006-dtmerge-add-missing-include-for-va_list.patch

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 ...make-vmcs.cmake-allow-to-override-VMCS_IN.patch | 27 -----------------
 ...6-dtmerge-add-missing-include-for-va_list.patch | 34 ++++++++++++++++++++++
 package/rpi-userland/rpi-userland.mk               |  2 +-
 3 files changed, 35 insertions(+), 28 deletions(-)
 delete mode 100644 package/rpi-userland/0002-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
 create mode 100644 package/rpi-userland/0006-dtmerge-add-missing-include-for-va_list.patch

diff --git a/package/rpi-userland/0002-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch b/package/rpi-userland/0002-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
deleted file mode 100644
index c218898..0000000
--- a/package/rpi-userland/0002-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8894136ff80a8c6eeadf1799af59aa3aa7b87827 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Sat, 24 Jan 2015 19:44:50 +0100
-Subject: [PATCH] makefiles/cmake/vmcs.cmake: allow to override
- VMCS_INSTALL_PREFIX
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- makefiles/cmake/vmcs.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/makefiles/cmake/vmcs.cmake b/makefiles/cmake/vmcs.cmake
-index 0f8641b..cc70cca 100644
---- a/makefiles/cmake/vmcs.cmake
-+++ b/makefiles/cmake/vmcs.cmake
-@@ -9,7 +9,7 @@ INCLUDE(CPack)
- # Where shall we install?
- if (ANDROID)
-   SET(VMCS_INSTALL_PREFIX "/vendor/brcm/islands" CACHE PATH "Prefix prepended to install directories" FORCE)
--else()
-+elseif(NOT DEFINED VMCS_INSTALL_PREFIX)
-   SET(VMCS_INSTALL_PREFIX "/opt/vc" CACHE PATH "Prefix prepended to install directories" FORCE)
- endif()
- 
--- 
-1.9.1
-
diff --git a/package/rpi-userland/0006-dtmerge-add-missing-include-for-va_list.patch b/package/rpi-userland/0006-dtmerge-add-missing-include-for-va_list.patch
new file mode 100644
index 0000000..f028f67
--- /dev/null
+++ b/package/rpi-userland/0006-dtmerge-add-missing-include-for-va_list.patch
@@ -0,0 +1,34 @@
+From 1ffed0e8601afb7e65545bd545772edd0fccc404 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Sat, 23 Apr 2016 17:48:13 +0200
+Subject: [PATCH] dtmerge: add missing include for va_list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes compile error with uclibc-1.0.14:
+
+  In file included from rpi-userland-52eca998aa43f278314579dba4798a3fe1da46c3/host_applications/linux/apps/dtmerge/dtmerge.c:32:0:
+  rpi-userland-52eca998aa43f278314579dba4798a3fe1da46c3/helpers/dtoverlay/dtoverlay.h:65:54: error: unknown type name ???va_list???
+                                     const char *fmt, va_list args);
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ host_applications/linux/apps/dtmerge/dtmerge.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/host_applications/linux/apps/dtmerge/dtmerge.c b/host_applications/linux/apps/dtmerge/dtmerge.c
+index 9243da1..2ac8d39 100644
+--- a/host_applications/linux/apps/dtmerge/dtmerge.c
++++ b/host_applications/linux/apps/dtmerge/dtmerge.c
+@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libfdt.h>
++#include <stdarg.h>
+ 
+ #include "dtoverlay.h"
+ 
+-- 
+2.8.1
+
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index c0a0186..2312fcf 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 8369e390999f4a7c3bc57e577247e0dd502c51f7
+RPI_USERLAND_VERSION = 52eca998aa43f278314579dba4798a3fe1da46c3
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
-- 
2.1.4

[Buildroot] [PATCH v1 3/4] raspberrypi_defconfig: bump to kernel version 4.4.7

[Peter Seiderer]

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 configs/raspberrypi_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 8d13381..70818c9 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -4,15 +4,15 @@ BR2_ARM_EABIHF=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.4 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=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="d33d0293e245badc4ca6ede3984d8bb8ea63cb1a"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3de232825c9ba5989522b8691eb6ac5df6619458"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 
 # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources
-- 
2.1.4

[Buildroot] [PATCH v1 4/4] raspberrypi2_defconfig: bump to kernel version 4.4.7

[Peter Seiderer]

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 configs/raspberrypi2_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index 7fc39c2..69a5403 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -7,13 +7,13 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.4 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=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="d33d0293e245badc4ca6ede3984d8bb8ea63cb1a"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3de232825c9ba5989522b8691eb6ac5df6619458"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
-- 
2.1.4

[Buildroot] [PATCH v1 0/4] Raspberry PI (raspberrypi/raspberrypi2) update

[Thomas Petazzoni]

Hello,

On Sat, 23 Apr 2016 18:46:20 +0200, Peter Seiderer wrote:

> Peter Seiderer (4):
>   rpi-firmware: bump version
>   rpi-userland: bump version
>   raspberrypi_defconfig: bump to kernel version 4.4.7
>   raspberrypi2_defconfig: bump to kernel version 4.4.7

All four patches applied, thanks!

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