Renaming Lunch target from caas_dev to caas_vbb

vbb stands for virtual box base Test done : Boot check done Tracked-On: OAM-113424 Signed-off-by: swaroopb <[email protected]>
projectceladon · Nov 17, 2023 · 3043de2 · 3043de2
1 parent e871ad8
commit 3043de2
Show file tree

Hide file tree

Showing 151 changed files with 22 additions and 22 deletions.
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
@@ -18,10 +18,10 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/celadon_ivi/celadon_ivi.mk \
     $(LOCAL_DIR)/celadon_tablet/celadon_tablet.mk \
     $(LOCAL_DIR)/caas/caas.mk \
-    $(LOCAL_DIR)/caas_dev/caas_dev.mk
+    $(LOCAL_DIR)/caas_vbb/caas_vbb.mk
 
 COMMON_LUNCH_CHOICES += \
     celadon_ivi-userdebug \
     celadon_tablet-userdebug \
     caas-userdebug \
-    caas_dev-userdebug \
+    caas_vbb-userdebug \
diff --git a/caas_dev/AndroidBoard.mk → caas_vbb/AndroidBoard.mk b/caas_dev/AndroidBoard.mk → caas_vbb/AndroidBoard.mk
@@ -76,14 +76,14 @@ KF4UEFI := $(PRODUCT_OUT)/efi/kernelflinger.efi
 BOARD_FIRST_STAGE_LOADER := $(KF4UEFI)
 BOARD_EXTRA_EFI_MODULES :=
 
-#$(call flashfile_add_blob,capsule.fv,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_dev/::variant::/$(BIOS_VARIANT)/capsule.fv,,BOARD_SFU_UPDATE)
-#$(call flashfile_add_blob,ifwi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_dev/::variant::/$(BIOS_VARIANT)/ifwi.bin,,EFI_IFWI_BIN)
-#$(call flashfile_add_blob,ifwi_dnx.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_dev/::variant::/$(BIOS_VARIANT)/ifwi_dnx.bin,,EFI_IFWI_DNX_BIN)
-#$(call flashfile_add_blob,firmware.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_dev/::variant::/$(BIOS_VARIANT)/emmc.bin,,EFI_EMMC_BIN)
-#$(call flashfile_add_blob,afu.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_dev/::variant::/$(BIOS_VARIANT)/afu.bin,,EFI_AFU_BIN)
-#$(call flashfile_add_blob,dnxp_0x1.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_dev/::variant::/$(BIOS_VARIANT)/dnxp_0x1.bin,,DNXP_BIN)
-#$(call flashfile_add_blob,cfgpart.xml,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_dev/::variant::/$(BIOS_VARIANT)/cfgpart.xml,,CFGPART_XML)
-#$(call flashfile_add_blob,cse_spi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_dev/::variant::/$(BIOS_VARIANT)/cse_spi.bin,,CSE_SPI_BIN)
+#$(call flashfile_add_blob,capsule.fv,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_vbb/::variant::/$(BIOS_VARIANT)/capsule.fv,,BOARD_SFU_UPDATE)
+#$(call flashfile_add_blob,ifwi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_vbb/::variant::/$(BIOS_VARIANT)/ifwi.bin,,EFI_IFWI_BIN)
+#$(call flashfile_add_blob,ifwi_dnx.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_vbb/::variant::/$(BIOS_VARIANT)/ifwi_dnx.bin,,EFI_IFWI_DNX_BIN)
+#$(call flashfile_add_blob,firmware.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_vbb/::variant::/$(BIOS_VARIANT)/emmc.bin,,EFI_EMMC_BIN)
+#$(call flashfile_add_blob,afu.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_vbb/::variant::/$(BIOS_VARIANT)/afu.bin,,EFI_AFU_BIN)
+#$(call flashfile_add_blob,dnxp_0x1.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_vbb/::variant::/$(BIOS_VARIANT)/dnxp_0x1.bin,,DNXP_BIN)
+#$(call flashfile_add_blob,cfgpart.xml,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_vbb/::variant::/$(BIOS_VARIANT)/cfgpart.xml,,CFGPART_XML)
+#$(call flashfile_add_blob,cse_spi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/caas_vbb/::variant::/$(BIOS_VARIANT)/cse_spi.bin,,CSE_SPI_BIN)
 
 
 ifneq ($(EFI_IFWI_BIN),)
@@ -503,7 +503,7 @@ pfw_rebuild_settings := true
 include $(TARGET_DEVICE_DIR)/audio/AndroidBoard.mk
 AUTO_IN += $(TARGET_DEVICE_DIR)/extra_files/audio/auto_hal.in
 ##############################################################
-# Source: device/intel/mixins/groups/device-specific/caas_dev/AndroidBoard.mk
+# Source: device/intel/mixins/groups/device-specific/caas_vbb/AndroidBoard.mk
 ##############################################################
 KERNEL_APL_DIFFCONFIG = $(wildcard $(KERNEL_CONFIG_PATH)/apl_nuc_diffconfig)
 KERNEL_DIFFCONFIG += $(KERNEL_APL_DIFFCONFIG)

diff --git a/caas_dev/BoardConfig.mk → caas_vbb/BoardConfig.mk b/caas_dev/BoardConfig.mk → caas_vbb/BoardConfig.mk
@@ -283,7 +283,7 @@ USE_LEGACY_BASELINE_AUDIO_HAL := true
 ##############################################################
 DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/device-type/overlay-tablet
 ##############################################################
