summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--Android.mk2
-rw-r--r--AndroidProducts.mk2
-rw-r--r--BoardConfig.mk8
-rw-r--r--Kernel.mk31
-rw-r--r--ampere.mk (renamed from p212.mk)28
-rw-r--r--device.mk58
-rw-r--r--[-rwxr-xr-x]make_boot.sh14
-rwxr-xr-x[-rw-r--r--]mkern.sh8
-rw-r--r--vendorsetup.sh6
9 files changed, 86 insertions, 71 deletions
diff --git a/Kernel.mk b/Kernel.mk
index 27e9a01..682fcdf 100644
--- a/Kernel.mk
+++ b/Kernel.mk
@@ -3,18 +3,37 @@
-include device/amlogic/common/media_modules.mk
-include device/amlogic/common/wifi_modules.mk
-USE_PREBUILT_KERNEL := false
+KERNEL_ROOTDIR := common
+KERNEL_KO_OUT := $(PRODUCT_OUT)/obj/lib_vendor
+
+TARGET_KERNEL_BUILT_FROM_SOURCE := false
+
WIFI_MODULE := multiwifi
INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
-ifeq ($(USE_PREBUILT_KERNEL),true)
-TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
+ifneq ($(TARGET_KERNEL_BUILT_FROM_SOURCE), true)
+TARGET_PREBUILT_KERNEL := device/amlogic/ampere-kernel/Image.gz
+INSTALLED_BOARDDTB_TARGET := $(PRODUCT_OUT)/dtb.img
+LOCAL_DTB := device/amlogic/ampere-kernel/ampere.dtb
+
+$(TARGET_PREBUILT_KERNEL): $(INSTALLED_BOARDDTB_TARGET)
+ @echo "cp kernel modules"
+ mkdir -p $(PRODUCT_OUT)/root/boot
+ mkdir -p $(PRODUCT_OUT)/vendor/lib
+ mkdir -p $(KERNEL_KO_OUT)
+ cp device/amlogic/ampere-kernel/lib/mali.ko $(PRODUCT_OUT)/vendor/lib/
+ cp device/amlogic/ampere-kernel/lib/modules/* $(KERNEL_KO_OUT)/
+ mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/
+ cp $(KERNEL_KO_OUT)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/
$(INSTALLED_KERNEL_TARGET): $(TARGET_PREBUILT_KERNEL) | $(ACP)
@echo "Kernel installed"
$(transform-prebuilt-to-target)
- @echo "cp kernel modules"
+
+$(INSTALLED_BOARDDTB_TARGET): $(LOCAL_DTB) | $(ACP)
+ @echo "dtb installed"
+ $(transform-prebuilt-to-target)
else
@@ -22,8 +41,6 @@ KERNEL_DEVICETREE := gxl_p212_1g gxl_p212_2g
KERNEL_DEFCONFIG := meson64_defconfig
KERNEL_ARCH := arm64
-KERNEL_ROOTDIR := common
-
KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
@@ -43,8 +60,6 @@ WIFI_OUT := $(TARGET_OUT_INTERMEDIATES)/hardware/wifi
PREFIX_CROSS_COMPILE=/opt/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
-KERNEL_KO_OUT := $(PRODUCT_OUT)/obj/lib_vendor
-
define cp-modules
mkdir -p $(PRODUCT_OUT)/root/boot
mkdir -p $(KERNEL_KO_OUT)