Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8da43106 authored by Raghu Gandham's avatar Raghu Gandham Committed by Jean-Baptiste Queru
Browse files

MIPS support to *.mk files and envsetup.sh 



Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: default avatarChris Dearman <chris@mips.com>
Signed-off-by: default avatarRaghu Gandham <raghu@mips.com>
parent 6e6d92c4

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -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 :=

core/dumpvar.mk

+7 −0
Original line number Diff line number Diff line
@@ -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)

core/envsetup.mk

+3 −6
Original line number Diff line number Diff line
@@ -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)

core/user_tags.mk

+2 −0
Original line number Diff line number Diff line
@@ -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 \

envsetup.sh

+16 −3
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ function setpaths() 
            ;;

        arm) toolchaindir=arm/arm-linux-androideabi-4.6/bin

            ;;

        mips) toolchaindir=mips/mipsel-linux-android-4.6/bin

            ;;

        *)

            echo "Can't find toolchain for unknown architecture: $ARCH"

            toolchaindir=xxxxxxxxx
@@ -140,6 +142,8 @@ function setpaths() 
                 ARM_EABI_TOOLCHAIN_PATH=":$gccprebuiltdir/$toolchaindir"

            fi

            ;;

        mips) toolchaindir=mips/mips-eabi-4.4.3/bin

            ;;

        *)

            # No need to set ARM_EABI_TOOLCHAIN for other ARCHs

            ;;
@@ -203,13 +207,14 @@ function set_sequence_number() 
function settitle()

{

    if [ "$STAY_OFF_MY_LAWN" = "" ]; then

        local arch=$(gettargetarch)

        local product=$TARGET_PRODUCT

        local variant=$TARGET_BUILD_VARIANT

        local apps=$TARGET_BUILD_APPS

        if [ -z "$apps" ]; then

            export PROMPT_COMMAND="echo -ne \"\033]0;[${product}-${variant}] ${USER}@${HOSTNAME}: ${PWD}\007\""

            export PROMPT_COMMAND="echo -ne \"\033]0;[${arch}-${product}-${variant}] ${USER}@${HOSTNAME}: ${PWD}\007\""

        else

            export PROMPT_COMMAND="echo -ne \"\033]0;[$apps $variant] ${USER}@${HOSTNAME}: ${PWD}\007\""

            export PROMPT_COMMAND="echo -ne \"\033]0;[$arch $apps $variant] ${USER}@${HOSTNAME}: ${PWD}\007\""

        fi

    fi

}
@@ -416,6 +421,7 @@ function add_lunch_combo() 
add_lunch_combo full-eng

add_lunch_combo full_x86-eng

add_lunch_combo vbox_x86-eng

add_lunch_combo full_mips-eng



function print_lunch_menu()

{
@@ -738,6 +744,7 @@ function gdbclient() 
   case "$ARCH" in

       x86) GDB=i686-linux-android-gdb;;

       arm) GDB=arm-linux-androideabi-gdb;;

       mips) GDB=mipsel-linux-android-gdb;;

       *) echo "Unknown arch $ARCH"; return 1;;

   esac
@@ -804,6 +811,11 @@ case `uname -s` in 
        ;;

esac



function gettargetarch

{

    get_build_var TARGET_ARCH

}



function jgrep()

{

    find . -name .repo -prune -o -name .git -prune -o  -type f -name "*\.java" -print0 | xargs -0 grep --color -n "$@"
@@ -859,7 +871,8 @@ function tracedmdump() 
        return

    fi

    local prebuiltdir=$(getprebuilt)

    local KERNEL=$T/prebuilt/android-arm/kernel/vmlinux-qemu

    local arch=$(gettargetarch)

    local KERNEL=$T/prebuilts/qemu-kernel/$arch/vmlinux-qemu



    local TRACE=$1

    if [ ! "$TRACE" ] ; then