diff options
| author | Raghu Gandham <raghu@mips.com> | 2012-07-25 19:57:22 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-08-10 09:15:38 -0700 |
| commit | 8da4310646da498255173b475915aa066de4200a (patch) | |
| tree | 3dbc12358b1ca21fcb5cd7fd1f9e28ccdc5bd97f /core | |
| parent | 6e6d92c47acbb976ce47ae4d90406fa56ea68a3a (diff) | |
| download | build-8da4310646da498255173b475915aa066de4200a.zip build-8da4310646da498255173b475915aa066de4200a.tar.gz build-8da4310646da498255173b475915aa066de4200a.tar.bz2 | |
MIPS support to *.mk files and envsetup.sh
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/config.mk | 3 | ||||
| -rw-r--r-- | core/dumpvar.mk | 7 | ||||
| -rw-r--r-- | core/envsetup.mk | 9 | ||||
| -rw-r--r-- | core/user_tags.mk | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/core/config.mk b/core/config.mk index b0b5082..03e4245 100644 --- a/core/config.mk +++ b/core/config.mk @@ -148,6 +148,9 @@ ifneq ($(words $(board_config_mk)),1) $(error Multiple board config files for TARGET_DEVICE $(TARGET_DEVICE): $(board_config_mk)) endif include $(board_config_mk) +ifeq ($(TARGET_ARCH),) + $(error TARGET_ARCH not defined by board config: $(board_config_mk)) +endif TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk))) board_config_mk := diff --git a/core/dumpvar.mk b/core/dumpvar.mk index d481742..5298f35 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -23,6 +23,13 @@ else ifeq ($(TARGET_ARCH),x86) ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin endif endif + +# Add the mips toolchain bin dir if it actually exists +ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-4.6/bin),) + # this should be copied to HOST_OUT_EXECUTABLES instead + ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-4.6/bin +endif + ANDROID_BUILD_PATHS := $(ABP) ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG) ANDROID_GCC_PREBUILTS := prebuilts/gcc/$(HOST_PREBUILT_TAG) diff --git a/core/envsetup.mk b/core/envsetup.mk index 74e9100..ce222a9 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -33,7 +33,7 @@ endif # --------------------------------------------------------------- # Set up configuration for host machine. We don't do cross- -# compiles except for arm, so the HOST is whatever we are +# compiles except for arm/mips, so the HOST is whatever we are # running on UNAME := $(shell uname -sm) @@ -124,13 +124,10 @@ endif # Set up configuration for target machine. # The following must be set: # TARGET_OS = { linux } -# TARGET_ARCH = { arm | x86 } +# TARGET_ARCH = { arm | x86 | mips } - -ifeq ($(TARGET_ARCH),) -TARGET_ARCH := arm -endif TARGET_OS := linux +# TARGET_ARCH should be set by BoardConfig.mk and will be checked later # the target build type defaults to release ifneq ($(TARGET_BUILD_TYPE),debug) diff --git a/core/user_tags.mk b/core/user_tags.mk index 24f563d..e13969c 100644 --- a/core/user_tags.mk +++ b/core/user_tags.mk @@ -112,6 +112,7 @@ GRANDFATHERED_USER_MODULES += \ emmalib \ emulator \ emulator-arm \ + emulator-mips \ emulator-core \ emulator-elff \ emulator-hw \ @@ -209,6 +210,7 @@ GRANDFATHERED_USER_MODULES += \ libebl \ libebl_arm \ libebl_sh \ + libebl_mips \ libedify \ libeffects \ libEGL \ |