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 31D88C00144 for ; Mon, 1 Aug 2022 10:31:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DFADD84538; Mon, 1 Aug 2022 12:30:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=fris.de 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=fris.de header.i=@fris.de header.b="P0nDOwpW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D3DEE8450E; Mon, 1 Aug 2022 12:30:45 +0200 (CEST) Received: from mail.fris.de (mail.fris.de [IPv6:2a01:4f8:c2c:390b::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E3475844F4 for ; Mon, 1 Aug 2022 12:30:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=fris.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=frieder@fris.de Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 5C3F4C012C; Mon, 1 Aug 2022 12:30:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1659349840; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=EHe6yi+muB9x4Tj+ecWQxOXlTDYBzYTsQtgDEG7Dyw4=; b=P0nDOwpW5yGXVpGiX35xMgnUoyd7T+yQrHzGIg6k9XnEJkKx7SajOvEJ9qyz0iJw1IOQBC SdJ/Pz+OpBKFazivRbfwtMQlHRHsB1glPpDK33FSBAXgOwt/dKTEnsccxBAT/6/xEDFCHO Ed18iBBYK4X462ILt4ZSjfz3lF19hTCaSlk9ojI77Od54OW8WhiRHN0tgMo3OZiHOLRG8g J4lFV/amx8ZrupXfD/4Ejpi/skn5N2Uj3p7/bGun5srsoDwB6rCeFQ+unoqtY14uQ2zVKd 0tdkOy2qURlvO2SH+JzF9Txfc28cerVee6paO3byHCfVVdt9YIMRFMn5IxG5xQ== From: Frieder Schrempf To: Frieder Schrempf , u-boot@lists.denx.de Cc: Fabio Estevam , Peng Fan , Stefano Babic Subject: [PATCH v2 03/19] imx: kontron-sl-mx8mm: Remove custom board_boot_order() workaround Date: Mon, 1 Aug 2022 12:30:05 +0200 Message-Id: <20220801103027.96820-4-frieder@fris.de> In-Reply-To: <20220801103027.96820-1-frieder@fris.de> References: <20220801103027.96820-1-frieder@fris.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 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.6 at phobos.denx.de X-Virus-Status: Clean From: Frieder Schrempf Nowadays detecting the SPI NOR as boot device from the ROMAPI is fixed and works even if the SPI NOR is used as fallback boot device. Therefore we don't need this workaround anymore. Signed-off-by: Frieder Schrempf --- Changes in v2: * new patch --- board/kontron/sl-mx8mm/spl.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/board/kontron/sl-mx8mm/spl.c b/board/kontron/sl-mx8mm/spl.c index c379d37f1e8..2a562f4ac97 100644 --- a/board/kontron/sl-mx8mm/spl.c +++ b/board/kontron/sl-mx8mm/spl.c @@ -238,25 +238,3 @@ void board_init_f(ulong dummy) board_init_r(NULL, 0); } - -void board_boot_order(u32 *spl_boot_list) -{ - u32 bootdev = spl_boot_device(); - - /* - * The default boot fuse settings use the SD card (MMC2) as primary - * boot device, but allow SPI NOR as a fallback boot device. - * We can't detect the fallback case and spl_boot_device() will return - * BOOT_DEVICE_MMC2 despite the actual boot device being SPI NOR. - * Therefore we try to load U-Boot proper vom SPI NOR after loading - * from MMC has failed. - */ - spl_boot_list[0] = bootdev; - - switch (bootdev) { - case BOOT_DEVICE_MMC1: - case BOOT_DEVICE_MMC2: - spl_boot_list[1] = BOOT_DEVICE_SPI; - break; - } -} -- 2.37.1