The BCM2835 AUX device is a MUX between one UART block and two SPI blocks. Move it to the hw/misc/ folder.
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- hw/char/Makefile.objs | 1 - hw/char/trace-events | 4 ---- hw/misc/Makefile.objs | 1 + hw/{char => misc}/bcm2835_aux.c | 2 +- hw/misc/trace-events | 4 ++++ include/hw/arm/bcm2835_peripherals.h | 2 +- include/hw/{char => misc}/bcm2835_aux.h | 0 7 files changed, 7 insertions(+), 7 deletions(-) rename hw/{char => misc}/bcm2835_aux.c (99%) rename include/hw/{char => misc}/bcm2835_aux.h (100%) diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs index 5bd93bde9f..d6b8ce5e60 100644 --- a/hw/char/Makefile.objs +++ b/hw/char/Makefile.objs @@ -20,7 +20,6 @@ obj-$(CONFIG_SH4) += sh_serial.o obj-$(CONFIG_PSERIES) += spapr_vty.o obj-$(CONFIG_DIGIC) += digic-uart.o obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o -obj-$(CONFIG_RASPI) += bcm2835_aux.o common-obj-$(CONFIG_RASPI) += bcm2835_miniuart.o common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o diff --git a/hw/char/trace-events b/hw/char/trace-events index 0c86a907df..f1e6dd9918 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -1,9 +1,5 @@ # See docs/devel/tracing.txt for syntax documentation. -# bcm2835_aux.c -bcm2835_aux_read(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x" -bcm2835_aux_write(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x" - # bcm2835_miniuart.c bcm2835_miniuart_read(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x" bcm2835_miniuart_write(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x" diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index a150680966..9ffeee7f46 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -50,6 +50,7 @@ common-obj-$(CONFIG_OMAP) += omap_gpmc.o common-obj-$(CONFIG_OMAP) += omap_l4.o common-obj-$(CONFIG_OMAP) += omap_sdrc.o common-obj-$(CONFIG_OMAP) += omap_tap.o +common-obj-$(CONFIG_RASPI) += bcm2835_aux.o common-obj-$(CONFIG_RASPI) += bcm2835_mbox.o common-obj-$(CONFIG_RASPI) += bcm2835_property.o common-obj-$(CONFIG_RASPI) += bcm2835_rng.o diff --git a/hw/char/bcm2835_aux.c b/hw/misc/bcm2835_aux.c similarity index 99% rename from hw/char/bcm2835_aux.c rename to hw/misc/bcm2835_aux.c index a1ca9741d6..83698e2ece 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/misc/bcm2835_aux.c @@ -12,7 +12,7 @@ */ #include "qemu/osdep.h" -#include "hw/char/bcm2835_aux.h" +#include "hw/misc/bcm2835_aux.h" #include "hw/irq.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" diff --git a/hw/misc/trace-events b/hw/misc/trace-events index 74276225f8..0756d58162 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -1,5 +1,9 @@ # See docs/devel/tracing.txt for syntax documentation. +# bcm2835_aux.c +bcm2835_aux_read(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x" +bcm2835_aux_write(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x" + # eccmemctl.c ecc_mem_writel_mer(uint32_t val) "Write memory enable 0x%08x" ecc_mem_writel_mdr(uint32_t val) "Write memory delay 0x%08x" diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h index 6b17f6a382..7aae515d7e 100644 --- a/include/hw/arm/bcm2835_peripherals.h +++ b/include/hw/arm/bcm2835_peripherals.h @@ -13,7 +13,7 @@ #include "hw/sysbus.h" #include "hw/char/pl011.h" -#include "hw/char/bcm2835_aux.h" +#include "hw/misc/bcm2835_aux.h" #include "hw/display/bcm2835_fb.h" #include "hw/dma/bcm2835_dma.h" #include "hw/intc/bcm2835_ic.h" diff --git a/include/hw/char/bcm2835_aux.h b/include/hw/misc/bcm2835_aux.h similarity index 100% rename from include/hw/char/bcm2835_aux.h rename to include/hw/misc/bcm2835_aux.h -- 2.21.0