PawletOS/android_device_brcm_rpi5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename rpi4 -> rpi5

Browse Source
This commit is contained in:
Konsta
2023-10-28 20:21:13 +03:00
parent f5db2884d7
commit 1c9bf21bfe
14 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AndroidProducts.mk
View File

@@ -5,11 +5,11 @@
#
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_rpi4.mk \
$(LOCAL_DIR)/aosp_rpi4_car.mk \
$(LOCAL_DIR)/aosp_rpi4_tv.mk
$(LOCAL_DIR)/aosp_rpi5.mk \
$(LOCAL_DIR)/aosp_rpi5_car.mk \
$(LOCAL_DIR)/aosp_rpi5_tv.mk
COMMON_LUNCH_CHOICES := \
aosp_rpi4-userdebug \
aosp_rpi4_car-userdebug \
aosp_rpi4_tv-userdebug
aosp_rpi5-userdebug \
aosp_rpi5_car-userdebug \
aosp_rpi5_tv-userdebug

6
BoardConfig.mk
View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
DEVICE_PATH := device/brcm/rpi4
DEVICE_PATH := device/brcm/rpi5
# Platform
TARGET_NO_BOOTLOADER := true
@@ -45,7 +45,7 @@ BOARD_MESA3D_VULKAN_DRIVERS := broadcom
# Kernel
BOARD_CUSTOM_BOOTIMG := true
BOARD_CUSTOM_BOOTIMG_MK := $(DEVICE_PATH)/mkbootimg.mk
BOARD_KERNEL_CMDLINE := console=ttyS0,115200 no_console_suspend root=/dev/ram0 rootwait androidboot.hardware=rpi4
BOARD_KERNEL_CMDLINE := console=ttyS0,115200 no_console_suspend root=/dev/ram0 rootwait androidboot.hardware=rpi5
# Manifest
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(DEVICE_PATH)/framework_compatibility_matrix.xml
@@ -66,7 +66,7 @@ TARGET_USERIMAGES_USE_EXT4 := true
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
# SELinux
BOARD_SEPOLICY_DIRS += device/brcm/rpi4/sepolicy
BOARD_SEPOLICY_DIRS += device/brcm/rpi5/sepolicy
BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
# Treble

2
README.md
View File

@@ -1 +1 @@
Raspberry Vanilla AOSP 14 device configuration for Raspberry Pi 4.
Raspberry Vanilla AOSP 14 device configuration for Raspberry Pi 5.

10
aosp_rpi4.mk → aosp_rpi5.mk
View File

@@ -5,7 +5,7 @@
#
# Inherit device configuration
$(call inherit-product, device/brcm/rpi4/device.mk)
$(call inherit-product, device/brcm/rpi5/device.mk)
PRODUCT_AAPT_CONFIG := normal mdpi hdpi
PRODUCT_AAPT_PREF_CONFIG := hdpi
@@ -25,9 +25,9 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml
# Device identifier. This must come after all inclusions.
PRODUCT_DEVICE := rpi4
PRODUCT_NAME := aosp_rpi4
PRODUCT_DEVICE := rpi5
PRODUCT_NAME := aosp_rpi5
PRODUCT_BRAND := Raspberry
PRODUCT_MODEL := Raspberry Pi 4
PRODUCT_MODEL := Raspberry Pi 5
PRODUCT_MANUFACTURER := Raspberry
PRODUCT_RELEASE_NAME := Raspberry Pi 4
PRODUCT_RELEASE_NAME := Raspberry Pi 5

12
aosp_rpi4_car.mk → aosp_rpi5_car.mk
View File

