From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 995ABC6FD18 for ; Wed, 29 Mar 2023 19:06:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1430286043; Wed, 29 Mar 2023 21:05:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="hcUTk2Hn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4BF24856D2; Wed, 29 Mar 2023 21:04:56 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5CFF686031 for ; Wed, 29 Mar 2023 21:04:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0486761DF4; Wed, 29 Mar 2023 19:04:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4916BC4339C; Wed, 29 Mar 2023 19:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680116670; bh=WpMmlCTHbSPnctPW6MMTgZ+/J0EEv3lkpvQy9rb6mIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hcUTk2Hny9ZVmPRpPNB36wrqq/Ri4LQMBAPot+UdI2/OMRnNudRGFSTyNXpBMf03k mTKrAIb0gV/PlEvJZf8ghBzVvPKBDQd59YJjOFdXEN1gZ/95eaHTrsLIXsnZbTP5bm O35PWtLmX6/GNFwQd7MTvVOi5uQdaFuwHvhEL2XUslG7JlFCnuY1ZF7+/ODZ+sn8+D q9oCFJDwC2etyfW33Sqt5wWlgchKSQIs5NfOwtMwntQc6fcceFsXn1OornS8dLKW75 GR3FIvVBQsmMs1rsMZ7gbTMOPdu6v4+smCPSQqgVnciBBtIVgaB87mOAutocJgE5QA N8u7+yWLe2R0g== Received: by pali.im (Postfix) id 91052B6E; Wed, 29 Mar 2023 21:04:27 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Stefan Roese Cc: u-boot@lists.denx.de Subject: [PATCH v2 u-boot-mvebu 2/6] arm: mvebu: Remove A38x BOOT_FROM_SATA 0x22 constant Date: Wed, 29 Mar 2023 21:03:31 +0200 Message-Id: <20230329190335.9861-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230329190335.9861-1-pali@kernel.org> References: <20230304105036.19189-1-pali@kernel.org> <20230329190335.9861-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean A385 BootROM treats strapping configuration 0x22 as SPI-NAND. So remove incorrect definition 0x22 as SATA. SATA on A385 has configuration 0x2A. Signed-off-by: Pali Rohár Tested-by: Tony Dinh Tested-by: Martin Rowe --- arch/arm/mach-mvebu/cpu.c | 1 - arch/arm/mach-mvebu/include/mach/soc.h | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index b72037d45b1c..0fcd520c1dbc 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -114,7 +114,6 @@ u32 get_boot_device(void) return BOOT_DEVICE_UART; #ifdef BOOT_FROM_SATA case BOOT_FROM_SATA: - case BOOT_FROM_SATA_ALT: return BOOT_DEVICE_SATA; #endif case BOOT_FROM_SPI: diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 4a9463292fcb..3266749836a7 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -161,9 +161,8 @@ #define BOOT_DEV_SEL_MASK (0x3f << BOOT_DEV_SEL_OFFS) #define BOOT_FROM_NAND 0x0A -#define BOOT_FROM_SATA 0x22 +#define BOOT_FROM_SATA 0x2A #define BOOT_FROM_UART 0x28 -#define BOOT_FROM_SATA_ALT 0x2A #define BOOT_FROM_SPI 0x32 #define BOOT_FROM_MMC 0x30 #define BOOT_FROM_MMC_ALT 0x31 -- 2.20.1