-# Source: device/intel/mixins/groups/device-specific/caas_dev/BoardConfig.mk
+# Source: device/intel/mixins/groups/device-specific/caas_vbb/BoardConfig.mk
 ##############################################################
 DEVICE_PACKAGE_OVERLAYS += ${TARGET_DEVICE_DIR}/overlay
 

diff --git a/caas_dev/audio/AndroidBoard.mk → caas_vbb/audio/AndroidBoard.mk b/caas_dev/audio/AndroidBoard.mk → caas_vbb/audio/AndroidBoard.mk
diff --git a/caas_dev/audio/default/AndroidBoard.mk → caas_vbb/audio/default/AndroidBoard.mk b/caas_dev/audio/default/AndroidBoard.mk → caas_vbb/audio/default/AndroidBoard.mk
diff --git a/...ev/audio/default/effect/audio_effects.xml → ...bb/audio/default/effect/audio_effects.xml b/...ev/audio/default/effect/audio_effects.xml → ...bb/audio/default/effect/audio_effects.xml
diff --git a/caas_dev/audio/default/mixer_paths_0.xml → caas_vbb/audio/default/mixer_paths_0.xml b/caas_dev/audio/default/mixer_paths_0.xml → caas_vbb/audio/default/mixer_paths_0.xml
diff --git a/caas_dev/audio/default/mixer_paths_ehl.xml → caas_vbb/audio/default/mixer_paths_ehl.xml b/caas_dev/audio/default/mixer_paths_ehl.xml → caas_vbb/audio/default/mixer_paths_ehl.xml
diff --git a/caas_dev/audio/default/mixer_paths_usb.xml → caas_vbb/audio/default/mixer_paths_usb.xml b/caas_dev/audio/default/mixer_paths_usb.xml → caas_vbb/audio/default/mixer_paths_usb.xml
diff --git a/...ult/parameter-framework/AudioCriteria.txt → ...ult/parameter-framework/AudioCriteria.txt b/...ult/parameter-framework/AudioCriteria.txt → ...ult/parameter-framework/AudioCriteria.txt
diff --git a/...ter-framework/AudioParameterFramework.xml → ...ter-framework/AudioParameterFramework.xml b/...ter-framework/AudioParameterFramework.xml → ...ter-framework/AudioParameterFramework.xml
diff --git a/...ork/Settings/Audio/routing_defaulthda.pfw → ...ork/Settings/Audio/routing_defaulthda.pfw b/...ork/Settings/Audio/routing_defaulthda.pfw → ...ork/Settings/Audio/routing_defaulthda.pfw
diff --git a/...framework/Settings/Audio/routing_hdmi.pfw → ...framework/Settings/Audio/routing_hdmi.pfw b/...framework/Settings/Audio/routing_hdmi.pfw → ...framework/Settings/Audio/routing_hdmi.pfw
diff --git a/...-framework/Structure/Audio/AudioClass.xml → ...-framework/Structure/Audio/AudioClass.xml b/...-framework/Structure/Audio/AudioClass.xml → ...-framework/Structure/Audio/AudioClass.xml
diff --git a/...ructure/Audio/DefaultHDaudioSubsystem.xml → ...ructure/Audio/DefaultHDaudioSubsystem.xml b/...ructure/Audio/DefaultHDaudioSubsystem.xml → ...ructure/Audio/DefaultHDaudioSubsystem.xml
diff --git a/...amework/Structure/Audio/HdmiSubsystem.xml → ...amework/Structure/Audio/HdmiSubsystem.xml b/...amework/Structure/Audio/HdmiSubsystem.xml → ...amework/Structure/Audio/HdmiSubsystem.xml
diff --git a/...olicy/a2dp_audio_policy_configuration.xml → ...olicy/a2dp_audio_policy_configuration.xml b/...olicy/a2dp_audio_policy_configuration.xml → ...olicy/a2dp_audio_policy_configuration.xml
diff --git a/...2dp_in_audio_policy_configuration_7_0.xml → ...2dp_in_audio_policy_configuration_7_0.xml b/...2dp_in_audio_policy_configuration_7_0.xml → ...2dp_in_audio_policy_configuration_7_0.xml
diff --git a/...ult/policy/audio_policy_configuration.xml → ...ult/policy/audio_policy_configuration.xml b/...ult/policy/audio_policy_configuration.xml → ...ult/policy/audio_policy_configuration.xml
diff --git a/...default/policy/audio_policy_criteria.conf → ...default/policy/audio_policy_criteria.conf b/...default/policy/audio_policy_criteria.conf → ...default/policy/audio_policy_criteria.conf
diff --git a/...icy/audio_policy_engine_configuration.xml → ...icy/audio_policy_engine_configuration.xml b/...icy/audio_policy_engine_configuration.xml → ...icy/audio_policy_engine_configuration.xml
diff --git a/...t/policy/audio_policy_engine_criteria.xml → ...t/policy/audio_policy_engine_criteria.xml b/...t/policy/audio_policy_engine_criteria.xml → ...t/policy/audio_policy_engine_criteria.xml
diff --git a/...udio_policy_engine_criterion_types.xml.in → ...udio_policy_engine_criterion_types.xml.in b/...udio_policy_engine_criterion_types.xml.in → ...udio_policy_engine_criterion_types.xml.in
diff --git a/...udio_policy_engine_product_strategies.xml → ...udio_policy_engine_product_strategies.xml b/...udio_policy_engine_product_strategies.xml → ...udio_policy_engine_product_strategies.xml
diff --git a/...o/default/policy/audio_policy_volumes.xml → ...o/default/policy/audio_policy_volumes.xml b/...o/default/policy/audio_policy_volumes.xml → ...o/default/policy/audio_policy_volumes.xml
diff --git a/...etooth_audio_policy_configuration_7_0.xml → ...etooth_audio_policy_configuration_7_0.xml b/...etooth_audio_policy_configuration_7_0.xml → ...etooth_audio_policy_configuration_7_0.xml
diff --git a/.../default/policy/default_volume_tables.xml → .../default/policy/default_volume_tables.xml b/.../default/policy/default_volume_tables.xml → .../default/policy/default_volume_tables.xml
diff --git a/...ck/audio_policy_configuration_generic.xml → ...ck/audio_policy_configuration_generic.xml b/...ck/audio_policy_configuration_generic.xml → ...ck/audio_policy_configuration_generic.xml
diff --git a/.../policy/fallback/audio_policy_volumes.xml → .../policy/fallback/audio_policy_volumes.xml b/.../policy/fallback/audio_policy_volumes.xml → .../policy/fallback/audio_policy_volumes.xml
diff --git a/...policy/fallback/default_volume_tables.xml → ...policy/fallback/default_volume_tables.xml b/...policy/fallback/default_volume_tables.xml → ...policy/fallback/default_volume_tables.xml
diff --git a/...ck/primary_audio_policy_configuration.xml → ...ck/primary_audio_policy_configuration.xml b/...ck/primary_audio_policy_configuration.xml → ...ck/primary_audio_policy_configuration.xml
diff --git a/...k/r_submix_audio_policy_configuration.xml → ...k/r_submix_audio_policy_configuration.xml b/...k/r_submix_audio_policy_configuration.xml → ...k/r_submix_audio_policy_configuration.xml
diff --git a/...olicy/hdmi_audio_policy_configuration.xml → ...olicy/hdmi_audio_policy_configuration.xml b/...olicy/hdmi_audio_policy_configuration.xml → ...olicy/hdmi_audio_policy_configuration.xml
diff --git a/...y/r_submix_audio_policy_configuration.xml → ...y/r_submix_audio_policy_configuration.xml b/...y/r_submix_audio_policy_configuration.xml → ...y/r_submix_audio_policy_configuration.xml
diff --git a/...olicy/stub_audio_policy_configuration.xml → ...olicy/stub_audio_policy_configuration.xml b/...olicy/stub_audio_policy_configuration.xml → ...olicy/stub_audio_policy_configuration.xml
diff --git a/...policy/usb_audio_policy_configuration.xml → ...policy/usb_audio_policy_configuration.xml b/...policy/usb_audio_policy_configuration.xml → ...policy/usb_audio_policy_configuration.xml
diff --git a/...ev/audio/default/route/audio_criteria.xml → ...bb/audio/default/route/audio_criteria.xml b/...ev/audio/default/route/audio_criteria.xml → ...bb/audio/default/route/audio_criteria.xml
diff --git a/...o/default/route/audio_criterion_types.xml → ...o/default/route/audio_criterion_types.xml b/...o/default/route/audio_criterion_types.xml → ...o/default/route/audio_criterion_types.xml
diff --git a/...configurable_audio_policy/AndroidBoard.mk → ...configurable_audio_policy/AndroidBoard.mk b/...configurable_audio_policy/AndroidBoard.mk → ...configurable_audio_policy/AndroidBoard.mk
diff --git a/...ameterFrameworkConfigurationPolicy.xml.in → ...ameterFrameworkConfigurationPolicy.xml.in b/...ameterFrameworkConfigurationPolicy.xml.in → ...ameterFrameworkConfigurationPolicy.xml.in
diff --git a/...rence_configurable_audio_policy/README.md → ...rence_configurable_audio_policy/README.md b/...rence_configurable_audio_policy/README.md → ...rence_configurable_audio_policy/README.md
diff --git a/...cy/Settings/PolicyConfigurableDomains.xml → ...cy/Settings/PolicyConfigurableDomains.xml b/...cy/Settings/PolicyConfigurableDomains.xml → ...cy/Settings/PolicyConfigurableDomains.xml
diff --git a/...licy/Settings/device_for_input_source.pfw → ...licy/Settings/device_for_input_source.pfw b/...licy/Settings/device_for_input_source.pfw → ...licy/Settings/device_for_input_source.pfw
diff --git a/...ngs/device_for_strategy_accessibility.pfw → ...ngs/device_for_strategy_accessibility.pfw b/...ngs/device_for_strategy_accessibility.pfw → ...ngs/device_for_strategy_accessibility.pfw
diff --git a/...icy/Settings/device_for_strategy_dtmf.pfw → ...icy/Settings/device_for_strategy_dtmf.pfw b/...icy/Settings/device_for_strategy_dtmf.pfw → ...icy/Settings/device_for_strategy_dtmf.pfw
diff --git a/.../device_for_strategy_enforced_audible.pfw → .../device_for_strategy_enforced_audible.pfw b/.../device_for_strategy_enforced_audible.pfw → .../device_for_strategy_enforced_audible.pfw
diff --git a/...cy/Settings/device_for_strategy_media.pfw → ...cy/Settings/device_for_strategy_media.pfw b/...cy/Settings/device_for_strategy_media.pfw → ...cy/Settings/device_for_strategy_media.pfw
diff --git a/...cy/Settings/device_for_strategy_phone.pfw → ...cy/Settings/device_for_strategy_phone.pfw b/...cy/Settings/device_for_strategy_phone.pfw → ...cy/Settings/device_for_strategy_phone.pfw
diff --git a/...ettings/device_for_strategy_rerouting.pfw → ...ettings/device_for_strategy_rerouting.pfw b/...ettings/device_for_strategy_rerouting.pfw → ...ettings/device_for_strategy_rerouting.pfw
diff --git a/...ings/device_for_strategy_sonification.pfw → ...ings/device_for_strategy_sonification.pfw b/...ings/device_for_strategy_sonification.pfw → ...ings/device_for_strategy_sonification.pfw
diff --git a/..._for_strategy_sonification_respectful.pfw → ..._for_strategy_sonification_respectful.pfw b/..._for_strategy_sonification_respectful.pfw → ..._for_strategy_sonification_respectful.pfw
diff --git a/..._strategy_transmitted_through_speaker.pfw → ..._strategy_transmitted_through_speaker.pfw b/..._strategy_transmitted_through_speaker.pfw → ..._strategy_transmitted_through_speaker.pfw
diff --git a/...o_policy/Settings/strategy_for_stream.pfw → ...o_policy/Settings/strategy_for_stream.pfw b/...o_policy/Settings/strategy_for_stream.pfw → ...o_policy/Settings/strategy_for_stream.pfw
diff --git a/...io_policy/Settings/strategy_for_usage.pfw → ...io_policy/Settings/strategy_for_usage.pfw b/...io_policy/Settings/strategy_for_usage.pfw → ...io_policy/Settings/strategy_for_usage.pfw
diff --git a/...gurable_audio_policy/Settings/volumes.pfw → ...gurable_audio_policy/Settings/volumes.pfw b/...gurable_audio_policy/Settings/volumes.pfw → ...gurable_audio_policy/Settings/volumes.pfw
diff --git a/...ttingsNoInput/device_for_input_source.pfw → ...ttingsNoInput/device_for_input_source.pfw b/...ttingsNoInput/device_for_input_source.pfw → ...ttingsNoInput/device_for_input_source.pfw
diff --git a/...ettingsNoOutput/device_for_strategies.pfw → ...ettingsNoOutput/device_for_strategies.pfw b/...ettingsNoOutput/device_for_strategies.pfw → ...ettingsNoOutput/device_for_strategies.pfw
diff --git a/...le_audio_policy/Structure/PolicyClass.xml → ...le_audio_policy/Structure/PolicyClass.xml b/...le_audio_policy/Structure/PolicyClass.xml → ...le_audio_policy/Structure/PolicyClass.xml
diff --git a/...Structure/PolicySubsystem-CommonTypes.xml → ...Structure/PolicySubsystem-CommonTypes.xml b/...Structure/PolicySubsystem-CommonTypes.xml → ...Structure/PolicySubsystem-CommonTypes.xml
diff --git a/...udio_policy/Structure/PolicySubsystem.xml → ...udio_policy/Structure/PolicySubsystem.xml b/...udio_policy/Structure/PolicySubsystem.xml → ...udio_policy/Structure/PolicySubsystem.xml
diff --git a/...igurable_audio_policy/policy_criteria.txt → ...igurable_audio_policy/policy_criteria.txt b/...igurable_audio_policy/policy_criteria.txt → ...igurable_audio_policy/policy_criteria.txt
diff --git a/caas_dev/auto_switch_pt_usb_vms.sh → caas_vbb/auto_switch_pt_usb_vms.sh b/caas_dev/auto_switch_pt_usb_vms.sh → caas_vbb/auto_switch_pt_usb_vms.sh
diff --git a/caas_dev/bldr_utils.img → caas_vbb/bldr_utils.img b/caas_dev/bldr_utils.img → caas_vbb/bldr_utils.img
diff --git a/caas_dev/caas_dev.mk → caas_vbb/caas_vbb.mk b/caas_dev/caas_dev.mk → caas_vbb/caas_vbb.mk
@@ -47,8 +47,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(LOCAL_PATH)/device.mk)
 
