lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

arch/sim: Even though the simulation has no chips, it needs to have CONFIG_ARCH_CHIP and chip sub-directories. Otherwise, we would have to treat it as a special case in the build system.

Browse source
This commit is contained in:
Gregory Nutt 2019-08-07 16:05:00 -06:00
parent 8ecb72ded6
commit c840ac2496
54 changed files with 65 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/sim/Kconfig
View file

@ -21,6 +21,10 @@ config HOST_ARM
endchoice # Host CPU Type
config ARCH_CHIP
string
default "sim" if ARCH_SIM
config SIM_M32
bool "Build 32-bit simulation on 64-bit machine"
default n

3
arch/sim/include/sim/README.txt Normal file
View file

@ -0,0 +1,3 @@
This is just a placeholder to assure that this fake "chip" directory exits.
The simulation, of course, has no chips.

9
arch/sim/src/Makefile
View file

@ -36,9 +36,10 @@
-include $(TOPDIR)/Make.defs
CPPFLAGS += -I$(TOPDIR)/sched $(EXTRADEFINES)
CFLAGS += -I$(TOPDIR)/sched $(EXTRADEFINES)
CXXFLAGS += -I$(TOPDIR)/sched $(EXTRADEFINES)
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
CPPFLAGS += -I$(ARCH_SRCDIR)/chip -I$(TOPDIR)/sched $(EXTRADEFINES)
CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(TOPDIR)/sched $(EXTRADEFINES)
CXXFLAGS += -I$(ARCH_SRCDIR)/chip -I$(TOPDIR)/sched $(EXTRADEFINES)
ASRCS =
@ -62,6 +63,8 @@ CSRCS += up_unblocktask.c up_blocktask.c up_releasepending.c
CSRCS += up_reprioritizertr.c up_exit.c up_schedulesigaction.c up_spiflash.c
CSRCS += up_allocateheap.c up_devconsole.c up_qspiflash.c
VPATH = sim
HOSTSRCS = up_hostusleep.c
ifeq ($(CONFIG_SCHED_TICKLESS),y)

3
arch/sim/src/sim/README.txt Normal file
View file

@ -0,0 +1,3 @@
This is just a placeholder to assure that this fake "chip" directory exits.
The simulation, of course, has no chips.

2
arch/sim/src/board_lcd.c → arch/sim/src/sim/board_lcd.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/board_lcd.c
* arch/sim/src/sim/board_lcd.c
*
* Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_ajoystick.c → arch/sim/src/sim/up_ajoystick.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_ajoystick.c
* arch/sim/src/sim/up_ajoystick.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_allocateheap.c → arch/sim/src/sim/up_allocateheap.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_allocateheap.c
* arch/sim/src/sim/up_allocateheap.c
*
* Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_blockdevice.c → arch/sim/src/sim/up_blockdevice.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_blockdevice.c
* arch/sim/src/sim/up_blockdevice.c
*
* Copyright (C) 2007-2009, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_blocktask.c → arch/sim/src/sim/up_blocktask.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_blocktask.c
* arch/sim/src/sim/up_blocktask.c
*
* Copyright (C) 2007-2009, 2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_cpuidlestack.c → arch/sim/src/sim/up_cpuidlestack.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_cpuidlestack.c
* arch/sim/src/sim/up_cpuidlestack.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_createstack.c → arch/sim/src/sim/up_createstack.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_createstack.c
* arch/sim/src/sim/up_createstack.c
*
* Copyright (C) 2007-2009, 2013, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_critmon.c → arch/sim/src/sim/up_critmon.c
View file

