From patchwork Tue Oct 31 16:27:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1857673 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SKbC502k0z1yQ5 for ; Wed, 1 Nov 2023 03:27:28 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qxraD-0004PI-UY; Tue, 31 Oct 2023 16:27:14 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qxra9-0004Os-8s for kernel-team@lists.ubuntu.com; Tue, 31 Oct 2023 16:27:09 +0000 Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id DB9A43FADE for ; Tue, 31 Oct 2023 16:27:07 +0000 (UTC) Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-5079630993dso6507274e87.1 for ; Tue, 31 Oct 2023 09:27:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698769627; x=1699374427; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IkiH5G3ZwMuOaAnXZMmDvEq95de+cthfTLkqJY35tuo=; b=oc2CdyOjLn7TQFGlCLONRN8TNRIjIfMuUjAT7psn1fG4rVe1esfLNEGOoiKhGUmcuU Sji4aRb8drccGYeiBcobfGfv6iD+F0gwav9Jk+ZAJEU1Y4PCH9TNcrnCmlSM2/EM0hst kNRDJ28aqhhKr19m34DxOkUFaDcGySjSIm2lAS4mAUHiFYSQ7Y6ON/YyjBI2YZhwxJPr u+HIArpRNnu6D0sw7UfKulYu1ZVQgfsLdfZDYkKDh5j3WeZSOpVIly+LNviUQBTm+ZHh sMk0QrfsEUaYwUCdzHhGxZ7kc2RzSAIb7NVGSn7hY8D6XfIt3vriLDJp+v6UY5sSpET5 m61Q== X-Gm-Message-State: AOJu0YwRuvBy2iROLZx5CTwMDcr7EI9r1t0y9O6sKpcv99NnzR7I10ib H0vkBHFWnhdMFw+vgLsE0q3rowJCjJwbTFz6xBVyZ5O3RKCxFEeuxm054zx0nRlm85uWxTqllOT gcxWBEyA2b17Zo/Q0T9l7AL2QHsH+YA82iBBaoyw0715YopPw3A== X-Received: by 2002:a19:5211:0:b0:507:99fe:28f3 with SMTP id m17-20020a195211000000b0050799fe28f3mr8933348lfb.34.1698769627201; Tue, 31 Oct 2023 09:27:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJ2U8ohqA5Xjy4I7Rtrb+3r6X3LjquzUPKpRYBBpox9FpLyWqlaZVYPiF1vwg8X8xDUSLnUg== X-Received: by 2002:a19:5211:0:b0:507:99fe:28f3 with SMTP id m17-20020a195211000000b0050799fe28f3mr8933329lfb.34.1698769626708; Tue, 31 Oct 2023 09:27:06 -0700 (PDT) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id t1-20020a05640203c100b0054351b5a768sm1359530edw.82.2023.10.31.09.27.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 09:27:06 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][M:raspi][PATCH] UBUNTU: [Config] raspi: Set ARCH_BRCMSTB=n for armhf Date: Tue, 31 Oct 2023 17:27:05 +0100 Message-Id: <20231031162705.45947-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2039431 CONFIG_ARCH_BRCMSTB is required for Pi 5 but Pi 5 is arm64 only so disable it for armhf. Signed-off-by: Juerg Haefliger Acked-by: Manuel Diewald Acked-by: Tim Gardner --- debian.raspi/config/annotations | 41 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 21 deletions(-) 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'}>