@@ -5,7 +5,7 @@
#
# Inherit device configuration
$(call inherit-product, device/brcm/rpi4/device.mk)
$(call inherit-product, device/brcm/rpi5/device.mk)
PRODUCT_AAPT_CONFIG := normal mdpi hdpi
PRODUCT_AAPT_PREF_CONFIG := hdpi
@@ -52,7 +52,7 @@ ENABLE_EVS_SERVICE := true
ENABLE_REAR_VIEW_CAMERA_SAMPLE := true
PRODUCT_COPY_FILES += \
device/brcm/rpi4/camera/evs_config_override.json:${TARGET_COPY_OUT_VENDOR}/etc/automotive/evs/config_override.json
device/brcm/rpi5/camera/evs_config_override.json:${TARGET_COPY_OUT_VENDOR}/etc/automotive/evs/config_override.json
# Overlays
PRODUCT_PACKAGES += \
@@ -71,9 +71,9 @@ PRODUCT_PACKAGES += \
android.hardware.automotive.vehicle@2.0-default-service
# Device identifier. This must come after all inclusions.
PRODUCT_DEVICE := rpi4
PRODUCT_NAME := aosp_rpi4_car
PRODUCT_DEVICE := rpi5
PRODUCT_NAME := aosp_rpi5_car
PRODUCT_BRAND := Raspberry
PRODUCT_MODEL := Raspberry Pi 4
PRODUCT_MODEL := Raspberry Pi 5
PRODUCT_MANUFACTURER := Raspberry
PRODUCT_RELEASE_NAME := Raspberry Pi 4
PRODUCT_RELEASE_NAME := Raspberry Pi 5

10
aosp_rpi4_tv.mk → aosp_rpi5_tv.mk
View File

@@ -5,7 +5,7 @@
#
# Inherit device configuration
$(call inherit-product, device/brcm/rpi4/device.mk)
$(call inherit-product, device/brcm/rpi5/device.mk)
PRODUCT_AAPT_PREF_CONFIG := tvdpi
PRODUCT_CHARACTERISTICS := tv
@@ -34,9 +34,9 @@ PRODUCT_PACKAGES += \
WifiRpiOverlay
# Device identifier. This must come after all inclusions.
PRODUCT_DEVICE := rpi4
PRODUCT_NAME := aosp_rpi4_tv
PRODUCT_DEVICE := rpi5
PRODUCT_NAME := aosp_rpi5_tv
PRODUCT_BRAND := Raspberry
PRODUCT_MODEL := Raspberry Pi 4
PRODUCT_MODEL := Raspberry Pi 5
PRODUCT_MANUFACTURER := Raspberry
PRODUCT_RELEASE_NAME := Raspberry Pi 4
PRODUCT_RELEASE_NAME := Raspberry Pi 5

2
bluetooth/bdroid_buildcfg.h
View File

@@ -7,6 +7,6 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
#define BTM_DEF_LOCAL_NAME "Raspberry Pi 4"
#define BTM_DEF_LOCAL_NAME "Raspberry Pi 5"
#endif

14
device.mk
View File

@@ -4,12 +4,12 @@
# SPDX-License-Identifier: Apache-2.0
#
DEVICE_PATH := device/brcm/rpi4
DEVICE_PATH := device/brcm/rpi5
PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
$(call inherit-product, vendor/brcm/rpi4/rpi4-vendor.mk)
$(call inherit-product, vendor/brcm/rpi5/rpi5-vendor.mk)
# APEX
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
@@ -220,11 +220,11 @@ PRODUCT_PACKAGES += \
# Ramdisk
PRODUCT_COPY_FILES += \
$(DEVICE_PATH)/ramdisk/fstab.rpi4:$(TARGET_COPY_OUT_RAMDISK)/fstab.rpi4 \
$(DEVICE_PATH)/ramdisk/fstab.rpi4:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.rpi4 \
$(DEVICE_PATH)/ramdisk/init.rpi4.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.rpi4.rc \
$(DEVICE_PATH)/ramdisk/init.rpi4.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.rpi4.usb.rc \
$(DEVICE_PATH)/ramdisk/ueventd.rpi4.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
$(DEVICE_PATH)/ramdisk/fstab.rpi5:$(TARGET_COPY_OUT_RAMDISK)/fstab.rpi5 \
$(DEVICE_PATH)/ramdisk/fstab.rpi5:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.rpi5 \
$(DEVICE_PATH)/ramdisk/init.rpi5.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.rpi5.rc \
$(DEVICE_PATH)/ramdisk/init.rpi5.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.rpi5.usb.rc \
$(DEVICE_PATH)/ramdisk/ueventd.rpi5.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
# Seccomp
PRODUCT_COPY_FILES += \

