| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-09-04 06:23:11 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2018-09-04 06:23:11 (GMT) |
| commit | 24a8baa764dc6005d652dcf0f350097c7fee7686 (patch) | |
| tree | 0b9e696c59847830f2349752f2d1e0ce8a47e250 | |
| parent | f61988f3919f609c3a182b91314b79f5bee365ff (diff) | |
| download | braun-24a8baa764dc6005d652dcf0f350097c7fee7686.zip braun-24a8baa764dc6005d652dcf0f350097c7fee7686.tar.gz braun-24a8baa764dc6005d652dcf0f350097c7fee7686.tar.bz2 | |
braun: erase param when fastboot-all & OTA [3/10]
PD# 172643
erase param when fastboot-all & OTA
Change-Id: Ie004ac3a00fa19dfa14652f98d5d54ce762b366a
| -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 329e735..65e791e 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -46,6 +46,9 @@ TARGET_NO_RADIOIMAGE := true TARGET_BOARD_PLATFORM := gxl TARGET_BOOTLOADER_BOARD_NAME := braun +# Allow passing `--second` to mkbootimg via 2ndbootloader. +TARGET_BOOTLOADER_IS_2ND := true + # Graphics & Display USE_OPENGL_RENDERER := true NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 @@ -7,7 +7,9 @@ WIFI_MODULE := multiwifi 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/braun-kernel/Image.gz @@ -46,6 +48,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 -include device/amlogic/common/media_modules.mk @@ -123,7 +129,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 4c4ab59..aa1c07d 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 |