diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-27 15:29:33 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-27 15:29:33 +0000 |
| commit | 6ff45f01c734e1ad051f19913449e2577c9f4b7d (patch) | |
| tree | c471a8a31590faba7a963b4df9ef266ea94fd634 /hw | |
| parent | 9ad665df2a9eeb8ed6f3501896e45c1a3cd9dd5f (diff) | |
| parent | a7a5544a3a59600f30f29985397f56ee40929850 (diff) | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140327' into staging
target-arm queue:
* Don't default to integratorcp board if no machine specified
# gpg: Signature made Thu 27 Mar 2014 14:09:12 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
* remotes/pmaydell/tags/pull-target-arm-20140327:
vl.c: Improve message when no default machine is found
hw/arm: Stop specifying integratorcp as the default board
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/integratorcp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index a759689b44..912af96ee6 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -534,7 +534,6 @@ static QEMUMachine integratorcp_machine = { .name = "integratorcp", .desc = "ARM Integrator/CP (ARM926EJ-S)", .init = integratorcp_init, - .is_default = 1, }; static void integratorcp_machine_init(void) |