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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA187C433F5 for ; Sat, 9 Oct 2021 17:34:36 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1278A60F9D for ; Sat, 9 Oct 2021 17:34:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1278A60F9D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8283483689; Sat, 9 Oct 2021 19:34:16 +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="Yi54tDkp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 44E3583688; Sat, 9 Oct 2021 19:34:03 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (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 4D78D83678 for ; Sat, 9 Oct 2021 19:33:54 +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=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 00AA26108B; Sat, 9 Oct 2021 17:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633800832; bh=g8unZRjLxehVRTJ3uOnV27d08NYP2+SEY3nwdNDtm+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yi54tDkphi/W3zFmXfOlMYiP652bCzGlBnd3bfFoL+MBtaPSJQcJFQ+bXnUlTffmZ 1T6rJNx7TvkUW33L2J7bHRHlCPMFfjeXomw1nMnAMcG+Be7quwkOtz3P0qpuXhIxwF whMF6muaONuEnyd6s4HWMVbex1jpyUt5jcgT0HLgUGF4DldEo5VXWb5TDwBfdj+abE aDwdq5PCamcfhDG8F0KNGPJK3d/HWQOE0uX6TBbYAeFowD9hAX+i70Y+vn3eci815V 1w0QtFADg2NG306fa9zc+6DX5Qx8fajeb6cDFuNH6Qp8U77rX5bAn44i9v48NyzyF0 uOSkWDQvqwPQA== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Stefan Roese Cc: u-boot@lists.denx.de, pali@kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH u-boot-marvell 02/12] arm: mvebu: turris_mox: Move options to defconfig Date: Sat, 9 Oct 2021 19:33:36 +0200 Message-Id: <20211009173346.7859-3-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211009173346.7859-1-kabel@kernel.org> References: <20211009173346.7859-1-kabel@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.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.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún Move config options CONFIG_LAST_STAGE_INIT and CONFIG_DISPLAY_BOARDINFO_LATE to turris_mox_defconfig. Signed-off-by: Marek Behún --- configs/turris_mox_defconfig | 2 ++ include/configs/turris_mox.h | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index 6ff551e477..e494aebecc 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -24,7 +24,9 @@ CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_ARCH_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_MISC_INIT_R=y CONFIG_CMD_SHA1SUM=y CONFIG_CMD_CLK=y diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 0bbc984753..0fcf216eb1 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -10,13 +10,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) -#define CONFIG_LAST_STAGE_INIT - -/* - * High Level Configuration Options (easy to change) - */ -#define CONFIG_DISPLAY_BOARDINFO_LATE - /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -- 2.32.0