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 250F6C433EF for ; Thu, 14 Oct 2021 18:24:27 +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 8A6C1611C7 for ; Thu, 14 Oct 2021 18:24:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8A6C1611C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.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 DB433837E9; Thu, 14 Oct 2021 20:24:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="YirBUOug"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 620EB83649; Thu, 14 Oct 2021 20:23:42 +0200 (CEST) Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 4253D837E8 for ; Thu, 14 Oct 2021 20:23:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id w11so4474581ilv.6 for ; Thu, 14 Oct 2021 11:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JpDoGQ4rJv5mmEzwiKapC+NHuLmnbdJzgFn9S9YdAq0=; b=YirBUOug8jgBzq2+rPvFLt1FmKjRWBwiWuHlgdGKUsExE4d0KHGG7aqnTXNRVeVWp/ OG5RH/CHxprxeFCo4y0T8riTb/3eOMpUWZtGKL8Uc5WFZowo4/D2DW99dUg13UgJxZTT DAt1muV1sSprcQqwfesIxLv1eaXZplWUZGOo0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JpDoGQ4rJv5mmEzwiKapC+NHuLmnbdJzgFn9S9YdAq0=; b=Aw1pzvwTvde3MorbqNMC2qlCdOiijZhgqHgFt+H8FLFC6MtVyk8RamXMteCfl2mkTv QizL70HImlPNBjF/Eh6YO/GmyOPGYa/6zM3mKbFbIWJ537cezczMXFpXFy2FviPZVd47 aPD+OU7gJ9S8g4Y+xX2Ql9+9W78AGvTyiSSiahzLFKU42GWknnptVHPb0OuaUyHLzvdh C/XSULlKNWdgFKQjIsaiHW3l+/RlWEO9SPKo0atJPDYmTPaf84J3lsLaOHqoflMpM3U4 AWakGZIcrf9siNcKKuf5Dl8lAc+fM9JXeWR4CCruPO6XXDMQIvhFX4+HkgwW3nG3axB2 W+Hg== X-Gm-Message-State: AOAM531F2/byJ0hAxUtoxhNdYmhHp9vBLfiU8QENz5dwcSHw00zis6U+ g1jwI9l2Ae9CBtXdf8JJUNZlT4LWRQcL8w== X-Google-Smtp-Source: ABdhPJw+zbt3lC201o+zIRd+jn5qRRhyy8p1E42UOE7bLCJ8TDL9X3xflfr8ael0DkQhK+FwxVxp2A== X-Received: by 2002:a05:6e02:1aa1:: with SMTP id l1mr382696ilv.179.1634235787776; Thu, 14 Oct 2021 11:23:07 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id h26sm1717536ila.4.2021.10.14.11.23.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 11:23:07 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Wolfgang Denk , Simon Glass Subject: [PATCH v6 5/7] sandbox: Use a text-based environment Date: Thu, 14 Oct 2021 12:22:55 -0600 Message-Id: <20211014122254.v6.5.I0690bd21a0701ccc5dd95fb5df88519d216d8af5@changeid> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211014182257.468649-1-sjg@chromium.org> References: <20211014182257.468649-1-sjg@chromium.org> MIME-Version: 1.0 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 Use a text file for the environment instead of the #define settings. Signed-off-by: Simon Glass --- (no changes since v3) Changes in v3: - Add new patch to use a text-based environment for sandbox board/sandbox/env/sandbox.env | 25 +++++++++++++++++++++++++ include/configs/sandbox.h | 29 ----------------------------- 2 files changed, 25 insertions(+), 29 deletions(-) create mode 100644 board/sandbox/env/sandbox.env diff --git a/board/sandbox/env/sandbox.env b/board/sandbox/env/sandbox.env new file mode 100644 index 00000000000..0f8d95b8db0 --- /dev/null +++ b/board/sandbox/env/sandbox.env @@ -0,0 +1,25 @@ +stdin=serial +#ifdef CONFIG_SANDBOX_SDL +stdin+=,cros-ec-keyb,usbkbd +#endif +stdout=serial,vidconsole +stderr=serial,vidconsole + +ethaddr=00:00:11:22:33:44 +eth2addr=00:00:11:22:33:48 +eth3addr=00:00:11:22:33:45 +eth4addr=00:00:11:22:33:48 +eth5addr=00:00:11:22:33:46 +eth6addr=00:00:11:22:33:47 +ipaddr=1.2.3.4 + +/* + * These are used for distro boot which is not supported. But once bootmethod + * is provided these will be used again. + */ +bootm_size=0x10000000 +kernel_addr_r=0x1000000 +fdt_addr_r=0xc00000 +ramdisk_addr_r=0x2000000 +scriptaddr=0x1000 +pxefile_addr_r=0x2000 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index c19232f202f..c703a1330c0 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -64,37 +64,8 @@ #define CONFIG_LCD_BMP_RLE8 #define CONFIG_KEYBOARD - -#define SANDBOX_SERIAL_SETTINGS "stdin=serial,cros-ec-keyb,usbkbd\0" \ - "stdout=serial,vidconsole\0" \ - "stderr=serial,vidconsole\0" -#else -#define SANDBOX_SERIAL_SETTINGS "stdin=serial\0" \ - "stdout=serial,vidconsole\0" \ - "stderr=serial,vidconsole\0" #endif -#define SANDBOX_ETH_SETTINGS "ethaddr=00:00:11:22:33:44\0" \ - "eth2addr=00:00:11:22:33:48\0" \ - "eth3addr=00:00:11:22:33:45\0" \ - "eth4addr=00:00:11:22:33:48\0" \ - "eth5addr=00:00:11:22:33:46\0" \ - "eth6addr=00:00:11:22:33:47\0" \ - "ipaddr=1.2.3.4\0" - -#define MEM_LAYOUT_ENV_SETTINGS \ - "bootm_size=0x10000000\0" \ - "kernel_addr_r=0x1000000\0" \ - "fdt_addr_r=0xc00000\0" \ - "ramdisk_addr_r=0x2000000\0" \ - "scriptaddr=0x1000\0" \ - "pxefile_addr_r=0x2000\0" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - SANDBOX_SERIAL_SETTINGS \ - SANDBOX_ETH_SETTINGS \ - MEM_LAYOUT_ENV_SETTINGS - #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_IDE_MAXBUS 1 #define CONFIG_SYS_ATA_IDE0_OFFSET 0 -- 2.33.0.1079.g6e70778dc9-goog