From patchwork Mon Feb 15 18:07:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabien Parent X-Patchwork-Id: 1440679 X-Patchwork-Delegate: trini@ti.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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=vTa7WtHA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4DfXCZ6mWBz9sRN for ; Tue, 16 Feb 2021 05:08:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6B3DA8271A; Mon, 15 Feb 2021 19:08:04 +0100 (CET) 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="vTa7WtHA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8BEDE826D4; Mon, 15 Feb 2021 19:07:57 +0100 (CET) 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,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) (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 76AEF826D4 for ; Mon, 15 Feb 2021 19:07:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=fparent@baylibre.com Received: by mail-wm1-x333.google.com with SMTP id l17so6950914wmq.2 for ; Mon, 15 Feb 2021 10:07:53 -0800 (PST) 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=Q0E/5SYEUBLfE03jGobyX52u30EAyeV5YXZyQ+lhFVc=; b=vTa7WtHAgTxeet9SsGWy7Z5H8GZ1TlsjstwRUTx+un+DGn8YhNnCERLvFY0Jf9p1zH 6n2omFtilmlKTMeSJqpODd8DmKT2dku3eFeG1TjLJ1Dm5eTOHo8JZA9Ca126DWf3m4ky jYaH4SAU2hO/III5vtxnmQTHMireBZg5BFl2YFPSaIEj7RNI7KbiSlwI56w/lxQ9E3cQ 0dTI/d82TEnxSuHKuC/wyovHZRATN+Lv3FtMGSzVg7vFWzMbAO+A40fFHfkkBy9Oez3j 4C19Sag4xonLTlmIZdpeIiK9iq+sMCcjXdEFjxS+irJE0aYiPzjsL7ss0OEuODaTVz/x bSxw== 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=Q0E/5SYEUBLfE03jGobyX52u30EAyeV5YXZyQ+lhFVc=; b=mM09lOVx4gR0BZceVunFm0g18Hw7Se71+7yDrvB25IjIDhgw9MReV+IOuzYtP7HTMB ZPL4E9QLjUdGqxUncjqK/RtlhfLsM5/rWd6HX+yVuPP7fT2c8aZUeYm77V3C6hor3J/w u1NCsODq4M/lOq+Ezz0/NXibFGYqApiz3yJJHEfo2L2CJljSNpCiWszVWBvlQe5G6bOW CYlAyktcP2DamRAdl8DUuTEeR2X6jibLgO3kjVnzDwRxcNODi6uke3zN/xBmwH6NxtTh Ysu2iLIzwC0B+XSZp2q2uTAmIE0QmTejEFZKMpFV75A4Fs7M7HVpmHdqsJcTP3scQ7/3 r9yQ== X-Gm-Message-State: AOAM530HUXVOV9NqTIsxmcwav2ZU6E9LY8NT1z3TjVxbvgaBNcHOISeQ mSHvYNalt1TpWMEohYjkpK8jzw== X-Google-Smtp-Source: ABdhPJwIgTbxcdJw61S2CZB6jWQ3Bg3UQj+f+3HJpsAprUfMhIk3d5tRd6tMw7/9OBpV/TgctKDGBA== X-Received: by 2002:a05:600c:350a:: with SMTP id h10mr111017wmq.142.1613412473088; Mon, 15 Feb 2021 10:07:53 -0800 (PST) Received: from localhost.localdomain ([88.160.162.107]) by smtp.gmail.com with ESMTPSA id u4sm23575597wrr.37.2021.02.15.10.07.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 10:07:52 -0800 (PST) From: Fabien Parent To: Fabien Parent Cc: u-boot@lists.denx.de Subject: [PATCH 3/3] configs: mt8516: use bootcmd from config_distro_bootcmd.h Date: Mon, 15 Feb 2021 19:07:46 +0100 Message-Id: <20210215180746.2382067-3-fparent@baylibre.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210215180746.2382067-1-fparent@baylibre.com> References: <20210215180746.2382067-1-fparent@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.3 at phobos.denx.de X-Virus-Status: Clean Instead of redefining our own way to boot, let's just use config_distro_bootcmd.h. Signed-off-by: Fabien Parent --- include/configs/mt8516.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h index e809a9c7e304..a1c5d8174be7 100644 --- a/include/configs/mt8516.h +++ b/include/configs/mt8516.h @@ -31,23 +31,11 @@ /* Environment settings */ #include -#define MMCBOOT \ - "mmcdev=0\0" \ - "kernel_partition=2\0" \ - "rootfs_partition=3\0" \ - "mmc_discover_partition=" \ - "part start mmc ${mmcdev} ${kernel_partition} kernel_part_addr;" \ - "part size mmc ${mmcdev} ${kernel_partition} kernel_part_size;\0" \ - "mmcboot=" \ - "mmc dev ${mmcdev};" \ - "run mmc_discover_partition;" \ - "mmc read ${kerneladdr} ${kernel_part_addr} ${kernel_part_size};" \ - "setenv bootargs ${bootargs} root=/dev/mmcblk${mmcdev}p${rootfs_partition} rootwait; " \ - "bootm ${kerneladdr}; \0" +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) #define CONFIG_EXTRA_ENV_SETTINGS \ - "kerneladdr=0x4A000000\0" \ - MMCBOOT \ - "bootcmd=run mmcboot;\0" + "scriptaddr=0x40000000\0" \ + BOOTENV #endif