[meta-raspberrypi][PATCH 1/3] userland: Fix build for armv7

[meta-raspberrypi][PATCH 1/3] userland: Fix build for armv7

[Andrei Gherzan]

[Bug #49]

Change-Id: I340b4134ae4227f315c1c3df1345b04ebd4b874b
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 conf/machine/raspberrypi2.conf            | 5 -----
 recipes-graphics/userland/userland_git.bb | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
index 778f5a6..30edae3 100644
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -2,11 +2,6 @@
 #@NAME: RaspberryPi 2 Development Board
 #@DESCRIPTION: Machine configuration for the RaspberryPi 2
 
-# userland is not compiling on RPI 2
-# https://github.com/raspberrypi/userland/issues/214
-PREFERRED_PROVIDER_virtual/egl ?= "vc-graphics-hardfp"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "vc-graphics-hardfp"
-
 DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 
 require conf/machine/include/tune-cortexa7.inc
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index 77c98d7..ddca36e 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -22,6 +22,7 @@ S = "${WORKDIR}/git"
 inherit cmake
 
 EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed'"
+CFLAGS_append = " -fPIC"
 
 # The compiled binaries don't provide sonames.
 SOLIBS = "${SOLIBSDEV}"
-- 
2.1.0

[meta-raspberrypi][PATCH 2/3] rpi-base.inc: Use KERNEL_DEVICETREE by default

[Andrei Gherzan]

We already switched to kernel v3.18 by default so we can activate
KERNEL_DEVICETREE by default too.

Change-Id: I69612be72f8254d462421112cf851e17a1ef24f8
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 conf/machine/include/rpi-base.inc | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index f1c404d..102f9d8 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -18,22 +18,22 @@ XSERVER = " \
     "
 
 # Really supported starting from linux-raspberrypi 3.18.y only
-#KERNEL_DEVICETREE ?= " \
-#    bcm2708-rpi-b.dtb \
-#    bcm2708-rpi-b-plus.dtb \
-#    ds1307-rtc-overlay.dtb \
-#    hifiberry-amp-overlay.dtb \
-#    hifiberry-dac-overlay.dtb \
-#    hifiberry-dacplus-overlay.dtb \
-#    hifiberry-digi-overlay.dtb \
-#    iqaudio-dac-overlay.dtb \
-#    iqaudio-dacplus-overlay.dtb \
-#    lirc-rpi-overlay.dtb \
-#    pcf8523-rtc-overlay.dtb \
-#    pps-gpio-overlay.dtb \
-#    w1-gpio-overlay.dtb \
-#    w1-gpio-pullup-overlay.dtb \
-#    "
+KERNEL_DEVICETREE ?= " \
+    bcm2708-rpi-b.dtb \
+    bcm2708-rpi-b-plus.dtb \
+    ds1307-rtc-overlay.dtb \
+    hifiberry-amp-overlay.dtb \
+    hifiberry-dac-overlay.dtb \
+    hifiberry-dacplus-overlay.dtb \
+    hifiberry-digi-overlay.dtb \
+    iqaudio-dac-overlay.dtb \
+    iqaudio-dacplus-overlay.dtb \
+    lirc-rpi-overlay.dtb \
+    pcf8523-rtc-overlay.dtb \
+    pps-gpio-overlay.dtb \
+    w1-gpio-overlay.dtb \
+    w1-gpio-pullup-overlay.dtb \
+    "
 KERNEL_IMAGETYPE ?= "Image"
 
 MACHINE_FEATURES = "kernel26 apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
-- 
2.1.0

[meta-raspberrypi][PATCH 3/3] raspberrypi.conf: Use arm1176jzfshf as default tune

[Andrei Gherzan]

Reformat the tune-arm1176jzf-s.inc file.
There is not 'PACKAGE_EXTRA_ARCHS_tune-armv6hf-vfp'. Replace it by
'PACKAGE_EXTRA_ARCHS_tune-armv6hf'.

Change-Id: I0dd63b1dd3e1ebc7fe0600e93fb9d27a6a833cd9
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 conf/machine/include/tune-arm1176jzf-s.inc | 13 +++++--------
 conf/machine/raspberrypi.conf              |  2 ++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/conf/machine/include/tune-arm1176jzf-s.inc b/conf/machine/include/tune-arm1176jzf-s.inc
index a5368a3..b6fcc59 100644
--- a/conf/machine/include/tune-arm1176jzf-s.inc
+++ b/conf/machine/include/tune-arm1176jzf-s.inc
@@ -6,13 +6,10 @@ TUNEVALID[arm1176jzfs] = "Enable arm1176jzfs specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1176jzfs", "-mtune=arm1176jzf-s", "", d)}"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "vfp", "-mfpu=vfp", "", d)}"
 
-AVAILTUNES += "arm1176jzfs"
-TUNE_FEATURES_tune-arm1176jzfs = "${TUNE_FEATURES_tune-armv6} arm1176jzfs"
+AVAILTUNES += "arm1176jzfs arm1176jzfshf"
 ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs"
-PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}"
-
-AVAILTUNES += "arm1176jzfshf"
-TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard"
 ARMPKGARCH_tune-arm1176jzfshf = "arm1176jzfs"
-PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf-vfp} arm1176jzfshf-vfp"
-
+TUNE_FEATURES_tune-arm1176jzfs = "${TUNE_FEATURES_tune-armv6} arm1176jzfs"
+TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard"
+PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}"
+PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} arm1176jzfshf-vfp"
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index 4e887b3..e8516e7 100644
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -2,5 +2,7 @@
 #@NAME: RaspberryPi Development Board
 #@DESCRIPTION: Machine configuration for the RaspberryPi http://www.raspberrypi.org/ Board
 
+DEFAULTTUNE ?= "arm1176jzfshf"
+
 require conf/machine/include/tune-arm1176jzf-s.inc
 include conf/machine/include/rpi-base.inc
-- 
2.1.0

Re: [meta-raspberrypi][PATCH 1/3] userland: Fix build for armv7

[Andrei Gherzan]

On Wed, Feb 11, 2015 at 09:34:56PM +0100, Andrei Gherzan wrote:
> [Bug #49]
>
> Change-Id: I340b4134ae4227f315c1c3df1345b04ebd4b874b
> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> ---
>  conf/machine/raspberrypi2.conf            | 5 -----
>  recipes-graphics/userland/userland_git.bb | 1 +
>  2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
> index 778f5a6..30edae3 100644
> --- a/conf/machine/raspberrypi2.conf
> +++ b/conf/machine/raspberrypi2.conf
> @@ -2,11 +2,6 @@
>  #@NAME: RaspberryPi 2 Development Board
>  #@DESCRIPTION: Machine configuration for the RaspberryPi 2
>
> -# userland is not compiling on RPI 2
> -# https://github.com/raspberrypi/userland/issues/214
> -PREFERRED_PROVIDER_virtual/egl ?= "vc-graphics-hardfp"
> -PREFERRED_PROVIDER_virtual/libgles2 ?= "vc-graphics-hardfp"
> -
>  DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
>
>  require conf/machine/include/tune-cortexa7.inc
> diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
> index 77c98d7..ddca36e 100644
> --- a/recipes-graphics/userland/userland_git.bb
> +++ b/recipes-graphics/userland/userland_git.bb
> @@ -22,6 +22,7 @@ S = "${WORKDIR}/git"
>  inherit cmake
>
>  EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed'"
> +CFLAGS_append = " -fPIC"
>
>  # The compiled binaries don't provide sonames.
>  SOLIBS = "${SOLIBSDEV}"
> --
> 2.1.0
>

Merged to master along with the entire series.

--
Andrei Gherzan