From 8b6587a9957c5c060a1e65607fd7c2436687cba8 Mon Sep 17 00:00:00 2001 From: Ziyan Date: Wed, 11 Jan 2017 23:17:02 +0100 Subject: Use common SGX KM build target Change-Id: I52b28c4a3729601cf4aa369c0f8b88ee281cf996 --- BoardConfigCommon.mk | 13 +++---------- rootdir/init.espresso.rc | 3 --- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index eb861e4..5bcc148 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -20,6 +20,9 @@ # Inherit common omap4 board config -include hardware/ti/omap4/BoardConfigCommon.mk +# Build SGX KM +-include hardware/ti/omap4/pvr-km.mk + TARGET_NO_BOOTLOADER := true TARGET_BOOTLOADER_BOARD_NAME := piranha @@ -33,16 +36,6 @@ BOARD_KERNEL_PAGESIZE := 2048 BOARD_KERNEL_BASE := 0x40000000 BOARD_KERNEL_CMDLINE := androidboot.hardware=espresso -# External SGX Module -SGX_MODULES: - make clean -C $(HARDWARE_TI_OMAP4_BASE)/pvr-source/eurasiacon/build/linux2/omap4430_android - cp $(TARGET_KERNEL_SOURCE)/drivers/video/omap2/omapfb/omapfb.h $(KERNEL_OUT)/drivers/video/omap2/omapfb/omapfb.h - make -j8 -C $(HARDWARE_TI_OMAP4_BASE)/pvr-source/eurasiacon/build/linux2/omap4430_android ARCH=arm KERNEL_CROSS_COMPILE=arm-eabi- CROSS_COMPILE=arm-eabi- KERNELDIR=$(KERNEL_OUT) TARGET_PRODUCT="blaze_tablet" BUILD=release TARGET_SGX=540 PLATFORM_VERSION=4.0 - mv $(KERNEL_OUT)/../../target/kbuild/pvrsrvkm_sgx540_120.ko $(KERNEL_MODULES_OUT) - $(ARM_EABI_TOOLCHAIN)/arm-eabi-strip --strip-unneeded $(KERNEL_MODULES_OUT)/pvrsrvkm_sgx540_120.ko - -TARGET_KERNEL_MODULES += SGX_MODULES - # Filesystem TARGET_USERIMAGES_USE_EXT4 := true BOARD_BOOTIMAGE_PARTITION_SIZE := 8388608 diff --git a/rootdir/init.espresso.rc b/rootdir/init.espresso.rc index 373711e..552513c 100644 --- a/rootdir/init.espresso.rc +++ b/rootdir/init.espresso.rc @@ -20,9 +20,6 @@ on fs restorecon_recursive /efs - # pvr module - insmod /system/lib/modules/pvrsrvkm_sgx540_120.ko - # read only 1 page at a time write /proc/sys/vm/page-cluster 0 -- cgit v1.1