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

Commit 3517076e authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "AndroidKernel: Add configuration for the LLVM path"

parents 7b1b746a 90461c5c

AndroidKernel.mk

+14 −0
Original line number Diff line number Diff line
@@ -51,6 +51,20 @@ else 
KERNEL_CROSS_COMPILE := $(shell pwd)/$(TARGET_TOOLS_PREFIX)

endif



ifeq ($(KERNEL_LLVM_SUPPORT), true)

  ifeq ($(KERNEL_SD_LLVM_SUPPORT), true)  #Using sd-llvm compiler

    ifeq ($(shell echo $(SDCLANG_PATH_2) | head -c 1),/)

       KERNEL_LLVM_BIN := $(shell pwd)/$(SDCLANG_PATH_2)/clang

    else

       KERNEL_LLVM_BIN := $(shell pwd)/$(SDCLANG_PATH_2)/clang

    endif

    $(warning "Using sdllvm" $(KERNEL_LLVM_BIN))

  else

     KERNEL_LLVM_BIN := $(shell pwd)/$(CLANG) #Using aosp-llvm compiler

    $(warning "Using aosp-llvm" $(KERNEL_LLVM_BIN))

  endif

endif



ifeq ($(TARGET_PREBUILT_KERNEL),)



KERNEL_GCC_NOANDROID_CHK := $(shell (echo "int main() {return 0;}" | $(KERNEL_CROSS_COMPILE)gcc -E -mno-android - > /dev/null 2>&1 ; echo $$?))

drivers/media/platform/msm/vidc/venus_hfi.c

+2 −2
Original line number Diff line number Diff line
@@ -3687,7 +3687,7 @@ static inline int __init_clocks(struct venus_hfi_device *device) 
static int __handle_reset_clk(struct msm_vidc_platform_resources *res,

			enum reset_state state)

{

	int rc = 0;

	int rc = 0, i;

	struct reset_control *rst;

	struct reset_set *rst_set = &res->reset_set;
@@ -3695,7 +3695,7 @@ static int __handle_reset_clk(struct msm_vidc_platform_resources *res, 
		return 0;



	dprintk(VIDC_DBG, "%s reset_state %d\n", __func__, state);

	for (int i = 0; i < rst_set->count; i++) {

	for (i = 0; i < rst_set->count; i++) {

		rst = rst_set->reset_tbl[i].rst;

		switch (state) {

		case INIT: