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