author | Xindong Xu <xindong.xu@amlogic.com> | 2017-10-23 08:03:50 (GMT) |
---|---|---|
committer | Xindong Xu <xindong.xu@amlogic.com> | 2017-11-01 02:32:44 (GMT) |
commit | 40ddd2f74d42bceae8d19ab88f340011af63b09e (patch) | |
tree | 1e685dcaf15ddde8a7cd1f536bd88d54d6de1506 | |
parent | 71058a6c61eaedf427fc9ca26a72cd88498b927d (diff) | |
download | amlogic-o-40ddd2f74d42bceae8d19ab88f340011af63b09e.zip amlogic-o-40ddd2f74d42bceae8d19ab88f340011af63b09e.tar.gz amlogic-o-40ddd2f74d42bceae8d19ab88f340011af63b09e.tar.bz2 |
device: use old partition table for upgrade devices [1/2]
PD# 152829
if you set BOARD_OLD_PARTITION := true in p212.mk
we will use old partition table for upgrade devices
the dts file in kernel maybe arch/arm64/boot/dts/amlogic/partition_mbox_old.dtsi
and we set arch/arm64/boot/dts/amlogic/partition_mbox_old.dtsi in p212.mk
Change-Id: Ie92d2e78df6eb1d835d42cd10ae5ed991102ea26
-rw-r--r-- | common/factory.mk | 9 | ||||
-rw-r--r-- | p212/BoardConfig.mk | 2 | ||||
-rw-r--r-- | p212/Kernel.mk | 3 | ||||
-rw-r--r-- | p212/p212.mk | 8 | ||||
-rw-r--r-- | p230/BoardConfig.mk | 2 | ||||
-rw-r--r-- | p230/Kernel.mk | 3 | ||||
-rw-r--r-- | p230/p230.mk | 8 |
7 files changed, 18 insertions, 17 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/p212/BoardConfig.mk b/p212/BoardConfig.mk index d517c1f..3b720e4 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..e231b6e 100644 --- a/p212/Kernel.mk +++ b/p212/Kernel.mk @@ -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/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 9ccbd10..cef5cf0 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/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 |