Message ID | 1528976621-8397-3-git-send-email-narmstrong@baylibre.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 51597601F9 for <patchwork-linux-amlogic@patchwork.kernel.org>; Thu, 14 Jun 2018 12:05:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 415BC289EA for <patchwork-linux-amlogic@patchwork.kernel.org>; Thu, 14 Jun 2018 12:05:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35CA028A54; Thu, 14 Jun 2018 12:05:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E2DF3289EA for <patchwork-linux-amlogic@patchwork.kernel.org>; Thu, 14 Jun 2018 12:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=UqCx940qemWyKW1jiR/XXOYk8VCM/hmxXXglIGpBACQ=; b=QCY9gfTRUCnToYZzyeicHVBvi2 c8CQ0ojASlWcAZoJkATXA/hu2QKppqH4e4djcSD1ueTqZOrDEuuAqRCq0bBgYP/zLQFMLcr/3bz03 LoKyQm3f3ykOnbz4kj5kYwjKblf0D/DhYNXwhqb++6BGjGramqsnyhQJYiNNglqlgJaVOyBIqe1pl XGMLl0yfydNjWRhaEwa6F2FraJ/bQ/bkK2XdPcRCGcPLSLxTb7WVaZTwkg9IjwhwIizBUzZy7yCg5 F/33CwphCHHohdjkk1WDt2VFkb+19kwNj3jX5zWcQL6UV3hR1Si1zAwmC637eZhIXsQq33/wsdco5 wqB+36rg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fTR0K-0006bC-UK; Thu, 14 Jun 2018 12:05:28 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fTR0I-0006Yb-58 for linux-amlogic@bombadil.infradead.org; Thu, 14 Jun 2018 12:05:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=GmX/a2l+PZ84th6l/7nALXifDvwinJiZk12aQ7PfHKE=; b=Nl/tewZxWlklOGUVehiXxadEe B+1ALtTKUIQV6HQ6Wi7pSKL5mHDeVIlG+2hKAyMSGsf5huXuYwv9XYPoX6Bj9QWHR0KlknCjoTjTV olsuUX13Q5DMcopcTcdqPeDFELX1bqql0c5KY7/f/C6j7hOYiIG9ijaZSwEMeIZSd6l8EhOlGaQde 7/DLOisgdBczK2zJRnPHwSq1DF1cL/ZzIcKiQdMPSAXLhTz3K9djXpb4O/LjLx+7j0y+Bogh7O08g ZNhgfpwgfzoXHH7vyBvp7KRVyei/p+steFAy9H5wfqHfbfxnHURyeM8tUdal2bHuXy+CsiK0Ith/6 SQ7q8mR7w==; Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fTQfY-00042a-UA for linux-amlogic@lists.infradead.org; Thu, 14 Jun 2018 11:44:01 +0000 Received: by mail-wm0-x241.google.com with SMTP id p11-v6so11360286wmc.4 for <linux-amlogic@lists.infradead.org>; Thu, 14 Jun 2018 04:43:48 -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; bh=GmX/a2l+PZ84th6l/7nALXifDvwinJiZk12aQ7PfHKE=; b=WlBOF0Bevf3QSnfmuW19j0tnJU9tKar8iVb+XLCozB2gICIPsbLSdb38ZeKbIZD39R glTrx8/hDoA+aoRfR8hB8wB4N+wWrPWXZGaIl7BP/FUu2UOGNJTTiKmuV28p56VireMz w7ijVB71SltEicL7UYB0gzpFMUWsg8TMMe3Bhe3j/bJvnGRqRk6gLnBh2b/d09sEBQKF f2BFHf/iGHOsn3jHk226skilJDzE8lAj2GP9OcUHrrQWAFM5SWu9Q/ieW5a5Z/7XjsW2 h5ovyo2pzCRLbGmmb6JaWBFIdM3mUrecFEoVvb9G/K2X+vW1liTleaTeGxzN3JNjDgTT XBMw== 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; bh=GmX/a2l+PZ84th6l/7nALXifDvwinJiZk12aQ7PfHKE=; b=jhmvtFEEU4RXFCvXxLws+/O65Y2vPHxJVJM4L16NVHj3HTYyhLQsGnfNWFfuyqThFw Nw40cwLcloUUw7YeGcPdK7Hjq6nG8kSsa4H6jtdhVKIVhEdp0XOciGX7icYpu3QeSyMM SReGbTTmrevVUEFS5AJIhFYm5jr8mrLU3uDQ9bcnlUfD91ihf1v0RKuR1UtspnkWCCDU 6U8QOMpGYEDbahuz98oyjQ55J5sDOq+6IxOo77nMAxqgYfKy0rCxMmAVYL2+o8jlklSI XJfsj+i/mhMm876+ud/l+BLqx/V8RU3i/bBGmbTLPnnGcVJQeVpdwZgRWpPR8ck7uFr8 t1kg== X-Gm-Message-State: APt69E2pyQzslfqlNEvGTSefZLjRTgaRPQbx//sn57jAE96+kbTKi3v1 WF3wKA2Y21SzAs/LyhmKJ7ECTQ== X-Google-Smtp-Source: ADUXVKImzX6k05Kt9oIKAsS7okNrxGrWf3cve8woVlmhTv24cSBAToPIpwOcKk0yYd+jmrKHwQh+Bg== X-Received: by 2002:a1c:9189:: with SMTP id t131-v6mr1728655wmd.89.1528976626715; Thu, 14 Jun 2018 04:43:46 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id b80-v6sm7850426wmf.2.2018.06.14.04.43.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jun 2018 04:43:45 -0700 (PDT) From: Neil Armstrong <narmstrong@baylibre.com> To: trini@konsulko.com, sjg@chromium.org Subject: [PATCH u-boot 2/5] config: meson-gx-common: Enable USB boot Date: Thu, 14 Jun 2018 13:43:38 +0200 Message-Id: <1528976621-8397-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528976621-8397-1-git-send-email-narmstrong@baylibre.com> References: <1528976621-8397-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180614_074401_068416_E4B8CCFB X-CRM114-Status: UNSURE ( 9.89 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-amlogic.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-amlogic>, <mailto:linux-amlogic-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-amlogic/> List-Post: <mailto:linux-amlogic@lists.infradead.org> List-Help: <mailto:linux-amlogic-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-amlogic>, <mailto:linux-amlogic-request@lists.infradead.org?subject=subscribe> Cc: u-boot@lists.denx.de, linux-amlogic@lists.infradead.org, Neil Armstrong <narmstrong@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" <linux-amlogic-bounces@lists.infradead.org> Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
On Thu, Jun 14, 2018 at 01:43:38PM +0200, Neil Armstrong wrote: > Add USB as boot target depending on the configuration. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/meson-gx-common.h b/include/configs/meson-gx-common.h index 6e61b70..7435f34 100644 --- a/include/configs/meson-gx-common.h +++ b/include/configs/meson-gx-common.h @@ -23,10 +23,17 @@ #define GICD_BASE 0xc4301000 #define GICC_BASE 0xc4302000 +#ifdef CONFIG_CMD_USB +#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) +#else +#define BOOT_TARGET_DEVICES_USB(func) +#endif + #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ + BOOT_TARGET_DEVICES_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na)
Add USB as boot target depending on the configuration. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- include/configs/meson-gx-common.h | 7 +++++++ 1 file changed, 7 insertions(+)