diff options
| author | Thomas Huth <thuth@redhat.com> | 2019-11-20 10:10:11 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2019-12-16 17:24:07 +0100 |
| commit | 6da68df7f9b92e901263ea065712a289c8d3838e (patch) | |
| tree | f7cb3ba2e99b91446653030dc3f1b70ec03512bf /hw/arm | |
| parent | cb88904a54903ef6ba21a68a61d9cd51e2166304 (diff) | |
| download | qemu-6da68df7f9b92e901263ea065712a289c8d3838e.zip qemu-6da68df7f9b92e901263ea065712a289c8d3838e.tar.gz qemu-6da68df7f9b92e901263ea065712a289c8d3838e.tar.bz2 | |
hw/arm/nseries: Replace the bluetooth chardev with a "null" chardev
We are going to remove the bitrotten bluetooth backend, so we can
not use it in the n800 and n810 machines anymore. Replace the chardev
here with a "null" chardev and stop including the "hw/bt.h" header.
I am not aware of a full working N8x0 environment that can be used to
test these machines, but the Linux kernel from the Meego project that
can be found on http://stskeeps.subnetmask.net/meego-n8x0/ still seems
to boot as far as it did before.
Message-Id: <20191120091014.16883-2-thuth@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/nseries.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 7e36193..3fd196f 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" +#include "chardev/char.h" #include "qemu/cutils.h" #include "qemu/bswap.h" #include "sysemu/reset.h" @@ -39,7 +40,6 @@ #include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "hw/hw.h" -#include "hw/bt.h" #include "hw/loader.h" #include "hw/sysbus.h" #include "qemu/log.h" @@ -792,13 +792,11 @@ static void n8x0_cbus_setup(struct n800_s *s) static void n8x0_uart_setup(struct n800_s *s) { - Chardev *radio = uart_hci_init(); - - qdev_connect_gpio_out(s->mpu->gpio, N8X0_BT_RESET_GPIO, - csrhci_pins_get(radio)[csrhci_pin_reset]); - qdev_connect_gpio_out(s->mpu->gpio, N8X0_BT_WKUP_GPIO, - csrhci_pins_get(radio)[csrhci_pin_wakeup]); - + Chardev *radio = qemu_chr_new("bt-dummy-uart", "null", NULL); + /* + * Note: We used to connect N8X0_BT_RESET_GPIO and N8X0_BT_WKUP_GPIO + * here, but this code has been removed with the bluetooth backend. + */ omap_uart_attach(s->mpu->uart[BT_UART], radio); } @@ -1137,7 +1135,7 @@ static struct omap_partition_info_s { { 0, 0, 0, NULL } }; -static bdaddr_t n8x0_bd_addr = {{ N8X0_BD_ADDR }}; +static uint8_t n8x0_bd_addr[6] = { N8X0_BD_ADDR }; static int n8x0_atag_setup(void *p, int model) { |