| -rw-r--r-- | common/factory.mk | 9 | ||||
| -rw-r--r-- | common/hdcp_tx22/hdcp_tx22 | 174 | ||||
| -rw-r--r-- | p212/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | p212/Kernel.mk | 5 | ||||
| -rwxr-xr-x | p212/make_boot.sh | 41 | ||||
| -rw-r--r-- | p212/p212.mk | 8 | ||||
| -rw-r--r-- | p230/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | p230/Kernel.mk | 3 | ||||
| -rwxr-xr-x | p230/make_boot.sh | 39 | ||||
| -rw-r--r-- | p230/p230.mk | 8 |
10 files changed, 208 insertions, 83 deletions
diff --git a/common/factory.mk b/common/factory.mk index 7c15956..bc1de6a 100644 --- a/common/factory.mk +++ b/common/factory.mk @@ -43,7 +43,6 @@ ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) $(INSTALLED_BOARDDTB_TARGET) : $(KERNEL_DEVICETREE_SRC) $(KERNEL_OUT) $(KERNEL_CONFIG) -ifeq ($(AB_OTA_UPDATER),true) $(foreach aDts, $(KERNEL_DEVICETREE), \ sed -i 's/^#include \"partition_.*/#include \"$(TARGET_PARTITION_DTSI)\"/' $(KERNEL_ROOTDIR)/$(KERNEL_DEVICETREE_DIR)/$(strip $(aDts)).dts; \ if [ -f "$(KERNEL_ROOTDIR)/$(KERNEL_DEVICETREE_DIR)/$(aDts).dtd" ]; then \ @@ -51,14 +50,6 @@ ifeq ($(AB_OTA_UPDATER),true) fi;\ $(MAKE) -C $(KERNEL_ROOTDIR) O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) $(strip $(aDts)).dtb; \ ) -else - $(foreach aDts, $(KERNEL_DEVICETREE), \ - if [ -f "$(KERNEL_ROOTDIR)/$(KERNEL_DEVICETREE_DIR)/$(aDts).dtd" ]; then \ - $(MAKE) -C $(KERNEL_ROOTDIR) O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) $(strip $(aDts)).dtd; \ - fi;\ - $(MAKE) -C $(KERNEL_ROOTDIR) O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) $(strip $(aDts)).dtb; \ - ) -endif ifneq ($(strip $(word 2, $(KERNEL_DEVICETREE)) ),) $(hide) $(DTBTOOL) -o $@ -p $(KERNEL_OUT)/scripts/dtc/ $(KERNEL_OUT)/$(KERNEL_DEVICETREE_DIR) else# elif dts num == 1 diff --git a/common/hdcp_tx22/hdcp_tx22 b/common/hdcp_tx22/hdcp_tx22 index a1b13fb..cb718a2 100644 --- a/common/hdcp_tx22/hdcp_tx22 +++ b/common/hdcp_tx22/hdcp_tx22 @@ -1,25 +1,27 @@ -ELF - -03/K -i +ELF + +03/K +i +%p bhhiGOqB@ O{@nBٴ"R 5C/ɲf Fah$#"nhiRFG $>$Ѹ -yD h h -O0 -J K!hzD{D -O0 +yD h h +O0 +J K!hzD{D +O0 f c L -@[ eT -Q -iGahhhi@!G8B вKJ{D!h -J K!hzD{D +Os eT +iGahhhi@!G8B вKJ{D!h +Q +H +J K!hzD{D " -!" -K +!" +K VE - + 8 @@ -28,76 +30,81 @@ VE FE )BxxxC"`@ F & -O1
F1FF +O1
F1FF i O
0 O Z -6]DfE +6]DfE B -ahhKiX!GOqB%J%K!hzD{D +ahhKiX!GOqB%J%K!hzD{D +H J -K!hzD{D -.HxD -I JyD - - -8h -GYIFYJ yDzDb -!FzDEJ !FzD2 -7 - -c -/йJzD'vhI(FyDF - - +K!hzD{D +.HxD +I JyD + @ + +8h + +KpIFpJ yDzD +!FzDNNJ !FzDF8 + +FOpB` `$yDzDL(F<@@$yD +zD@@$ +yDzD 64T 0tA 0}D DD@Ox + +; +@|Fű(F + + -(EAF=JChzD <AF1JhzD xO - QFP8F LD I JyDzD4 -HxD +(EAF=JChzD <AF1JhzD O + QF8F +HxD I -JyDzD - +JyDzD + )$܀)6А)OР)@ "1O@ 6 A - -W - - -xD -!F -(FoBF -HxD -- - GpGF + + + +xD +!F +(FoBF +HxD + GpGF h)F2Fi FG? Nreu h -
- е?D - -pJ -OT - FoG + +pJ +OT + FoG p bh^h B& -xD +xD +(
dxDpGp ($ -HxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpG}HxDpG{HxDpGxHxDpGvHxDpGsHxDpGqHxDpGnHxDpGlHxDpGiHxDpGgHxDpGdHxDpGbHxDpG_HxDpG]HxDpGZHxDpGXHxDpGUHxDpGSHxDpGPHxDpGMHxDpGJHxDpGHHxDpGEHxDpGCHxDpG@HxDpG>HxDpG;HxDpG9HxDpG6HxDpG4HxDpG1HxDpG/HxDpG,HxDpG*HxDpG'HxDpG%HxDpG"HxDpG HxDpG HxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpG HxDpG HxDpGHxDpGHxDpGHxDpG& -% +HxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpG}HxDpG{HxDpGxHxDpGvHxDpGsHxDpGqHxDpGnHxDpGlHxDpGiHxDpGgHxDpGdHxDpGbHxDpG_HxDpG]HxDpGZHxDpGXHxDpGUHxDpGSHxDpGPHxDpGMHxDpGJHxDpGHHxDpGEHxDpGCHxDpG@HxDpG>HxDpG;HxDpG9HxDpG6HxDpG4HxDpG1HxDpG/HxDpG,HxDpG*HxDpG'HxDpG%HxDpG"HxDpG HxDpG HxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpG HxDpG HxDpGHxDpGHxDpGHxDpG' ?o/o C02 -@-@ -бԱ ܲT -| @DL8N\vx HT - \ +@-@ + İȰ(d̾ Ŀ +P\h "0JL ( +D - - + + + + @@ -122,6 +129,7 @@ B& + @@ -133,13 +141,14 @@ B& + - + @@ -158,8 +167,43 @@ B& - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A - "&Dhdcp_tx2200 + "&Dhdcp_tx220 + + diff --git a/p212/BoardConfig.mk b/p212/BoardConfig.mk index 51c128a..3d4b11d 100644 --- a/p212/BoardConfig.mk +++ b/p212/BoardConfig.mk @@ -77,6 +77,8 @@ BOARD_ROOT_EXTRA_FOLDERS := odm BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_ODMIMAGE_PARTITION_SIZE := 268435456 BOARD_USES_ODMIMAGE := true +else +GPU_MODS_OUT?=system/vendor/lib endif diff --git a/p212/Kernel.mk b/p212/Kernel.mk index 90adf5e..05e43c0 100644 --- a/p212/Kernel.mk +++ b/p212/Kernel.mk @@ -18,7 +18,7 @@ $(INSTALLED_KERNEL_TARGET): $(TARGET_PREBUILT_KERNEL) | $(ACP) else -KERNEL_DEVICETREE := gxl_p212_2g +KERNEL_DEVICETREE := gxl_p212_1g gxl_p212_2g KERNEL_DEFCONFIG := meson64_defconfig KERNEL_ARCH := arm64 @@ -77,9 +77,6 @@ $(INTERMEDIATES_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(INSTALLED_BOARDDTB_TAR $(MAKE) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) -f device/amlogic/common/wifi_driver.mk $(WIFI_MODULE) $(cp-modules) $(media-modules) -ifeq ($(BOARD_OLD_PARTITION),true) - cp $(KERNEL_OUT)/net/wireless/cfg80211.ko $(KERNEL_KO_OUT)/ -endif mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/ cp $(KERNEL_KO_OUT)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/ diff --git a/p212/make_boot.sh b/p212/make_boot.sh new file mode 100755 index 0000000..90d6e83 --- a/dev/null +++ b/p212/make_boot.sh @@ -0,0 +1,41 @@ +#!/bin/bash -ex + +# Run from top of kitkat source + +ROOTFS=$1 +PREFIX_CROSS_COMPILE=/opt/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu- +DTBTOOL=vendor/amlogic/tools/dtbTool + +if [ "$ROOTFS" == "" -o ! -f "$ROOTFS" ]; then + echo "Usage: $0 <ramdisk.img> [m]" + exit 1 +fi + +KERNEL_OUT=out/target/product/p212/obj/KERNEL_OBJ +mkdir -p $KERNEL_OUT + +if [ ! -f $KERNEL_OUT/.config ]; then + make -C common O=../$KERNEL_OUT meson64_defconfig ARCH=arm64 CROSS_COMPILE=$PREFIX_CROSS_COMPILE +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 + +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/ +fi + +if [ "$2" != "m" ]; then + out/host/linux-x86/bin/mkbootimg --kernel common/../$KERNEL_OUT/arch/arm64/boot/Image.gz \ + --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 + echo "boot.img done" +fi diff --git a/p212/p212.mk b/p212/p212.mk index 80908d6..c8d26b9 100644 --- a/p212/p212.mk +++ b/p212/p212.mk @@ -73,7 +73,13 @@ TARGET_NO_RECOVERY := true TARGET_PARTITION_DTSI := partition_mbox_ab.dtsi else TARGET_NO_RECOVERY := false -TARGET_PARTITION_DTSI := partition_mbox.dtsi + +ifneq ($(BOARD_OLD_PARTITION),true) +TARGET_PARTITION_DTSI := partition_mbox_normal.dtsi +else +TARGET_PARTITION_DTSI := partition_mbox_old.dtsi +endif + BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 endif diff --git a/p230/BoardConfig.mk b/p230/BoardConfig.mk index 277af49..9d728ce 100644 --- a/p230/BoardConfig.mk +++ b/p230/BoardConfig.mk @@ -77,6 +77,8 @@ BOARD_ROOT_EXTRA_FOLDERS := odm BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_ODMIMAGE_PARTITION_SIZE := 268435456 BOARD_USES_ODMIMAGE := true +else +GPU_MODS_OUT?=system/vendor/lib endif diff --git a/p230/Kernel.mk b/p230/Kernel.mk index 9590bbc..0fee8c9 100644 --- a/p230/Kernel.mk +++ b/p230/Kernel.mk @@ -78,9 +78,6 @@ $(INTERMEDIATES_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(INSTALLED_BOARDDTB_TAR $(MAKE) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) -f device/amlogic/common/wifi_driver.mk $(WIFI_MODULE) $(cp-modules) $(media-modules) -ifeq ($(BOARD_OLD_PARTITION),true) - cp $(KERNEL_OUT)/net/wireless/cfg80211.ko $(KERNEL_KO_OUT)/ -endif mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/ cp $(KERNEL_KO_OUT)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/ diff --git a/p230/make_boot.sh b/p230/make_boot.sh new file mode 100755 index 0000000..5872f56 --- a/dev/null +++ b/p230/make_boot.sh @@ -0,0 +1,39 @@ +#!/bin/bash -ex + +# Run from top of kitkat source + +ROOTFS=$1 +PREFIX_CROSS_COMPILE=/opt/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu- +DTBTOOL=vendor/amlogic/tools/dtbTool + +if [ "$ROOTFS" == "" -o ! -f "$ROOTFS" ]; then + echo "Usage: $0 <ramdisk.img> [m]" + exit 1 +fi + +KERNEL_OUT=out/target/product/p230/obj/KERNEL_OBJ +mkdir -p $KERNEL_OUT + +if [ ! -f $KERNEL_OUT/.config ]; then + make -C common O=../$KERNEL_OUT meson64_defconfig ARCH=arm64 CROSS_COMPILE=$PREFIX_CROSS_COMPILE +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/p230/kernel + +if [ "$2" != "m" ]; then + make -C common O=../$KERNEL_OUT gxl_p230_2g.dtb ARCH=arm64 CROSS_COMPILE=$PREFIX_CROSS_COMPILE + cp -f $KERNEL_OUT/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dtb out/target/product/p230/dtb.img +fi + +if [ "$2" != "m" ]; then + out/host/linux-x86/bin/mkbootimg --kernel common/../$KERNEL_OUT/arch/arm64/boot/Image.gz \ + --base 0x0 \ + --kernel_offset 0x1080000 \ + --ramdisk ${ROOTFS} \ + --second out/target/product/p230/dtb.img \ + --output ./out/target/product/p230/boot.img + ls -l ./out/target/product/p230/boot.img + echo "boot.img done" +fi diff --git a/p230/p230.mk b/p230/p230.mk index 859b92a..6bd1d11 100644 --- a/p230/p230.mk +++ b/p230/p230.mk @@ -70,7 +70,13 @@ TARGET_NO_RECOVERY := true TARGET_PARTITION_DTSI := partition_mbox_ab.dtsi else TARGET_NO_RECOVERY := false -TARGET_PARTITION_DTSI := partition_mbox.dtsi + +ifneq ($(BOARD_OLD_PARTITION),true) +TARGET_PARTITION_DTSI := partition_mbox_normal.dtsi +else +TARGET_PARTITION_DTSI := partition_mbox_old.dtsi +endif + BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 endif |