Received: by 2002:a17:504:82cc:b0:1be9:327d:8ee3 with SMTP id m12csp106600njj; Tue, 29 Oct 2024 02:18:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUxFu9VyfRsoW2sJbj0ybMfiARpHQ1pkCme5SX3SKyo9UTaqfGYZ9FSjG0UpKpG7Q8chQy2D5hxUEzcjw==@linaro.org X-Google-Smtp-Source: AGHT+IHwqRDvdlpZsR5tgVtf52tM1lLSdfxzV2DzFkZc+BpURShfRKPwUpR4z+ErB+Z5klGrsmbL X-Received: by 2002:a05:690c:2a44:b0:6dd:76ce:d6c9 with SMTP id 00721157ae682-6e9d8b0eb5dmr85219257b3.42.1730193529512; Tue, 29 Oct 2024 02:18:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1730193529; cv=none; d=google.com; s=arc-20240605; b=FWvjPs3NPwbBMxoXRbvgPPMZDRyqPhzPQgmkuOe/K5IBLRyu8wkzk+25PK2nXdd66H YGCkvr/Bcv3PgkcBjpdaIFWsEc9RyO7oljAWgiZIbnO9mkEvTPWFJ8NKmOpJ+3k3ntmb aoV/dJgPG+Cd4BNifcLD1/pcIMjfYVL7JZe83pSBbgRQvP0M5GxSqkcOjbMgQR+oGsbK l5rXYqc0FKzUItk6kDOX12jwAgnwVwWRuBLeX2xqxSnZjzDTw7mxgtQ/upZ7EoLK96Bm aYX4gJtOiIzpfoPXwulsEl/SGcRPDblNPITHuvUUPYwRLvT9qTtWhWw35zkFMZkPkSCd 2UFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:from:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to; bh=bQMZkf6DStl3nkkyXdPLLgYzv4jr+tFJ89zinkJkVgs=; fh=4rHsaFhVkVMXk5u1IVZO4usPBujjRbqK1KMv0eZ+6CI=; b=P9R1Ftjk9s6jGVBWo1phNLMkO+jki6ahIOKp79rLwXJD6bBzZa7jrCZNbausFIAlN2 2HFEdhp9il6UUusER2X3mqzaQUNfjohI3kVTNG5WVkM3o9h3r8GeirQhSS6Zrbe1z0X5 ZrVLJUWEq06BnoXj3YYgbIK+8/tBIPWOTgUi2KUFc+QRNER4yWheDmZ7EF2ZVIV+Q/kR v6n2M3RnWBBxOZLjncAz07fF1eKUYh6Hx5Tai4d1mvdMd5FFr7EPD+Wk8E2ALxpLRPkW ueqmPlYgW1EcylEUZ/461hY+pyAPy1bokIR3Ng7jh1sEF1KO4KBMZpy8/GNeW6GilRX7 ACfQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6d179a4a238si104004836d6.416.2024.10.29.02.18.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Oct 2024 02:18:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5iMk-0000kN-8G; Tue, 29 Oct 2024 05:18:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5iMX-0000cX-TZ; Tue, 29 Oct 2024 05:18:07 -0400 Received: from mail.aspeedtech.com ([211.20.114.72] helo=TWMBX01.aspeed.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5iMW-0003A3-8N; Tue, 29 Oct 2024 05:18:05 -0400 Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 29 Oct 2024 17:17:32 +0800 Received: from localhost.localdomain (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Tue, 29 Oct 2024 17:17:32 +0800 To: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Steven Lee , Troy Lee , Andrew Jeffery , "Joel Stanley" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , "open list:ASPEED BMCs" , "open list:All patches CC here" , "open list:SD (Secure Card)" CC: , , Subject: [PATCH v1 8/8] aspeed: Support create flash devices via command line for AST1030 Date: Tue, 29 Oct 2024 17:17:29 +0800 Message-ID: <20241029091729.3317512-9-jamin_lin@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241029091729.3317512-1-jamin_lin@aspeedtech.com> References: <20241029091729.3317512-1-jamin_lin@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Received-SPF: pass client-ip=211.20.114.72; envelope-from=jamin_lin@aspeedtech.com; helo=TWMBX01.aspeed.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_FAIL=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jamin Lin From: Jamin Lin via Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: aQg1DuTi0EiO Add a "if-statement" in aspeed_minibmc_machine_init function. If users add "-nodefaults" in command line, the flash devices should be created by users setting. Otherwise, the flash devices are created at machine init. Signed-off-by: Jamin Lin --- hw/arm/aspeed.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 0468602d95..e161e6b1c5 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1602,18 +1602,20 @@ static void aspeed_minibmc_machine_init(MachineState *machine) connect_serial_hds_to_uarts(bmc); qdev_realize(DEVICE(bmc->soc), NULL, &error_abort); - aspeed_board_init_flashes(&bmc->soc->fmc, - bmc->fmc_model ? bmc->fmc_model : amc->fmc_model, - amc->num_cs, - 0); + if (defaults_enabled()) { + aspeed_board_init_flashes(&bmc->soc->fmc, + bmc->fmc_model ? bmc->fmc_model : amc->fmc_model, + amc->num_cs, + 0); - aspeed_board_init_flashes(&bmc->soc->spi[0], - bmc->spi_model ? bmc->spi_model : amc->spi_model, - amc->num_cs, amc->num_cs); + aspeed_board_init_flashes(&bmc->soc->spi[0], + bmc->spi_model ? bmc->spi_model : amc->spi_model, + amc->num_cs, amc->num_cs); - aspeed_board_init_flashes(&bmc->soc->spi[1], - bmc->spi_model ? bmc->spi_model : amc->spi_model, - amc->num_cs, (amc->num_cs * 2)); + aspeed_board_init_flashes(&bmc->soc->spi[1], + bmc->spi_model ? bmc->spi_model : amc->spi_model, + amc->num_cs, (amc->num_cs * 2)); + } if (amc->i2c_init) { amc->i2c_init(bmc); -- 2.34.1