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 DA92BC433F5 for ; Wed, 6 Apr 2022 09:40:46 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 88C4483D9B; Wed, 6 Apr 2022 11:40:20 +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="QA/vQHU3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC86583D8E; Wed, 6 Apr 2022 11:40:01 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (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 1E97083CA3 for ; Wed, 6 Apr 2022 11:39:52 +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 C33706145F; Wed, 6 Apr 2022 09:39:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EBA1C385A9; Wed, 6 Apr 2022 09:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649237990; bh=jycl5l3hNL1KaSV4b4i8SImbFsx9iLoVSPrCXgT3fwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QA/vQHU3MYv9NHiezvw+IESmwun3rDDqtCIVBYNm1te8j8m2ad311hSYOIEyrf9Mz nkAelWOC+DtQCtsn2YWMNkAfuZV47x5MwEbN8gKp8O2RQtJS+j24ZvH8NFWES7xeZx anUyUaUWRiwDO5JBMIC+qG5hcgeMrdn4/ACg5f9IrsJpu/Xp844FRol/IjPHzleqVF P1yJUb/QgP1NJH3xgTbNyyvVIM7ek1yZjbKl6O6PLz7+D1wPygNEfJfyU0pWzXjz9/ P5n/7xUkJz2ogszKWq2L3O4yd1gkPi6MayP0Xejd7z6eol4b/48plft5/J2yXB6I/Y tJsJdHUAWhq1g== Received: by pali.im (Postfix) id 56ABB942; Wed, 6 Apr 2022 11:39:47 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: =?UTF-8?q?Marek=20Beh=C3=BAn?= , Stefan Roese Cc: u-boot@lists.denx.de Subject: [PATCH 3/5] arm: mvebu: turris_omnia: Always enable MMC, SCSI and USB boot targets Date: Wed, 6 Apr 2022 11:39:34 +0200 Message-Id: <20220406093936.8854-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220406093936.8854-1-pali@kernel.org> References: <20220406093936.8854-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.5 at phobos.denx.de X-Virus-Status: Clean U-Boot for Turris Omnia is always compiled with MMC, SCSI and USB support, so always enable macros for booting from these devices. Signed-off-by: Pali Rohár --- include/configs/turris_omnia.h | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 15f874ea22e1..25aa0d0f9075 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -54,28 +54,10 @@ /* Include the common distro boot environment */ #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_MMC -#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) -#else -#define BOOT_TARGET_DEVICES_MMC(func) -#endif - -#ifdef CONFIG_USB_STORAGE -#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) -#else -#define BOOT_TARGET_DEVICES_USB(func) -#endif - -#ifdef CONFIG_SCSI -#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) -#else -#define BOOT_TARGET_DEVICES_SCSI(func) -#endif - #define BOOT_TARGET_DEVICES(func) \ - BOOT_TARGET_DEVICES_MMC(func) \ - BOOT_TARGET_DEVICES_SCSI(func) \ - BOOT_TARGET_DEVICES_USB(func) \ + func(MMC, mmc, 0) \ + func(SCSI, scsi, 0) \ + func(USB, usb, 0) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) -- 2.20.1