raviole: Change the BoardConfig layout

New structure will make sure all future changes to BoardConfig
will be applicable to AAOS on phone builds.

bug: 227488008
Test: Local build and wifi works on raven and oriole car builds
Change-Id: I928a2fb5cfc876427c382d06d798e684e0691ce9
This commit is contained in:
Gaurav Sarode 2022-07-12 17:02:51 -07:00
parent 748020328f
commit 55f68cb55c
2 changed files with 20 additions and 18 deletions

View file

@ -16,14 +16,15 @@
ifdef PHONE_CAR_BOARD_PRODUCT ifdef PHONE_CAR_BOARD_PRODUCT
include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else else
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := oriole
TARGET_SCREEN_DENSITY := 420 TARGET_SCREEN_DENSITY := 420
USES_DEVICE_GOOGLE_RAVIOLE := true
BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/gs101/BoardConfig-common.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
endif endif
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := oriole
USES_DEVICE_GOOGLE_RAVIOLE := true
BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/gs101/BoardConfig-common.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk

View file

@ -17,14 +17,15 @@
ifdef PHONE_CAR_BOARD_PRODUCT ifdef PHONE_CAR_BOARD_PRODUCT
include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else else
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := raven
TARGET_SCREEN_DENSITY := 560 TARGET_SCREEN_DENSITY := 560
USES_DEVICE_GOOGLE_RAVIOLE := true
BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/gs101/BoardConfig-common.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
endif endif
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := raven
USES_DEVICE_GOOGLE_RAVIOLE := true
BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/gs101/BoardConfig-common.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk