[Buildroot] [PATCH 0/5] sunxi-mali-mainline-*: add arm64 arch and add r8p1

[Buildroot] [PATCH 0/5] sunxi-mali-mainline-*: add arm64 arch and add r8p1

[Giulio Benetti]

On both sunxi-mali-mainline and sunxi-mali-mainline-driver bump version
to add arm64(aarch64) arch support.
On sunxi-mali-mainline add r8p1 version.

Giulio Benetti (5):
  sunxi-mali-mainline: bump version.
  sunxi-mali-mainline: add support for arm64(aarch64) architecture.
  sunxi-mali-mainline: add r8p1 blob version.
  sunxi-mali-mainline-driver: bump version
  sunxi-mali-mainline-driver: add support for building on arm64(aarch64)
    architecture.

 .../sunxi-mali-mainline-driver.mk                 |  8 +++++++-
 package/sunxi-mali-mainline/Config.in             |  6 ++++--
 .../sunxi-mali-mainline/sunxi-mali-mainline.mk    | 15 ++++++++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

-- 
2.17.1

[Buildroot] [PATCH 1/5] sunxi-mali-mainline: bump version.

[Giulio Benetti]

For arm64 architecture and r8p1 version.

git shortlog --no-merges cb3e8ece9b2c3a70cbeb3204cd6f30eceaa32023..
Giulio Benetti (1):
      Reorder folders splitting includes and libraries.

Maxime Ripard (6):
      Move binaries to an arch subfolder
      Make x11 binaries path consistent
      Add r6p2 arm wayland blobs
      Add r6p2 arm64 blobs
      Add r8p1 fbdev blobs
      Add r8p1 arm64 fbdev blobs

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
 package/sunxi-mali-mainline/sunxi-mali-mainline.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
index 933e2beb0d..5ec115bc4c 100644
--- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
+++ b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUNXI_MALI_MAINLINE_VERSION = cb3e8ece9b2c3a70cbeb3204cd6f30eceaa32023
+SUNXI_MALI_MAINLINE_VERSION = d691cb93884ca8ac67860502117bbec283dc19aa
 SUNXI_MALI_MAINLINE_SITE = $(call github,free-electrons,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION))
 SUNXI_MALI_MAINLINE_INSTALL_STAGING = YES
 SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles
-- 
2.17.1

[Buildroot] [PATCH 2/5] sunxi-mali-mainline: add support for arm64(aarch64) architecture.

[Giulio Benetti]

Blobs for arm64(aarch64) are now available at Bootlin Github.

Add support for them also under arm64(aarch64) architecture copying the
right blobs according to architecture(arm or arm64).
Check if BR2_arm or BR2_aarch64 is enabled.
Only BR2_arm needs to provide BR2_ARM_EABIHF,
so check must be done only in that case.
Mali-blobs repository folder layout has been changed,
so modify path when copying for:
- headers
- libraries

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
 package/sunxi-mali-mainline/Config.in              |  3 +--
 package/sunxi-mali-mainline/sunxi-mali-mainline.mk | 13 +++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in
index 759bed86ba..912f5d22c6 100644
--- a/package/sunxi-mali-mainline/Config.in
+++ b/package/sunxi-mali-mainline/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_SUNXI_MALI_MAINLINE
 	bool "sunxi-mali-mainline"
-	depends on BR2_arm
-	depends on BR2_ARM_EABIHF
+	depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm)
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_HAS_LIBEGL
 	select BR2_PACKAGE_HAS_LIBGLES
diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
index 5ec115bc4c..05b90f0bee 100644
--- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
+++ b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
@@ -11,13 +11,18 @@ SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles
 
 SUNXI_MALI_MAINLINE_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION))
 
+ifeq ($(BR2_arm),y)
+SUNXI_MALI_MAINLINE_ARCH=arm
+else ifeq ($(BR2_aarch64),y)
+SUNXI_MALI_MAINLINE_ARCH=arm64
+endif
+
 define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS
 	mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include
 
