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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2270BC636D7 for ; Tue, 21 Feb 2023 15:18:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B36A85A55; Tue, 21 Feb 2023 16:18:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=semihalf.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=semihalf.com header.i=@semihalf.com header.b="nVcztrYd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B86185A35; Tue, 21 Feb 2023 16:18:05 +0100 (CET) Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) (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 3472985A51 for ; Tue, 21 Feb 2023 16:17:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=semihalf.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pan@semihalf.com Received: by mail-lj1-x22b.google.com with SMTP id y44so4854617ljq.7 for ; Tue, 21 Feb 2023 07:17:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=igWGJXCEgDMKsPirlu7NqYSo/O7yJWtsEoSCY4Mubns=; b=nVcztrYdHYsWuPhG2qA9n86gDrt8TAM+9uN2eoNktt7itnb4ZV03d9wlyCWoc/LiRh /O2qWRewKEbS7Vg8/hFb4TRpjGgT4b/rySDeyI58FbDncu0S7LC6CIUpmxm3kSkTlPAB 3TVA/e7ZzSyUobyYLxmtnBCj5/rMGONUvC2ObHliHMhCyLibgrH86PXDPLr/ftpi86uF rcTzIUDMemmkuZuHAT0kinYHihGeCd7sLIEde9Htn2vGFxA2mg1Ugeg2hV4HQfM6da60 gVRH5K15Xmd7spe8D6kLNMI4nr81eAoI7bd+fC5QVqPG0P0feDQPHwMDzqQXcSchd+9Q Whow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=igWGJXCEgDMKsPirlu7NqYSo/O7yJWtsEoSCY4Mubns=; b=1D8JuHepH+8NfKOYxBptnYZzSr/BLLft5VE8OBCt+HJG3MN6q0uURVpXpy0s4TggRH QBbhtT6IHNIHRdh3y+rgzc3fqwEqLxiwxrhRwj1n80v9iD3Gj8HPIt5iHkKM2OIXUT4i XdvGep0bGjKlX9NRM7XkaudByNPuV5TXlEspvysuOo1c+P4WjXKBkXs0/Hel6bLbslSg /8WZ+lYb/2H3PmwzVVWvs6gqLjebiyAF4VbvY8nQLVIGF7ojZm77W8WQVw6p3mnjl/eL 5fAL9fF/ovxKvCHNMjh5r656w8MKDnVEe/pm5qsvGF126/TpbYR3++pWFmz5QWAwe5ir +xOg== X-Gm-Message-State: AO0yUKXwfB1YLKJU1bgzjs23DYE6WNu60eQ7HgagAiiDNKQw/mc0IusH nBy7KI6lV2egm6E8SZ+WsO6Eke9HZNNH2K3W X-Google-Smtp-Source: AK7set/BOSDwBSERW5WIi6N5iWpIfWIujzSH3miO/OEPRKogdd318G7BtFrlNHXxRAlrHPv1Nfa/DA== X-Received: by 2002:a2e:924f:0:b0:293:4ebc:98e0 with SMTP id v15-20020a2e924f000000b002934ebc98e0mr1746271ljg.17.1676992677461; Tue, 21 Feb 2023 07:17:57 -0800 (PST) Received: from panikiel.wifi.semihalf.net ([83.142.187.86]) by smtp.gmail.com with ESMTPSA id a2-20020a05651c030200b002946a078ad6sm341117ljp.125.2023.02.21.07.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 07:17:57 -0800 (PST) From: =?UTF-8?q?Pawe=C5=82=20Anikiel?= To: u-boot@lists.denx.de, marex@denx.de, simon.k.r.goldschmidt@gmail.com, tien.fong.chee@intel.com Cc: sjg@chromium.org, ka@semihalf.com, mw@semihalf.com, amstan@chromium.org, =?UTF-8?q?Pawe=C5=82=20Anikiel?= Subject: [PATCH v2 RESEND 2/6] socfpga: chameleonv3: Move environment to a text file Date: Tue, 21 Feb 2023 16:17:02 +0100 Message-Id: <20230221151706.48065-3-pan@semihalf.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog In-Reply-To: <20230221151706.48065-1-pan@semihalf.com> References: <20230221151706.48065-1-pan@semihalf.com> 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.39 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.6 at phobos.denx.de X-Virus-Status: Clean Move the environment to an easily editable text file in the boot partition Signed-off-by: Paweł Anikiel Reviewed-by: Simon Glass --- board/google/chameleonv3/environment.txt | 13 +++++++++++++ include/configs/socfpga_chameleonv3.h | 9 ++++----- 2 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 board/google/chameleonv3/environment.txt diff --git a/board/google/chameleonv3/environment.txt b/board/google/chameleonv3/environment.txt new file mode 100644 index 0000000000..52aedbb90a --- /dev/null +++ b/board/google/chameleonv3/environment.txt @@ -0,0 +1,13 @@ +# MMC boot command +bootcmd_mmc=load mmc 0:1 ${loadaddr} kernel.itb; bootm + +# Network boot command and vars +bootcmd_net=dhcp; tftpboot ${loadaddr} kernel.itb; bootm +autoload=no +serverip=192.168.0.1 + +# U-Boot will run this after loading this file +bootcmd_txt=run bootcmd_mmc + +# Kernel cmdline +bootargs=cma=256M console=ttyS1,115200 root=/dev/mmcblk0p3 rootflags=subvol=root rw rootwait diff --git a/include/configs/socfpga_chameleonv3.h b/include/configs/socfpga_chameleonv3.h index 2ce7011529..fc08e74dba 100644 --- a/include/configs/socfpga_chameleonv3.h +++ b/include/configs/socfpga_chameleonv3.h @@ -20,11 +20,10 @@ #define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200} #define CFG_EXTRA_ENV_SETTINGS \ - "autoload=no\0" \ - "bootargs=cma=256M console=ttyS1,115200 root=/dev/mmcblk0p3 rw rootwait\0" \ - "distro_bootcmd=bridge enable; run bootcmd_mmc\0" \ - "bootcmd_mmc=load mmc 0:1 ${loadaddr} kernel.itb; bootm\0" \ - "bootcmd_net=dhcp; tftpboot ${loadaddr} kernel.itb; bootm\0" + "distro_bootcmd=bridge enable; " \ + "load mmc 0:1 ${loadaddr} u-boot.txt; " \ + "env import -t ${loadaddr}; " \ + "run bootcmd_txt\0" /* * L4 OSC1 Timer 0 -- 2.39.2.637.g21b0678d19-goog