-PRODUCT_NAME := caas_dev
-PRODUCT_DEVICE := caas_dev
+PRODUCT_NAME := caas_vbb
+PRODUCT_DEVICE := caas_vbb
 PRODUCT_BRAND := intel
 PRODUCT_MODEL := AOSP on Intel Platform
 PRODUCT_MANUFACTURER := Intel

diff --git a/caas_dev/cam_sharing/0001-Netlink-sync.patch → caas_vbb/cam_sharing/0001-Netlink-sync.patch b/caas_dev/cam_sharing/0001-Netlink-sync.patch → caas_vbb/cam_sharing/0001-Netlink-sync.patch
diff --git a/caas_dev/cam_sharing/IntelCameraService → caas_vbb/cam_sharing/IntelCameraService b/caas_dev/cam_sharing/IntelCameraService → caas_vbb/cam_sharing/IntelCameraService
diff --git a/caas_dev/cam_sharing/virtualcamera.service → caas_vbb/cam_sharing/virtualcamera.service b/caas_dev/cam_sharing/virtualcamera.service → caas_vbb/cam_sharing/virtualcamera.service
diff --git a/caas_dev/check_lowmem.sh → caas_vbb/check_lowmem.sh b/caas_dev/check_lowmem.sh → caas_vbb/check_lowmem.sh
diff --git a/caas_dev/compatibility_matrix.xml → caas_vbb/compatibility_matrix.xml b/caas_dev/compatibility_matrix.xml → caas_vbb/compatibility_matrix.xml
diff --git a/...g-lts/linux-intel-lts2021/caas_diffconfig → ...g-lts/linux-intel-lts2021/caas_diffconfig b/...g-lts/linux-intel-lts2021/caas_diffconfig → ...g-lts/linux-intel-lts2021/caas_diffconfig
diff --git a/...-lts/linux-intel-lts2021/debug_diffconfig → ...-lts/linux-intel-lts2021/debug_diffconfig b/...-lts/linux-intel-lts2021/debug_diffconfig → ...-lts/linux-intel-lts2021/debug_diffconfig
diff --git a/...-lts/linux-intel-lts2021/x86_64_defconfig → ...-lts/linux-intel-lts2021/x86_64_defconfig b/...-lts/linux-intel-lts2021/x86_64_defconfig → ...-lts/linux-intel-lts2021/x86_64_defconfig
diff --git a/...nfig-lts/lts2021-chromium/caas_diffconfig → ...nfig-lts/lts2021-chromium/caas_diffconfig b/...nfig-lts/lts2021-chromium/caas_diffconfig → ...nfig-lts/lts2021-chromium/caas_diffconfig
diff --git a/...fig-lts/lts2021-chromium/debug_diffconfig → ...fig-lts/lts2021-chromium/debug_diffconfig b/...fig-lts/lts2021-chromium/debug_diffconfig → ...fig-lts/lts2021-chromium/debug_diffconfig
diff --git a/...fig-lts/lts2021-chromium/x86_64_defconfig → ...fig-lts/lts2021-chromium/x86_64_defconfig b/...fig-lts/lts2021-chromium/x86_64_defconfig → ...fig-lts/lts2021-chromium/x86_64_defconfig
diff --git a/caas_dev/device.mk → caas_vbb/device.mk b/caas_dev/device.mk → caas_vbb/device.mk
@@ -241,7 +241,7 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/tablet_core_hardware.xml:vendor/etc/permissions/tablet_core_hardware.xml
 
 ##############################################################
