From patchwork Wed Apr 21 09:18:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1468653 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=xb5GHDYM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FQFNd6WCyz9tkG for ; Wed, 21 Apr 2021 19:18:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 20F9582B73; Wed, 21 Apr 2021 11:18:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com 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=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="xb5GHDYM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B124482B7D; Wed, 21 Apr 2021 11:18:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C645082B53 for ; Wed, 21 Apr 2021 11:18:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wr1-x435.google.com with SMTP id g9so24548024wrx.0 for ; Wed, 21 Apr 2021 02:18:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=12xVK7p9c5fZTmJc83RpoW1OXJKr84du+5p/8X1vrnE=; b=xb5GHDYMOVIBgdNpBsaketMt63Jr5CcFUzGojw888dOeHHbULxK/hihm7Rj3Ilkhxq QBFlaz4IVzubNzcYc5iZXPvqxNNkXvkvakd8Xmo42Hz5xd7n7BRZLjUL00ktnpZfvnO0 aerjpnrzJ5hAA0lKYEtMDxTcT4jEsBxizkb/z57+iVXp7cPaUK1BBdblwufSDIf70ENV niekKY6ZOMIuqam99dHA8Lv1Ez6XKUGooG2Al5KaGW4fBwxrnOMfAAYbXDae5W86eF1S dk/UPhMUl1krG2pN88yPwNtAF2slpa+wfOp9UhaL5mYfe8lp7jvtmB/S/xizXleBiF6E PS/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=12xVK7p9c5fZTmJc83RpoW1OXJKr84du+5p/8X1vrnE=; b=rdhxLgCUhvkf9WMWH3RBjo2pWFPOB23zHyVkyMRX2ZcovurJ0OdDgTpWw31ikp5nuJ TFEDdk6KcPz/qy3gi/N+a49SburN8EbMxudI35QqBsiAct2bKxBzs0sq6oQhP53RSQxy ST8hIE1Oi4MV29YNBcacyyOZrYdwL3wUk7/cIG0ZLQVUZjzi5nhHDPyyOLQ9iwPL0Q0r sY8DF/UGWXN4SKyMEk1KplKsE5PN7agt8UWiZmCyzy9WgtC7tdxMjtxSgYAcyrju+5h+ Jy7Rts7Q4/PL+BkZUwO8N0UmdFgvNuYUPbBYHVfofO4RMkjfurJg7rT12daytmUJR3pi QCFw== X-Gm-Message-State: AOAM530DJeYSNPTDZlFNFQfqpZ5u411cDaHaq0YFhCQaUm6pf2b9GZJe nXNWXbkNC/ag5YA5/cLxnODj/Iu6xZ1jNRxO X-Google-Smtp-Source: ABdhPJwCg07WPIga67+qXdQx1Ds2Hh6IpxtR+FY+usQQIwierWlB7ZAnSOKwaYtljII1/xZY1JyVRA== X-Received: by 2002:adf:f692:: with SMTP id v18mr25103525wrp.206.1618996697022; Wed, 21 Apr 2021 02:18:17 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:90c:e290:f781:73d5:3127:752d]) by smtp.gmail.com with ESMTPSA id n18sm2280714wrw.11.2021.04.21.02.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 02:18:16 -0700 (PDT) From: Neil Armstrong To: u-boot@lists.denx.de Cc: u-boot-amlogic@groups.io, Neil Armstrong , Mark Kettenis Subject: [PATCH 4/8] configs: meson64: add SCSI boot target Date: Wed, 21 Apr 2021 11:18:05 +0200 Message-Id: <20210421091809.3103002-4-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210421091809.3103002-1-narmstrong@baylibre.com> References: <20210421091809.3103002-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean Add SCSI target to be able to boot from the SATA disks on the Odroid HC4 using an on-board AHCI PCIe controller. Signed-off-by: Neil Armstrong Signed-off-by: Mark Kettenis --- include/configs/meson64.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 17ebccd2c4..d1539477a0 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -64,6 +64,12 @@ #define BOOT_TARGET_NVME(func) #endif +#ifdef CONFIG_CMD_SCSI + #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) +#else + #define BOOT_TARGET_SCSI(func) +#endif + #ifndef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ func(ROMUSB, romusb, na) \ @@ -72,6 +78,7 @@ func(MMC, mmc, 2) \ BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_NVME(func) \ + BOOT_TARGET_SCSI(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) #endif