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 4FEF5C636CB for ; Sat, 28 Jan 2023 22:03:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 76A928577F; Sat, 28 Jan 2023 23:02:13 +0100 (CET) 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="KSBcB3AJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 89A268574D; Sat, 28 Jan 2023 23:01:35 +0100 (CET) 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 3B67A85765 for ; Sat, 28 Jan 2023 23:01:24 +0100 (CET) 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 f8so3754647ilj.5 for ; Sat, 28 Jan 2023 14:01:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; 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=YFvl8C66wXB16QQg56qeY4uzCWewmkJs1r5k/q8kmvA=; b=KSBcB3AJ9y2oOCjjIX5b5QeAgLSbeeL9QTRikZvo6N08jo61SYF5+w+nspGHDAk6A+ WP+belMNoAVzLSwJjdYZCFswlxx8KF8e7N4ne6OX6RofqDlPFJUc1lKGK0P8ttaW8HyC 2KKY0nWTY62dDoSUT7nL8T9+xQOc+MHckXDO0= 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=YFvl8C66wXB16QQg56qeY4uzCWewmkJs1r5k/q8kmvA=; b=MCHiCMlToXIg8ecmtLhy3GP51QiP1glzkOZiBLus3LJR7+31pHS3dDQKn18fxJnxpt 2z9j4AkCH+Y+1qMpQ8Degg2+2c7Gy0mPOtJ0BiUSRg2os7Eh5D7q0xhsUWXWJJq+MFeo 8Qms1VQ0rY0nKIHWZmpdyjn6nnJfB6NotQoD9wv9gYrM91KcMLWmv0hgm0lsAhqAUZJS HASNFmZzN1MSYOjPknwKlByRsNX3VuHApl3JoYq8K6m/sUmpnxhCDP3mzyAZuq3QP0dw cFGK4iIeuhT4g4DAwx1ii9vZNlRSRxC5eGhJl5TYd/D1sNt/CZ4xFdYdqZqJbGnBYD+1 ieEw== X-Gm-Message-State: AO0yUKWSzvtqlBD3Iy3AlY+7zD/cZQfF4oiW5YVx2WBMwXcDk6ESTMww xE84Py6olKXOlMwmceKtHCklfuMC/w5M5Vv/ X-Google-Smtp-Source: AK7set+BMDKjQRy17wZoqUNLc0udUwPLgISU9vYsfrruXgqEJulRWUEa7+rtPUHlu7zcV7T3IDewKQ== X-Received: by 2002:a92:c265:0:b0:310:e034:2164 with SMTP id h5-20020a92c265000000b00310e0342164mr1666100ild.20.1674943275955; Sat, 28 Jan 2023 14:01:15 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id f15-20020a056e0212af00b0030f1be2e051sm2525521ilr.39.2023.01.28.14.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jan 2023 14:01:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Albert Aribaud , Ilias Apalodimas , Simon Glass , Tuomas Tynkkynen Subject: [PATCH 12/13] arm: qemu: Switch to a text environment Date: Sat, 28 Jan 2023 15:00:27 -0700 Message-Id: <20230128220028.53575-13-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230128220028.53575-1-sjg@chromium.org> References: <20230128220028.53575-1-sjg@chromium.org> MIME-Version: 1.0 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 Use the new environment format so we can drop most of the config.h file. Signed-off-by: Simon Glass --- board/emulation/qemu-arm/qemu-arm.env | 12 ++++++++++++ include/configs/qemu-arm.h | 13 ------------- 2 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 board/emulation/qemu-arm/qemu-arm.env diff --git a/board/emulation/qemu-arm/qemu-arm.env b/board/emulation/qemu-arm/qemu-arm.env new file mode 100644 index 00000000000..e658d5ee7d6 --- /dev/null +++ b/board/emulation/qemu-arm/qemu-arm.env @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +/* environment for qemu-arm and qemu-arm64 */ + +fdt_high=0xffffffff +initrd_high=0xffffffff +fdt_addr=0x40000000 +scriptaddr=0x40200000 +pxefile_addr_r=0x40300000 +kernel_addr_r=0x40400000 +ramdisk_addr_r=0x44000000 +boot_targets=qfw usb scsi virtio nvme dhcp diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 02f9354c05d..77ab5738254 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -23,17 +23,4 @@ /* For timer, QEMU emulates an ARMv7/ARMv8 architected timer */ -/* Environment options */ -#define BOOT_TARGETS "qfw usb scsi virtio nvme dhcp" - -#define CFG_EXTRA_ENV_SETTINGS \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ - "fdt_addr=0x40000000\0" \ - "scriptaddr=0x40200000\0" \ - "pxefile_addr_r=0x40300000\0" \ - "kernel_addr_r=0x40400000\0" \ - "ramdisk_addr_r=0x44000000\0" \ - "boot_targets=" BOOT_TARGETS "\0" - #endif /* __CONFIG_H */ -- 2.39.1.456.gfc5497dd1b-goog