X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;fp=palacios%2Fbuild%2FMakefile;h=f2439492af84d4c14128379a68da7bf28641a60f;hp=9479e2bb01ef426b457b5c6b65ed1077c0694462;hb=ee177da9b30ebf340c63fb5b9d535c729f90134d;hpb=4b8b4ad83c037fa685a3bb8f3a681cf0b617ae9c diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 9479e2b..f243949 100644 --- a/palacios/build/Makefile +++ b/palacios/build/Makefile @@ -62,7 +62,8 @@ endif ifeq ($(DEBUG_ALL),1) - DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_NESTED_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_RAMDISK + DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_NESTED_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR +# -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_IDE endif @@ -154,19 +155,11 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_EMULATOR endif endif -ifeq ($(DEBUG_RAMDISK),1) -DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_RAMDISK +ifeq ($(DEBUG_IDE),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_IDE else -ifeq ($(DEBUG_RAMDISK),0) -DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_RAMDISK -endif -endif - -ifeq ($(TRACE_RAMDISK),1) -DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTRACE_RAMDISK -else -ifeq ($(TRACE_RAMDSK),0) -DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UTRACE_RAMDISK +ifeq ($(DEBUG_IDE),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_IDE endif endif @@ -330,15 +323,17 @@ DEVICES_OBJS := \ devices/8259a.o \ devices/8254.o \ devices/serial.o \ - devices/ramdisk.o \ - devices/cdrom.o \ devices/bochs_debug.o \ devices/os_debug.o \ devices/apic.o \ devices/io_apic.o \ devices/pci.o \ devices/para_net.o \ + devices/ide.o \ + devices/ram_cd.o \ +# devices/cdrom.o \ +# devices/ramdisk.o \ # devices/vnic.o \ $(DEVICES_OBJS) :: EXTRA_CFLAGS = \