@ -1,5 +1,5 @@
/************************************************************************************
* arch/sim/src/up_critmon.c
* arch/sim/src/sim/up_critmon.c
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_devconsole.c → arch/sim/src/sim/up_devconsole.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_devconsole.c
* arch/sim/src/sim/up_devconsole.c
*
* Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_deviceimage.c → arch/sim/src/sim/up_deviceimage.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_deviceimage.c
* arch/sim/src/sim/up_deviceimage.c
*
* Copyright (C) 2007, 2009, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_exit.c → arch/sim/src/sim/up_exit.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_exit.c
* arch/sim/src/sim/up_exit.c
*
* Copyright (C) 2007-2009, 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_framebuffer.c → arch/sim/src/sim/up_framebuffer.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_framebuffer.c
* arch/sim/src/sim/up_framebuffer.c
*
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_head.c → arch/sim/src/sim/up_head.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_head.c
* arch/sim/src/sim/up_head.c
*
* Copyright (C) 2007-2009, 2011-2013, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_hostfs.c → arch/sim/src/sim/up_hostfs.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_hostfs.c
* arch/sim/src/sim/up_hostfs.c
*
* Copyright (C) 2015 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com>

2
arch/sim/src/up_hostusleep.c → arch/sim/src/sim/up_hostusleep.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_hostusleep.c
* arch/sim/src/sim/up_hostusleep.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_idle.c → arch/sim/src/sim/up_idle.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_idle.c
* arch/sim/src/sim/up_idle.c
*
* Copyright (C) 2007-2009, 2011-2012, 2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_initialize.c → arch/sim/src/sim/up_initialize.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_initialize.c
* arch/sim/src/sim/up_initialize.c
*
* Copyright (C) 2007-2009, 2011-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_initialstate.c → arch/sim/src/sim/up_initialstate.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_initialstate.c
* arch/sim/src/sim/up_initialstate.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_interruptcontext.c → arch/sim/src/sim/up_interruptcontext.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_interruptcontext.c
* arch/sim/src/sim/up_interruptcontext.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_ioexpander.c → arch/sim/src/sim/up_ioexpander.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_ioexpander.h
* arch/sim/src/sim/up_ioexpander.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_netdev.c → arch/sim/src/sim/up_netdev.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_tapdev.c
* arch/sim/src/sim/up_tapdev.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_netdriver.c → arch/sim/src/sim/up_netdriver.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_netdriver.c
* arch/sim/src/sim/up_netdriver.c
*
* Copyright (C) 2007, 2009-2012, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_oneshot.c → arch/sim/src/sim/up_oneshot.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_oneshot.c
* arch/sim/src/sim/up_oneshot.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_qspiflash.c → arch/sim/src/sim/up_qspiflash.c
View file

@ -1,5 +1,5 @@
/************************************************************************************
* arch/sim/src/up_qspiflash.c
* arch/sim/src/sim/up_qspiflash.c
*
* Copyright (C) 2014, 2016 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com>

2
arch/sim/src/up_releasepending.c → arch/sim/src/sim/up_releasepending.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_releasepending.c
* arch/sim/src/sim/up_releasepending.c
*
* Copyright (C) 2007-2009, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_releasestack.c → arch/sim/src/sim/up_releasestack.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_releasestack.c
* arch/sim/src/sim/up_releasestack.c
*
* Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_reprioritizertr.c → arch/sim/src/sim/up_reprioritizertr.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_reprioritizertr.c
* arch/sim/src/sim/up_reprioritizertr.c
*
* Copyright (C) 2007-2009, 2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_romgetc.c → arch/sim/src/sim/up_romgetc.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_romgetc.c
* arch/sim/src/sim/up_romgetc.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_schednote.c → arch/sim/src/sim/up_schednote.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_schednote.c
* arch/sim/src/sim/up_schednote.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_schedulesigaction.c → arch/sim/src/sim/up_schedulesigaction.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_schedulesigaction.c
* arch/sim/src/sim/up_schedulesigaction.c
*
* Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_setjmp32.S → arch/sim/src/sim/up_setjmp32.S
View file

@ -1,5 +1,5 @@
/**************************************************************************
* arch/sim/src/up_setjmp32.S
* arch/sim/src/sim/up_setjmp32.S
*
* Copyright (C) 2007, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_setjmp64.S → arch/sim/src/sim/up_setjmp64.S
View file

@ -1,5 +1,5 @@
/**************************************************************************
* arch/sim/src/up_setjmp64.S
* arch/sim/src/sim/up_setjmp64.S
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_setjmp_arm.S → arch/sim/src/sim/up_setjmp_arm.S
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_setjmp_arm.h
* arch/sim/src/sim/up_setjmp_arm.h
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Nickolay Semyonov (RPI) <snob@wolpike.com>

2
arch/sim/src/up_simsmp.c → arch/sim/src/sim/up_simsmp.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_simsmp.c
* arch/sim/src/sim/up_simsmp.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_simuart.c → arch/sim/src/sim/up_simuart.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_simuart.c
* arch/sim/src/sim/up_simuart.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_smphook.c → arch/sim/src/sim/up_smphook.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_simhook.c
* arch/sim/src/sim/up_simhook.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_smpsignal.c → arch/sim/src/sim/up_smpsignal.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_simsmp.c
* arch/sim/src/sim/up_simsmp.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_spiflash.c → arch/sim/src/sim/up_spiflash.c
View file

@ -1,5 +1,5 @@
/************************************************************************************
* arch/sim/src/up_spiflash.c
* arch/sim/src/sim/up_spiflash.c
*
* Copyright (C) 2014, 2016 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com>

2
arch/sim/src/up_stackframe.c → arch/sim/src/sim/up_stackframe.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_stackframe.c
* arch/sim/src/sim/up_stackframe.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_tapdev.c → arch/sim/src/sim/up_tapdev.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_tapdev.c
* arch/sim/src/sim/up_tapdev.c
*
* Copyright (C) 2007-2009, 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_testset.c → arch/sim/src/sim/up_testset.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_testset.c
* arch/sim/src/sim/up_testset.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_tickless.c → arch/sim/src/sim/up_tickless.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_tickless.c
* arch/sim/src/sim/up_tickless.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_touchscreen.c → arch/sim/src/sim/up_touchscreen.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_touchscreen.c
* arch/sim/src/sim/up_touchscreen.c
*
* Copyright (C) 2011-2012, 2016-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_uartwait.c → arch/sim/src/sim/up_uartwait.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_uartwait.c
* arch/sim/src/sim/up_uartwait.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_unblocktask.c → arch/sim/src/sim/up_unblocktask.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_unblocktask.c
* arch/sim/src/sim/up_unblocktask.c
*
* Copyright (C) 2007-2009, 2013, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_usestack.c → arch/sim/src/sim/up_usestack.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_usestack.c
* arch/sim/src/sim/up_usestack.c
*
* Copyright (C) 2007-2009, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_wpcap.c → arch/sim/src/sim/up_wpcap.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_wcap.c
* arch/sim/src/sim/up_wcap.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_x11eventloop.c → arch/sim/src/sim/up_x11eventloop.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_x11eventloop.c
* arch/sim/src/sim/up_x11eventloop.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/sim/src/up_x11framebuffer.c → arch/sim/src/sim/up_x11framebuffer.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/sim/src/up_x11framebuffer.c
* arch/sim/src/sim/up_x11framebuffer.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

1
tools/configure.sh
View file

@ -152,7 +152,6 @@ for chip in ${chips}; do
chipdir=${chip}
echo " Detected ${archdir} Architecture"
echo " Detected ${chipdir} Chip"
echo ""
fi
done
done