8
mkbootimg.mk
View File

@@ -4,8 +4,8 @@
# SPDX-License-Identifier: Apache-2.0
#
DEVICE_PATH := device/brcm/rpi4
KERNEL_PATH := device/brcm/rpi4-kernel
DEVICE_PATH := device/brcm/rpi5
KERNEL_PATH := device/brcm/rpi5-kernel
VENDOR_PATH := vendor/brcm
RPI_BOOT_OUT := $(PRODUCT_OUT)/rpiboot
@@ -14,10 +14,10 @@ $(RPI_BOOT_OUT): $(INSTALLED_RAMDISK_TARGET)
mkdir -p $(RPI_BOOT_OUT)/overlays
cp $(DEVICE_PATH)/boot/* $(RPI_BOOT_OUT)
cp $(KERNEL_PATH)/Image $(RPI_BOOT_OUT)
cp $(KERNEL_PATH)/bcm2711-rpi-*.dtb $(RPI_BOOT_OUT)
cp $(KERNEL_PATH)/bcm2712-rpi-*.dtb $(RPI_BOOT_OUT)
cp $(KERNEL_PATH)/overlays/* $(RPI_BOOT_OUT)/overlays
cp $(PRODUCT_OUT)/ramdisk.img $(RPI_BOOT_OUT)
cp $(VENDOR_PATH)/rpi4/proprietary/boot/* $(RPI_BOOT_OUT)
cp $(VENDOR_PATH)/rpi5/proprietary/boot/* $(RPI_BOOT_OUT)
echo $(BOARD_KERNEL_CMDLINE) > $(RPI_BOOT_OUT)/cmdline.txt
$(INSTALLED_BOOTIMAGE_TARGET): $(RPI_BOOT_OUT)

4
mkimg.sh
View File

@@ -8,9 +8,9 @@
VERSION=RaspberryVanillaAOSP14
DATE=$(date +%Y%m%d)
IMGNAME=${VERSION}-${DATE}-rpi4.img
IMGNAME=${VERSION}-${DATE}-rpi5.img
IMGSIZE=7
OUTDIR=$(pwd | sed 's/\/device\/brcm\/rpi4$//')/out/target/product/rpi4
OUTDIR=$(pwd | sed 's/\/device\/brcm\/rpi5$//')/out/target/product/rpi5
echo "Creating image file ${OUTDIR}/${IMGNAME}..."
sudo dd if=/dev/zero of="${OUTDIR}/${IMGNAME}" bs=1M count=$(echo "${IMGSIZE}*1024" | bc)

0
ramdisk/fstab.rpi4 → ramdisk/fstab.rpi5
View File

4
ramdisk/init.rpi4.rc → ramdisk/init.rpi5.rc
View File

@@ -1,10 +1,10 @@
import /vendor/etc/init/hw/init.rpi4.usb.rc
import /vendor/etc/init/hw/init.rpi5.usb.rc
on init
symlink /sdcard /storage/sdcard0
on fs
mount_all /vendor/etc/fstab.rpi4
mount_all /vendor/etc/fstab.rpi5
on post-fs-data
# Create the directories used by the Wireless subsystem

2
ramdisk/init.rpi4.usb.rc → ramdisk/init.rpi5.usb.rc
View File

@@ -7,7 +7,7 @@ on boot
write /config/usb_gadget/g1/idVendor 0x18d1
write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
write /config/usb_gadget/g1/strings/0x409/manufacturer "Raspberry"
write /config/usb_gadget/g1/strings/0x409/product "Pi 4"
write /config/usb_gadget/g1/strings/0x409/product "Pi 5"
mkdir /config/usb_gadget/g1/functions/ffs.adb
mkdir /config/usb_gadget/g1/functions/ffs.mtp
mkdir /config/usb_gadget/g1/functions/ffs.ptp

0
ramdisk/ueventd.rpi4.rc → ramdisk/ueventd.rpi5.rc
View File