diff options
| author | Sam Protsenko <semen.protsenko@linaro.org> | 2019-07-25 17:49:28 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-25 17:49:28 -0700 |
| commit | 58d85e7ebb5e087dd8002d735e199e8b9e2c089d (patch) | |
| tree | 555f4095e806fb4da09125da00c23fbfadebccaf | |
| parent | a761c992848717c481c5ed931d7a3f77fc15e237 (diff) | |
| parent | 4706a543a099baf48fcd1a391f340a1db22a8e75 (diff) | |
| download | beagle-x15-58d85e7ebb5e087dd8002d735e199e8b9e2c089d.tar.gz | |
Fix recovery fstab am: 06f706c6fa am: f9c25b4c4d am: 4e953c93d7
am: 4706a543a0
Change-Id: If5b9f447cf9e3d51226a0e743a66e88daa2bbcf6
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rw-r--r-- | device.mk | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 804f50c..ad4f857 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -52,7 +52,7 @@ TARGET_BOOTLOADER_BOARD_NAME := beagle_x15board TARGET_BOARD_PLATFORM := am57x TARGET_COPY_OUT_VENDOR := vendor -TARGET_RECOVERY_FSTAB = device/ti/beagle_x15/fstab.beagle_x15board +TARGET_RECOVERY_FSTAB = device/ti/beagle_x15/$(TARGET_FSTAB) TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" TARGET_RELEASETOOLS_EXTENSIONS := device/ti/beagle_x15 @@ -113,20 +113,20 @@ PRODUCT_COPY_FILES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ persist.sys.usb.config=mtp \ +ifeq ($(KERNEL_MAJ),4) + TARGET_FSTAB := fstab.beagle_x15board_v4 +else + TARGET_FSTAB := fstab.beagle_x15board_v5 +endif PRODUCT_COPY_FILES += \ device/ti/beagle_x15/tablet_core_hardware_beagle_x15.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_beagle_x15.xml \ device/ti/beagle_x15/init.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.rc \ device/ti/beagle_x15/init.beagle_x15board.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.usb.rc \ device/ti/beagle_x15/ueventd.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ + device/ti/beagle_x15/$(TARGET_FSTAB):$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board \ frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ -ifeq ($(KERNEL_MAJ),4) - PRODUCT_COPY_FILES += device/ti/beagle_x15/fstab.beagle_x15board_v4:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board -else - PRODUCT_COPY_FILES += device/ti/beagle_x15/fstab.beagle_x15board_v5:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board -endif - #FIXME: this feature should be turned off as soon as google start checking for WIFI support before wifi calls PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ |