* [Buildroot] [PATCH 0/3] remove legacy sunxi-mali
@ 2019-03-06 15:24 Francois Perrad
2019-03-06 15:24 ` [Buildroot] [PATCH 1/3] olimex_a20_olinuxino_lime_legacy_defconfig: remove it Francois Perrad
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Francois Perrad @ 2019-03-06 15:24 UTC (permalink / raw)
To: buildroot
see initial discussion: http://lists.busybox.net/pipermail/buildroot/2018-November/236420.html
Francois Perrad (3):
olimex_a20_olinuxino_lime_legacy_defconfig: remove it
package/sunxi-mali: remove it
package/libump: remove it
Config.in.legacy | 16 ++++
DEVELOPERS | 2 -
board/olimex/a20_olinuxino/boot-legacy.cmd | 5 --
board/olimex/a20_olinuxino/post-build.sh | 5 --
board/olimex/a20_olinuxino/readme.txt | 7 --
...olimex_a20_olinuxino_lime_legacy_defconfig | 56 --------------
package/Config.in | 2 -
package/libump/Config.in | 13 ----
package/libump/libump.hash | 2 -
package/libump/libump.mk | 13 ----
package/qt5/qt5base/qt5base.mk | 2 +-
.../0001-Add-missing-GLchar-definitions.patch | 45 ------------
...002-linking-of-test-app-needs-libUMP.patch | 18 -----
...data-types-between-GLES2-gl2.h-and-G.patch | 57 ---------------
package/sunxi-mali/Config.in | 59 ---------------
package/sunxi-mali/S80mali | 54 --------------
package/sunxi-mali/egl.pc | 12 ---
package/sunxi-mali/glesv2.pc | 12 ---
package/sunxi-mali/sunxi-mali.hash | 2 -
package/sunxi-mali/sunxi-mali.mk | 73 -------------------
.../xdriver_xf86-video-fbturbo.mk | 4 -
21 files changed, 17 insertions(+), 442 deletions(-)
delete mode 100644 board/olimex/a20_olinuxino/boot-legacy.cmd
delete mode 100644 configs/olimex_a20_olinuxino_lime_legacy_defconfig
delete mode 100644 package/libump/Config.in
delete mode 100644 package/libump/libump.hash
delete mode 100644 package/libump/libump.mk
delete mode 100644 package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch
delete mode 100644 package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch
delete mode 100644 package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch
delete mode 100644 package/sunxi-mali/Config.in
delete mode 100644 package/sunxi-mali/S80mali
delete mode 100644 package/sunxi-mali/egl.pc
delete mode 100644 package/sunxi-mali/glesv2.pc
delete mode 100644 package/sunxi-mali/sunxi-mali.hash
delete mode 100644 package/sunxi-mali/sunxi-mali.mk
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/3] olimex_a20_olinuxino_lime_legacy_defconfig: remove it
2019-03-06 15:24 [Buildroot] [PATCH 0/3] remove legacy sunxi-mali Francois Perrad
@ 2019-03-06 15:24 ` Francois Perrad
2019-03-15 22:20 ` Thomas Petazzoni
2019-03-06 15:24 ` [Buildroot] [PATCH 2/3] package/sunxi-mali: " Francois Perrad
2019-03-06 15:24 ` [Buildroot] [PATCH 3/3] package/libump: " Francois Perrad
2 siblings, 1 reply; 5+ messages in thread
From: Francois Perrad @ 2019-03-06 15:24 UTC (permalink / raw)
To: buildroot
The old 3.4 Linux kernel used by this defconfig doesn't build with gcc 7.x
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
board/olimex/a20_olinuxino/boot-legacy.cmd | 5 --
board/olimex/a20_olinuxino/post-build.sh | 5 --
board/olimex/a20_olinuxino/readme.txt | 7 ---
...olimex_a20_olinuxino_lime_legacy_defconfig | 56 -------------------
4 files changed, 73 deletions(-)
delete mode 100644 board/olimex/a20_olinuxino/boot-legacy.cmd
delete mode 100644 configs/olimex_a20_olinuxino_lime_legacy_defconfig
diff --git a/board/olimex/a20_olinuxino/boot-legacy.cmd b/board/olimex/a20_olinuxino/boot-legacy.cmd
deleted file mode 100644
index 9fa5d6541..000000000
--- a/board/olimex/a20_olinuxino/boot-legacy.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-setenv bootm_boot_mode sec
-setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 consoleblank=0 ${extra}
-ext4load mmc 0 0x43000000 /boot/script.bin
-ext4load mmc 0 0x48000000 /boot/zImage
-bootz 0x48000000
diff --git a/board/olimex/a20_olinuxino/post-build.sh b/board/olimex/a20_olinuxino/post-build.sh
index 7a8a42746..d3f612f81 100755
--- a/board/olimex/a20_olinuxino/post-build.sh
+++ b/board/olimex/a20_olinuxino/post-build.sh
@@ -1,8 +1,3 @@
#!/bin/sh
cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
-
-if [ -e $BINARIES_DIR/script.bin ]; then
- # mali requires a legacy kernel
- cp $BINARIES_DIR/script.bin $TARGET_DIR/boot/script.bin
-fi
diff --git a/board/olimex/a20_olinuxino/readme.txt b/board/olimex/a20_olinuxino/readme.txt
index 57ee23d14..504483b51 100644
--- a/board/olimex/a20_olinuxino/readme.txt
+++ b/board/olimex/a20_olinuxino/readme.txt
@@ -16,15 +16,9 @@ The following defconfigs are available:
for the A20-OLinuXino-MICRO board using mainline kernel
- olimex_a20_olinuxino_lime_defconfig
for the A20-OLinuXino-LIME board using mainline kernel
- - olimex_a20_olinuxino_lime_legacy_defconfig
- for the A20-OLinuXino-LIME board using legacy linux-sunxi kernel
- olimex_a20_olinuxino_lime2_defconfig
for the A20-OLinuXino-LIME2 board using mainline kernel
-The legacy linux-sunxi kernels are based on the vendor code drops.
-They are only useful when accelerated 3D graphics and multimedia support
-is strictly necessary.
-
The Mainline Kernel is already a much better choice for a headless server.
And also the mainline kernel works fine even for a basic Linux desktop
system running on top of a simple framebuffer, which may be good enough for
@@ -51,7 +45,6 @@ After building, you should get a tree like this:
output/images/
+-- rootfs.ext2
+-- rootfs.ext4 -> rootfs.ext2
- +-- script.bin (lime_legacy)
+-- sdcard.img
+-- sun7i-a20-olinuxino-lime.dtb (lime, mainline)
+-- sun7i-a20-olinuxino-lime2.dtb (lime2, mainline)
diff --git a/configs/olimex_a20_olinuxino_lime_legacy_defconfig b/configs/olimex_a20_olinuxino_lime_legacy_defconfig
deleted file mode 100644
index 2c33f05e5..000000000
--- a/configs/olimex_a20_olinuxino_lime_legacy_defconfig
+++ /dev/null
@@ -1,56 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_cortex_a7=y
-BR2_ARM_EABIHF=y
-
-# The old 3.4 kernel doesn't build with gcc >= 7.x
-BR2_GCC_VERSION_6_X=y
-
-# Linux headers same as kernel, a 3.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y
-
-# System configuration
-BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
-BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
-BR2_TARGET_GENERIC_GETTY=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
-
-# Kernel, based on Linux version 3.4.113
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,dan-and,linux-sunxi,fc385cc6dfa350382ecc94a520a716b57e654410)/linux-fc385cc6dfa350382ecc94a520a716b57e654410.tar.gz"
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
-BR2_LINUX_KERNEL_DEFCONFIG="sun7i"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
-
-# sunxi packages
-BR2_PACKAGE_SUNXI_TOOLS=y
-BR2_PACKAGE_SUNXI_BOARDS=y
-BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/a20-olinuxino_lime.fex"
-BR2_PACKAGE_SUNXI_MALI=y
-BR2_PACKAGE_SUNXI_MALI_DBG=y
-
-# Filesystem
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-# BR2_TARGET_ROOTFS_TAR is not set
-
-# Bootloaders
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
-BR2_TARGET_UBOOT_FORMAT_BIN=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
-BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot-legacy.cmd"
-
-# Additional tools
-BR2_PACKAGE_HOST_GENIMAGE=y
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/3] package/sunxi-mali: remove it
2019-03-06 15:24 [Buildroot] [PATCH 0/3] remove legacy sunxi-mali Francois Perrad
2019-03-06 15:24 ` [Buildroot] [PATCH 1/3] olimex_a20_olinuxino_lime_legacy_defconfig: remove it Francois Perrad
@ 2019-03-06 15:24 ` Francois Perrad
2019-03-06 15:24 ` [Buildroot] [PATCH 3/3] package/libump: " Francois Perrad
2 siblings, 0 replies; 5+ messages in thread
From: Francois Perrad @ 2019-03-06 15:24 UTC (permalink / raw)
To: buildroot
The package sunxi-mali-mainline is available for recent kernels.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
Config.in.legacy | 10 +++
DEVELOPERS | 1 -
package/Config.in | 1 -
package/qt5/qt5base/qt5base.mk | 2 +-
.../0001-Add-missing-GLchar-definitions.patch | 45 ------------
...002-linking-of-test-app-needs-libUMP.patch | 18 -----
...data-types-between-GLES2-gl2.h-and-G.patch | 57 ---------------
package/sunxi-mali/Config.in | 59 ---------------
package/sunxi-mali/S80mali | 54 --------------
package/sunxi-mali/egl.pc | 12 ---
package/sunxi-mali/glesv2.pc | 12 ---
package/sunxi-mali/sunxi-mali.hash | 2 -
package/sunxi-mali/sunxi-mali.mk | 73 -------------------
13 files changed, 11 insertions(+), 335 deletions(-)
delete mode 100644 package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch
delete mode 100644 package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch
delete mode 100644 package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch
delete mode 100644 package/sunxi-mali/Config.in
delete mode 100644 package/sunxi-mali/S80mali
delete mode 100644 package/sunxi-mali/egl.pc
delete mode 100644 package/sunxi-mali/glesv2.pc
delete mode 100644 package/sunxi-mali/sunxi-mali.hash
delete mode 100644 package/sunxi-mali/sunxi-mali.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 25b48fba8..de10703c6 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -142,6 +142,16 @@ comment "unpredictable ways. "
comment "----------------------------------------------------"
endif
+###############################################################################
+comment "Legacy options removed in 2019.05"
+
+config BR2_PACKAGE_SUNXI_MALI
+ bool "sunxi-mali package removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_SUNXI_MALI_MAINLINE
+ help
+ The sunxi-mali package was removed.
+
###############################################################################
comment "Legacy options removed in 2019.02"
diff --git a/DEVELOPERS b/DEVELOPERS
index f9b6a0e7d..9ab39185f 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2008,7 +2008,6 @@ F: package/a10disp/
F: package/glmark2/
F: package/libvpx/
F: package/mesa3d-demos/
-F: package/sunxi-mali/
F: package/ti-gfx/
N: Stefan S?rensen <stefan.sorensen@spectralink.com>
diff --git a/package/Config.in b/package/Config.in
index cc232b9fb..9c723315c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -518,7 +518,6 @@ endmenu
source "package/statserial/Config.in"
source "package/stm32flash/Config.in"
source "package/sunxi-cedarx/Config.in"
- source "package/sunxi-mali/Config.in"
source "package/sunxi-mali-mainline/Config.in"
source "package/sunxi-mali-mainline-driver/Config.in"
source "package/sysstat/Config.in"
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index e7f6e658f..14536980a 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -275,7 +275,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y)
# use vivante backend
QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv
-else ifeq ($(BR2_PACKAGE_SUNXI_MALI)$(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y)
+else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y)
# use mali backend
QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali
endif
diff --git a/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch b/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch
deleted file mode 100644
index a9370b009..000000000
--- a/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 058d5e8cd90d117535b5d314fd9e15c70028ff20 Mon Sep 17 00:00:00 2001
-From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Mon, 21 Apr 2014 19:31:23 +0200
-Subject: [PATCH] Add missing GLchar definitions.
-
-The GLES and GLES2 header files provided by sunxi-mali do not define the
-type "GLchar" and use "char" instead in the prototype of some functions.
-
-This issue has been reported upstream some time ago, but the pull
-request has not been merged yet. (See
-https://github.com/linux-sunxi/sunxi-mali/pull/8).
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
----
- include/GLES/gl.h | 1 +
- include/GLES2/gl2.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/include/GLES/gl.h b/include/GLES/gl.h
-index 858f394..a6bb591 100644
---- a/include/GLES/gl.h
-+++ b/include/GLES/gl.h
-@@ -29,6 +29,7 @@ typedef float GLfloat;
- typedef float GLclampf;
- typedef signed int GLfixed;
- typedef signed int GLclampx;
-+typedef char GLchar;
-
- typedef int * GLintptr;
- typedef int * GLsizeiptr;
-diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h
-index 59e376c..90d96bb 100644
---- a/include/GLES2/gl2.h
-+++ b/include/GLES2/gl2.h
-@@ -32,6 +32,7 @@ typedef unsigned int GLuint;
- typedef khronos_float_t GLfloat;
- typedef khronos_float_t GLclampf;
- typedef khronos_int32_t GLfixed;
-+typedef char GLchar;
-
- /* GL types for handling large vertex buffer objects */
- typedef khronos_intptr_t GLintptr;
---
-1.9.0
-
diff --git a/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch b/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch
deleted file mode 100644
index 1c8f7ee21..000000000
--- a/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-linking of test app needs libUMP
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-diff --git a/test/Makefile b/test/Makefile
-index 700416e..92085cb 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -5,7 +5,7 @@
- all: test
-
- test: ../config.mk test.c
-- $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2
-+ $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2 -lUMP
-
- clean:
- rm -f test
-
diff --git a/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch b/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch
deleted file mode 100644
index 62e1b1782..000000000
--- a/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5bf4d4f9c759fdb3c0db61a781042223236169c6 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Mon, 5 Jun 2017 12:40:16 +0200
-Subject: [PATCH] fix conflicting data types between GLES2/gl2.h and GLES/gl.h
-
-When OpenGL ES 1.1 and OpenGL ES 2.0 are used at the same time, the
-build fail since GLintptr and GLsizeiptr data type are not the same in
-GLES2/gl2.h and GLES/gl.h.
-
-Also sync the data type of GLbyte, GLubyte, GLfloat, GLclampf and
-GLfixed.
-
-Fixes:
-http://autobuild.buildroot.net/results/258/25898b45cefde9661d8ac87dd84bc883bb5283d1
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- include/GLES/gl.h | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/include/GLES/gl.h b/include/GLES/gl.h
-index a6bb591..799408b 100644
---- a/include/GLES/gl.h
-+++ b/include/GLES/gl.h
-@@ -18,22 +18,21 @@ typedef void GLvoid;
- typedef unsigned int GLenum;
- typedef unsigned char GLboolean;
- typedef unsigned int GLbitfield;
--typedef signed char GLbyte;
-+typedef khronos_int8_t GLbyte;
- typedef short GLshort;
- typedef int GLint;
- typedef int GLsizei;
--typedef unsigned char GLubyte;
-+typedef khronos_uint8_t GLubyte;
- typedef unsigned short GLushort;
- typedef unsigned int GLuint;
--typedef float GLfloat;
--typedef float GLclampf;
--typedef signed int GLfixed;
-+typedef khronos_float_t GLfloat;
-+typedef khronos_float_t GLclampf;
-+typedef khronos_int32_t GLfixed;
- typedef signed int GLclampx;
- typedef char GLchar;
-
--typedef int * GLintptr;
--typedef int * GLsizeiptr;
--
-+typedef khronos_intptr_t GLintptr;
-+typedef khronos_ssize_t GLsizeiptr;
-
- /*************************************************************/
-
---
-2.9.4
-
diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in
deleted file mode 100644
index 554ee6845..000000000
--- a/package/sunxi-mali/Config.in
+++ /dev/null
@@ -1,59 +0,0 @@
-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
- select BR2_PACKAGE_LIBUMP
- help
- Install the ARM Mali drivers for sunxi based systems (i.e
- systems based on ARM Allwinner SoCs). This driver requires
- either the sunxi-kernel with the ARM Mali driver enabled or
- the installation of the ARM Mali drivers as an external
- module.
-
- http://github.com/linux-sunxi/sunxi-mali
-
-if BR2_PACKAGE_SUNXI_MALI
-
-config BR2_PACKAGE_PROVIDES_LIBEGL
- default "sunxi-mali"
-
-config BR2_PACKAGE_PROVIDES_LIBGLES
- default "sunxi-mali"
-
-config BR2_PACKAGE_SUNXI_MALI_DBG
- bool "install malitest and maliver tools"
- help
- Install 3D triangle demo malitest application and the
- maliver application which describes the kernel module
- version.
-
-choice
- prompt "Version"
- default BR2_PACKAGE_SUNXI_MALI_R3P0
- help
- Select the version of the kernel module. For the
- sunxi-kernel, the appropriate version number is r3p0. For
- other kernels, use the maliver application to determine the
- appropriate version.
-
-config BR2_PACKAGE_SUNXI_MALI_R3P0
- bool "r3p0"
-
-config BR2_PACKAGE_SUNXI_MALI_R3P1
- bool "r3p1"
-
-endchoice
-
-endif
-
-comment "sunxi-mali needs an EABIhf glibc toolchain"
- depends on BR2_arm
- depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF
diff --git a/package/sunxi-mali/S80mali b/package/sunxi-mali/S80mali
deleted file mode 100644
index ecfbab97b..000000000
--- a/package/sunxi-mali/S80mali
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh -e
-
-install_driver() {
- DRIVER=$1
- OPTS=$2
-
- modprobe $DRIVER $OPTS
- maj=$(awk "\$2==\"${DRIVER}\" { print \$1; }" /proc/devices)
-
- rm -f /dev/${DRIVER}
-
- mknod /dev/${DRIVER} c $maj 0
- chmod 600 /dev/${DRIVER}
-}
-
-start() {
- echo "mali: starting driver"
-
- BITSPERPIXEL="$(fbset | awk '/geom/ {print $6}')"
- YRES="$(fbset | awk '/geom/ {print $3}')"
- # Set RGBA ordering to something the drivers like
- if [ "$BITSPERPIXEL" = "32" ] ; then
- fbset -rgba 8/16,8/8,8/0,8/24
- fi
- # Try to enable triple buffering when there's enough VRAM
- fbset -vyres $(( YRES*3 ))
-
- install_driver mali
- install_driver ump
-}
-
-stop() {
- echo "mali: stopping driver"
-
- rmmod ump
- rmmod mali
-}
-
-case "$1" in
-start)
- start
-;;
-stop)
- stop
-;;
-restart)
- stop
- start
-;;
-*)
- echo "mali: Please use start, stop, or restart."
- exit 1
-;;
-esac
diff --git a/package/sunxi-mali/egl.pc b/package/sunxi-mali/egl.pc
deleted file mode 100644
index 2823209a7..000000000
--- a/package/sunxi-mali/egl.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr/
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: egl
-Description: ARM Mali implementation of EGL
-Version: 1.4
-Requires:
-Libs: -L${libdir} -lEGL -lGLESv2 -lUMP
-Cflags: -I${includedir}
-
diff --git a/package/sunxi-mali/glesv2.pc b/package/sunxi-mali/glesv2.pc
deleted file mode 100644
index 4702d1394..000000000
--- a/package/sunxi-mali/glesv2.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: glesv2
-Description: ARM Mali implementation of OpenGL ESv2
-Version: 2.0
-Requires:
-Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP
-Cflags: -I${includedir}
-
diff --git a/package/sunxi-mali/sunxi-mali.hash b/package/sunxi-mali/sunxi-mali.hash
deleted file mode 100644
index 31b5990de..000000000
--- a/package/sunxi-mali/sunxi-mali.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed
-sha256 c5f58b2c0533a74f491634ddbd80d888781f4ea29ecc5c24bd7300c02bef1145 sunxi-mali-d343311efc8db166d8371b28494f0f27b6a5872.tar.gz
diff --git a/package/sunxi-mali/sunxi-mali.mk b/package/sunxi-mali/sunxi-mali.mk
deleted file mode 100644
index 90b580f5f..000000000
--- a/package/sunxi-mali/sunxi-mali.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-################################################################################
-#
-# sunxi-mali
-#
-################################################################################
-
-# last sha1 character dropped to ensure unique filename
-SUNXI_MALI_VERSION = d343311efc8db166d8371b28494f0f27b6a5872
-SUNXI_MALI_SITE = https://github.com/linux-sunxi/sunxi-mali
-SUNXI_MALI_SITE_METHOD = git
-
-# Get the sunxi-mali-proprietary libraries
-SUNXI_MALI_GIT_SUBMODULES = YES
-
-SUNXI_MALI_INSTALL_STAGING = YES
-SUNXI_MALI_DEPENDENCIES = libump
-SUNXI_MALI_PROVIDES = libegl libgles
-
-# The options below must be provided in the environment. Providing these
-# through options overrides the value and prevents the makefiles from
-# appending to these variables. This is used throughout the sunxi-mali build
-# system.
-#
-# Furthermore, the -lm -dl -lpthread options are included due to a possible bug
-# in the way the linaro 2013.06 toolchain handles shared libraries.
-SUNXI_MALI_MAKE_ENV = \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \
- $(TARGET_MAKE_ENV)
-
-SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer \
- ABI=armhf
-
-ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y)
-SUNXI_MALI_MAKE_OPTS += VERSION=r3p0
-endif
-ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P1),y)
-SUNXI_MALI_MAKE_OPTS += VERSION=r3p1
-endif
-
-define SUNXI_MALI_BUILD_CMDS
- $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) all
- $(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/version/version \
- $(@D)/version/version.c
-endef
-
-define SUNXI_MALI_INSTALL_STAGING_CMDS
- $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) \
- $(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
- # test must be built after install because it depends on headers that are
- # generated during the install above.
- $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) test
- $(INSTALL) -D -m 0644 package/sunxi-mali/egl.pc \
- $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
- $(INSTALL) -D -m 0644 package/sunxi-mali/glesv2.pc \
- $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc
-endef
-
-define SUNXI_MALI_INSTALL_TARGET_CMDS
- $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D)/lib \
- $(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
- $(if $(BR2_PACKAGE_SUNXI_MALI_DBG),
- $(INSTALL) -m 755 $(@D)/version/version $(TARGET_DIR)/usr/bin/maliver; \
- $(INSTALL) -m 755 $(@D)/test/test $(TARGET_DIR)/usr/bin/malitest
- )
-endef
-
-define SUNXI_MALI_INSTALL_INIT_SYSV
- $(INSTALL) -D -m 0755 package/sunxi-mali/S80mali \
- $(TARGET_DIR)/etc/init.d/S80mali
-endef
-
-$(eval $(generic-package))
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/3] package/libump: remove it
2019-03-06 15:24 [Buildroot] [PATCH 0/3] remove legacy sunxi-mali Francois Perrad
2019-03-06 15:24 ` [Buildroot] [PATCH 1/3] olimex_a20_olinuxino_lime_legacy_defconfig: remove it Francois Perrad
2019-03-06 15:24 ` [Buildroot] [PATCH 2/3] package/sunxi-mali: " Francois Perrad
@ 2019-03-06 15:24 ` Francois Perrad
2 siblings, 0 replies; 5+ messages in thread
From: Francois Perrad @ 2019-03-06 15:24 UTC (permalink / raw)
To: buildroot
this library was previously a part of sunxi-mali
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
Config.in.legacy | 6 ++++++
DEVELOPERS | 1 -
package/Config.in | 1 -
package/libump/Config.in | 13 -------------
package/libump/libump.hash | 2 --
package/libump/libump.mk | 13 -------------
.../xdriver_xf86-video-fbturbo.mk | 4 ----
7 files changed, 6 insertions(+), 34 deletions(-)
delete mode 100644 package/libump/Config.in
delete mode 100644 package/libump/libump.hash
delete mode 100644 package/libump/libump.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index de10703c6..030947341 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -152,6 +152,12 @@ config BR2_PACKAGE_SUNXI_MALI
help
The sunxi-mali package was removed.
+config BR2_PACKAGE_LIBUMP
+ bool "libump package removed"
+ select BR2_LEGACY
+ help
+ The libump package was removed.
+
###############################################################################
comment "Legacy options removed in 2019.02"
diff --git a/DEVELOPERS b/DEVELOPERS
index 9ab39185f..335f11f2d 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -827,7 +827,6 @@ F: package/ficl/
F: package/gdbm/
F: package/libtomcrypt/
F: package/libtommath/
-F: package/libump/
F: package/linenoise/
F: package/ljlinenoise/
F: package/lpeg/
diff --git a/package/Config.in b/package/Config.in
index 9c723315c..f8f96a872 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -453,7 +453,6 @@ endmenu
source "package/kbd/Config.in"
source "package/lcdproc/Config.in"
source "package/libuio/Config.in"
- source "package/libump/Config.in"
source "package/linuxconsoletools/Config.in"
source "package/linux-backports/Config.in"
source "package/lirc-tools/Config.in"
diff --git a/package/libump/Config.in b/package/libump/Config.in
deleted file mode 100644
index 696ccf3b1..000000000
--- a/package/libump/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_LIBUMP
- bool "libump"
- depends on BR2_TOOLCHAIN_USES_GLIBC
- depends on BR2_arm
- help
- The ARMs Universal Memory Provider userspace library.
- This library is a requirement for ARMs binary Mali driver.
-
- http://github.com/linux-sunxi/libump
-
-comment "libump needs a glibc toolchain"
- depends on BR2_arm
- depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/libump/libump.hash b/package/libump/libump.hash
deleted file mode 100644
index 5d2ad2eb3..000000000
--- a/package/libump/libump.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# locally computed
-sha256 745bbb3e6a6b2b1d8caec75d2f2e884691ceefa5c2be0480baed31dba66cf450 libump-ec0680628744f30b8fac35e41a7bd8e23e59c39f.tar.gz
diff --git a/package/libump/libump.mk b/package/libump/libump.mk
deleted file mode 100644
index 65012ffd1..000000000
--- a/package/libump/libump.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# libump
-#
-################################################################################
-
-LIBUMP_VERSION = ec0680628744f30b8fac35e41a7bd8e23e59c39f
-LIBUMP_SITE = $(call github,linux-sunxi,libump,$(LIBUMP_VERSION))
-LIBUMP_LICENSE = Apache-2.0
-LIBUMP_AUTORECONF = YES
-LIBUMP_INSTALL_STAGING = YES
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
index 58a70416d..049a2b5be 100644
--- a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
+++ b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
@@ -21,10 +21,6 @@ else
XDRIVER_XF86_VIDEO_FBTURBO_CONF_OPTS += --disable-pciaccess
endif
-ifeq ($(BR2_PACKAGE_LIBUMP),y)
-XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libump
-endif
-
define XDRIVER_XF86_VIDEO_FBTURBO_INSTALL_CONF_FILE
$(INSTALL) -m 0644 -D $(@D)/xorg.conf $(TARGET_DIR)/etc/X11/xorg.conf
endef
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/3] olimex_a20_olinuxino_lime_legacy_defconfig: remove it
2019-03-06 15:24 ` [Buildroot] [PATCH 1/3] olimex_a20_olinuxino_lime_legacy_defconfig: remove it Francois Perrad
@ 2019-03-15 22:20 ` Thomas Petazzoni
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2019-03-15 22:20 UTC (permalink / raw)
To: buildroot
Hello Fran?ois,
On Wed, 6 Mar 2019 16:24:24 +0100
Francois Perrad <fperrad@gmail.com> wrote:
> The old 3.4 Linux kernel used by this defconfig doesn't build with gcc 7.x
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> board/olimex/a20_olinuxino/boot-legacy.cmd | 5 --
> board/olimex/a20_olinuxino/post-build.sh | 5 --
> board/olimex/a20_olinuxino/readme.txt | 7 ---
> ...olimex_a20_olinuxino_lime_legacy_defconfig | 56 -------------------
> 4 files changed, 73 deletions(-)
> delete mode 100644 board/olimex/a20_olinuxino/boot-legacy.cmd
> delete mode 100644 configs/olimex_a20_olinuxino_lime_legacy_defconfig
Thanks, I've applied the series, after improving a bit the text in
Config.in.legacy.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-15 22:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-06 15:24 [Buildroot] [PATCH 0/3] remove legacy sunxi-mali Francois Perrad
2019-03-06 15:24 ` [Buildroot] [PATCH 1/3] olimex_a20_olinuxino_lime_legacy_defconfig: remove it Francois Perrad
2019-03-15 22:20 ` Thomas Petazzoni
2019-03-06 15:24 ` [Buildroot] [PATCH 2/3] package/sunxi-mali: " Francois Perrad
2019-03-06 15:24 ` [Buildroot] [PATCH 3/3] package/libump: " Francois Perrad
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox