Commit 0b4f0420 authored by d0n (d0n@d0nmachine)'s avatar d0n (d0n@d0nmachine)
Browse files

removed Android files 

Change-Id: I8608c7a0061941bea9c5e0d1075b9cca0f4a50eb
parent b3a01c9b

proprietary/bootable/bootloader/lk/Android.mk

deleted100755 → 0
+0 −62
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

LK_ROOT_DIR := $(PWD)

HOST_OS ?= $(shell uname | tr '[A-Z]' '[a-z]')

export HOST_OS LCM_WIDTH LCM_HEIGHT



ifdef LK_PROJECT

    LK_DIR := $(LOCAL_PATH)

    INSTALLED_LK_TARGET := $(PRODUCT_OUT)/lk.bin 

    INSTALLED_LOGO_TARGET := $(PRODUCT_OUT)/logo.bin



  ifeq ($(wildcard $(TARGET_PREBUILT_LK)),)

    TARGET_LK_OUT ?= $(if $(filter /% ~%,$(TARGET_OUT_INTERMEDIATES)),,$(LK_ROOT_DIR)/)$(TARGET_OUT_INTERMEDIATES)/BOOTLOADER_OBJ

    BUILT_LK_TARGET := $(TARGET_LK_OUT)/build-$(LK_PROJECT)/lk.bin

    ifeq ($(LK_CROSS_COMPILE),)

    ifeq ($(TARGET_ARCH), arm)

#      LK_CROSS_COMPILE := $(LK_ROOT_DIR)/$(TARGET_TOOLS_PREFIX)

    else ifeq ($(TARGET_2ND_ARCH), arm)

#      LK_CROSS_COMPILE := $(LK_ROOT_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_TOOLS_PREFIX)

    endif

    endif

    LK_MAKE_OPTION := $(if $(SHOW_COMMANDS),NOECHO=) $(if $(LK_CROSS_COMPILE),TOOLCHAIN_PREFIX=$(LK_CROSS_COMPILE)) BOOTLOADER_OUT=$(TARGET_LK_OUT) ROOTDIR=$(LK_ROOT_DIR)



$(BUILT_LK_TARGET): FORCE

	$(hide) mkdir -p $(dir $@)

	$(MAKE) -C $(LK_DIR) $(LK_MAKE_OPTION) $(LK_PROJECT)



$(TARGET_PREBUILT_LK): $(BUILT_LK_TARGET)

	$(hide) mkdir -p $(dir $@)

	$(hide) cp -f $(BUILT_LK_TARGET) $@

	$(hide) cp -f $(dir $(BUILT_LK_TARGET))logo.bin $(dir $@)logo.bin



  else

    BUILT_LK_TARGET := $(TARGET_PREBUILT_LK)

  endif#TARGET_PREBUILT_LK



$(INSTALLED_LK_TARGET): $(BUILT_LK_TARGET)

	$(hide) mkdir -p $(dir $@)

	$(hide) cp -f $(BUILT_LK_TARGET) $(INSTALLED_LK_TARGET)



$(INSTALLED_LOGO_TARGET): $(BUILT_LK_TARGET)

	$(hide) mkdir -p $(dir $@)

	$(hide) cp -f $(dir $(BUILT_LK_TARGET))logo.bin $(INSTALLED_LOGO_TARGET)



.PHONY: lk save-lk clean-lk

droidcore: $(INSTALLED_LK_TARGET) $(INSTALLED_LOGO_TARGET)

lk: $(INSTALLED_LK_TARGET) $(INSTALLED_LOGO_TARGET)

save-lk: $(TARGET_PREBUILT_LK)



clean-lk:

	$(hide) rm -rf $(INSTALLED_LK_TARGET) $(INSTALLED_LOGO_TARGET) $(TARGET_LK_OUT)



droid: check-lk-config

check-mtk-config: check-lk-config

check-lk-config:

ifneq (yes,$(strip $(DISABLE_MTK_CONFIG_CHECK)))

	python device/mediatek/build/build/tools/check_kernel_config.py -c $(MTK_TARGET_PROJECT_FOLDER)/ProjectConfig.mk -l $(LK_DIR)/project/$(LK_PROJECT).mk -p $(MTK_PROJECT_NAME)

else

	-python device/mediatek/build/build/tools/check_kernel_config.py -c $(MTK_TARGET_PROJECT_FOLDER)/ProjectConfig.mk -l $(LK_DIR)/project/$(LK_PROJECT).mk -p $(MTK_PROJECT_NAME)

endif





endif#LK_PROJECT

proprietary/bootable/bootloader/lk/platform/mt6757/atags.c

+6 −6
Original line number Diff line number Diff line
@@ -548,14 +548,14 @@ int target_fdt_model(void *fdt) 
	const struct fdt_property *prop;

	char *prop_name = "model";

	const char *mali_model_name[] = {

		"MT8163",

		"MT8163",

		"MT8163",

		"MT6757",

		"MT6757",

		"MT6757",

	};

	const char *sph_model_name[] = {

		"MT8163S",

		"MT8163S",

		"MT8163S",

		"MT6757S",

		"MT6757S",

		"MT6757S",

	};



	if (code > code_max)

proprietary/bootable/bootloader/lk/platform/mt6757/include/platform/msdc.h

+2 −2
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ 




/*

  *  This definition is used for MT8163_GPIO_RegMap.doc by fengguo.gao 

  *  This definition is used for MT6757_GPIO_RegMap.doc by fengguo.gao 

  *  Zhanyong.Wang

  *  2014/11/28

  */
@@ -1517,7 +1517,7 @@ typedef enum __MSDC_PIN_STATE { 
}MSDC_PIN_STATE;



/*

  *  this definition is used for MT8163_GPIO_RegMap.doc by Sander.Lin 

  *  this definition is used for MT6757_GPIO_RegMap.doc by Sander.Lin 

  *  Zhanyong.Wang

  *  2014/12/14

  */

proprietary/bootable/bootloader/lk/platform/mt6757/mmc_core.c

+3 −3
Original line number Diff line number Diff line
@@ -3550,10 +3550,10 @@ u32 mmc_is_exist(u32 id) 
#define EFUSE_M_HW2_RES0                0x000061C0

#define EFUSE_EMMC_MSDC3_DIS            (1ul <<  7)

#define EFUSE_EMMC_MSDC0_DIS            (1ul <<  6)

#define MT8163_IO_READ32(addr, index)   (*(volatile unsigned int*)((addr) + (index)))

#define MT6757_IO_READ32(addr, index)   (*(volatile unsigned int*)((addr) + (index)))



#define EFUSE_EMMC_MSDC3_IsDisabled()   (!!(MT8163_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC3_DIS))

#define EFUSE_EMMC_MSDC0_IsDisabled()   (!!(MT8163_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC0_DIS))

#define EFUSE_EMMC_MSDC3_IsDisabled()   (!!(MT6757_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC3_DIS))

#define EFUSE_EMMC_MSDC0_IsDisabled()   (!!(MT6757_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC0_DIS))

#endif

u32 mmc_whoami(void)

{

proprietary/bootable/bootloader/preloader/Android.mk

deleted100755 → 0
+0 −72
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

PRELOADER_ROOT_DIR := $(PWD)



ifdef PRELOADER_TARGET_PRODUCT

    PRELOADER_DIR := $(LOCAL_PATH)

    PRELOADER_OUT ?= $(if $(filter /% ~%,$(TARGET_OUT_INTERMEDIATES)),,$(PRELOADER_ROOT_DIR)/)$(TARGET_OUT_INTERMEDIATES)/PRELOADER_OBJ

  ifdef PL_MODE

    INSTALLED_PRELOADER_TARGET := $(PRODUCT_OUT)/preloader_$(PRELOADER_TARGET_PRODUCT).bin

    BUILT_PRELOADER_TARGET := $(PRELOADER_OUT)/bin/preloader_$(PRELOADER_TARGET_PRODUCT)_$(PL_MODE).bin

  else

    INSTALLED_PRELOADER_TARGET := $(PRODUCT_OUT)/preloader_$(PRELOADER_TARGET_PRODUCT).bin

    BUILT_PRELOADER_TARGET := $(PRELOADER_OUT)/bin/preloader_$(PRELOADER_TARGET_PRODUCT).bin

  endif

    ifeq ($(LK_CROSS_COMPILE),)

    ifeq ($(TARGET_ARCH), arm)

#      PRELOADER_CROSS_COMPILE := $(PRELOADER_ROOT_DIR)/$(TARGET_TOOLS_PREFIX)

    else ifeq ($(TARGET_2ND_ARCH), arm)

#      PRELOADER_CROSS_COMPILE := $(PRELOADER_ROOT_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_TOOLS_PREFIX)

    endif

    endif



ifneq (MT8127,$(strip $(MTK_PLATFORM)))

    PRELOADER_CROSS_COMPILE := $(CURDIR)/prebuilts/gcc/$(HOST_OS)-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-

else

    PRELOADER_CROSS_COMPILE := $(CURDIR)/prebuilts/gcc/$(HOST_OS)-x86/arm/arm-eabi-4.8/bin/arm-eabi-

endif

    PRELOADER_MAKE_OPTION := $(if $(SHOW_COMMANDS),,-s) -f Makefile $(if $(PRELOADER_CROSS_COMPILE),CROSS_COMPILE=$(PRELOADER_CROSS_COMPILE)) PRELOADER_OUT=$(PRELOADER_OUT) MTK_PROJECT=$(PRELOADER_TARGET_PRODUCT) TOOL_PATH=$(PRELOADER_ROOT_DIR)/device/mediatek/build/build/tools ROOTDIR=$(PRELOADER_ROOT_DIR)



  ifeq ($(wildcard $(TARGET_PREBUILT_PRELOADER)),)

$(BUILT_PRELOADER_TARGET): FORCE

	$(hide) mkdir -p $(dir $@)

	$(MAKE) -C $(PRELOADER_DIR) $(PRELOADER_MAKE_OPTION)



$(TARGET_PREBUILT_PRELOADER): $(BUILT_PRELOADER_TARGET) | $(ACP)

	$(copy-file-to-target)



  else

    BUILT_PRELOADER_TARGET := $(TARGET_PREBUILT_PRELOADER)

  endif#TARGET_PREBUILT_PRELOADER



  ifneq ($(INSTALLED_PRELOADER_TARGET),$(BUILT_PRELOADER_TARGET))

$(INSTALLED_PRELOADER_TARGET): $(BUILT_PRELOADER_TARGET) | $(ACP)

	$(copy-file-to-target)



  endif



.PHONY: preloader pl save-preloader %-preloader clean-preloader check-mtk-config check-pl-config



TARGET_PRELOADER := $(PRODUCT_OUT)/preloader.img

$(TARGET_PRELOADER): $(INSTALLED_PRELOADER_TARGET) $(PRELOADER_DIR)/tools/gen-preloader-img.py

	$(hide) $(PRELOADER_DIR)/tools/gen-preloader-img.py $< $@



droidcore: preloader

preloader pl: check-pl-config $(INSTALLED_PRELOADER_TARGET) $(TARGET_PRELOADER)

save-preloader: $(TARGET_PREBUILT_PRELOADER)



%-preloader:

	$(MAKE) -C $(PRELOADER_DIR) $(PRELOADER_MAKE_OPTION) $(patsubst %-preloader,%,$@)



clean-preloader:

	$(hide) rm -rf $(INSTALLED_PRELOADER_TARGET) $(TARGET_PRELOADER) $(PRELOADER_OUT)



check-mtk-config: check-pl-config

check-pl-config:

ifneq (yes,$(strip $(DISABLE_MTK_CONFIG_CHECK)))

	python device/mediatek/build/build/tools/check_kernel_config.py -c $(MTK_TARGET_PROJECT_FOLDER)/ProjectConfig.mk -b $(PRELOADER_DIR)/custom/$(PRELOADER_TARGET_PRODUCT)/$(PRELOADER_TARGET_PRODUCT).mk -p $(MTK_PROJECT_NAME)

else

	-python device/mediatek/build/build/tools/check_kernel_config.py -c $(MTK_TARGET_PROJECT_FOLDER)/ProjectConfig.mk -b $(PRELOADER_DIR)/custom/$(PRELOADER_TARGET_PRODUCT)/$(PRELOADER_TARGET_PRODUCT).mk -p $(MTK_PROJECT_NAME)

endif





endif#PRELOADER_TARGET_PRODUCT