summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuc Verhaegen <libv@skynet.be>2013-09-12 20:14:43 +0400
committerLuc Verhaegen <libv@skynet.be>2013-09-12 20:14:43 +0400
commit0809383f9d3ee2575da52262a639ddd6464a641f (patch)
treeb6b8aa4f43d10e2233f075f1eb4965f0d881f6b2
parent4834e0087d0faf27586dc022ef935eba04ce98b4 (diff)
downloadsunxi-mali-0809383f9d3ee2575da52262a639ddd6464a641f.tar.xz
fix versioning of r3p2 binaries
These are r3p2-01rel1 binaries. Version tool now knows about newer versions as well. Signed-off-by: Luc Verhaegen <libv@skynet.be>
-rw-r--r--Makefile.config4
-rw-r--r--README2
-rw-r--r--include/ump/Makefile2
m---------lib/mali0
-rw-r--r--lib/ump/Makefile2
-rw-r--r--version/version.c2
6 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.config b/Makefile.config
index 790791e..45fe791 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -50,10 +50,10 @@ endif
ifeq ($(VERSION),r2p4)
else ifeq ($(VERSION),r3p0)
else ifeq ($(VERSION),r3p1)
-else ifeq ($(VERSION),r3p2)
+else ifeq ($(VERSION),r3p2-01rel1)
else
$(warning Unknown/unhandled Mali Version "$(VERSION)")
- $(warning Use VERSION=(r2p4,r3p0,r3p1,r3p2) instead)
+ $(warning Use VERSION=(r2p4,r3p0,r3p1,r3p2-01rel1) instead)
$(error Unknown/unhandled Mali Version "$(VERSION)")
endif
diff --git a/README b/README
index 541112e..5755de3 100644
--- a/README
+++ b/README
@@ -60,7 +60,7 @@ binaries need to be installed. It will use the utility in version/ to query the
kernel driver for its version. So please make sure to run this on the target
system with the mali kernel driver loaded. The mali driver version can be
overridden when configuring with the VERSION= argument. Possible values are
-currently 'r2p4', 'r3p0', 'r3p1' and 'r3p2'.
+currently 'r2p4', 'r3p0', 'r3p1', and 'r3p2-01rel1' (which also supports rel2).
The build system will try to determine which of the 'armel' of 'armhf'
toolchains your system uses, so that the correct binaries can be installed. This
diff --git a/include/ump/Makefile b/include/ump/Makefile
index 91d0e00..82b0c78 100644
--- a/include/ump/Makefile
+++ b/include/ump/Makefile
@@ -12,6 +12,8 @@ else ifeq ($(MALI_VERSION),r3p1)
UMP_VERSION = 3
else ifeq ($(MALI_VERSION),r3p2)
UMP_VERSION = 3
+else ifeq ($(MALI_VERSION),r3p2-01rel1)
+ UMP_VERSION = 3
else
# should've been caught when setting up config.mk.
$(error Unknown/unhandled Mali Version "$(MALI_VERSION)")
diff --git a/lib/mali b/lib/mali
-Subproject 856b04dd16655e8fe1ab3b20536be3cc179da83
+Subproject 95b2aee796eb22ce6b5c4a07d545b804ec1bacf
diff --git a/lib/ump/Makefile b/lib/ump/Makefile
index 7c92045..c3da96b 100644
--- a/lib/ump/Makefile
+++ b/lib/ump/Makefile
@@ -19,6 +19,8 @@ else ifeq ($(MALI_VERSION),r3p1)
TARGET = $(BARE_TARGET).3
else ifeq ($(MALI_VERSION),r3p2)
TARGET = $(BARE_TARGET).3
+else ifeq ($(MALI_VERSION),r3p2-01rel1)
+ TARGET = $(BARE_TARGET).3
endif
OBJECTS = ump_frontend.o \
diff --git a/version/version.c b/version/version.c
index 07767db..1b7651a 100644
--- a/version/version.c
+++ b/version/version.c
@@ -51,6 +51,8 @@ static struct {
{14, "r3p0"},
{17, "r3p1"},
{19, "r3p2"},
+ {20, "r3p2-01rel1"}, /* and r3p2-01rel2 */
+ {23, "r3p2-01rel3"},
{0, NULL},
};