-# Source: device/intel/mixins/groups/device-specific/caas_dev/product.mk
+# Source: device/intel/mixins/groups/device-specific/caas_vbb/product.mk
 ##############################################################
 TARGET_BOARD_PLATFORM := celadon
 

diff --git a/...ev/extra_files/abota-fw/update_ifwi_ab.sh → ...bb/extra_files/abota-fw/update_ifwi_ab.sh b/...ev/extra_files/abota-fw/update_ifwi_ab.sh → ...bb/extra_files/abota-fw/update_ifwi_ab.sh
diff --git a/.../extra_files/abota-fw/update_ifwi_boot.sh → .../extra_files/abota-fw/update_ifwi_boot.sh b/.../extra_files/abota-fw/update_ifwi_boot.sh → .../extra_files/abota-fw/update_ifwi_boot.sh
diff --git a/...tra_files/abota-fw/upgrade_o/fw_update.sh → ...tra_files/abota-fw/upgrade_o/fw_update.sh b/...tra_files/abota-fw/upgrade_o/fw_update.sh → ...tra_files/abota-fw/upgrade_o/fw_update.sh
diff --git a/...ra_files/abota-fw/upgrade_o/updater_ab.sh → ...ra_files/abota-fw/upgrade_o/updater_ab.sh b/...ra_files/abota-fw/upgrade_o/updater_ab.sh → ...ra_files/abota-fw/upgrade_o/updater_ab.sh
diff --git a/...xtra_files/acpio-partition/dummy-ssdt.asl → ...xtra_files/acpio-partition/dummy-ssdt.asl b/...xtra_files/acpio-partition/dummy-ssdt.asl → ...xtra_files/acpio-partition/dummy-ssdt.asl
diff --git a/caas_dev/extra_files/audio/auto_hal.in → caas_vbb/extra_files/audio/auto_hal.in b/caas_dev/extra_files/audio/auto_hal.in → caas_vbb/extra_files/audio/auto_hal.in
diff --git a/caas_dev/extra_files/avx/checkavx.sh → caas_vbb/extra_files/avx/checkavx.sh b/caas_dev/extra_files/avx/checkavx.sh → caas_vbb/extra_files/avx/checkavx.sh
diff --git a/...dev/extra_files/boot-arch/set_soc_prop.sh → ...vbb/extra_files/boot-arch/set_soc_prop.sh b/...dev/extra_files/boot-arch/set_soc_prop.sh → ...vbb/extra_files/boot-arch/set_soc_prop.sh
diff --git a/caas_dev/extra_files/boot-arch/startup.nsh → caas_vbb/extra_files/boot-arch/startup.nsh b/caas_dev/extra_files/boot-arch/startup.nsh → caas_vbb/extra_files/boot-arch/startup.nsh
diff --git a/...v/extra_files/boot-arch/update_ifwi_ab.sh → ...b/extra_files/boot-arch/update_ifwi_ab.sh b/...v/extra_files/boot-arch/update_ifwi_ab.sh → ...b/extra_files/boot-arch/update_ifwi_ab.sh
diff --git a/...les/camera-ext/external_camera_config.xml → ...les/camera-ext/external_camera_config.xml b/...les/camera-ext/external_camera_config.xml → ...les/camera-ext/external_camera_config.xml
diff --git a/...ev/extra_files/codec2/media_codecs_c2.xml → ...bb/extra_files/codec2/media_codecs_c2.xml b/...ev/extra_files/codec2/media_codecs_c2.xml → ...bb/extra_files/codec2/media_codecs_c2.xml
diff --git a/...es/codec2/media_codecs_intel_c2_video.xml → ...es/codec2/media_codecs_intel_c2_video.xml b/...es/codec2/media_codecs_intel_c2_video.xml → ...es/codec2/media_codecs_intel_c2_video.xml
diff --git a/...odec2/media_codecs_performance_c2_adl.xml → ...odec2/media_codecs_performance_c2_adl.xml b/...odec2/media_codecs_performance_c2_adl.xml → ...odec2/media_codecs_performance_c2_adl.xml
diff --git a/...odec2/media_codecs_performance_c2_tgl.xml → ...odec2/media_codecs_performance_c2_tgl.xml b/...odec2/media_codecs_performance_c2_tgl.xml → ...odec2/media_codecs_performance_c2_tgl.xml
diff --git a/..._dev/extra_files/codec2/mfx_c2_store.conf → ..._vbb/extra_files/codec2/mfx_c2_store.conf b/..._dev/extra_files/codec2/mfx_c2_store.conf → ..._vbb/extra_files/codec2/mfx_c2_store.conf
diff --git a/caas_dev/extra_files/codecs/auto_hal.in → caas_vbb/extra_files/codecs/auto_hal.in b/caas_dev/extra_files/codecs/auto_hal.in → caas_vbb/extra_files/codecs/auto_hal.in
diff --git a/...extra_files/codecs/media_codecs_gen12.xml → ...extra_files/codecs/media_codecs_gen12.xml b/...extra_files/codecs/media_codecs_gen12.xml → ...extra_files/codecs/media_codecs_gen12.xml
diff --git a/.../extra_files/codecs/media_codecs_gen9.xml → .../extra_files/codecs/media_codecs_gen9.xml b/.../extra_files/codecs/media_codecs_gen9.xml → .../extra_files/codecs/media_codecs_gen9.xml
diff --git a/...s/codecs/media_codecs_performance_adl.xml → ...s/codecs/media_codecs_performance_adl.xml b/...s/codecs/media_codecs_performance_adl.xml → ...s/codecs/media_codecs_performance_adl.xml
diff --git a/...s/codecs/media_codecs_performance_cml.xml → ...s/codecs/media_codecs_performance_cml.xml b/...s/codecs/media_codecs_performance_cml.xml → ...s/codecs/media_codecs_performance_cml.xml
diff --git a/...s/codecs/media_codecs_performance_tgl.xml → ...s/codecs/media_codecs_performance_tgl.xml b/...s/codecs/media_codecs_performance_tgl.xml → ...s/codecs/media_codecs_performance_tgl.xml
diff --git a/...v/extra_files/codecs/media_codecs_vp9.xml → ...b/extra_files/codecs/media_codecs_vp9.xml b/...v/extra_files/codecs/media_codecs_vp9.xml → ...b/extra_files/codecs/media_codecs_vp9.xml
diff --git a/...dev/extra_files/codecs/media_profiles.xml → ...vbb/extra_files/codecs/media_profiles.xml b/...dev/extra_files/codecs/media_profiles.xml → ...vbb/extra_files/codecs/media_profiles.xml
diff --git a/...tra_files/codecs/media_profiles_1080p.xml → ...tra_files/codecs/media_profiles_1080p.xml b/...tra_files/codecs/media_profiles_1080p.xml → ...tra_files/codecs/media_profiles_1080p.xml
diff --git a/...ev/extra_files/codecs/mfx_omxil_core.conf → ...bb/extra_files/codecs/mfx_omxil_core.conf b/...ev/extra_files/codecs/mfx_omxil_core.conf → ...bb/extra_files/codecs/mfx_omxil_core.conf
diff --git a/...xtra_files/codecs/mfx_omxil_core_vp9.conf → ...xtra_files/codecs/mfx_omxil_core_vp9.conf b/...xtra_files/codecs/mfx_omxil_core_vp9.conf → ...xtra_files/codecs/mfx_omxil_core_vp9.conf
diff --git a/...a_files/debug-crashlogd/init.crashlogd.rc → ...a_files/debug-crashlogd/init.crashlogd.rc b/...a_files/debug-crashlogd/init.crashlogd.rc → ...a_files/debug-crashlogd/init.crashlogd.rc
diff --git a/.../extra_files/ethernet/load_eth_modules.in → .../extra_files/ethernet/load_eth_modules.in b/.../extra_files/ethernet/load_eth_modules.in → .../extra_files/ethernet/load_eth_modules.in
diff --git a/...v/extra_files/firststage-mount/config.asl → ...b/extra_files/firststage-mount/config.asl b/...v/extra_files/firststage-mount/config.asl → ...b/extra_files/firststage-mount/config.asl
diff --git a/caas_dev/extra_files/graphics/auto_hal.in → caas_vbb/extra_files/graphics/auto_hal.in b/caas_dev/extra_files/graphics/auto_hal.in → caas_vbb/extra_files/graphics/auto_hal.in
diff --git a/caas_dev/extra_files/graphics/drirc → caas_vbb/extra_files/graphics/drirc b/caas_dev/extra_files/graphics/drirc → caas_vbb/extra_files/graphics/drirc
diff --git a/...dev/extra_files/intel_prop/intel_prop.cfg → ...vbb/extra_files/intel_prop/intel_prop.cfg b/...dev/extra_files/intel_prop/intel_prop.cfg → ...vbb/extra_files/intel_prop/intel_prop.cfg
diff --git a/...extra_files/kernel/load_kernel_modules.in → ...extra_files/kernel/load_kernel_modules.in b/...extra_files/kernel/load_kernel_modules.in → ...extra_files/kernel/load_kernel_modules.in
diff --git a/caas_dev/extra_files/media/auto_hal.in → caas_vbb/extra_files/media/auto_hal.in b/caas_dev/extra_files/media/auto_hal.in → caas_vbb/extra_files/media/auto_hal.in
diff --git a/...ev/extra_files/neuralnetworks/plugins.xml → ...bb/extra_files/neuralnetworks/plugins.xml b/...ev/extra_files/neuralnetworks/plugins.xml → ...bb/extra_files/neuralnetworks/plugins.xml
diff --git a/caas_dev/extra_files/power/auto_hal.in → caas_vbb/extra_files/power/auto_hal.in b/caas_dev/extra_files/power/auto_hal.in → caas_vbb/extra_files/power/auto_hal.in
diff --git a/...les/public-libraries/public.libraries.txt → ...les/public-libraries/public.libraries.txt b/...les/public-libraries/public.libraries.txt → ...les/public-libraries/public.libraries.txt
diff --git a/caas_dev/extra_files/sensors/auto_hal.in → caas_vbb/extra_files/sensors/auto_hal.in b/caas_dev/extra_files/sensors/auto_hal.in → caas_vbb/extra_files/sensors/auto_hal.in
diff --git a/caas_dev/extra_files/slot-ab/postinstall.sh → caas_vbb/extra_files/slot-ab/postinstall.sh b/caas_dev/extra_files/slot-ab/postinstall.sh → caas_vbb/extra_files/slot-ab/postinstall.sh
diff --git a/caas_dev/extra_files/suspend/auto_hal.in → caas_vbb/extra_files/suspend/auto_hal.in b/caas_dev/extra_files/suspend/auto_hal.in → caas_vbb/extra_files/suspend/auto_hal.in
diff --git a/caas_dev/extra_files/thermal/auto_hal.in → caas_vbb/extra_files/thermal/auto_hal.in b/caas_dev/extra_files/thermal/auto_hal.in → caas_vbb/extra_files/thermal/auto_hal.in
diff --git a/caas_dev/extra_files/usb-gadget/auto_hal.in → caas_vbb/extra_files/usb-gadget/auto_hal.in b/caas_dev/extra_files/usb-gadget/auto_hal.in → caas_vbb/extra_files/usb-gadget/auto_hal.in
diff --git a/.../extra_files/usb-init/load_usb_modules.in → .../extra_files/usb-init/load_usb_modules.in b/.../extra_files/usb-init/load_usb_modules.in → .../extra_files/usb-init/load_usb_modules.in
diff --git a/...ra_files/usb-otg-switch/usb_otg_switch.sh → ...ra_files/usb-otg-switch/usb_otg_switch.sh b/...ra_files/usb-otg-switch/usb_otg_switch.sh → ...ra_files/usb-otg-switch/usb_otg_switch.sh
diff --git a/...ra_files/vendor-partition/mkshrc_recovery → ...ra_files/vendor-partition/mkshrc_recovery b/...ra_files/vendor-partition/mkshrc_recovery → ...ra_files/vendor-partition/mkshrc_recovery
diff --git a/.../extra_files/vendor-partition/sh_recovery → .../extra_files/vendor-partition/sh_recovery b/.../extra_files/vendor-partition/sh_recovery → .../extra_files/vendor-partition/sh_recovery
diff --git a/...a_files/vendor-partition/toolbox_recovery → ...a_files/vendor-partition/toolbox_recovery b/...a_files/vendor-partition/toolbox_recovery → ...a_files/vendor-partition/toolbox_recovery
diff --git a/caas_dev/file_share.sh → caas_vbb/file_share.sh b/caas_dev/file_share.sh → caas_vbb/file_share.sh
diff --git a/caas_dev/findall.py → caas_vbb/findall.py b/caas_dev/findall.py → caas_vbb/findall.py
diff --git a/caas_dev/flash_cmd.sh → caas_vbb/flash_cmd.sh b/caas_dev/flash_cmd.sh → caas_vbb/flash_cmd.sh
diff --git a/caas_dev/flashfiles.ini → caas_vbb/flashfiles.ini b/caas_dev/flashfiles.ini → caas_vbb/flashfiles.ini
@@ -48,7 +48,7 @@ description = Erase teedata partition
 
 
 ##############################################################
