From nobody Mon Feb 9 19:30:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619465736; cv=none; d=zohomail.com; s=zohoarc; b=TQeLoxzbESiCvpboUcsf47moDCZnI7t1OcX6uv4EMtZcmfW5QcqMqrVPefTkZT+N5gKMAuAfsdNrphO37Z6OvjBtwPB6T1ZWkH9bZkYHN6KFCVY15ed/kNLQ2iS9oPQSfLXFKezNpd/FF5IE5Lpb8L0U0jKnb6KKQE+c2ucpNAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619465736; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=m3J2o1342PI/Nwq9CiNtPMcwkrmRbYFAeBct1A9GlkY=; b=Sq78KJHkkV8B74TnZG6QTOfR1Oh3fk3YCkyA09xYSnbwBKihJOqrtWc58F5Vlnsvbno06f/JknvqyxyyDXyxlVbqj/8GTQIcbgq5T69edIORtqFQGHUecj/+QsPKH0fSFJDEO/q93RdirQ6aubY85TKEe34+t3/NEoanz/N31zs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 161946573679786.3543935406176; Mon, 26 Apr 2021 12:35:36 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-277-9bETGEopP_mfLQLF1AJyVA-1; Mon, 26 Apr 2021 15:35:33 -0400 Received: by mail-wm1-f71.google.com with SMTP id o18-20020a1ca5120000b02901333a56d46eso3355167wme.8 for ; Mon, 26 Apr 2021 12:35:33 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id i11sm1269242wrp.56.2021.04.26.12.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Apr 2021 12:35:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619465735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m3J2o1342PI/Nwq9CiNtPMcwkrmRbYFAeBct1A9GlkY=; b=R1ItYCTl8AsUh2XQd9oSEzlP8yNaVzlOPRPAr33eCdrq9FvBAEspLIUyHxmCLb+gMYkwMB f4yZieq8j7LwGhV4EL/xuhM8OGIAwvLdHhBylP4C/3Z37a+8texEuaxtNH/Glh20MrwJQG 0j8SnL83H5CqqQpDISoFRXidYILUi50= X-MC-Unique: 9bETGEopP_mfLQLF1AJyVA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m3J2o1342PI/Nwq9CiNtPMcwkrmRbYFAeBct1A9GlkY=; b=F9+IkcuMGcU8Bzy1BZi3zIzPFw+k/j5A70CHF4i1tVwZW+9xUuPQywTFVqMXiEvx4c 6S7QpCDZYYt+G8Rh4C24aznU0u5ckeHavcQwwDvcR+V0vRz0RzrTFDHeNDoMkDAzq4kR I/cjs23vYNEmXwwWITvGPnlS54mEVy2MU1s33bai+PK5xdg61oyhpnRup9ux7NfbJF4w xlCpsYP6AFbc9Y1MsQw2w2PWgHc6pMLVAdfF64WAKvNw642wttyC2PXtxdUf9ueUsQcm 9QyQyF3rGPHf20W/S0c1cU4k4GJ2kFLADNeNTqF+3t76FzkH5r1FWIzaBYGh0zxs2DJl Y8CA== X-Gm-Message-State: AOAM532NU5TDFkpwSzwynk+uFwXaBNw2iwX0TGKAHe6+lXLvcpEdW+cw uDu8EiDdgD2hTipt4zpNLt/EvfEyLwKEwl5jLMhNqYidxUlsIxV2eQwyoeDOMZlWiNen0f/4nkb kQU77CmOX4JtiLA== X-Received: by 2002:a05:600c:2cd6:: with SMTP id l22mr14768500wmc.160.1619465732096; Mon, 26 Apr 2021 12:35:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXqNoDYJSJBVuKEOCsjaj69O8GsYv1GJb+RSGtbi7V1NKSZMRw/Y6KTl0UTxKt42tLmXa42A== X-Received: by 2002:a05:600c:2cd6:: with SMTP id l22mr14768489wmc.160.1619465731909; Mon, 26 Apr 2021 12:35:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , qemu-riscv@nongnu.org, Laszlo Ersek , qemu-ppc@nongnu.org, qemu-arm@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [PATCH 2/7] hw/nvram: Rename FW_CFG_MIPS as generic FW_CFG Kconfig symbol Date: Mon, 26 Apr 2021 21:35:15 +0200 Message-Id: <20210426193520.4115528-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210426193520.4115528-1-philmd@redhat.com> References: <20210426193520.4115528-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Targets using the fw_cfg device might have architecture specific keys. If so, they define the fw_cfg_arch_key_name() function. The use of FW_CFG_MIPS is not MIPS-specific, it is simply the architectural implementation. Rename it using the generic 'FW_CFG' and move the Kconfig declaration in hw/nvram/ where fw_cfg code is maintained. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/Kconfig | 5 +---- hw/mips/meson.build | 2 +- hw/nvram/Kconfig | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index aadd436bf4e..bbc6b9c1d11 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -42,7 +42,7 @@ config LOONGSON3V select PCI_DEVICES select PCI_EXPRESS_GENERIC_BRIDGE select MSI_NONBROKEN - select FW_CFG_MIPS + select FW_CFG =20 config MIPS_CPS bool @@ -50,6 +50,3 @@ config MIPS_CPS =20 config MIPS_BOSTON bool - -config FW_CFG_MIPS - bool diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 1195716dc73..893e56f7453 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -1,6 +1,6 @@ mips_ss =3D ss.source_set() mips_ss.add(files('bootloader.c', 'mips_int.c')) -mips_ss.add(when: 'CONFIG_FW_CFG_MIPS', if_true: files('fw_cfg.c')) +mips_ss.add(when: 'CONFIG_FW_CFG', if_true: files('fw_cfg.c')) mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loongson3_bootp.c',= 'loongson3_virt.c')) mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig index e872fcb1941..cab1070375f 100644 --- a/hw/nvram/Kconfig +++ b/hw/nvram/Kconfig @@ -1,3 +1,6 @@ +config FW_CFG + bool + config DS1225Y bool =20 --=20 2.26.3