From 641b2918b3960e488d489ccfec99fb2c85697ae5 Mon Sep 17 00:00:00 2001 From: Xindong Xu Date: Wed, 13 Dec 2017 03:01:47 +0000 Subject: 1. change all p212 to ampere 2. use prebuilt kernel --- diff --git a/Android.mk b/Android.mk index 15e651c..338837e 100644 --- a/Android.mk +++ b/Android.mk @@ -20,7 +20,7 @@ # to only building on ARM if they include assembly. Individual makefiles # are responsible for having their own logic, for fine-grained control. -ifeq ($(TARGET_PRODUCT),p212) +ifeq ($(TARGET_PRODUCT),ampere) LOCAL_PATH := $(call my-dir) # if some modules are built directly from this directory (not subdirectories), # their rules should be written here. diff --git a/AndroidProducts.mk b/AndroidProducts.mk index f4f2323..085bd8f 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -14,4 +14,4 @@ # limitations under the License. # -PRODUCT_MAKEFILES := $(LOCAL_DIR)/p212.mk +PRODUCT_MAKEFILES := $(LOCAL_DIR)/ampere.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 966d33b..ea5f313 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -44,7 +44,7 @@ TARGET_NO_KERNEL := false TARGET_NO_RADIOIMAGE := true TARGET_BOARD_PLATFORM := gxl -TARGET_BOOTLOADER_BOARD_NAME := p212 +TARGET_BOOTLOADER_BOARD_NAME := ampere # Graphics & Display USE_OPENGL_RENDERER := true @@ -83,9 +83,9 @@ endif TARGET_SUPPORT_USB_BURNING_V2 := true -TARGET_AMLOGIC_RES_PACKAGE := device/amlogic/p212/logo_img_files +TARGET_AMLOGIC_RES_PACKAGE := device/amlogic/ampere/logo_img_files -TARGET_RECOVERY_FSTAB := device/amlogic/p212/recovery/recovery.fstab +TARGET_RECOVERY_FSTAB := device/amlogic/ampere/recovery/recovery.fstab #BOARD_HAL_STATIC_LIBRARIES := libhealthd.mboxdefault @@ -122,5 +122,5 @@ WITH_DEXPREOPT := true PRODUCT_FULL_TREBLE_OVERRIDE := true BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true -DEVICE_MANIFEST_FILE := device/amlogic/p212/manifest.xml +DEVICE_MANIFEST_FILE := device/amlogic/ampere/manifest.xml #DEVICE_MATRIX_FILE := device/amlogic/common/compatibility_matrix.xml 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) diff --git a/p212.mk b/ampere.mk index 1c943c8..6a705fa 100644 --- a/p212.mk +++ b/ampere.mk @@ -33,18 +33,18 @@ endif endif $(call inherit-product, device/amlogic/common/products/mbox/product_mbox.mk) -$(call inherit-product, device/amlogic/p212/device.mk) +$(call inherit-product, device/amlogic/ampere/device.mk) $(call inherit-product-if-exists, vendor/google/products/gms.mk) -# p212: +# ampere: PRODUCT_PROPERTY_OVERRIDES += \ ro.hdmi.device_type=4 \ persist.sys.hdmi.keep_awake=false -PRODUCT_NAME := p212 -PRODUCT_DEVICE := p212 +PRODUCT_NAME := ampere +PRODUCT_DEVICE := ampere PRODUCT_BRAND := Amlogic -PRODUCT_MODEL := p212 +PRODUCT_MODEL := ampere PRODUCT_MANUFACTURER := Amlogic PRODUCT_TYPE := mbox @@ -142,43 +142,43 @@ ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) ifeq ($(AB_OTA_UPDATER),true) ifeq ($(BUILD_WITH_DM_VERITY), true) PRODUCT_COPY_FILES += \ - device/amlogic/p212/fstab.AB.verity.amlogic:root/fstab.amlogic + device/amlogic/ampere/fstab.AB.verity.amlogic:root/fstab.amlogic else PRODUCT_COPY_FILES += \ - device/amlogic/p212/fstab.AB.amlogic:root/fstab.amlogic + device/amlogic/ampere/fstab.AB.amlogic:root/fstab.amlogic endif else ifeq ($(BUILD_WITH_DM_VERITY), true) PRODUCT_COPY_FILES += \ - device/amlogic/p212/fstab.verity.amlogic:root/fstab.amlogic + device/amlogic/ampere/fstab.verity.amlogic:root/fstab.amlogic else PRODUCT_COPY_FILES += \ - device/amlogic/p212/fstab.amlogic:root/fstab.amlogic + device/amlogic/ampere/fstab.amlogic:root/fstab.amlogic endif endif else ifeq ($(AB_OTA_UPDATER),true) ifeq ($(BUILD_WITH_DM_VERITY), true) PRODUCT_COPY_FILES += \ - device/amlogic/p212/fstab.AB.verity.amlogic:recovery/root/fstab.amlogic + device/amlogic/ampere/fstab.AB.verity.amlogic:recovery/root/fstab.amlogic else PRODUCT_COPY_FILES += \ - device/amlogic/p212/fstab.AB.amlogic:recovery/root/fstab.amlogic + device/amlogic/ampere/fstab.AB.amlogic:recovery/root/fstab.amlogic endif else ifeq ($(BUILD_WITH_DM_VERITY), true) PRODUCT_COPY_FILES += \ - device/amlogic/p212/fstab.verity.amlogic:recovery/root/fstab.amlogic + device/amlogic/ampere/fstab.verity.amlogic:recovery/root/fstab.amlogic else PRODUCT_COPY_FILES += \ - device/amlogic/p212/fstab.amlogic:recovery/root/fstab.amlogic + device/amlogic/ampere/fstab.amlogic:recovery/root/fstab.amlogic endif endif endif endif ifeq ($(BOARD_OLD_PARTITION),true) PRODUCT_COPY_FILES += \ - device/amlogic/p212/fstab.3.14.amlogic:root/fstab.amlogic + device/amlogic/ampere/fstab.3.14.amlogic:root/fstab.amlogic endif ######################################################################### diff --git a/device.mk b/device.mk index 708c2ec..ba9d63f 100644 --- a/device.mk +++ b/device.mk @@ -18,55 +18,55 @@ ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) PRODUCT_COPY_FILES += device/amlogic/common/products/mbox/init.amlogic.rc:root/init.amlogic.rc PRODUCT_COPY_FILES += \ - device/amlogic/p212/init.amlogic.usb.rc:root/init.amlogic.usb.rc \ + device/amlogic/ampere/init.amlogic.usb.rc:root/init.amlogic.usb.rc \ device/amlogic/common/products/mbox/ueventd.amlogic.rc:root/ueventd.amlogic.rc \ - device/amlogic/p212/init.amlogic.board.rc:root/init.amlogic.board.rc + device/amlogic/ampere/init.amlogic.board.rc:root/init.amlogic.board.rc else PRODUCT_COPY_FILES += device/amlogic/common/products/mbox/init.amlogic.rc:recovery/root/init.amlogic.rc PRODUCT_COPY_FILES += \ - device/amlogic/p212/init.amlogic.usb.$(BOARD_KERNEL_VERSION).rc:recovery/root/init.amlogic.usb.rc \ + device/amlogic/ampere/init.amlogic.usb.$(BOARD_KERNEL_VERSION).rc:recovery/root/init.amlogic.usb.rc \ device/amlogic/common/products/mbox/ueventd.amlogic.rc:recovery/root/ueventd.amlogic.rc \ - device/amlogic/p212/init.amlogic.board.rc:recovery/root/init.amlogic.board.rc + device/amlogic/ampere/init.amlogic.board.rc:recovery/root/init.amlogic.board.rc endif PRODUCT_COPY_FILES += \ - device/amlogic/p212/files/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ - device/amlogic/p212/files/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ - device/amlogic/p212/files/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \ - device/amlogic/p212/files/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ - device/amlogic/p212/files/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - device/amlogic/p212/files/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ - device/amlogic/p212/files/mesondisplay.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/mesondisplay.cfg \ - device/amlogic/p212/files/remote.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/remote.cfg \ - device/amlogic/p212/files/remote.tab1:$(TARGET_COPY_OUT_VENDOR)/etc/remote.tab1 \ - device/amlogic/p212/files/remote.tab2:$(TARGET_COPY_OUT_VENDOR)/etc/remote.tab2 \ - device/amlogic/p212/files/remote.tab3:$(TARGET_COPY_OUT_VENDOR)/etc/remote.tab3 \ - device/amlogic/p212/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml + device/amlogic/ampere/files/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ + device/amlogic/ampere/files/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ + device/amlogic/ampere/files/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \ + device/amlogic/ampere/files/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + device/amlogic/ampere/files/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + device/amlogic/ampere/files/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + device/amlogic/ampere/files/mesondisplay.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/mesondisplay.cfg \ + device/amlogic/ampere/files/remote.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/remote.cfg \ + device/amlogic/ampere/files/remote.tab1:$(TARGET_COPY_OUT_VENDOR)/etc/remote.tab1 \ + device/amlogic/ampere/files/remote.tab2:$(TARGET_COPY_OUT_VENDOR)/etc/remote.tab2 \ + device/amlogic/ampere/files/remote.tab3:$(TARGET_COPY_OUT_VENDOR)/etc/remote.tab3 \ + device/amlogic/ampere/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml PRODUCT_COPY_FILES += \ - device/amlogic/p212/recovery/init.recovery.amlogic.rc:root/init.recovery.amlogic.rc \ - device/amlogic/p212/recovery/recovery.kl:recovery/root/etc/recovery.kl \ - device/amlogic/p212/files/mesondisplay.cfg:recovery/root/etc/mesondisplay.cfg \ - device/amlogic/p212/recovery/busybox:recovery/root/sbin/busybox \ - device/amlogic/p212/recovery/remotecfg:recovery/root/sbin/remotecfg \ - device/amlogic/p212/files/remote.cfg:recovery/root/etc/remote.cfg \ - device/amlogic/p212/files/remote.tab1:recovery/root/etc/remote.tab1 \ - device/amlogic/p212/files/remote.tab2:recovery/root/etc/remote.tab2 \ - device/amlogic/p212/files/remote.tab3:recovery/root/etc/remote.tab3 \ - device/amlogic/p212/recovery/sh:recovery/root/sbin/sh + device/amlogic/ampere/recovery/init.recovery.amlogic.rc:root/init.recovery.amlogic.rc \ + device/amlogic/ampere/recovery/recovery.kl:recovery/root/etc/recovery.kl \ + device/amlogic/ampere/files/mesondisplay.cfg:recovery/root/etc/mesondisplay.cfg \ + device/amlogic/ampere/recovery/busybox:recovery/root/sbin/busybox \ + device/amlogic/ampere/recovery/remotecfg:recovery/root/sbin/remotecfg \ + device/amlogic/ampere/files/remote.cfg:recovery/root/etc/remote.cfg \ + device/amlogic/ampere/files/remote.tab1:recovery/root/etc/remote.tab1 \ + device/amlogic/ampere/files/remote.tab2:recovery/root/etc/remote.tab2 \ + device/amlogic/ampere/files/remote.tab3:recovery/root/etc/remote.tab3 \ + device/amlogic/ampere/recovery/sh:recovery/root/sbin/sh # remote IME config file PRODUCT_COPY_FILES += \ - device/amlogic/p212/files/Vendor_0001_Product_0001.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl \ - device/amlogic/p212/files/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl + device/amlogic/ampere/files/Vendor_0001_Product_0001.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl \ + device/amlogic/ampere/files/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl PRODUCT_AAPT_CONFIG := xlarge hdpi xhdpi PRODUCT_AAPT_PREF_CONFIG := hdpi PRODUCT_CHARACTERISTICS := mbx,nosdcard DEVICE_PACKAGE_OVERLAYS := \ - device/amlogic/p212/overlay + device/amlogic/ampere/overlay PRODUCT_TAGS += dalvik.gc.type-precise diff --git a/make_boot.sh b/make_boot.sh index 90d6e83..bc1140e 100755..100644 --- a/make_boot.sh +++ b/make_boot.sh @@ -11,7 +11,7 @@ if [ "$ROOTFS" == "" -o ! -f "$ROOTFS" ]; then exit 1 fi -KERNEL_OUT=out/target/product/p212/obj/KERNEL_OBJ +KERNEL_OUT=out/target/product/ampere/obj/KERNEL_OBJ mkdir -p $KERNEL_OUT if [ ! -f $KERNEL_OUT/.config ]; then @@ -20,13 +20,13 @@ fi make -C common O=../$KERNEL_OUT ARCH=arm64 -j6 CROSS_COMPILE=$PREFIX_CROSS_COMPILE modules Image.gz -cp $KERNEL_OUT/arch/arm64/boot/Image.gz out/target/product/p212/kernel +cp $KERNEL_OUT/arch/arm64/boot/Image.gz out/target/product/ampere/kernel if [ "$2" != "m" ]; then make -C common O=../$KERNEL_OUT gxl_p212_1g.dtb ARCH=arm64 CROSS_COMPILE=$PREFIX_CROSS_COMPILE make -C common O=../$KERNEL_OUT gxl_p212_2g.dtb ARCH=arm64 CROSS_COMPILE=$PREFIX_CROSS_COMPILE - #cp -f $KERNEL_OUT/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dtb out/target/product/p212/dtb.img - $DTBTOOL -o out/target/product/p212/dtb.img -p $KERNEL_OUT/scripts/dtc/ $KERNEL_OUT/arch/arm64/boot/dts/amlogic/ + #cp -f $KERNEL_OUT/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dtb out/target/product/ampere/dtb.img + $DTBTOOL -o out/target/product/ampere/dtb.img -p $KERNEL_OUT/scripts/dtc/ $KERNEL_OUT/arch/arm64/boot/dts/amlogic/ fi if [ "$2" != "m" ]; then @@ -34,8 +34,8 @@ if [ "$2" != "m" ]; then --base 0x0 \ --kernel_offset 0x1080000 \ --ramdisk ${ROOTFS} \ - --second out/target/product/p212/dtb.img \ - --output ./out/target/product/p212/boot.img - ls -l ./out/target/product/p212/boot.img + --second out/target/product/ampere/dtb.img \ + --output ./out/target/product/ampere/boot.img + ls -l ./out/target/product/ampere/boot.img echo "boot.img done" fi diff --git a/mkern.sh b/mkern.sh index 4fd65a0..af42646 100644..100755 --- a/mkern.sh +++ b/mkern.sh @@ -3,7 +3,7 @@ # Run from top of kitkat source #ROOTFS=$1 -ROOTFS="out/target/product/p212/ramdisk.img" +ROOTFS="out/target/product/ampere/ramdisk.img" PREFIX_CROSS_COMPILE=aarch64-linux-gnu- if [ "$ROOTFS" == "" -o ! -f "$ROOTFS" ]; then @@ -11,7 +11,7 @@ if [ "$ROOTFS" == "" -o ! -f "$ROOTFS" ]; then exit 1 fi -KERNEL_OUT=out/target/product/p212/obj/KERNEL_OBJ +KERNEL_OUT=out/target/product/ampere/obj/KERNEL_OBJ #mkdir -p $KERNEL_OUT if [ ! -f $KERNEL_OUT/.config ]; then @@ -32,7 +32,7 @@ if [ "$2" != "m" ]; then --base 0x0 \ --kernel_offset 0x1080000 \ --ramdisk ${ROOTFS} \ - --output ./out/target/product/p212/boot.img - ls -l ./out/target/product/p212/boot.img + --output ./out/target/product/ampere/boot.img + ls -l ./out/target/product/ampere/boot.img echo "boot.img done" fi diff --git a/vendorsetup.sh b/vendorsetup.sh index 657e782..58883a1 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -1,3 +1,3 @@ -add_lunch_combo p212-eng -add_lunch_combo p212-user -add_lunch_combo p212-userdebug +add_lunch_combo ampere-eng +add_lunch_combo ampere-user +add_lunch_combo ampere-userdebug -- cgit