-----Original Message-----
From: Nabih Estefan <nabiheste...@google.com>
Sent: Wednesday, February 7, 2024 7:24 AM
To: peter.mayd...@linaro.org
Cc: qemu-...@nongnu.org; qemu-devel@nongnu.org; CS20 KFTing
<kft...@nuvoton.com>; wuhao...@google.com; jasow...@redhat.com; IS20 Avi
Fishman <avi.fish...@nuvoton.com>; nabiheste...@google.com; CS20 KWLiu
<kw...@nuvoton.com>; IS20 Tomer Maimon <tomer.mai...@nuvoton.com>; IN20 Hila
Miranda-Kuzi <hila.miranda-k...@nuvoton.com>
Subject: [PATCH 1/1] tests/qtest: Fixing GMAC test to run in 7xx
CAUTION - External Email: Do not click links or open attachments unless you
acknowledge the sender and content.
Fixing the nocm_gmac-test.c file to run on a nuvoton 7xx machine instead of
8xx. Also fixing comments referencing this and values expecting 8xx.
Change-Id: I07b91e8be473e6a1ece65a2202608b52ed4025b8
Signed-Off-By: Nabih Estefan <nabiheste...@google.com>
Reviewed-by: Tyrone Ting <kft...@nuvoton.com>
---
tests/qtest/meson.build | 4 ++--
tests/qtest/npcm_gmac-test.c | 12 ++----------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index
39557d5ecb..2b89e8634b 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -192,7 +192,8 @@ qtests_npcm7xx = \
'npcm7xx_sdhci-test',
'npcm7xx_smbus-test',
'npcm7xx_timer-test',
- 'npcm7xx_watchdog_timer-test'] + \
+ 'npcm7xx_watchdog_timer-test',
+ 'npcm_gmac-test'] + \
(slirp.found() ? ['npcm7xx_emc-test'] : []) qtests_aspeed = \
['aspeed_hace-test',
@@ -231,7 +232,6 @@ qtests_aarch64 = \
(config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \
(config_all_accel.has_key('CONFIG_TCG') and
\
config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] :
[]) + \
- (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \
['arm-cpu-features',
'numa-test',
'boot-serial-test',
diff --git a/tests/qtest/npcm_gmac-test.c b/tests/qtest/npcm_gmac-test.c index
9e58b15ca1..0d1bc8107b 100644
--- a/tests/qtest/npcm_gmac-test.c
+++ b/tests/qtest/npcm_gmac-test.c
@@ -36,7 +36,7 @@ typedef struct TestData {
const GMACModule *module;
} TestData;
-/* Values extracted from hw/arm/npcm8xx.c */
+/* Values extracted from hw/arm/npcm7xx.c */
static const GMACModule gmac_module_list[] = {
{
.irq = 14,
@@ -46,14 +46,6 @@ static const GMACModule gmac_module_list[] = {
.irq = 15,
.base_addr = 0xf0804000
},
- {
- .irq = 16,
- .base_addr = 0xf0806000
- },
- {
- .irq = 17,
- .base_addr = 0xf0808000
- }
};
/* Returns the index of the GMAC module. */ @@ -196,7 +188,7 @@ static void
test_init(gconstpointer test_data) {
const TestData *td = test_data;
const GMACModule *mod = td->module;
- QTestState *qts = qtest_init("-machine npcm845-evb");
+ QTestState *qts = qtest_init("-machine npcm750-evb");
#define CHECK_REG32(regno, value) \
do { \
--
2.43.0.594.gd9cf4e227d-goog
________________________________
________________________________
The privileged confidential information contained in this email is intended
for use only by the addressees as indicated by the original sender of this
email. If you are not the addressee indicated in this email or are not
responsible for delivery of the email to such a person, please kindly reply to
the sender indicating this fact and delete all copies of it from your computer
and network server immediately. Your cooperation is highly appreciated. It is
advised that any unauthorized use of confidential information of Nuvoton is
strictly prohibited; and any information in this email irrelevant to the
official business of Nuvoton shall be deemed as neither given nor endorsed by
Nuvoton.
