From b64d64de1a5b88de88146e3ad36e7b09b97837eb Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Fri, 16 Oct 2015 11:14:53 +0100 Subject: [PATCH] arm: imx25-pdk: Fix machine name ARM uses dashes instead of underscores for machine names. Fix imx25_pdk which has not seen a release yet (so there is no legacy yet). Cc: Jean-Christophe Dubois Signed-off-by: Peter Crosthwaite Message-id: 1444445785-3648-1-git-send-email-crosthwaite.peter@gmail.com Reviewed-by: Peter Maydell [PMM: Added change to tests/ds1338-test.c to use new machine name] Signed-off-by: Peter Maydell --- hw/arm/imx25_pdk.c | 2 +- tests/ds1338-test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 4250114..59a4c11 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -151,4 +151,4 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->init = imx25_pdk_init; } -DEFINE_MACHINE("imx25_pdk", imx25_pdk_machine_init) +DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init) diff --git a/tests/ds1338-test.c b/tests/ds1338-test.c index a7fb415..7d513d8 100644 --- a/tests/ds1338-test.c +++ b/tests/ds1338-test.c @@ -61,7 +61,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); - s = qtest_start("-display none -machine imx25_pdk"); + s = qtest_start("-display none -machine imx25-pdk"); i2c = imx_i2c_create(IMX25_I2C_0_BASE); addr = DS1338_ADDR; -- 2.7.4