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

Commit c2c1d803 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents 9d8b59fb 2d284aec

core/combo/arch/arm/armv7-a-neon.mk

+8 −9
Original line number Diff line number Diff line
@@ -7,24 +7,24 @@ ARCH_ARM_HAVE_VFP_D32 := true 
ARCH_ARM_HAVE_NEON              := true



ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait))

	arch_variant_cflags := -mcpu=cortex-a15

	arch_variant_cflags := -mcpu=cortex-a15 -mfpu=neon-vfpv4

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a9)

	arch_variant_cflags := -mcpu=cortex-a9

	arch_variant_cflags := -mcpu=cortex-a9 -mfpu=neon

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a8)

	arch_variant_cflags := -mcpu=cortex-a8

	arch_variant_cflags := -mcpu=cortex-a8 -mfpu=neon

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a7)

	arch_variant_cflags := -mcpu=cortex-a7

	arch_variant_cflags := -mcpu=cortex-a7 -mfpu=neon-vfpv4

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a5)

	arch_variant_cflags := -mcpu=cortex-a5

	arch_variant_cflags := -mcpu=cortex-a5 -mfpu=neon-vfpv4

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),scorpion)

	arch_variant_cflags := -mcpu=cortex-a8

	arch_variant_cflags := -mcpu=cortex-a8 -mfpu=neon

else

	arch_variant_cflags := -march=armv7-a

	arch_variant_cflags := -march=armv7-a -mfpu=neon

endif

endif

endif
@@ -33,8 +33,7 @@ endif 
endif



arch_variant_cflags += \

    -mfloat-abi=softfp \

    -mfpu=neon

    -mfloat-abi=softfp



arch_variant_ldflags := \

	-Wl,--fix-cortex-a8

core/config.mk

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ comma := , 
# only has an effect on python 2.6 and above.

export PYTHONDONTWRITEBYTECODE := 1



-include $(TOPDIR)vendor/extra/extra_config.mk



# Standard source directories.

SRC_DOCS:= $(TOPDIR)docs

# TODO: Enforce some kind of layering; only add include paths
@@ -158,6 +156,7 @@ ifneq ($(words $(board_config_mk)),1) 
  $(error Multiple board config files for TARGET_DEVICE $(TARGET_DEVICE): $(board_config_mk))

endif

include $(board_config_mk)

-include vendor/extra/BoardConfigExtra.mk

ifeq ($(TARGET_ARCH),)

  $(error TARGET_ARCH not defined by board config: $(board_config_mk))

endif

core/dumpvar.mk

+4 −0
Original line number Diff line number Diff line
@@ -106,5 +106,9 @@ $(info HOST_OS_EXTRA=$(HOST_OS_EXTRA)) 
$(info   HOST_BUILD_TYPE=$(HOST_BUILD_TYPE))

$(info   BUILD_ID=$(BUILD_ID))

$(info   OUT_DIR=$(OUT_DIR))

ifeq ($(CYNGN_TARGET),true)

$(info   CYNGN_TARGET=$(CYNGN_TARGET))

$(info   CYNGN_FEATURES=$(CYNGN_FEATURES))

endif

$(info ============================================)

endif

core/main.mk

+0 −4
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ include $(BUILD_SYSTEM)/qcom_utils.mk 
# Include the google-specific config

-include vendor/google/build/config.mk



# Include the extra device config

-include vendor/extra/device.mk



VERSION_CHECK_SEQUENCE_NUMBER := 3

-include $(OUT_DIR)/versions_checked.mk

ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
@@ -486,7 +483,6 @@ GET-INSTALL-PATH: 
		echo 'INSTALL-PATH: $(m) $(ALL_MODULES.$(m).INSTALLED)';))



else # ONE_SHOT_MAKEFILE



ifneq ($(dont_bother),true)

#

# Include all of the makefiles in the system

core/qcom_target.mk

+19 −0
Original line number Diff line number Diff line
@@ -18,4 +18,23 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) 
            TARGET_GLOBAL_CPPFLAGS += -DQCOM_DIRECTTRACK

        endif

    endif



    # This is the list of all supported QCOM variants.

    qcom_variant_list := audio camera display gps media sensors



    # Set the QCOM_*_PATH variables for each variant.

    #   $1 = Upper case name for variable name

    #   $2 = Lower case name for variable value (pathname)

    define qcom_variant_path

    $(strip \

        $(if $(TARGET_QCOM_$(1)_VARIANT), \

            hardware/qcom/$(2)-$(TARGET_QCOM_$(1)_VARIANT), \

            hardware/qcom/$(2)))

    endef

    $(foreach variant, \

        $(qcom_variant_list), \

        $(eval ln:=$(shell echo $(variant) | tr [A-Z] [a-z])) \

        $(eval un:=$(shell echo $(variant) | tr [a-z] [A-Z])) \

        $(eval QCOM_$(un)_PATH:=$(call qcom_variant_path,$(un),$(ln))))



endif