-# Source: device/intel/mixins/groups/device-specific/caas_dev/flashfiles.ini
+# Source: device/intel/mixins/groups/device-specific/caas_vbb/flashfiles.ini
 ##############################################################
 [global]
 [command.unlock.unlock]

diff --git a/caas_dev/framework_manifest.xml → caas_vbb/framework_manifest.xml b/caas_dev/framework_manifest.xml → caas_vbb/framework_manifest.xml
diff --git a/caas_dev/fstab → caas_vbb/fstab b/caas_dev/fstab → caas_vbb/fstab
diff --git a/caas_dev/fstab.recovery → caas_vbb/fstab.recovery b/caas_dev/fstab.recovery → caas_vbb/fstab.recovery
diff --git a/caas_dev/gpt.ini → caas_vbb/gpt.ini b/caas_dev/gpt.ini → caas_vbb/gpt.ini
diff --git a/caas_dev/guest_pm_control → caas_vbb/guest_pm_control b/caas_dev/guest_pm_control → caas_vbb/guest_pm_control
diff --git a/caas_dev/init.rc → caas_vbb/init.rc b/caas_dev/init.rc → caas_vbb/init.rc
@@ -195,7 +195,7 @@ on property:sys.boot_completed=1 && property:ro.vendor.hdmi.audio=tgl
     stop audioserver
     start audioserver
 ##############################################################
