| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-09-04 06:26:04 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2018-09-04 06:26:04 (GMT) |
| commit | 3290ba4e21be6f047bff9ec730b942775b3ff8ba (patch) | |
| tree | 7d094125115276ca54f7659617e8ab91c225b2b8 | |
| parent | f3f8b95ba523f9df57933ed24d728fda38f73b6d (diff) | |
| download | einstein-3290ba4e21be6f047bff9ec730b942775b3ff8ba.zip einstein-3290ba4e21be6f047bff9ec730b942775b3ff8ba.tar.gz einstein-3290ba4e21be6f047bff9ec730b942775b3ff8ba.tar.bz2 | |
einstein: erase param when fastboot-all & OTA [6/10]
PD# 172643
erase param when fastboot-all & OTA
Change-Id: Id4e354ffafe4762334fc8e5dbfc1acf7472070c3
| -rw-r--r-- | BoardConfig.mk | 3 | ||||
| -rw-r--r-- | Kernel.mk | 14 | ||||
| -rw-r--r-- | recovery/recovery.fstab | 1 | ||||
| -rw-r--r-- | recovery/recovery_system.fstab | 1 |
4 files changed, 17 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 8777237..1586b50 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -47,6 +47,9 @@ TARGET_NO_RADIOIMAGE := true TARGET_BOARD_PLATFORM := txlx TARGET_BOOTLOADER_BOARD_NAME := einstein +# Allow passing `--second` to mkbootimg via 2ndbootloader. +TARGET_BOOTLOADER_IS_2ND := true + # Graphics & Display USE_OPENGL_RENDERER := true NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 @@ -5,7 +5,9 @@ KERNEL_KO_OUT := $(PRODUCT_OUT)/obj/lib_vendor INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel -BOARD_MKBOOTIMG_ARGS := --second $(PRODUCT_OUT)/dt.img --kernel_offset $(BOARD_KERNEL_OFFSET) +BOARD_MKBOOTIMG_ARGS := --kernel_offset $(BOARD_KERNEL_OFFSET) + +INSTALLED_2NDBOOTLOADER_TARGET := $(PRODUCT_OUT)/2ndbootloader ifneq ($(TARGET_KERNEL_BUILT_FROM_SOURCE), true) TARGET_PREBUILT_KERNEL := device/amlogic/einstein-kernel/Image.gz @@ -43,6 +45,10 @@ $(INSTALLED_BOARDDTB_TARGET): $(LOCAL_DTB) | $(ACP) @echo "dtb installed" $(transform-prebuilt-to-target) +$(INSTALLED_2NDBOOTLOADER_TARGET): $(INSTALLED_BOARDDTB_TARGET) | $(ACP) + @echo "2ndbootloader installed" + $(transform-prebuilt-to-target) + else -include device/amlogic/common/gpu.mk @@ -121,7 +127,11 @@ savekernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG) build-modules-quick: $(media-modules) -$(INSTALLED_KERNEL_TARGET): $(INTERMEDIATES_KERNEL) $(PRODUCT_OUT)/dt.img | $(ACP) +$(INSTALLED_2NDBOOTLOADER_TARGET): $(PRODUCT_OUT)/dt.img | $(ACP) + @echo "2ndbootloader installed" + $(transform-prebuilt-to-target) + +$(INSTALLED_KERNEL_TARGET): $(INTERMEDIATES_KERNEL) | $(ACP) @echo "Kernel installed" $(transform-prebuilt-to-target) diff --git a/recovery/recovery.fstab b/recovery/recovery.fstab index f1c4988..d0fa860 100644 --- a/recovery/recovery.fstab +++ b/recovery/recovery.fstab @@ -8,6 +8,7 @@ /dev/block/system /system ext4 defaults defaults /dev/block/vendor /vendor ext4 defaults defaults /dev/block/odm /odm ext4 defaults defaults +/dev/block/param /param ext4 defaults defaults /dev/block/product /product ext4 defaults defaults /dev/block/metadata /metadata ext4 defaults defaults /dev/block/tee /tee ext4 defaults defaults diff --git a/recovery/recovery_system.fstab b/recovery/recovery_system.fstab index a1cccc7..88888db 100644 --- a/recovery/recovery_system.fstab +++ b/recovery/recovery_system.fstab @@ -8,6 +8,7 @@ /dev/block/system / ext4 defaults defaults /dev/block/vendor /vendor ext4 defaults defaults /dev/block/odm /odm ext4 defaults defaults +/dev/block/param /param ext4 defaults defaults /dev/block/product /product ext4 defaults defaults /dev/block/metadata /metadata ext4 defaults defaults /dev/block/tee /tee ext4 defaults defaults |