diff options
| -rw-r--r-- | BoardConfig.mk | 13 | ||||
| -rw-r--r-- | boot_fit/Android.mk | 7 | ||||
| -rw-r--r-- | device.mk | 20 |
3 files changed, 32 insertions, 8 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index f493fa2..47c8a51 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -69,6 +69,13 @@ TARGET_UBOOT_CONFIGS += device/ti/beagle_x15/beagle_x15_uboot.conf TARGET_UBOOT_MAKE_TARGET := u-boot-img.bin TARGET_UBOOT_COPY_TARGETS := u-boot.img MLO -# Graphics -BOARD_VENDOR_KERNEL_MODULES += \ - device/ti/beagle_x15-kernel/$(TARGET_KERNEL_USE)/pvrsrvkm.ko +# Copy kernel modules (including pvrsrvkm.ko) into /vendor/lib/modules +BOARD_ALL_MODULES := $(shell find $(LOCAL_KERNEL_HOME) -type f -iname '*.ko') +BOARD_VENDOR_KERNEL_MODULES += $(BOARD_ALL_MODULES) + +# Check if SGX kernel module is present in chosen kernel directory +SGX_KO := $(shell find $(LOCAL_KERNEL_HOME) -type f -name 'pvrsrvkm.ko') +ifeq ($(SGX_KO),) + $(warning SGX module (pvrsrvkm.ko) not found, graphics won't work) + $(warning SGX module search path is: $(LOCAL_KERNEL_HOME)) +endif diff --git a/boot_fit/Android.mk b/boot_fit/Android.mk index fed6a39..fed87fa 100644 --- a/boot_fit/Android.mk +++ b/boot_fit/Android.mk @@ -17,12 +17,15 @@ $(BOOTIMG_FIT): PRIVATE_BOARD_DIR := $(BOARD_DIR) $(BOOTIMG_FIT): PRIVATE_INSTALLED_KERNEL_TARGET := $(BOOTIMG_FIT_INSTALLED_KERNEL_TARGET) $(BOOTIMG_FIT): PRIVATE_INSTALLED_RAMDISK_TARGET := $(BOOTIMG_FIT_INSTALLED_RAMDISK_TARGET) $(BOOTIMG_FIT): $(BOOTIMG_FIT_INSTALLED_KERNEL_TARGET) $(BOOTIMG_FIT_INSTALLED_RAMDISK_TARGET) -$(BOOTIMG_FIT): $(BOARD_DIR)/$(ITS) $(MKIMAGE) $(DTC) $(wildcard $(LOCAL_KERNEL)/$(TARGET_KERNEL_USE)/*.dtb*) +$(BOOTIMG_FIT): $(BOARD_DIR)/$(ITS) $(MKIMAGE) $(DTC) $(wildcard $(DTB_DIR)/*.dtb) mkdir -p $(PRIVATE_INTERMEDIATES) cp $(PRIVATE_BOARD_DIR)/$(PRIVATE_ITS) $(PRIVATE_INTERMEDIATES)/ cp $(PRIVATE_INSTALLED_RAMDISK_TARGET) $(PRIVATE_INTERMEDIATES)/ cp $(PRIVATE_INSTALLED_KERNEL_TARGET) $(PRIVATE_INTERMEDIATES)/zImage - cp $(LOCAL_KERNEL)/$(TARGET_KERNEL_USE)/*.dtb* $(PRIVATE_INTERMEDIATES)/ + cp $(DTB_DIR)/*.dtb $(PRIVATE_INTERMEDIATES)/ +ifneq ($(wildcard $(DTBO_DIR)/*.dtbo),) + cp $(DTBO_DIR)/*.dtbo $(PRIVATE_INTERMEDIATES)/ +endif PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(PRIVATE_MKIMAGE) -D "$(PRIVATE_DTC_FLAGS_MKIMAGE)" -f $(PRIVATE_INTERMEDIATES)/$(PRIVATE_ITS) $@ include $(CLEAR_VARS) @@ -23,10 +23,24 @@ $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-hea # Set custom settings DEVICE_PACKAGE_OVERLAYS := device/ti/beagle_x15/overlay -LOCAL_KERNEL := device/ti/beagle_x15-kernel +PREBUILT_DIR := device/ti/beagle_x15-kernel TARGET_KERNEL_USE ?= 4.14 -TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL)/$(TARGET_KERNEL_USE)/zImage -PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel + +# Helper variables for working with kernel files +ifneq ($(KERNELDIR),) + LOCAL_KERNEL_HOME := $(KERNELDIR) + LOCAL_KERNEL := $(KERNELDIR)/arch/arm/boot/zImage + DTB_DIR := $(KERNELDIR)/arch/arm/boot/dts + DTBO_DIR := $(KERNELDIR)/arch/arm/boot/dts/ti +else + LOCAL_KERNEL_HOME := $(PREBUILT_DIR)/$(TARGET_KERNEL_USE) + LOCAL_KERNEL := $(LOCAL_KERNEL_HOME)/zImage + DTB_DIR := $(LOCAL_KERNEL_HOME) + DTBO_DIR := $(DTB_DIR) +endif + +TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL) +PRODUCT_COPY_FILES += $(LOCAL_KERNEL):kernel # Graphics PRODUCT_PACKAGES += \ |