-# Source: device/intel/mixins/groups/device-specific/caas_dev/init.rc
+# Source: device/intel/mixins/groups/device-specific/caas_vbb/init.rc
 ##############################################################
 on post-fs-data
     mkdir /data/kpanic 0770 system system

diff --git a/caas_dev/init.recovery.rc → caas_vbb/init.recovery.rc b/caas_dev/init.recovery.rc → caas_vbb/init.recovery.rc
@@ -16,7 +16,7 @@ on boot
     start watchdogd
     write /proc/sys/kernel/hung_task_timeout_secs 120
 ##############################################################
-# Source: device/intel/mixins/groups/device-specific/caas_dev/init.recovery.rc
+# Source: device/intel/mixins/groups/device-specific/caas_vbb/init.recovery.rc
 ##############################################################
 on post-fs
     wait /dev/graphics/fb0

diff --git a/caas_dev/intel-thermal-conf.xml → caas_vbb/intel-thermal-conf.xml b/caas_dev/intel-thermal-conf.xml → caas_vbb/intel-thermal-conf.xml
diff --git a/caas_dev/manifest.xml → caas_vbb/manifest.xml b/caas_dev/manifest.xml → caas_vbb/manifest.xml
diff --git a/caas_dev/mixins.spec → caas_vbb/mixins.spec b/caas_dev/mixins.spec → caas_vbb/mixins.spec
@@ -9,7 +9,7 @@ product.mk: device.mk
 [groups]
 kernel: gmin64(useprebuilt=false,src_path=kernel/lts2021-chromium, loglevel=8, interactive_governor=false, relative_sleepstates=false, modules_in_bootimg=false, external_modules=,debug_modules=, use_bcmdhd=false, use_iwlwifi=false, extmod_platform=bxt, iwl_defconfig=, cfg_path=config-lts/lts2021-chromium, more_modules=true, lts2021_chromium_src_path=kernel/lts2021-chromium, lts2021_chromium_cfg_path=config-lts/lts2021-chromium, linux_intel_lts2021_src_path=kernel/linux-intel-lts2021, linux_intel_lts2021_cfg_path=config-lts/linux-intel-lts2021)
 disk-bus: auto
-boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,metadata_encryption=true,fsverity=true,target=caas_dev,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true,userdata_checkpoint=true,data_use_f2fs=true)
+boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,metadata_encryption=true,fsverity=true,target=caas_vbb,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true,userdata_checkpoint=true,data_use_f2fs=true)
 sepolicy: permissive
 bluetooth: btusb(ivi=false)
 audio: project-celadon
@@ -67,7 +67,7 @@ usb-audio-init: false
 usb-otg-switch: true
 vndk: true
 public-libraries: true
-device-specific: caas_dev
+device-specific: caas_vbb
 hdcpd: true
 treble: true
 swap: zram_auto(size=1073741824,swappiness=true,hardware=gordon_peak,disk_based_swap=true)

diff --git a/...works/base/core/res/res/values/config.xml → ...works/base/core/res/res/values/config.xml b/...works/base/core/res/res/values/config.xml → ...works/base/core/res/res/values/config.xml
diff --git a/...orks/base/core/res/res/values/strings.xml → ...orks/base/core/res/res/values/strings.xml b/...orks/base/core/res/res/values/strings.xml → ...orks/base/core/res/res/values/strings.xml
diff --git a/...orks/base/core/res/res/values/symbols.xml → ...orks/base/core/res/res/values/symbols.xml b/...orks/base/core/res/res/values/symbols.xml → ...orks/base/core/res/res/values/symbols.xml
diff --git a/...s/base/core/res/res/xml/power_profile.xml → ...s/base/core/res/res/xml/power_profile.xml b/...s/base/core/res/res/xml/power_profile.xml → ...s/base/core/res/res/xml/power_profile.xml
diff --git a/.../SettingsProvider/res/values/defaults.xml → .../SettingsProvider/res/values/defaults.xml b/.../SettingsProvider/res/values/defaults.xml → .../SettingsProvider/res/values/defaults.xml
diff --git a/...e/packages/SystemUI/res/values/config.xml → ...e/packages/SystemUI/res/values/config.xml b/...e/packages/SystemUI/res/values/config.xml → ...e/packages/SystemUI/res/values/config.xml
diff --git a/...ages/apps/Bluetooth/res/values/config.xml → ...ages/apps/Bluetooth/res/values/config.xml b/...ages/apps/Bluetooth/res/values/config.xml → ...ages/apps/Bluetooth/res/values/config.xml
diff --git a/caas_dev/setup_audio_host.sh → caas_vbb/setup_audio_host.sh b/caas_dev/setup_audio_host.sh → caas_vbb/setup_audio_host.sh
diff --git a/caas_dev/sof_audio/configure_sof.sh → caas_vbb/sof_audio/configure_sof.sh b/caas_dev/sof_audio/configure_sof.sh → caas_vbb/sof_audio/configure_sof.sh
diff --git a/caas_dev/system.prop → caas_vbb/system.prop b/caas_dev/system.prop → caas_vbb/system.prop
@@ -1,5 +1,5 @@
 #
-# system.prop for caas_dev
+# system.prop for caas_vbb
 #
 
 persist.sys.enable_rescue=false

diff --git a/caas_dev/thermald.service → caas_vbb/thermald.service b/caas_dev/thermald.service → caas_vbb/thermald.service
diff --git a/caas_dev/ueventd.rc → caas_vbb/ueventd.rc b/caas_dev/ueventd.rc → caas_vbb/ueventd.rc
@@ -18,7 +18,7 @@
 /dev/rfkill                   0660   root       bluetooth
 /dev/bus/usb/00*/00*               0660 bluetooth bluetooth
 ##############################################################
-# Source: device/intel/mixins/groups/device-specific/caas_dev/ueventd.rc
+# Source: device/intel/mixins/groups/device-specific/caas_vbb/ueventd.rc
 ##############################################################
 # FIXME: move these mei definitions to a mix-in
 

diff --git a/caas_dev/wakeup.py → caas_vbb/wakeup.py b/caas_dev/wakeup.py → caas_vbb/wakeup.py