diff options
| author | Todd Kjos <tkjos@google.com> | 2020-01-31 04:07:37 +0000 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2020-01-31 04:07:37 +0000 |
| commit | 471d30e6330f88e0b3a8cd32fd84f88dc00b8980 (patch) | |
| tree | e41996e8156e115da1b9b26a4381977990d4ca24 /pixel3_mainline | |
| parent | 85f6a8aecd3ba7609d28ace79f474a411092ebdd (diff) | |
Revert "pixel3_maineline: Add changes to get pixel3_mainline building a boot.img"
This reverts commit 85f6a8aecd3ba7609d28ace79f474a411092ebdd.
Reason for revert: Caused build-break for aosp-master (pixel3_mainline-userdebug build)
Change-Id: I653961de83baa953cfdde32e42d5706869764d9a
Diffstat (limited to 'pixel3_mainline')
| -rw-r--r-- | pixel3_mainline/BoardConfig.mk | 10 | ||||
| -rw-r--r-- | pixel3_mainline/device.mk | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/pixel3_mainline/BoardConfig.mk b/pixel3_mainline/BoardConfig.mk index 7f59e9c..03fce75 100644 --- a/pixel3_mainline/BoardConfig.mk +++ b/pixel3_mainline/BoardConfig.mk @@ -4,16 +4,6 @@ include device/linaro/dragonboard/BoardConfigCommon.mk TARGET_BOOTLOADER_BOARD_NAME := pixel3_mainline TARGET_BOARD_PLATFORM := pixel3_mainline -# Bootloader/Kernel Configuration -TARGET_NO_KERNEL := false -BOARD_KERNEL_BAS := 0x00000000 -BOARD_KERNEL_PAGESIZE := 4096 -BOARD_KERNEL_TAGS_OFFSET := 0x01E00000 -BOARD_RAMDISK_OFFSET := 0x02000000 -BOARD_KERNEL_CMDLINE := firmware_class.path=/vendor/firmware/ androidboot.hardware=pixel3_mainline efi=noruntime -BOARD_KERNEL_CMDLINE += init=/init androidboot.boot_devices=soc/1d84000.ufshc printk.devkmsg=on -BOARD_KERNEL_CMDLINE += androidboot.super_partition=system_b #system_b is super partition - # Image Configuration BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000 BOARD_USERDATAIMAGE_PARTITION_SIZE := 10737418240 diff --git a/pixel3_mainline/device.mk b/pixel3_mainline/device.mk index ff5f08f..aab118b 100644 --- a/pixel3_mainline/device.mk +++ b/pixel3_mainline/device.mk @@ -19,7 +19,6 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk) PRODUCT_COPY_FILES := \ - $(PIXEL3_KERNEL_DIR)/Image.gz-dtb:kernel \ device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.pixel3_mainline \ device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.pixel3_mainline \ device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.pixel3_mainline \ |