[Buildroot] [PATCH 1/2] odroid-mali: rename pkg to odroid-gl

[Buildroot] [PATCH 1/2] odroid-mali: rename pkg to odroid-gl

[Dagg Stompler]

this pkg provides the GL implementation for the odroidc2 broad.
mali is the name of the kernel gpu driver, this might cause some
confusion. thus rename it for odroid-gl

Signed-off-by: Dagg Stompler <daggs@gmx.com>
---
 package/Config.in                                  |  2 +-
 package/{odroid-mali => odroid-gl}/Config.in       | 14 +++---
 .../odroid-mali.hash => odroid-gl/odroid-gl.hash}  |  0
 package/odroid-gl/odroid-gl.mk                     | 52 ++++++++++++++++++++++
 package/odroid-mali/odroid-mali.mk                 | 52 ----------------------
 5 files changed, 60 insertions(+), 60 deletions(-)
 rename package/{odroid-mali => odroid-gl}/Config.in (76%)
 rename package/{odroid-mali/odroid-mali.hash => odroid-gl/odroid-gl.hash} (100%)
 create mode 100644 package/odroid-gl/odroid-gl.mk
 delete mode 100644 package/odroid-mali/odroid-mali.mk

diff --git a/package/Config.in b/package/Config.in
index 4eaa95b1d..a7e0696f8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -435,7 +435,7 @@ endmenu
 	source "package/nvidia-driver/Config.in"
 	source "package/nvidia-tegra23/Config.in"
 	source "package/nvme/Config.in"
-	source "package/odroid-mali/Config.in"
+	source "package/odroid-gl/Config.in"
 	source "package/odroid-scripts/Config.in"
 	source "package/ofono/Config.in"
 	source "package/ola/Config.in"
diff --git a/package/odroid-mali/Config.in b/package/odroid-gl/Config.in
similarity index 76%
rename from package/odroid-mali/Config.in
rename to package/odroid-gl/Config.in
index e5c07f237..9c605f6de 100644
--- a/package/odroid-mali/Config.in
+++ b/package/odroid-gl/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_ODROID_MALI
-	bool "odroid-mali"
+config BR2_PACKAGE_ODROID_GL
+	bool "odroid-gl"
 	select BR2_PACKAGE_HAS_LIBEGL
 	select BR2_PACKAGE_HAS_LIBGLES
 	select BR2_PACKAGE_ODROID_SCRIPTS # runtime
@@ -10,17 +10,17 @@ config BR2_PACKAGE_ODROID_MALI
 
 	  https://github.com/mdrjr/c2_mali
 
-if BR2_PACKAGE_ODROID_MALI
+if BR2_PACKAGE_ODROID_GL
 
 config BR2_PACKAGE_PROVIDES_LIBEGL
-	default "odroid-mali"
+	default "odroid-gl"
 
 config BR2_PACKAGE_PROVIDES_LIBGLES
-	default "odroid-mali"
+	default "odroid-gl"
 
 endif
 
-config BR2_PACKAGE_ODROID_MALI_X11
+config BR2_PACKAGE_ODROID_GL_X11
 	bool
 	depends on BR2_aarch64 # No 32 bit version available
 	select BR2_PACKAGE_LIBDRM
@@ -29,6 +29,6 @@ config BR2_PACKAGE_ODROID_MALI_X11
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXFIXES
 
