From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f67.google.com (mail-dl1-f67.google.com [74.125.82.67]) (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 BFAD3E573 for ; Sat, 9 May 2026 01:13:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.67 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778289231; cv=none; b=alsJdqHdo8hbP2wpUtDzIMSwVNqM4vGZ8rKVwVhIRXR37GHbuvos+xjTTkuZDZgIbJ06w7ptsM4TWvzN8OiWhESmO027s6OPa6LKrmo9ZP3hvtXu8MgFKNAuKfu6vEGnwynyirbghY/3ANGGiSZ2tJB6FZOBjVEnPZfQuhRm54Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778289231; c=relaxed/simple; bh=HOC/S1kLM7iLRvtEh038sGybndGG7vOeXfjsTxjfzeE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=iTfbk61AtTO7g1PXVkrq/YvTq1t/KXVBKDX0103DB8BM/E9TyFFVl1HoGButAyYN+cMHbmbRu+4hL2s9Rkxr39YB7seaBdIqpdYtRX94EXZnATGlLte0WZz7FDQykisJkn4UppvwOpcmbxnUoodP//IReCzyQaecEjiz0W5HDVg= 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=DbE6MOae; arc=none smtp.client-ip=74.125.82.67 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="DbE6MOae" Received: by mail-dl1-f67.google.com with SMTP id a92af1059eb24-130b2295ed0so7558127c88.0 for ; Fri, 08 May 2026 18:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778289229; x=1778894029; 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=TXXt6IPoG7zkad4DUA+McXh2fJcYiyph1jCtx0enA5U=; b=DbE6MOaeI2S2bdxvdDSfzknOVR5sMQF45rqas6JKrP6lOhlZVwaQHYdoi5gNRwXCUO 1hRRMBNW8O/oH2V0DZVlTVDpzhOHL/aPAMRn3DVX/waPyeNxqTgtyxiE4bkg3mG9Oe0x SsHhg9Rcb6/fB9OVBpE18cU+2HFavkx7HMypNs1sklksTcPunpLslPOOdb6N4mpg1Gky FO0IaIzjDr7ph8ZqGxiwnmEh60835yLC5VRup5y9Kh73uV8rHFScU1qwnxzfihOGfLQC q4FU1a3M0txFdvxdcdW1vLl+3++Zp1tLDEyy7xfuPdFGTWD8qf2x/nFZTcKKWlnBJUEU VS9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778289229; x=1778894029; 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=TXXt6IPoG7zkad4DUA+McXh2fJcYiyph1jCtx0enA5U=; b=dQ+/qa+RmVFCqCwIMMbP1S1TTgH8Y68kzUjPzqOPvzcs0iWuHo3UO1d76EDB7un6Go 4833fq5kr9pKZ2mT+6EEzIF+wCPLifMRZExey/phnfeGBPVuNUvwxy71tLbR6olQXoBV nqmC79G7q60ISA7v5lH8+62WzFqiDX2bL5eoHbEzT8UVm6s3pZrbZH2fuwRtKxEBc23d tE9rV3BlNePsdBC/KjoXvlvO+b0xagyLip0k/l/gygNC+/Ssg9RUFHDO0C0OEifob+I4 mETgaD7k275ehZVIVgEYXdcFzVynIaU3XIYncxal0tkebo8LizZOjmFFokQG9mWHTSwm 7ChA== X-Forwarded-Encrypted: i=1; AFNElJ8OSmgZiJ3YnNoLrg6sA1tcguouyqburA/Kmd0MvCLbf0p0Tf6ExJfN8HdGbwbqIudf0Zf4336Sh0WOtGQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxRNa++Gn2CrmrQqjVf98wpKVGBTLEsj8dQckDtFslXDlulZGw5 WEXTT3aqVQ0KCyHr8yfPzJcxb2wE2hIzuYUTkkOq/1+11M/EUPDZVU96 X-Gm-Gg: AeBDievh2MZuv4BOtGaI2w76EvaL1fa5IOmwk6I+KhXhRLxtLpVOO6VD41cVc51fadn 4bUdjFDpEk1ZpuyuIXycv08neMa+zRNkPTYm2wJzMTR6ZSbhxG/gkJUjNBYiwXdiRfzdGeApgd/ Pf4tdxqyYyN2EwKz60CwKkYSD3aAm8AzqMdUCqkrEmlBlNzthFLd3LsdEWRyyrLi7uk4JT1QNyB UdV5ss5q8LBAyVt1MwuKXcNvM0766h3p5sikdW8qj8rNUmfoMx+t69CZAJdq4aOkisru6EZhjNC mFv8LPdp+zdz3Tb3RGBexeJzfxfosLWk72uly3ccTXKANLzTfjcWBGrAQ6Bg6LSjCzFcbDaEUWT bZKWsohB+QOrf1LIjDbJWinYeGINrpresvkxQyJ/YB0Sp5YKqdO8Oy8XfOamfnTqrdYwpX0tC30 DOkD33bo0Cw2x+jpfAjbz5BXny75EfNyreZz+DXVXAVXeJu60pCou1co2kog9c9XZdJZ4T/Tv02 HD++4dwH6NiabSKvgwi31QEC4QjTLC7H1SsiU4WIzTTbbenBhMw7nZZoyN8XizYmMKLePD2SXqb 08H5SI7LQsOfk0iwHw== X-Received: by 2002:a05:7022:e98d:b0:12d:de3e:cbfd with SMTP id a92af1059eb24-1318eb56aa8mr7426643c88.36.1778289228724; Fri, 08 May 2026 18:13:48 -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-132787673ffsm5716709c88.15.2026.05.08.18.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 18:13:48 -0700 (PDT) From: Ethan Nelson-Moore To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ethan Nelson-Moore , Russell King Subject: [PATCH] arm: boot: head-sharpsl.S: don't rely on MACH_TYPE_* of removed boards Date: Fri, 8 May 2026 18:13:20 -0700 Message-ID: <20260509011322.13013-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 head-sharpsl.S relies on the MACH_TYPE_* constants for five boards that are no longer supported by the kernel. They were removed in commit d6df7df7ae5a ("ARM: pxa: remove unused board files"). This prevents the removal of boards no longer present in the kernel from mach-types. Replace the MACH_TYPE_* references with hardcoded values. (If the IDs were simply removed, these boards would be detected as other supported machines, causing incorrect behavior. The kernel will abort on detecting an unsupported machine ID.) Signed-off-by: Ethan Nelson-Moore --- arch/arm/boot/compressed/head-sharpsl.S | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/compressed/head-sharpsl.S b/arch/arm/boot/compressed/head-sharpsl.S index 992e784500fa..da05e01903e2 100644 --- a/arch/arm/boot/compressed/head-sharpsl.S +++ b/arch/arm/boot/compressed/head-sharpsl.S @@ -103,16 +103,22 @@ __SharpSL_start: .word 0x08010000 @ w100 Chip ID Reg Address .SCOOP2ADDR: .word 0x08800040 +/* + * These five machines are no longer supported by the kernel, but if checks for + * them were removed, they would be detected as other supported machines, + * causing incorrect behavior. The kernel will abort on detecting an unsupported + * machine ID. + */ .POODLEID: - .word MACH_TYPE_POODLE + .word 424 @ MACH_TYPE_POODLE .CORGIID: - .word MACH_TYPE_CORGI + .word 423 @ MACH_TYPE_CORGI .SHEPHERDID: - .word MACH_TYPE_SHEPHERD + .word 545 @ MACH_TYPE_SHEPHERD .HUSKYID: - .word MACH_TYPE_HUSKY + .word 543 @ MACH_TYPE_HUSKY .TOSAID: - .word MACH_TYPE_TOSA + .word 520 @ MACH_TYPE_TOSA .SPITZID: .word MACH_TYPE_SPITZ .AKITAID: -- 2.43.0