diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
index 6b636a3afbe7..8cb70031938a 100644
--- a/debian.raspi/config/annotations
+++ b/debian.raspi/config/annotations
@@ -9,7 +9,7 @@ CONFIG_AMIGA_PARTITION                          policy<{'arm64': 'n', 'armhf': '
 CONFIG_ARCH_BCM                                 policy<{'arm64': 'y', 'armhf': 'y'}> note<'Required for Pi (different from master)'>
 CONFIG_ARCH_BCM2835                             policy<{'arm64': 'y', 'armhf': 'y'}> note<'Required for Pi (not in master)'>
 CONFIG_ARCH_BCM_63XX                            policy<{'armhf': 'n'}> note<'Introduced by rpi-6.2.y'>
-CONFIG_ARCH_BRCMSTB                             policy<{'arm64': 'y', 'armhf': 'y'}> note<'Required for Pi 5B'>
+CONFIG_ARCH_BRCMSTB                             policy<{'arm64': 'y', 'armhf': 'n'}> note<'Required for Pi 5B'>
 CONFIG_ARCH_FORCE_MAX_ORDER                     policy<{'arm64': '10', 'armhf': '11'}> note<'Required for Pi (different from master)'>
 CONFIG_ARCH_MA35                                policy<{'arm64': 'n'}> note<'Not supported on Pi'>
 CONFIG_ARCH_ROCKCHIP                            policy<{'arm64': 'n', 'armhf': 'n'}> note<'Not supported on Pi'>
@@ -659,7 +659,7 @@ CONFIG_AF_RXRPC_INJECT_LOSS                     policy<{'arm64': 'n', 'armhf': '
 CONFIG_AF_RXRPC_INJECT_RX_DELAY                 policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_AF_RXRPC_IPV6                            policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_AF_UNIX_OOB                              policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_AHCI_BRCM                                policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_AHCI_BRCM                                policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_AHCI_CEVA                                policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_AHCI_DWC                                 policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_AIC79XX_CMDS_PER_DEVICE                  policy<{'arm64': '32', 'armhf': '32'}>
@@ -772,7 +772,7 @@ CONFIG_ARCH_HAS_PMEM_API                        policy<{'arm64': 'y'}>
 CONFIG_ARCH_HAS_PTE_DEVMAP                      policy<{'arm64': 'y'}>
 CONFIG_ARCH_HAS_PTE_SPECIAL                     policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_ARCH_HAS_RELR                            policy<{'arm64': 'y'}>
-CONFIG_ARCH_HAS_RESET_CONTROLLER                policy<{'arm64': 'y', 'armhf': 'y'}>
+CONFIG_ARCH_HAS_RESET_CONTROLLER                policy<{'arm64': 'y', 'armhf': '-'}>
 CONFIG_ARCH_HAS_SETUP_DMA_OPS                   policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_ARCH_HAS_SET_DIRECT_MAP                  policy<{'arm64': 'y'}>
 CONFIG_ARCH_HAS_SET_MEMORY                      policy<{'arm64': 'y', 'armhf': 'y'}>
@@ -973,7 +973,7 @@ CONFIG_ARM_ARCH_TIMER                           policy<{'arm64': 'y', 'armhf': '
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM                 policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND            policy<{'arm64': 'y'}>
 CONFIG_ARM_ATAG_DTB_COMPAT                      policy<{'armhf': 'n'}>
-CONFIG_ARM_BRCMSTB_AVS_CPUFREQ                  policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_ARM_BRCMSTB_AVS_CPUFREQ                  policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_ARM_CMN                                  policy<{'arm64': 'm'}>
 CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU        policy<{'arm64': 'm'}>
 CONFIG_ARM_CPUIDLE                              policy<{'armhf': 'y'}>
@@ -1281,9 +1281,9 @@ CONFIG_BCM2835_POWER                            policy<{'arm64': 'y', 'armhf': '
 CONFIG_BCM2835_TIMER                            policy<{'armhf': 'y'}>
 CONFIG_BCM2835_VCHIQ_MMAL                       policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_BCM54140_PHY                             policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_BCM7038_L1_IRQ                           policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_BCM7038_WDT                              policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_BCM7120_L2_IRQ                           policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_BCM7038_L1_IRQ                           policy<{'arm64': 'm', 'armhf': '-'}>
+CONFIG_BCM7038_WDT                              policy<{'arm64': 'm', 'armhf': '-'}>
+CONFIG_BCM7120_L2_IRQ                           policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_BCM7XXX_PHY                              policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_BCM87XX_PHY                              policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_BCMA                                     policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -1451,12 +1451,12 @@ CONFIG_BRCMFMAC_SDIO                            policy<{'arm64': 'y', 'armhf': '
 CONFIG_BRCMFMAC_USB                             policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_BRCMSMAC                                 policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_BRCMSMAC_LEDS                            policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_BRCMSTB_DPFE                             policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_BRCMSTB_DPFE                             policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_BRCMSTB_L2_IRQ                           policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_BRCMSTB_MEMC                             policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_BRCMSTB_THERMAL                          policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_BRCMSTB_MEMC                             policy<{'arm64': 'm', 'armhf': '-'}>
+CONFIG_BRCMSTB_THERMAL                          policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_BRCMUTIL                                 policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_BRCM_USB_PINMAP                          policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_BRCM_USB_PINMAP                          policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_BRIDGE                                   policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_BRIDGE_CFM                               policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_BRIDGE_EBT_802_3                         policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -1566,7 +1566,6 @@ CONFIG_CACHEFILES_DEBUG                         policy<{'arm64': 'n', 'armhf': '
 CONFIG_CACHEFILES_ERROR_INJECTION               policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_CACHEFILES_ONDEMAND                      policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_CACHESTAT_SYSCALL                        policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_CACHE_B15_RAC                            policy<{'armhf': 'n'}>
 CONFIG_CADENCE_WATCHDOG                         policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_CAIF                                     policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_CAIF_DEBUG                               policy<{'arm64': 'n', 'armhf': 'n'}>
@@ -5024,7 +5023,7 @@ CONFIG_MMC_REALTEK_PCI                          policy<{'arm64': 'n', 'armhf': '
 CONFIG_MMC_REALTEK_USB                          policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MMC_RICOH_MMC                            policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_MMC_SDHCI_AM654                          policy<{'arm64': 'n', 'armhf': 'n'}>
-CONFIG_MMC_SDHCI_BRCMSTB                        policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_MMC_SDHCI_BRCMSTB                        policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_MMC_SDHCI_CADENCE                        policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MMC_SDHCI_F_SDH30                        policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MMC_SDHCI_IO_ACCESSORS                   policy<{'arm64': 'y', 'armhf': 'y'}>
@@ -6197,7 +6196,7 @@ CONFIG_PHYLIB                                   policy<{'arm64': 'y', 'armhf': '
 CONFIG_PHYLIB_LEDS                              policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_PHYLINK                                  policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_PHYS_ADDR_T_64BIT                        policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_PHY_BRCM_SATA                            policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_PHY_BRCM_SATA                            policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_PHY_CADENCE_DPHY                         policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_PHY_CADENCE_DPHY_RX                      policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_PHY_CADENCE_SALVO                        policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -6373,7 +6372,7 @@ CONFIG_PVPANIC                                  policy<{'arm64': 'n', 'armhf': '
 CONFIG_PWM                                      policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_PWM_ATMEL_HLCDC_PWM                      policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_PWM_ATMEL_TCB                            policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_PWM_BRCMSTB                              policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_PWM_BRCMSTB                              policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_PWM_CLK                                  policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_PWM_DEBUG                                policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_PWM_DWC                                  policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -6646,7 +6645,7 @@ CONFIG_RELAY                                    policy<{'arm64': 'y', 'armhf': '
 CONFIG_RELOCATABLE                              policy<{'arm64': 'y'}>
 CONFIG_REMOTE_TARGET                            policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_RENESAS_PHY                              policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_RESET_BRCMSTB_RESCAL                     policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_RESET_BRCMSTB_RESCAL                     policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_RESET_CONTROLLER                         policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_RESET_SIMPLE                             policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_RESET_TI_SYSCON                          policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -6755,7 +6754,7 @@ CONFIG_RTC_DRV_AS3722                           policy<{'arm64': 'm', 'armhf': '
 CONFIG_RTC_DRV_BD70528                          policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_RTC_DRV_BQ32K                            policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_RTC_DRV_BQ4802                           policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_RTC_DRV_BRCMSTB                          policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_RTC_DRV_BRCMSTB                          policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_RTC_DRV_CADENCE                          policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_RTC_DRV_CPCAP                            policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_RTC_DRV_DA9063                           policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -6823,7 +6822,7 @@ CONFIG_RTC_DRV_R9701                            policy<{'arm64': 'm', 'armhf': '
 CONFIG_RTC_DRV_RC5T619                          policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_RTC_DRV_RK808                            policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_RTC_DRV_RP5C01                           policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_RTC_DRV_RPI                              policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_RTC_DRV_RPI                              policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_RTC_DRV_RS5C348                          policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_RTC_DRV_RS5C372                          policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_RTC_DRV_RV3028                           policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -7364,7 +7363,7 @@ CONFIG_SENSORS_XDPE152                          policy<{'arm64': 'm', 'armhf': '
 CONFIG_SENSORS_ZL6100                           policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_SERIAL_8250                              policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_SERIAL_8250_16550A_VARIANTS              policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_SERIAL_8250_BCM7271                      policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_SERIAL_8250_BCM7271                      policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_SERIAL_8250_CONSOLE                      policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_SERIAL_8250_DEPRECATED_OPTIONS           policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_SERIAL_8250_DETECT_IRQ                   policy<{'arm64': 'n', 'armhf': 'n'}>
@@ -8574,7 +8573,7 @@ CONFIG_USB_AUDIO                                policy<{'arm64': 'm', 'armhf': '
 CONFIG_USB_AUTOSUSPEND_DELAY                    policy<{'arm64': '2', 'armhf': '2'}>
 CONFIG_USB_BDC_UDC                              policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_USB_BELKIN                               policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_USB_BRCMSTB                              policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_USB_BRCMSTB                              policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_USB_C67X00_HCD                           policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_USB_CATC                                 policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_USB_CDC_COMPOSITE                        policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -8634,7 +8633,7 @@ CONFIG_USB_DWC3_OF_SIMPLE                       policy<{'arm64': 'm', 'armhf': '
 CONFIG_USB_DWC3_ULPI                            policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_USB_DYNAMIC_MINORS                       policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_USB_EG20T                                policy<{'arm64': 'n', 'armhf': 'n'}>
-CONFIG_USB_EHCI_BRCMSTB                         policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_USB_EHCI_BRCMSTB                         policy<{'arm64': 'm', 'armhf': '-'}>
 CONFIG_USB_EHCI_FSL                             policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_USB_EHCI_HCD_PLATFORM                    policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_USB_EHCI_PCI                             policy<{'arm64': 'm', 'armhf': 'm'}>
