From 1c9bf21bfe277ad0c900e84006648a4459209c80 Mon Sep 17 00:00:00 2001 From: Konsta Date: Sat, 28 Oct 2023 20:21:13 +0300 Subject: [PATCH] rename rpi4 -> rpi5 --- AndroidProducts.mk | 12 ++++++------ BoardConfig.mk | 6 +++--- README.md | 2 +- aosp_rpi4.mk => aosp_rpi5.mk | 10 +++++----- aosp_rpi4_car.mk => aosp_rpi5_car.mk | 12 ++++++------ aosp_rpi4_tv.mk => aosp_rpi5_tv.mk | 10 +++++----- bluetooth/bdroid_buildcfg.h | 2 +- device.mk | 14 +++++++------- mkbootimg.mk | 8 ++++---- mkimg.sh | 4 ++-- ramdisk/{fstab.rpi4 => fstab.rpi5} | 0 ramdisk/{init.rpi4.rc => init.rpi5.rc} | 4 ++-- ramdisk/{init.rpi4.usb.rc => init.rpi5.usb.rc} | 2 +- ramdisk/{ueventd.rpi4.rc => ueventd.rpi5.rc} | 0 14 files changed, 43 insertions(+), 43 deletions(-) rename aosp_rpi4.mk => aosp_rpi5.mk (81%) rename aosp_rpi4_car.mk => aosp_rpi5_car.mk (91%) rename aosp_rpi4_tv.mk => aosp_rpi5_tv.mk (83%) rename ramdisk/{fstab.rpi4 => fstab.rpi5} (100%) rename ramdisk/{init.rpi4.rc => init.rpi5.rc} (88%) rename ramdisk/{init.rpi4.usb.rc => init.rpi5.usb.rc} (98%) rename ramdisk/{ueventd.rpi4.rc => ueventd.rpi5.rc} (100%) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index e7a87c1..ade5ddd 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -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 diff --git a/BoardConfig.mk b/BoardConfig.mk index 1f93188..c9b36cb 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -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 diff --git a/README.md b/README.md index fe24141..5a741cb 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Raspberry Vanilla AOSP 14 device configuration for Raspberry Pi 4. +Raspberry Vanilla AOSP 14 device configuration for Raspberry Pi 5. diff --git a/aosp_rpi4.mk b/aosp_rpi5.mk similarity index 81% rename from aosp_rpi4.mk rename to aosp_rpi5.mk index 606e3a7..e83588c 100644 --- a/aosp_rpi4.mk +++ b/aosp_rpi5.mk @@ -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 diff --git a/aosp_rpi4_car.mk b/aosp_rpi5_car.mk similarity index 91% rename from aosp_rpi4_car.mk rename to aosp_rpi5_car.mk index 4f1c777..1309463 100644 --- a/aosp_rpi4_car.mk +++ b/aosp_rpi5_car.mk @@ -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 diff --git a/aosp_rpi4_tv.mk b/aosp_rpi5_tv.mk similarity index 83% rename from aosp_rpi4_tv.mk rename to aosp_rpi5_tv.mk index 83503d2..d3c4112 100644 --- a/aosp_rpi4_tv.mk +++ b/aosp_rpi5_tv.mk @@ -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 diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index a8c7909..edf8714 100644 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -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 diff --git a/device.mk b/device.mk index e5fc71b..b69c908 100644 --- a/device.mk +++ b/device.mk @@ -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 += \ diff --git a/mkbootimg.mk b/mkbootimg.mk index 8d36d53..221971c 100644 --- a/mkbootimg.mk +++ b/mkbootimg.mk @@ -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) diff --git a/mkimg.sh b/mkimg.sh index a22e168..e61917e 100755 --- a/mkimg.sh +++ b/mkimg.sh @@ -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) diff --git a/ramdisk/fstab.rpi4 b/ramdisk/fstab.rpi5 similarity index 100% rename from ramdisk/fstab.rpi4 rename to ramdisk/fstab.rpi5 diff --git a/ramdisk/init.rpi4.rc b/ramdisk/init.rpi5.rc similarity index 88% rename from ramdisk/init.rpi4.rc rename to ramdisk/init.rpi5.rc index f061768..6dad79e 100644 --- a/ramdisk/init.rpi4.rc +++ b/ramdisk/init.rpi5.rc @@ -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 diff --git a/ramdisk/init.rpi4.usb.rc b/ramdisk/init.rpi5.usb.rc similarity index 98% rename from ramdisk/init.rpi4.usb.rc rename to ramdisk/init.rpi5.usb.rc index a4e62e0..d9c376e 100644 --- a/ramdisk/init.rpi4.usb.rc +++ b/ramdisk/init.rpi5.usb.rc @@ -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 diff --git a/ramdisk/ueventd.rpi4.rc b/ramdisk/ueventd.rpi5.rc similarity index 100% rename from ramdisk/ueventd.rpi4.rc rename to ramdisk/ueventd.rpi5.rc