Skip to content

Commit

Permalink
DM: Cleanup vmcfg
Browse files Browse the repository at this point in the history
Removed the entire vmcfg feature, these changes are made:
1.Deleted devicemodel/vmcfg/
2.Deleted devicemodel/include/vmcfg.h
3.Cleanup vmcfg in devicemodel/Makefile

Tracked-On: #3192
Acked-by: Anthony Xu <anthony.xu@intel.com>
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
  • Loading branch information
taoyuhong authored and acrnsi committed May 29, 2019
1 parent 7315515 commit 50f5087
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 933 deletions.
15 changes: 2 additions & 13 deletions devicemodel/Makefile
Expand Up @@ -150,21 +150,16 @@ SRCS += core/timer.c
# arch
SRCS += arch/x86/pm.c

# vmcfg
SRCS += vmcfg/vmcfg.c
SRCS += vmcfg/apl-mrb/vm1/vm1.c

# log
SRCS += log/log.c
SRCS += log/kmsg_logger.c

OBJS := $(patsubst %.c,$(DM_OBJDIR)/%.o,$(SRCS))

VERSION_H := $(DM_OBJDIR)/include/version.h
VMCFG_CONFIG_H := $(DM_OBJDIR)/include/vmcfg_config.h

HEADERS := $(shell find $(BASEDIR) -name '*.h')
HEADERS += $(VERSION_H) $(VMCFG_CONFIG_H)
HEADERS += $(VERSION_H)

DISTCLEAN_OBJS := $(shell find $(BASEDIR) -name '*.o')

Expand All @@ -179,9 +174,6 @@ BIOS_BIN := $(wildcard bios/*)
all: $(DM_OBJDIR)/$(PROGRAM)
@echo -n ""

$(VMCFG_CONFIG_H):
$(MAKE) -C $(BASEDIR)/vmcfg $@ BASEDIR=$(BASEDIR) DM_OBJDIR=$(DM_OBJDIR)

$(DM_OBJDIR)/$(PROGRAM): $(OBJS)
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBS)

Expand Down Expand Up @@ -224,7 +216,7 @@ $(DM_OBJDIR)/%.o: %.c $(HEADERS)
[ ! -e $@ ] && mkdir -p $(dir $@); \
$(CC) $(CFLAGS) -c $< -o $@

install: $(DM_OBJDIR)/$(PROGRAM) install-samples-nuc install-samples-mrb install-bios install-vmcfg install-samples-up2
install: $(DM_OBJDIR)/$(PROGRAM) install-samples-nuc install-samples-mrb install-bios install-samples-up2
install -D --mode=0755 $(DM_OBJDIR)/$(PROGRAM) $(DESTDIR)/usr/bin/$(PROGRAM)

install-samples-up2: $(SAMPLES_UP2)
Expand All @@ -241,6 +233,3 @@ install-samples-mrb: $(SAMPLES_MRB)
install-bios: $(BIOS_BIN)
install -d $(DESTDIR)/usr/share/acrn/bios
install -D --mode=0664 -t $(DESTDIR)/usr/share/acrn/bios $^

install-vmcfg:
$(MAKE) -C $(BASEDIR)/vmcfg install DESTDIR=$(DESTDIR) BASEDIR=$(BASEDIR)
25 changes: 0 additions & 25 deletions devicemodel/include/vmcfg.h

This file was deleted.

7 changes: 0 additions & 7 deletions devicemodel/vmcfg/Kconfig

This file was deleted.

9 changes: 0 additions & 9 deletions devicemodel/vmcfg/Makefile

This file was deleted.

45 changes: 0 additions & 45 deletions devicemodel/vmcfg/apl-mrb/mrb-env-setup.sh

This file was deleted.

0 comments on commit 50f5087

Please sign in to comment.