|
 |
19bfd8 |
diff -Naurwp a/default-configs/pci.mak b/default-configs/pci.mak
|
|
|
19bfd8 |
--- a/default-configs/pci.mak 2019-06-28 11:45:41.983632134 +0000
|
|
|
19bfd8 |
+++ b/default-configs/pci.mak 2019-06-29 02:13:42.117191042 +0000
|
|
|
19bfd8 |
@@ -15,7 +15,7 @@ CONFIG_USB_XHCI_NEC=y
|
|
|
19bfd8 |
CONFIG_AC97=y
|
|
|
19bfd8 |
CONFIG_HDA=y
|
|
|
19bfd8 |
#CONFIG_ES1370=y
|
|
|
19bfd8 |
-#CONFIG_LSI_SCSI_PCI=y
|
|
|
19bfd8 |
+CONFIG_LSI_SCSI_PCI=y
|
|
|
19bfd8 |
#CONFIG_VMW_PVSCSI_SCSI_PCI=y
|
|
|
19bfd8 |
#CONFIG_MEGASAS_SCSI_PCI=y
|
|
|
19bfd8 |
#CONFIG_MPTSAS_SCSI_PCI=y
|
|
|
19bfd8 |
diff -Naurwp a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
|
|
|
19bfd8 |
--- a/hw/arm/Makefile.objs 2019-06-28 11:45:39.996700783 +0000
|
|
|
19bfd8 |
+++ b/hw/arm/Makefile.objs 2019-06-28 12:41:01.139408649 +0000
|
|
|
19bfd8 |
@@ -16,7 +16,7 @@ obj-$(CONFIG_STRONGARM) += collie.o
|
|
|
19bfd8 |
obj-$(CONFIG_VERSATILE) += vexpress.o versatilepb.o
|
|
|
19bfd8 |
obj-$(CONFIG_ZYNQ) += xilinx_zynq.o
|
|
|
19bfd8 |
|
|
|
19bfd8 |
-#obj-$(CONFIG_ARM_V7M) += armv7m.o
|
|
|
19bfd8 |
+obj-$(CONFIG_ARM_V7M) += armv7m.o
|
|
|
19bfd8 |
obj-$(CONFIG_EXYNOS4) += exynos4210.o
|
|
|
19bfd8 |
obj-$(CONFIG_PXA2XX) += pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
|
|
|
19bfd8 |
obj-$(CONFIG_DIGIC) += digic.o
|
|
|
19bfd8 |
diff -Naurwp a/hw/arm/nseries.c b/hw/arm/nseries.c
|
|
|
19bfd8 |
--- a/hw/arm/nseries.c 2018-04-24 16:30:46.000000000 +0000
|
|
|
19bfd8 |
+++ b/hw/arm/nseries.c 2019-06-28 12:58:48.691559918 +0000
|
|
|
19bfd8 |
@@ -786,6 +786,7 @@ static void n8x0_cbus_setup(struct n800_
|
|
|
19bfd8 |
|
|
|
19bfd8 |
static void n8x0_uart_setup(struct n800_s *s)
|
|
|
19bfd8 |
{
|
|
|
19bfd8 |
+#if 0 //Bluetooth Disabled
|
|
|
19bfd8 |
Chardev *radio = uart_hci_init();
|
|
|
19bfd8 |
|
|
|
19bfd8 |
qdev_connect_gpio_out(s->mpu->gpio, N8X0_BT_RESET_GPIO,
|
|
|
19bfd8 |
@@ -794,6 +795,7 @@ static void n8x0_uart_setup(struct n800_
|
|
|
19bfd8 |
csrhci_pins_get(radio)[csrhci_pin_wakeup]);
|
|
|
19bfd8 |
|
|
|
19bfd8 |
omap_uart_attach(s->mpu->uart[BT_UART], radio);
|
|
|
19bfd8 |
+#endif
|
|
|
19bfd8 |
}
|
|
|
19bfd8 |
|
|
|
19bfd8 |
static void n8x0_usb_setup(struct n800_s *s)
|
|
|
19bfd8 |
diff -Naurwp a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
|
|
|
19bfd8 |
--- a/hw/char/exynos4210_uart.c 2018-04-24 16:30:46.000000000 +0000
|
|
|
19bfd8 |
+++ b/hw/char/exynos4210_uart.c 2019-06-28 12:07:13.338023334 +0000
|
|
|
19bfd8 |
@@ -590,7 +590,7 @@ DeviceState *exynos4210_uart_create(hwad
|
|
|
19bfd8 |
SysBusDevice *bus;
|
|
|
19bfd8 |
|
|
|
19bfd8 |
const char chr_name[] = "serial";
|
|
|
19bfd8 |
- char label[ARRAY_SIZE(chr_name) + 1];
|
|
|
19bfd8 |
+ char label[ARRAY_SIZE(chr_name) + 20];
|
|
|
19bfd8 |
|
|
|
19bfd8 |
dev = qdev_create(NULL, TYPE_EXYNOS4210_UART);
|
|
|
19bfd8 |
|
|
|
19bfd8 |
diff -Naurwp a/hw/core/Makefile.objs b/hw/core/Makefile.objs
|
|
|
19bfd8 |
--- a/hw/core/Makefile.objs 2019-06-28 11:45:40.002700575 +0000
|
|
|
19bfd8 |
+++ b/hw/core/Makefile.objs 2019-06-28 13:20:50.504941179 +0000
|
|
|
19bfd8 |
@@ -16,11 +16,10 @@ common-obj-$(CONFIG_SOFTMMU) += machine.
|
|
|
19bfd8 |
common-obj-$(CONFIG_SOFTMMU) += loader.o
|
|
|
19bfd8 |
common-obj-$(CONFIG_FITLOADER) += loader-fit.o
|
|
|
19bfd8 |
common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
|
|
|
19bfd8 |
-# Disabled in Red Hat Enterprise Linux
|
|
|
19bfd8 |
-# common-obj-$(CONFIG_SOFTMMU) += register.o
|
|
|
19bfd8 |
-# obj-$(CONFIG_SOFTMMU) += generic-loader.o
|
|
|
19bfd8 |
-# common-obj-$(CONFIG_SOFTMMU) += or-irq.o
|
|
|
19bfd8 |
-#common-obj-$(CONFIG_SOFTMMU) += split-irq.o
|
|
|
19bfd8 |
+common-obj-$(CONFIG_SOFTMMU) += register.o
|
|
|
19bfd8 |
+common-obj-$(CONFIG_SOFTMMU) += or-irq.o
|
|
|
19bfd8 |
+common-obj-$(CONFIG_SOFTMMU) += split-irq.o
|
|
|
19bfd8 |
common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
|
|
|
19bfd8 |
|
|
|
19bfd8 |
+obj-$(CONFIG_SOFTMMU) += generic-loader.o
|
|
|
19bfd8 |
obj-$(CONFIG_SOFTMMU) += null-machine.o
|