Skip to contentSkip to conversation

remove legacy sunxi-mali

PATCH New Francois Perrad 2 participants 5 messages Mar 6, 2019 – Mar 15, 2019 Arm/Allwinner sunXi SoC support

lore
Share & tools
lore
#0 lore raw

cover remove legacy sunxi-mali

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
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 olimex_a20_olinuxino_lime_legacy_defconfig: remove it

The old 3.4 Linux kernel used by this defconfig doesn't build with gcc 7.x

---
 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
board/olimex/a20_olinuxino/boot-legacy.cmd deleted +0 -5
deleted file mode 100644
index 9fa5d6541..000000000
@@ -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
board/olimex/a20_olinuxino/post-build.sh +0 -5
index 7a8a42746..d3f612f81 100755
@@ -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
board/olimex/a20_olinuxino/readme.txt +0 -7
index 57ee23d14..504483b51 100644
@@ -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)
configs/olimex_a20_olinuxino_lime_legacy_defconfig deleted +0 -56

56 lines not on this page · raw message

Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/3 olimex_a20_olinuxino_lime_legacy_defconfig: remove it

Hello Fran?ois,

Quoted 11 lines · On Wed, 6 Mar 2019 16:24:24 +0100 Francois Perrad <[email protected]> wrote:

The old 3.4 Linux kernel used by this defconfig doesn't build with gcc 7.x

---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/3 package/sunxi-mali: remove it

In reply to Francois Perrad

The package sunxi-mali-mainline is available for recent kernels.

---
 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
Config.in.legacy +10 -0
index 25b48fba8..de10703c6 100644
@@ -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"
DEVELOPERS +0 -1
index f9b6a0e7d..9ab39185f 100644
@@ -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 <[email protected]>
package/Config.in +0 -1
index cc232b9fb..9c723315c 100644
@@ -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"
package/qt5/qt5base/qt5base.mk +1 -1
index e7f6e658f..14536980a 100644
@@ -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
package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch deleted +0 -45

45 lines not on this page · raw message

package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch deleted +0 -18
deleted file mode 100644
index 1c8f7ee21..000000000
@@ -1,18 +0,0 @@
-linking of test app needs libUMP
-
-Signed-off-by: Francois Perrad <[email protected]>
-
-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
-
package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch deleted +0 -57

57 lines not on this page · raw message

package/sunxi-mali/Config.in deleted +0 -59

59 lines not on this page · raw message

package/sunxi-mali/S80mali deleted +0 -54

54 lines not on this page · raw message

package/sunxi-mali/egl.pc deleted +0 -12
deleted file mode 100644
index 2823209a7..000000000
@@ -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}
-
package/sunxi-mali/glesv2.pc deleted +0 -12
deleted file mode 100644
index 4702d1394..000000000
@@ -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}
-
package/sunxi-mali/sunxi-mali.hash deleted +0 -2
deleted file mode 100644
index 31b5990de..000000000
@@ -1,2 +0,0 @@
-# Locally computed
-sha256 c5f58b2c0533a74f491634ddbd80d888781f4ea29ecc5c24bd7300c02bef1145  sunxi-mali-d343311efc8db166d8371b28494f0f27b6a5872.tar.gz
package/sunxi-mali/sunxi-mali.mk deleted +0 -73

73 lines not on this page · raw message

Signature · 1 line
2.17.1
#4 lore raw

PATCH 3/3 package/libump: remove it

In reply to Francois Perrad

this library was previously a part of sunxi-mali

---
 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
Config.in.legacy +6 -0
index de10703c6..030947341 100644
@@ -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"
DEVELOPERS +0 -1
index 9ab39185f..335f11f2d 100644
@@ -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/
package/Config.in +0 -1
index 9c723315c..f8f96a872 100644
@@ -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"
package/libump/Config.in deleted +0 -13
deleted file mode 100644
index 696ccf3b1..000000000
@@ -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
package/libump/libump.hash deleted +0 -2
deleted file mode 100644
index 5d2ad2eb3..000000000
@@ -1,2 +0,0 @@
-# locally computed
-sha256  745bbb3e6a6b2b1d8caec75d2f2e884691ceefa5c2be0480baed31dba66cf450  libump-ec0680628744f30b8fac35e41a7bd8e23e59c39f.tar.gz
package/libump/libump.mk deleted +0 -13
deleted file mode 100644
index 65012ffd1..000000000
@@ -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))
package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk +0 -4
index 58a70416d..049a2b5be 100644
@@ -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
Signature · 1 line
2.17.1