-comment "odroid-mali needs a glibc toolchain"
+comment "odroid-gl needs a glibc toolchain"
 	depends on BR2_aarch64 || BR2_ARM_EABIHF
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/odroid-mali/odroid-mali.hash b/package/odroid-gl/odroid-gl.hash
similarity index 100%
rename from package/odroid-mali/odroid-mali.hash
rename to package/odroid-gl/odroid-gl.hash
diff --git a/package/odroid-gl/odroid-gl.mk b/package/odroid-gl/odroid-gl.mk
new file mode 100644
index 000000000..0591497ca
--- /dev/null
+++ b/package/odroid-gl/odroid-gl.mk
@@ -0,0 +1,52 @@
+################################################################################
+#
+# odroid-gl
+#
+################################################################################
+
+ODROID_GL_VERSION = 4f8a541693fee5fdcaa162a7fd8922861a4ba0a9
+ODROID_GL_SITE = $(call github,mdrjr,c2_mali,$(ODROID_GL_VERSION))
+ODROID_GL_LICENSE = Hardkernel EULA
+ODROID_GL_LICENSE_FILES = README.md
+
+ODROID_GL_INSTALL_STAGING = YES
+ODROID_GL_PROVIDES = libegl libgles
+
+ifeq ($(BR2_PACKAGE_ODROID_GL_X11),y)
+ODROID_GL_HEADERS_SUBDIR = x11/mali_headers/
+ODROID_GL_LIBS_SUBDIR = x11/mali_libs/
+# The X11 blobs are linked against those libraries, and the headers
+# include headers from those libraries
+ODROID_GL_DEPENDENCIES += \
+	libdrm xlib_libX11 xlib_libXdamage \
+	xlib_libXext xlib_libXfixes
+else
+define ODROID_GL_FIX_EGL_PC
+	$(SED) "s/Cflags: /Cflags: -DMESA_EGL_NO_X11_HEADERS /" \
+		$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
+endef
+ODROID_GL_HEADERS_SUBDIR = fbdev/mali_headers/
+ifeq ($(BR2_aarch64),y)
+ODROID_GL_LIBS_SUBDIR = fbdev/mali_libs/
+else
+ODROID_GL_LIBS_SUBDIR = fbdev/32bit_libs/
+endif
+endif
+
+define ODROID_GL_INSTALL_LIBS
+	cp -dpfr $(@D)/$(ODROID_GL_LIBS_SUBDIR)/lib* $(1)/usr/lib/
+endef
+
+define ODROID_GL_INSTALL_STAGING_CMDS
+	$(call ODROID_GL_INSTALL_LIBS,$(STAGING_DIR))
+	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+	cp -dpfr $(@D)/pkgconfig/*.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	cp -dpfr $(@D)/$(ODROID_GL_HEADERS_SUBDIR)/* $(STAGING_DIR)/usr/include
+	$(ODROID_GL_FIX_EGL_PC)
+endef
+
+define ODROID_GL_INSTALL_TARGET_CMDS
+	$(call ODROID_GL_INSTALL_LIBS,$(TARGET_DIR))
+endef
+
+$(eval $(generic-package))
diff --git a/package/odroid-mali/odroid-mali.mk b/package/odroid-mali/odroid-mali.mk
deleted file mode 100644
index 86215a1d5..000000000
--- a/package/odroid-mali/odroid-mali.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-################################################################################
-#
-# odroid-mali
-#
-################################################################################
-
-ODROID_MALI_VERSION = 4f8a541693fee5fdcaa162a7fd8922861a4ba0a9
-ODROID_MALI_SITE = $(call github,mdrjr,c2_mali,$(ODROID_MALI_VERSION))
-ODROID_MALI_LICENSE = Hardkernel EULA
-ODROID_MALI_LICENSE_FILES = README.md
-
-ODROID_MALI_INSTALL_STAGING = YES
-ODROID_MALI_PROVIDES = libegl libgles
-
-ifeq ($(BR2_PACKAGE_ODROID_MALI_X11),y)
-ODROID_MALI_HEADERS_SUBDIR = x11/mali_headers/
-ODROID_MALI_LIBS_SUBDIR = x11/mali_libs/
-# The X11 blobs are linked against those libraries, and the headers
-# include headers from those libraries
-ODROID_MALI_DEPENDENCIES += \
-	libdrm xlib_libX11 xlib_libXdamage \
-	xlib_libXext xlib_libXfixes
-else
-define ODROID_MALI_FIX_EGL_PC
-	$(SED) "s/Cflags: /Cflags: -DMESA_EGL_NO_X11_HEADERS /" \
-		$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
-endef
-ODROID_MALI_HEADERS_SUBDIR = fbdev/mali_headers/
-ifeq ($(BR2_aarch64),y)
-ODROID_MALI_LIBS_SUBDIR = fbdev/mali_libs/
-else
-ODROID_MALI_LIBS_SUBDIR = fbdev/32bit_libs/
-endif
-endif
-
-define ODROID_MALI_INSTALL_LIBS
-	cp -dpfr $(@D)/$(ODROID_MALI_LIBS_SUBDIR)/lib* $(1)/usr/lib/
-endef
-
-define ODROID_MALI_INSTALL_STAGING_CMDS
-	$(call ODROID_MALI_INSTALL_LIBS,$(STAGING_DIR))
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	cp -dpfr $(@D)/pkgconfig/*.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-	cp -dpfr $(@D)/$(ODROID_MALI_HEADERS_SUBDIR)/* $(STAGING_DIR)/usr/include
-	$(ODROID_MALI_FIX_EGL_PC)
-endef
-
-define ODROID_MALI_INSTALL_TARGET_CMDS
-	$(call ODROID_MALI_INSTALL_LIBS,$(TARGET_DIR))
-endef
-
-$(eval $(generic-package))
-- 
2.12.2

[Buildroot] [PATCH 2/2] odroid-gl: reorganize structure

[Dagg Stompler]

 - remove support for 32 bit libs as it is impossible to build a 32 bit odroid image.
 - reorganize structure to support other boards from odroid.

Signed-off-by: Dagg Stompler <daggs@gmx.com>
---
 package/odroid-gl/Config.in      | 13 +++++++++++--
 package/odroid-gl/odroid-gl.hash |  2 +-
 package/odroid-gl/odroid-gl.mk   | 20 ++++++++++++--------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/package/odroid-gl/Config.in b/package/odroid-gl/Config.in
index 9c605f6de..72727f41e 100644
--- a/package/odroid-gl/Config.in
+++ b/package/odroid-gl/Config.in
@@ -6,9 +6,10 @@ config BR2_PACKAGE_ODROID_GL
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_aarch64 || BR2_ARM_EABIHF
 	help
-	  Install the ARM Mali drivers for odroidc2 based systems.
+	  Install the ARM Mali drivers for odorid boards.
 
-	  https://github.com/mdrjr/c2_mali
+	  support list:
+	    c2: https://github.com/mdrjr/c2_mali
 
 if BR2_PACKAGE_ODROID_GL
 
@@ -18,6 +19,14 @@ config BR2_PACKAGE_PROVIDES_LIBEGL
 config BR2_PACKAGE_PROVIDES_LIBGLES
 	default "odroid-gl"
 
+choice
+	prompt "odroid board selection"
+
+	config BR2_PACKAGE_ODROID_GL_C2
+		bool "odroid c2 gl"
+
+endchoice
+
 endif
 
 config BR2_PACKAGE_ODROID_GL_X11
diff --git a/package/odroid-gl/odroid-gl.hash b/package/odroid-gl/odroid-gl.hash
index b71ebab13..456944651 100644
--- a/package/odroid-gl/odroid-gl.hash
+++ b/package/odroid-gl/odroid-gl.hash
@@ -1,2 +1,2 @@
 # Locally computed hash
-sha256 6c85e96f3372c24c6497f2a1cbea867a8dbf3a7b3edd736802c762176006aec6  odroid-mali-4f8a541693fee5fdcaa162a7fd8922861a4ba0a9.tar.gz
+sha256 6c85e96f3372c24c6497f2a1cbea867a8dbf3a7b3edd736802c762176006aec6  odroid-gl-c2-4f8a541693fee5fdcaa162a7fd8922861a4ba0a9.tar.gz
diff --git a/package/odroid-gl/odroid-gl.mk b/package/odroid-gl/odroid-gl.mk
index 0591497ca..40be77f01 100644
--- a/package/odroid-gl/odroid-gl.mk
+++ b/package/odroid-gl/odroid-gl.mk
@@ -4,8 +4,20 @@
 #
 ################################################################################
 
+ifeq ($(BR2_PACKAGE_ODROID_GL_C2),y)
 ODROID_GL_VERSION = 4f8a541693fee5fdcaa162a7fd8922861a4ba0a9
 ODROID_GL_SITE = $(call github,mdrjr,c2_mali,$(ODROID_GL_VERSION))
+ODROID_GL_LIBS_SUBDIR = fbdev/mali_libs/
+ODROID_GL_PREFIX = c2
+ifeq ($(BR2_PACKAGE_ODROID_GL_X11),y)
+ODROID_GL_HEADERS_SUBDIR = x11/mali_headers/
+ODROID_GL_LIBS_SUBDIR = x11/mali_libs/
+else
+ODROID_GL_HEADERS_SUBDIR = fbdev/mali_headers/
+endif
+endif
+
+ODROID_GL_SOURCE := odroid-gl-$(ODROID_GL_PREFIX)-$(ODROID_GL_VERSION).tar.gz
 ODROID_GL_LICENSE = Hardkernel EULA
 ODROID_GL_LICENSE_FILES = README.md
 
@@ -13,8 +25,6 @@ ODROID_GL_INSTALL_STAGING = YES
 ODROID_GL_PROVIDES = libegl libgles
 
 ifeq ($(BR2_PACKAGE_ODROID_GL_X11),y)
-ODROID_GL_HEADERS_SUBDIR = x11/mali_headers/
-ODROID_GL_LIBS_SUBDIR = x11/mali_libs/
 # The X11 blobs are linked against those libraries, and the headers
 # include headers from those libraries
 ODROID_GL_DEPENDENCIES += \
@@ -25,12 +35,6 @@ define ODROID_GL_FIX_EGL_PC
 	$(SED) "s/Cflags: /Cflags: -DMESA_EGL_NO_X11_HEADERS /" \
 		$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
 endef
-ODROID_GL_HEADERS_SUBDIR = fbdev/mali_headers/
-ifeq ($(BR2_aarch64),y)
-ODROID_GL_LIBS_SUBDIR = fbdev/mali_libs/
-else
-ODROID_GL_LIBS_SUBDIR = fbdev/32bit_libs/
-endif
 endif
 
 define ODROID_GL_INSTALL_LIBS
-- 
2.12.2

[Buildroot] [PATCH 1/2] odroid-mali: rename pkg to odroid-gl

[Thomas Petazzoni]

Hello,

On Mon, 17 Apr 2017 09:56:53 +0300, Dagg Stompler wrote:
> this pkg provides the GL implementation for the odroidc2 broad.
> mali is the name of the kernel gpu driver, this might cause some
> confusion. thus rename it for odroid-gl

Mali is not the name of the kernel gpu driver, Mali is the name of the
GPU sold by ARM. So both the kernel driver and the userspace blob are
Mali-related.

In addition, we already have sunxi-mali for Allwinner platforms, and
mali-t76x. So please keep the odroid-mali name.

Thanks,

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

[Buildroot] [PATCH 2/2] odroid-gl: reorganize structure

[Arnout Vandecappelle]

 Hi Dagg,

On 17-04-17 08:56, Dagg Stompler wrote:
>  - remove support for 32 bit libs as it is impossible to build a 32 bit odroid image.

 I think this part should be a separate patch.

>  - reorganize structure to support other boards from odroid.

 This would better be combined in a series that actually adds such a different
board, so we can see where this is going.

> 
> Signed-off-by: Dagg Stompler <daggs@gmx.com>
> ---
>  package/odroid-gl/Config.in      | 13 +++++++++++--
>  package/odroid-gl/odroid-gl.hash |  2 +-
>  package/odroid-gl/odroid-gl.mk   | 20 ++++++++++++--------
>  3 files changed, 24 insertions(+), 11 deletions(-)
> 
> diff --git a/package/odroid-gl/Config.in b/package/odroid-gl/Config.in
> index 9c605f6de..72727f41e 100644
> --- a/package/odroid-gl/Config.in
> +++ b/package/odroid-gl/Config.in
> @@ -6,9 +6,10 @@ config BR2_PACKAGE_ODROID_GL
>  	depends on BR2_TOOLCHAIN_USES_GLIBC
>  	depends on BR2_aarch64 || BR2_ARM_EABIHF
>  	help
> -	  Install the ARM Mali drivers for odroidc2 based systems.
> +	  Install the ARM Mali drivers for odorid boards.
                                           ^^^^^^ odroid?

>  
> -	  https://github.com/mdrjr/c2_mali
> +	  support list:
> +	    c2: https://github.com/mdrjr/c2_mali

 I guess the idea here is to add more boards?

>  
>  if BR2_PACKAGE_ODROID_GL
>  
> @@ -18,6 +19,14 @@ config BR2_PACKAGE_PROVIDES_LIBEGL
>  config BR2_PACKAGE_PROVIDES_LIBGLES
>  	default "odroid-gl"
>  
> +choice
> +	prompt "odroid board selection"
> +
> +	config BR2_PACKAGE_ODROID_GL_C2
> +		bool "odroid c2 gl"

 With just one option, this choice really doesn't make any sense. It could make
sense as an in-between patch in a series that adds 4 or more additional boards.
But if it is just one or two more, you can keep it in a single patch adding
those two options.

 Also, in this patch you're introducing this new symbol, but you're not actually
using it anywhere. That is really completely pointless: even if you gradually
want to add several boards, the first patch should contain both the new config
symbol and how it is used in the .mk file.

 [sidetrack: it is already crazy that Mali needs a different binary blob for
different chips, but it also needs a different binary for a different *board*?
Really? What are these guys smoking?]

> +
> +endchoice
> +
>  endif
>  
>  config BR2_PACKAGE_ODROID_GL_X11
> diff --git a/package/odroid-gl/odroid-gl.hash b/package/odroid-gl/odroid-gl.hash
> index b71ebab13..456944651 100644
> --- a/package/odroid-gl/odroid-gl.hash
> +++ b/package/odroid-gl/odroid-gl.hash
> @@ -1,2 +1,2 @@
>  # Locally computed hash
> -sha256 6c85e96f3372c24c6497f2a1cbea867a8dbf3a7b3edd736802c762176006aec6  odroid-mali-4f8a541693fee5fdcaa162a7fd8922861a4ba0a9.tar.gz
> +sha256 6c85e96f3372c24c6497f2a1cbea867a8dbf3a7b3edd736802c762176006aec6  odroid-gl-c2-4f8a541693fee5fdcaa162a7fd8922861a4ba0a9.tar.gz
> diff --git a/package/odroid-gl/odroid-gl.mk b/package/odroid-gl/odroid-gl.mk
> index 0591497ca..40be77f01 100644
> --- a/package/odroid-gl/odroid-gl.mk
> +++ b/package/odroid-gl/odroid-gl.mk
> @@ -4,8 +4,20 @@
>  #
>  ################################################################################
>  
> +ifeq ($(BR2_PACKAGE_ODROID_GL_C2),y)
>  ODROID_GL_VERSION = 4f8a541693fee5fdcaa162a7fd8922861a4ba0a9
>  ODROID_GL_SITE = $(call github,mdrjr,c2_mali,$(ODROID_GL_VERSION))
> +ODROID_GL_LIBS_SUBDIR = fbdev/mali_libs/
> +ODROID_GL_PREFIX = c2
> +ifeq ($(BR2_PACKAGE_ODROID_GL_X11),y)
> +ODROID_GL_HEADERS_SUBDIR = x11/mali_headers/
> +ODROID_GL_LIBS_SUBDIR = x11/mali_libs/

 What is the reason to move this part?

> +else
> +ODROID_GL_HEADERS_SUBDIR = fbdev/mali_headers/
> +endif
> +endif
> +
> +ODROID_GL_SOURCE := odroid-gl-$(ODROID_GL_PREFIX)-$(ODROID_GL_VERSION).tar.gz

 Use = instead of :=, except if there is a *really* good reason not to. And such
a reason would typically warrant a comment explaining it.

 But I wonder where this is going... With the github helper, the _SOURCE can
actually be set to *anything* (as long as it ends with .tar.gz). github will
only look at the directory path leading up to it. So this ODROID_GL_PREFIX can't
possibly have any function, as far as I can see...

>  ODROID_GL_LICENSE = Hardkernel EULA
>  ODROID_GL_LICENSE_FILES = README.md
>  
> @@ -13,8 +25,6 @@ ODROID_GL_INSTALL_STAGING = YES
>  ODROID_GL_PROVIDES = libegl libgles
>  
>  ifeq ($(BR2_PACKAGE_ODROID_GL_X11),y)
> -ODROID_GL_HEADERS_SUBDIR = x11/mali_headers/
> -ODROID_GL_LIBS_SUBDIR = x11/mali_libs/
>  # The X11 blobs are linked against those libraries, and the headers
>  # include headers from those libraries
>  ODROID_GL_DEPENDENCIES += \
> @@ -25,12 +35,6 @@ define ODROID_GL_FIX_EGL_PC
>  	$(SED) "s/Cflags: /Cflags: -DMESA_EGL_NO_X11_HEADERS /" \
>  		$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
>  endef
> -ODROID_GL_HEADERS_SUBDIR = fbdev/mali_headers/
> -ifeq ($(BR2_aarch64),y)
> -ODROID_GL_LIBS_SUBDIR = fbdev/mali_libs/
> -else
> -ODROID_GL_LIBS_SUBDIR = fbdev/32bit_libs/

 If it can never work on 32 bits, why do they even have this directory?

 Regards,
 Arnout

> -endif
>  endif
>  
>  define ODROID_GL_INSTALL_LIBS
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF