diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-04-28 20:05:36 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-04-28 20:05:36 +0000 |
commit | a4e581dcc17aac08ba588e4ced3918d0fb3c28d9 (patch) | |
tree | 5fece6543f3f08f86325f266bebdb4f0a3095d4f /nuttx | |
parent | cfa89740728582ffd77b868c732c45cef8c20ea9 (diff) | |
download | px4-nuttx-a4e581dcc17aac08ba588e4ced3918d0fb3c28d9.tar.gz px4-nuttx-a4e581dcc17aac08ba588e4ced3918d0fb3c28d9.tar.bz2 px4-nuttx-a4e581dcc17aac08ba588e4ced3918d0fb3c28d9.zip |
Changes to use the common ARM directory under arch/arm
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@188 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/configs/README.txt | 6 | ||||
-rw-r--r-- | nuttx/configs/c5471evm/defconfig | 6 | ||||
-rw-r--r-- | nuttx/configs/c5471evm/include/board.h (renamed from nuttx/configs/c5471evm/include/c5471evm.h) | 8 | ||||
-rw-r--r-- | nuttx/configs/c5471evm/src/Makefile | 3 | ||||
-rw-r--r-- | nuttx/configs/ntosd-dm320/defconfig | 10 | ||||
-rw-r--r-- | nuttx/configs/ntosd-dm320/include/board.h (renamed from nuttx/configs/ntosd-dm320/include/ntosd.h) | 8 | ||||
-rw-r--r-- | nuttx/configs/ntosd-dm320/src/Makefile | 7 |
7 files changed, 32 insertions, 16 deletions
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index ac1565f84..5c13d7693 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -112,6 +112,12 @@ defconfig -- This is a configuration file similar to the Linux hence, the board that supports the particular chip or SoC. CONFIG_ARCH_BOARD_name - For use in C code + Some architectures require a description of the the RAM configuration: + + CONFIG_DRAM_SIZE - Describes the installed DRAM. + CONFIG_DRAM_START - The start address of DRAM (physical) + CONFIG_DRAM_VSTART - The startaddress of DRAM (virtual) + General OS setup CONFIG_EXAMPLE - identifies the subdirectory in examples diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig index ac24faf82..ec711f25e 100644 --- a/nuttx/configs/c5471evm/defconfig +++ b/nuttx/configs/c5471evm/defconfig @@ -45,18 +45,20 @@ # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence, # the board that supports the particular chip or SoC. # CONFIG_ARCH_BOARD_name - for use in C code +# CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_ROM_VECTORS - unique to c5471 # CONFIG_DRAM_END - the size of installed DRAM. # Unique to c5471 # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to c5471. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=c5471 -CONFIG_ARCH_C5471=y +CONFIG_ARCH=arm +CONFIG_ARCH_ARM=y CONFIG_ARCH_CHIP=c5471 CONFIG_ARCH_CHIP_C5471=y CONFIG_ARCH_BOARD=c5471evm CONFIG_ARCH_BOARD_C5471EVM=y +CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n CONFIG_DRAM_END=0x11000000 CONFIG_ARCH_LEDS=y diff --git a/nuttx/configs/c5471evm/include/c5471evm.h b/nuttx/configs/c5471evm/include/board.h index 6376d03a0..ffad227a7 100644 --- a/nuttx/configs/c5471evm/include/c5471evm.h +++ b/nuttx/configs/c5471evm/include/board.h @@ -1,5 +1,5 @@ /************************************************************ - * c5471.h + * arch/board.h * * Copyright (C) 2007 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -33,8 +33,8 @@ * ************************************************************/ -#ifndef __C5471EVM_H -#define __C5471EVM_H +#ifndef __ARCH_BOARD_H +#define __ARCH_BOARD_H /************************************************************ * Included Files @@ -67,4 +67,4 @@ * Inline Functions ************************************************************/ -#endif /* __C5471EVM_H */ +#endif /* __ARCH_BOARD_H */ diff --git a/nuttx/configs/c5471evm/src/Makefile b/nuttx/configs/c5471evm/src/Makefile index 177328576..a5b899337 100644 --- a/nuttx/configs/c5471evm/src/Makefile +++ b/nuttx/configs/c5471evm/src/Makefile @@ -46,7 +46,8 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -CFLAGS += -I $(TOPDIR)/arch/$(CONFIG_ARCH)/src +ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src +CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common all: libboard$(LIBEXT) diff --git a/nuttx/configs/ntosd-dm320/defconfig b/nuttx/configs/ntosd-dm320/defconfig index d2b62134a..9f38f866d 100644 --- a/nuttx/configs/ntosd-dm320/defconfig +++ b/nuttx/configs/ntosd-dm320/defconfig @@ -45,18 +45,24 @@ # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence, # the board that supports the particular chip or SoC. # CONFIG_ARCH_BOARD_name - for use in C code +# CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_ROM_VECTORS - unique to dm320 # CONFIG_DRAM_SIZE - Describes the installed DRAM. +# CONFIG_DRAM_START - The start address of DRAM (physical) +# CONFIG_DRAM_VSTART - The startaddress of DRAM (virtual) # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=dm320 -CONFIG_ARCH_DM320=y +CONFIG_ARCH=arm +CONFIG_ARCH_ARM=y CONFIG_ARCH_CHIP=dm320 CONFIG_ARCH_CHIP_DM320=y CONFIG_ARCH_BOARD=ntosd-dm320 CONFIG_ARCH_BOARD_NTOSD_DM320=y +CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n CONFIG_DRAM_SIZE=0x01000000 +CONFIG_DRAM_START=0x01000000 +CONFIG_DRAM_VSTART=0x00000000 CONFIG_DRAM_NUTTXENTRY=0x01008000 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/ntosd-dm320/include/ntosd.h b/nuttx/configs/ntosd-dm320/include/board.h index 271e04726..742b0cdb3 100644 --- a/nuttx/configs/ntosd-dm320/include/ntosd.h +++ b/nuttx/configs/ntosd-dm320/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * ntosd.h + * arch/board/board.h * * Copyright (C) 2007 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __NTOSD_H -#define __NTOSD_H +#ifndef __ARCH_BOARD_BOARD_H +#define __ARCH_BOARD_BOARD_H /************************************************************************************ * Included Files @@ -101,4 +101,4 @@ #endif -#endif /* __NTOSD_H */ +#endif /* __ARCH_BOARD_BOARD_H */ diff --git a/nuttx/configs/ntosd-dm320/src/Makefile b/nuttx/configs/ntosd-dm320/src/Makefile index 177328576..158b7f4d4 100644 --- a/nuttx/configs/ntosd-dm320/src/Makefile +++ b/nuttx/configs/ntosd-dm320/src/Makefile @@ -1,4 +1,4 @@ -############################################################ +############################################################################ # Makefile # # Copyright (C) 2007 Gregory Nutt. All rights reserved. @@ -31,7 +31,7 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs @@ -46,7 +46,8 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -CFLAGS += -I $(TOPDIR)/arch/$(CONFIG_ARCH)/src +ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src +CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common all: libboard$(LIBEXT) |