diff options
| -rw-r--r-- | Config.in.legacy | 8 | ||||
| -rw-r--r-- | package/sunxi-mali/Config.in | 25 | ||||
| -rw-r--r-- | package/sunxi-mali/sunxi-mali.mk | 12 |
3 files changed, 18 insertions, 27 deletions
diff --git a/Config.in.legacy b/Config.in.legacy index 3e043d4f41..0bacac2caf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2017.05" +config BR2_PACKAGE_SUNXI_MALI_R2P4 + bool "sunxi-mali r2p4 removed" + select BR2_LEGACY + help + sunxi-mali libMali for r2p4 Mali kernel module has been + removed since the libump package only provides libUMP.so.3. + libMali for r2p4 Mali kernel module requires libUMP.so.2. + config BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT bool "CoffeeScript option has been removed" select BR2_LEGACY diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in index 71b11955a8..9eb3ad85af 100644 --- a/package/sunxi-mali/Config.in +++ b/package/sunxi-mali/Config.in @@ -1,6 +1,12 @@ config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali" depends on BR2_arm + # libump package only provide libUMP.so.3 which is used by + # libMali for r3p0 and r3p1 Mali kernel module. This version + # is only available for ARM EABIhf. + # libMali for r2p4 Mali kernel module (available for ARM EABI) + # requires libUMP.so.2. + depends on BR2_ARM_EABIHF # libUMP.so.3 only depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES @@ -36,31 +42,16 @@ choice appropriate version number is r3p0. For other kernels, use the maliver application to determine the appropriate version. -config BR2_PACKAGE_SUNXI_MALI_R2P4 - bool "r2p4" - depends on BR2_ARM_EABI - -comment "r2p4 requires an EABI toolchain" - depends on !BR2_ARM_EABI - config BR2_PACKAGE_SUNXI_MALI_R3P0 bool "r3p0" - depends on BR2_ARM_EABIHF - -comment "r3p0 requires an EABIhf toolchain" - depends on !BR2_ARM_EABIHF config BR2_PACKAGE_SUNXI_MALI_R3P1 bool "r3p1" - depends on BR2_ARM_EABIHF - -comment "r3p1 requires an EABIhf toolchain" - depends on !BR2_ARM_EABIHF endchoice endif -comment "sunxi-mali needs a glibc toolchain" +comment "sunxi-mali needs an EABIhf glibc toolchain" depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali/sunxi-mali.mk b/package/sunxi-mali/sunxi-mali.mk index c808db6cf6..90b580f5f6 100644 --- a/package/sunxi-mali/sunxi-mali.mk +++ b/package/sunxi-mali/sunxi-mali.mk @@ -28,17 +28,9 @@ SUNXI_MALI_MAKE_ENV = \ CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \ $(TARGET_MAKE_ENV) -ifeq ($(BR2_ARM_EABIHF),y) -SUNXI_MALI_MAKE_OPTS += ABI=armhf -else -SUNXI_MALI_MAKE_OPTS += ABI=armel -endif - -SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer +SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer \ + ABI=armhf -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R2P4),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r2p4 -endif ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y) SUNXI_MALI_MAKE_OPTS += VERSION=r3p0 endif |
