summaryrefslogtreecommitdiff
path: root/nuttx/arch/x86/src/qemu/Make.defs
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/arch/x86/src/qemu/Make.defs')
-rw-r--r--nuttx/arch/x86/src/qemu/Make.defs35
1 files changed, 22 insertions, 13 deletions
diff --git a/nuttx/arch/x86/src/qemu/Make.defs b/nuttx/arch/x86/src/qemu/Make.defs
index 3c6e99fcc..63cee191f 100644
--- a/nuttx/arch/x86/src/qemu/Make.defs
+++ b/nuttx/arch/x86/src/qemu/Make.defs
@@ -1,7 +1,7 @@
############################################################################
# arch/x86/src/qemu/Make.defs
#
-# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -35,23 +35,32 @@
# The start-up, "head", file
-HEAD_ASRC = qemu_head.S
+HEAD_ASRC = qemu_head.S
# Common x86 and i486 files
-CMN_ASRCS = i486_utils.S up_syscall6.S
-CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
- up_createstack.c up_mdelay.c up_udelay.c up_exit.c\
- up_initialize.c up_initialstate.c up_interruptcontext.c up_irq.c \
- up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c up_regdump.c \
- up_releasepending.c up_releasestack.c up_reprioritizertr.c \
- up_savestate.c up_sigdeliver.c up_schedulesigaction.c up_unblocktask.c \
- up_usestack.c
+CMN_ASRCS = i486_utils.S up_syscall6.S
+CMN_CSRCS += up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c
+CMN_CSRCS += up_createstack.c up_mdelay.c up_udelay.c up_exit.c
+CMN_CSRCS += up_initialize.c up_initialstate.c up_interruptcontext.c
+CMN_CSRCS += up_irq.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c
+CMN_CSRCS += up_regdump.c up_releasepending.c up_releasestack.c
+CMN_CSRCS += up_reprioritizertr.c up_savestate.c up_sigdeliver.c
+CMN_CSRCS += up_schedulesigaction.c up_unblocktask.c up_usestack.c
# Required QEMU files
-CHIP_ASRCS = qemu_saveusercontext.S qemu_fullcontextrestore.S qemu_vectors.S
-CHIP_CSRCS = qemu_handlers.c qemu_idle.c qemu_lowputc.c qemu_lowsetup.c \
- qemu_serial.c qemu_timerisr.c
+CHIP_ASRCS = qemu_saveusercontext.S qemu_fullcontextrestore.S qemu_vectors.S
+CHIP_CSRCS = qemu_handlers.c qemu_idle.c qemu_lowputc.c qemu_lowsetup.c
+CHIP_CSRCS += qemu_serial.c qemu_timerisr.c
# Configuration-dependent QEMU files
+
+ifeq ($(CONFIG_QEMU_KEYPAD),y)
+CHIP_CSRCS += qemu_keypad.c
+endif
+
+ifeq ($(CONFIG_QEMU_VGA),y)
+CHIP_CSRCS += qemu_vga.c
+endif
+