From patchwork Sun May 24 21:10:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kettenis X-Patchwork-Id: 1296959 X-Patchwork-Delegate: ykai007@gmail.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; dmarc=none (p=none dis=none) header.from=openbsd.org 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49VXvL6zNyz9sPK for ; Mon, 25 May 2020 07:10:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C954801D6; Sun, 24 May 2020 23:10:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=openbsd.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 1797A804BE; Sun, 24 May 2020 23:10:42 +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,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lb1-smtp-cloud8.xs4all.net (lb1-smtp-cloud8.xs4all.net [194.109.24.21]) (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 36E0680199 for ; Sun, 24 May 2020 23:10:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=openbsd.org Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=kettenis@openbsd.org Received: from barber.sibelius.xs4all.nl ([83.163.83.176]) by smtp-cloud8.xs4all.net with ESMTP id cxtEj40U3dPgTcxtFjXRMb; Sun, 24 May 2020 23:10:37 +0200 From: Mark Kettenis To: u-boot@lists.denx.de Cc: jagan@amarulasolutions.com, kever.yang@rock-chips.com, patrick@blueri.se, sjg@chromium.org, philipp.tomsich@theobroma-systems.com, Mark Kettenis Subject: [PATCH] rk3399: Enable NVMe distro bootcmd Date: Sun, 24 May 2020 23:10:34 +0200 Message-Id: <20200524211034.38962-1-kettenis@openbsd.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfPMBtWOI1Iivg+BJKtZqGE75JkCpebpZnqIJ+DZli0PgPF4RHRM4H1qpTCwzQg97D0Ma2ASiq6/pLeVjf65yr8I/6A1Q9V3EQ3JlDx7vgD/bFEzRzDNa AG0dmLpl5lWSDDaDwD26WdTm7Biqztvqa2bdNav2ojoaodGdY2S+dtTBFzPdInJoIK/9drYml0u00tRDrKEl1Z7eSiEAmGpGnn6a/oK1MD0Jf0g5tF2ilyMU Tz5U/+C97WkeQ5GUZbx+PQK4koMfMVyKcIj9+y24Ed9nV/ggAN5osBcCBlx+5aZAM92u7r1WZ1UAMg3iJ4R5xPzGuSZZxuyiA2ymQgzrMceJxkW386teTrj1 r+4wBzT5hZvcjQwAh34jd/SgZSny8xxyGLWJD3pjVMMI6D4ubbo= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean Include NVME in the list of boot targets if CONFIG_NVME is enabled. Signed-off-by: Mark Kettenis Reviewed-by: Kever Yang --- include/configs/rockchip-common.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index bf8c60d6dd..0b9e24d1db 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -23,6 +23,12 @@ #define BOOT_TARGET_MMC(func) #endif +#if CONFIG_IS_ENABLED(CMD_NVME) + #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) +#else + #define BOOT_TARGET_NVME(func) +#endif + #if CONFIG_IS_ENABLED(CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else @@ -50,6 +56,7 @@ #ifdef CONFIG_ROCKCHIP_RK3399 #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_MMC(func) \ + BOOT_TARGET_NVME(func) \ BOOT_TARGET_USB(func) \ BOOT_TARGET_PXE(func) \ BOOT_TARGET_DHCP(func) \