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 5D779C4332F for ; Mon, 17 Jan 2022 15:06:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5F43E83196; Mon, 17 Jan 2022 16:05:40 +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="W2kHSF19"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1EA5D837F6; Mon, 17 Jan 2022 16:05:22 +0100 (CET) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (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 374B3837D0 for ; Mon, 17 Jan 2022 16:04:58 +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-io1-xd2f.google.com with SMTP id v6so21889508iom.6 for ; Mon, 17 Jan 2022 07:04:58 -0800 (PST) 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=uDAXLDL1CTJ1qgGGKUA+CdPyUGSjjbEZxfvcOJdDJ1c=; b=W2kHSF19QuQGCQHF9or1AvLJPk/7yAD06cfCUJOtJDwAXWfxrFv7zSv3SaTitdFdn5 cMxkpLbExyZIHfXKQ0I0/py5+M0f7dHuN/puGxQhIUrh40HZN5ar0ucY+wgxW0YCwwpa 4+BCFLZ69Lu5/qAuPpL3jRqMur8xODldTj5+w= 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=uDAXLDL1CTJ1qgGGKUA+CdPyUGSjjbEZxfvcOJdDJ1c=; b=6gExYmCRJ+Mq5wcfcLkUjyZSoTf2zYfBjPwEjoMbCptJ3+7ogD9kug1SAlMvk2eMcx cOQsIj7QmUNkFSQryPFHr9Ft3vpKrr/AmrvzOdxFYYwmjITij7CO4M+0W+HUBastLQnJ ptHJ6R1dm8QD3kbSXq/H6K5XZ4umWKzekVmW8HxNw5aRtIgYQf1kIC99/2rYawFuJnxd iUyUi+TXNRGseqV5YUs4loGONiRPHfck5Nvna0QN9AomtDDu/dODzT4wF0Dwnx4tZcGx ZGs72igdPhsL8ClRI0zC7xdtwjS2zNbKhohSynE/4Pnr8tlHWxRj5mE2CD45Z59SXRVt 7Y/g== X-Gm-Message-State: AOAM5303eE+v6W8wN5ItSwRUf7CCclkPCwjD3t9E0OM3DwghSpJabomr rk4MMoY/etqwQMVdatMDeJm9+VOngWQSvg== X-Google-Smtp-Source: ABdhPJwptFdovDJoTCPULm36+iv2mG71nMmTnwv0K7yIliWiIp5ZP/xjsGQWZ1FhLG7JzCZVp/oo4Q== X-Received: by 2002:a02:9992:: with SMTP id a18mr9122349jal.189.1642431896709; Mon, 17 Jan 2022 07:04:56 -0800 (PST) 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 f21sm9379320iol.42.2022.01.17.07.04.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jan 2022 07:04:56 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , Tom Rini , =?UTF-8?q?Fran=C3=A7ois=20Ozog?= , Heinrich Schuchardt , Bill Mills , Simon Glass , Bharat Gooty , Rayagonda Kokatanur , Tuomas Tynkkynen Subject: [PATCH v2 10/16] passage: Add a qemu test for ARM Date: Mon, 17 Jan 2022 08:04:22 -0700 Message-Id: <20220117150428.1580273-5-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog In-Reply-To: <20220117150428.1580273-1-sjg@chromium.org> References: <20220117150428.1580273-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.2 at phobos.denx.de X-Virus-Status: Clean Check that the standard passage works on ARM, by setting it up in SPL and making sure that it comes through correctly in U-Boot proper. Signed-off-by: Simon Glass --- Changes in v2: - Add a devicetree for qemu-arm so that qemu_arm_spl can work arch/arm/Kconfig | 2 +- configs/qemu_arm_spl_defconfig | 8 +++++++- test/py/tests/test_passage.py | 11 +++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 test/py/tests/test_passage.py diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 78c6b2e92dc..c4d06d2f1a0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -974,7 +974,7 @@ config ARCH_QEMU imply DM_RNG imply DM_RTC imply RTC_PL031 - imply OF_HAS_PRIOR_STAGE + imply OF_HAS_PRIOR_STAGE if !TARGET_QEMU_ARM_32BIT_SPL config ARCH_RMOBILE bool "Renesas ARM SoCs" diff --git a/configs/qemu_arm_spl_defconfig b/configs/qemu_arm_spl_defconfig index a6950584542..e91fed8f5e0 100644 --- a/configs/qemu_arm_spl_defconfig +++ b/configs/qemu_arm_spl_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_DEFAULT_DEVICE_TREE="qemu-arm" CONFIG_TARGET_QEMU_ARM_32BIT_SPL=y CONFIG_SPL_SERIAL=y +CONFIG_SPL_SYS_MALLOC_F_LEN=0x6000 CONFIG_DEBUG_UART_BASE=0x9000000 CONFIG_DEBUG_UART_CLOCK=0 CONFIG_ARMV7_LPAE=y @@ -28,6 +29,11 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_PCI_INIT_R=y +CONFIG_BLOBLIST=y +CONFIG_BLOBLIST_PASSAGE=y +CONFIG_SPL_BLOBLIST_ALLOC=y +CONFIG_BLOBLIST_SIZE=0x4000 +CONFIG_PASSAGE_IN=y CONFIG_SPL_FRAMEWORK_BOARD_INIT_F=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_NVEDIT_EFI=y @@ -37,7 +43,7 @@ CONFIG_CMD_PCI=y CONFIG_CMD_USB=y CONFIG_CMD_MTDPARTS=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_BOARD=y +CONFIG_OF_PASSAGE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x4000000 CONFIG_SPL_DM=y diff --git a/test/py/tests/test_passage.py b/test/py/tests/test_passage.py new file mode 100644 index 00000000000..594dc3cc685 --- /dev/null +++ b/test/py/tests/test_passage.py @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2021 Google LLC + +import pytest + +@pytest.mark.buildconfigspec('target_qemu_arm_32bit_spl') +def test_passage(u_boot_console): + """Test that the standard passage on ARM from SPL to U-Boot works.""" + + response = u_boot_console.run_command('bdinfo') + assert 'devicetree = passage' in response -- 2.34.1.703.g22d0c6ccf7-goog