Permalink
Browse files

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>
  • Loading branch information...
1 parent 4834e00 commit 0809383f9d3ee2575da52262a639ddd6464a641f @libv libv committed Sep 12, 2013
Showing with 10 additions and 4 deletions.
  1. +2 −2 Makefile.config
  2. +1 −1 README
  3. +2 −0 include/ump/Makefile
  4. +1 −1 lib/mali
  5. +2 −0 lib/ump/Makefile
  6. +2 −0 version/version.c
View
@@ -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
View
2 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
View
@@ -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)")
View
@@ -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 \
View
@@ -51,6 +51,8 @@ static struct {
{14, "r3p0"},
{17, "r3p1"},
{19, "r3p2"},
+ {20, "r3p2-01rel1"}, /* and r3p2-01rel2 */
+ {23, "r3p2-01rel3"},
{0, NULL},
};

0 comments on commit 0809383

Please sign in to comment.