From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f68.google.com (mail-dl1-f68.google.com [74.125.82.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C175FF9D9 for ; Sat, 9 May 2026 22:38:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.68 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778366308; cv=none; b=cg1/rvjpB3050gCHDB5IYwGmx1/dUuG7iGcUJpOzkQciPomTKY+kAfG2f7hwxxQR4V2x+Tv73p0mActfE8d9pXGSPtqU7G4i7J3fdBgHGtmWkVCq2fN/tO3z28Bv5raDyC9yh5FRu5WZNrIyJVIbVKr8ax0GV0/bavZh8vg/cgU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778366308; c=relaxed/simple; bh=4HVAov67Eqa8VxfZ6tR3nCWa9OVMvPcUkZXI86MaFYY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pn18YcDUKyH1SYfkW8MQDtgeBcuxnRpKe7beLQYfvKwmd1T52apFQy0NsrBk5+PAqSz3aQYLVfwjMb8lTgBPkER9Iqlxa57VQHPOiL6QPvF8M/YLkf/Go1/fBk7SF+fIJdjvnxJpmIQbcwUMeeFohKGrbyuyIB/vMhXHVcWAi20= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fvvoY/gV; arc=none smtp.client-ip=74.125.82.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fvvoY/gV" Received: by mail-dl1-f68.google.com with SMTP id a92af1059eb24-12dca45ca21so4486858c88.1 for ; Sat, 09 May 2026 15:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778366306; x=1778971106; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KaD8PMAL1fGcxVqGq3EhU94/gRz7M4CXPsJBOwicYdA=; b=fvvoY/gVQymaSH3x5NcMBkUMb0zs0xDUCaflYg3j8Y/OUoZ9+6OYZ7jPg4eFg7xQKN 7XvEiusMfmv/N/NKZvEP+heByz/WDiFiqJIN8SuGZU1OoM8T8yvHljZIowxTSwLproc7 3BqY30RsOGCPbXTyPocs+xX2wNYHsqknCzQxGmPpJuMhG5+xp07DJNuWIWaFbZi/9Y2P fIMmMg8jPUe30GmoD5iEvSQAhFnj2MrfpGBXJN5CI6+JhlDHu15iuGEpXDhQe86tDZxZ ynVVir3IxSySKhm7SxatcGVI1u5HkCXDFBzL+DtMll7pqnKz6ato1qJLDT3hiOFVGXL5 FGSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778366306; x=1778971106; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KaD8PMAL1fGcxVqGq3EhU94/gRz7M4CXPsJBOwicYdA=; b=KvFNDNQO543brZKzGcGVi86JcGMhGG1wwzPIauevdLNjYuzq+hbJeMMLjOeXtuBUg2 7rBz3Qm25wrxo4yFx5Jt+O4ku6LsdArMLgLpMM0iIY0rKj9qSRyGc0MQ1qx+S5ulf6Fv +DPNMLcYPVdTel6aBrQbzUEp0Y3k/4B2tS/0cY5jfbzgJTVvbplmr4xjRMBVUJ/u/NLd MSs7HAeuPhB82YinX1aEoS5imv3UNVLk8ebQ3v4YtuC1oOs+1oJKMokwYxHgy6/zaLKS miZodfosTzonah5bA66IqyVbSfHll0y77PSGUUd7vjj8Z/l5rJyjDieb0cpXFUdISTBY KFtQ== X-Forwarded-Encrypted: i=1; AFNElJ+uIWi/ziYrgM8X5nacYPS1wZsuNxA1ZlwdZcIWRr9a5uftda/ysSKwHd1u9CXXnlF16tRvXW+ehlf1Wss=@vger.kernel.org X-Gm-Message-State: AOJu0YyUvhE1/VusstRx3LP7iD71ymsjkmp5DQJK0KDwVMqyS+XkdcqB 2Jw3SY0ARUbPzpmWB91i94vWLfSojt/fD9Phf1tQZ02/X/ebwRseSxOt X-Gm-Gg: Acq92OE+QMOc61vJ2ZElScfBkESfSCA5SKQCpPcL5FMuwQq3BJdLh1bZZCtrJjPAP/j jNLEF7dT9tzUpD8P9SJyQN8BIF1L0FXVjIeaq/ySwWGB9vnbdYiW0VZ43RjeIO4eGPPqyAOXYux ucI7zrnU8Q/BPjhw1nGlhxZkUSveUeV0vMzGHx4PGfhFsqFxltKyJThSnzegcY0XovGUnm9C8ha QLykkfNFxG3hCcWRUyU1kUD6Nvz4Oobl6ULe51c2feczlGb+ByW/onoM9+4e5y1aOU/N1i7Y/Si SQ7C8fcurRmoIy2TKsWBsaCCngvg3fmeJAwTYlU34ROkDzZF/UXR0SrPusIS+ENvTjYOr+iay7k UlS4kCONNfKopV0FcV6yAJrZPSkUvN4p6l/9ZyWBcB1mnUr2k7tEDvjZ28QY9gawUTVRk/drXxu 6Bl48qkY+rm9mso7I4EeGwHbkjMRhwCzs5CBysm3ifaZLGldYODIOfeTXk/wsSNaMJHgkgHketg ysq6bycUclBQ1Qwix9wPeiONvFELnaxr55TCqj8VSq9J2SnzOFSkm/Wmk8Th4YFHXCxqwLS1qyI uzObsrk8AIt+1cccDA== X-Received: by 2002:a05:7022:238c:b0:12d:de3f:f3dc with SMTP id a92af1059eb24-1318ec5fa20mr8840329c88.38.1778366305800; Sat, 09 May 2026 15:38:25 -0700 (PDT) Received: from ethan-latitude5420.. (host-127-24.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.24]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13278210d40sm9887550c88.4.2026.05.09.15.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2026 15:38:25 -0700 (PDT) From: Ethan Nelson-Moore To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Russell King , Ethan Nelson-Moore , Hartley Sweeten , Alexander Sverdlin , Nikita Shubin Subject: [PATCH] arm: boot: ep93xx: don't rely on machine_is_*() for removed board files Date: Sat, 9 May 2026 15:38:19 -0700 Message-ID: <20260509223820.50347-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Code in misc-ep93xx.h relies on machine_is_*() macros for several boards that no longer have legacy board files. They were removed in commit e5ef574dda70 ("ARM: ep93xx: delete all boardfiles"). This prevents the removal of machine IDs no longer used by the kernel from mach-types. To resolve this issue, create local copies of these macros. (The checks themselves are still valid because the IDs are still passed in by the bootloader on these machines.) Also take the opportunity to remove three repeated checks for the same ID. Signed-off-by: Ethan Nelson-Moore --- arch/arm/boot/compressed/misc-ep93xx.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/compressed/misc-ep93xx.h b/arch/arm/boot/compressed/misc-ep93xx.h index 65b4121d1490..b0a1b42aab31 100644 --- a/arch/arm/boot/compressed/misc-ep93xx.h +++ b/arch/arm/boot/compressed/misc-ep93xx.h @@ -3,7 +3,22 @@ * Copyright (C) 2006 Lennert Buytenhek */ -#include +/* + * These machine IDs are no longer used by the kernel since EP93xx was converted + * to DT booting, but they are still passed in by bootloaders, so we use our own + * local definitions of the relevant macros. + */ +#define machine_is_bk3() (__machine_arch_type == 1880) +#define machine_is_edb9301() (__machine_arch_type == 462) +#define machine_is_edb9302a() (__machine_arch_type == 1127) +#define machine_is_edb9302() (__machine_arch_type == 538) +#define machine_is_edb9307a() (__machine_arch_type == 1128) +#define machine_is_edb9307() (__machine_arch_type == 607) +#define machine_is_edb9312() (__machine_arch_type == 451) +#define machine_is_edb9315a() (__machine_arch_type == 772) +#define machine_is_edb9315() (__machine_arch_type == 463) +#define machine_is_ts72xx() (__machine_arch_type == 673) +#define machine_is_vision_ep9307() (__machine_arch_type == 1578) static inline unsigned int __raw_readl(unsigned int ptr) { @@ -60,14 +75,11 @@ static inline void ep93xx_decomp_setup(void) if (machine_is_edb9301() || machine_is_edb9302() || machine_is_edb9302a() || - machine_is_edb9302a() || machine_is_edb9307() || machine_is_edb9307a() || - machine_is_edb9307a() || machine_is_edb9312() || machine_is_edb9315() || machine_is_edb9315a() || - machine_is_edb9315a() || machine_is_ts72xx() || machine_is_bk3() || machine_is_vision_ep9307()) -- 2.43.0