Skip to content

Commit 8c06b69

Browse files
ywan170jren1
authored andcommitted
dm: Reorganize ACRN DM directory.
The current dm, all non-pci and non-acpi related files are put into hw/platform directory. This is actually disturbed the meaning of *platform*. The platform devices are mean of board and SoC specific non-PCI devices, like usb devices, etc. This patch refines the ACRN dm directory architecture. For some common device logic files, likes block_if.c/uart_core.c or usb_core.c. They will move to hw/ directly. For platform architecture depended files, create arch/ under root dir. And create sub-dir arch/x86 for x86 architecture, will create more architectures in future. The pm.c will move to this new dir. The hw/acpi will be moved to hw/platform/acpi due to acpi also be considered as part of platform. Signed-off-by: Yu Wang <yu1.wang@intel.com>
1 parent eebf5fe commit 8c06b69

File tree

7 files changed

+9
-6
lines changed

7 files changed

+9
-6
lines changed

devicemodel/Makefile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,22 @@ LIBS += -lz
5050
LIBS += -luuid
5151

5252
# hw
53+
SRCS += hw/block_if.c
54+
SRCS += hw/usb_core.c
55+
SRCS += hw/uart_core.c
5356
SRCS += hw/pci/virtio/virtio.c
5457
SRCS += hw/pci/virtio/virtio_kernel.c
5558
SRCS += hw/platform/usb_mouse.c
56-
SRCS += hw/platform/usb_core.c
5759
SRCS += hw/platform/atkbdc.c
5860
SRCS += hw/platform/ps2mouse.c
5961
SRCS += hw/platform/rtc.c
6062
SRCS += hw/platform/ps2kbd.c
61-
SRCS += hw/platform/pm.c
62-
SRCS += hw/platform/uart_core.c
63-
SRCS += hw/platform/block_if.c
6463
SRCS += hw/platform/ioapic.c
6564
SRCS += hw/platform/cmos_io.c
6665
SRCS += hw/platform/ioc.c
6766
SRCS += hw/platform/ioc_cbc.c
67+
SRCS += hw/platform/acpi/acpi.c
68+
SRCS += hw/platform/acpi/acpi_pm.c
6869
SRCS += hw/pci/wdt_i6300esb.c
6970
SRCS += hw/pci/lpc.c
7071
SRCS += hw/pci/xhci.c
@@ -81,8 +82,6 @@ SRCS += hw/pci/virtio/virtio_hyper_dmabuf.c
8182
SRCS += hw/pci/virtio/virtio_heci.c
8283
SRCS += hw/pci/irq.c
8384
SRCS += hw/pci/uart.c
84-
SRCS += hw/acpi/acpi.c
85-
SRCS += hw/acpi/acpi_pm.c
8685

8786
# core
8887
#SRCS += core/bootrom.c
@@ -103,6 +102,10 @@ SRCS += core/mptbl.c
103102
SRCS += core/main.c
104103
SRCS += core/hugetlb.c
105104

105+
# arch
106+
SRCS += arch/x86/pm.c
107+
108+
106109
OBJS := $(patsubst %.c,$(DM_OBJDIR)/%.o,$(SRCS))
107110

108111
HEADERS := $(shell find $(BASEDIR) -name '*.h')
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)