-	cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/fbdev/lib/lib_fb_dev/* \
+	cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \
 		$(STAGING_DIR)/usr/lib/
-	cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/fbdev/include/* \
-		$(STAGING_DIR)/usr/include/
+	cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/
 
 	$(INSTALL) -D -m 0644 package/sunxi-mali-mainline/egl.pc \
 		$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
@@ -27,7 +32,7 @@ endef
 
 define SUNXI_MALI_MAINLINE_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/usr/lib
-	cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/fbdev/lib/lib_fb_dev/* \
+	cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \
 		$(TARGET_DIR)/usr/lib/
 endef
 
-- 
2.17.1

[Buildroot] [PATCH 3/5] sunxi-mali-mainline: add r8p1 blob version.

[Giulio Benetti]

Blobs for r8p1 are available on Bootlin Github.

Add r8p1 version to choice the same way as r6p2.

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
 package/sunxi-mali-mainline/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in
index 912f5d22c6..a889864465 100644
--- a/package/sunxi-mali-mainline/Config.in
+++ b/package/sunxi-mali-mainline/Config.in
@@ -25,12 +25,15 @@ choice
 
 config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2
 	bool "r6p2"
+config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1
+	bool "r8p1"
 
 endchoice
 
 config BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION
 	string
 	default "r6p2"	if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2
+	default "r8p1"	if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1
 
 endif
 
-- 
2.17.1

[Buildroot] [PATCH 4/5] sunxi-mali-mainline-driver: bump version

[Giulio Benetti]

For support H3 and H5 SoCs and r8p1 driver version.

git shortlog --invert-grep --grep travis --no-merges 52ef1c5e133cc5fd791ca636239dc5e7b19c26d5..
Maxime Ripard (6):
      Add r8p1 release
      sunxi: Move the reset test to a function
      sunxi: Add H3 support
      sunxi: Add H5 support
      sunxi: Remove generic compatible
      sunxi: Set clock rate in the driver

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
 .../sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
index 24817b07c7..fcaeb81efe 100644
--- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
+++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUNXI_MALI_MAINLINE_DRIVER_VERSION = 52ef1c5e133cc5fd791ca636239dc5e7b19c26d5
+SUNXI_MALI_MAINLINE_DRIVER_VERSION = 8e6b7d25b13089d53dbfc1ebd9e8737b0dc809cb
 SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION))
 SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux
 
-- 
2.17.1

[Buildroot] [PATCH 5/5] sunxi-mali-mainline-driver: add support for building on arm64(aarch64) architecture.

[Giulio Benetti]

Since Blobs for arm64(aarch64) are available at Bootlin Github and
sunxi-mali-mainline has been updated to support them, add support for
building on arm64(aarch64).

Check if BR2_arm or BR2_aarch64 is enabled and only in BR2_arm case
expect BR2_ARM_EABIHF to be enabled.
Add ARCH=arm or ARCH=arm64 to SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS
to build for the right architecture with build.sh script provided on
Maxime Ripard sunxi-mali repository.

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
 .../sunxi-mali-mainline-driver.mk                           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
index fcaeb81efe..e7a5ed2079 100644
--- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
+++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
@@ -13,6 +13,12 @@ SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \
 	CROSS_COMPILE=$(TARGET_CROSS) \
 	INSTALL_MOD_PATH=$(TARGET_DIR)
 
+ifeq ($(BR2_arm),y)
+SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS += ARCH=arm
+else ifeq ($(BR2_aarch64),y)
+SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS += ARCH=arm64
+endif
+
 define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES
 	ln -sf $(SUNXI_MALI_MAINLINE_REV)/series $(@D)/patches
 	$(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \
-- 
2.17.1

[Buildroot] [PATCH 0/5] sunxi-mali-mainline-*: add arm64 arch and add r8p1

[Giulio Benetti]

These patches are not bi-sectable, so I need to correct resubmit them as 
only 2 patches, one for sunxi-mali-mainline and one for 
sunxi-mali-mainline-driver.

Sorry, I reject them from patchwork.

Il 25/07/2018 12:06, Giulio Benetti ha scritto:
> On both sunxi-mali-mainline and sunxi-mali-mainline-driver bump version
> to add arm64(aarch64) arch support.
> On sunxi-mali-mainline add r8p1 version.
> 
> Giulio Benetti (5):
>    sunxi-mali-mainline: bump version.
>    sunxi-mali-mainline: add support for arm64(aarch64) architecture.
>    sunxi-mali-mainline: add r8p1 blob version.
>    sunxi-mali-mainline-driver: bump version
>    sunxi-mali-mainline-driver: add support for building on arm64(aarch64)
>      architecture.
> 
>   .../sunxi-mali-mainline-driver.mk                 |  8 +++++++-
>   package/sunxi-mali-mainline/Config.in             |  6 ++++--
>   .../sunxi-mali-mainline/sunxi-mali-mainline.mk    | 15 ++++++++++-----
>   3 files changed, 21 insertions(+), 8 deletions(-)
>