diff --git a/ChangeLog b/ChangeLog
index 13b02bf47a4..7814921b2f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,7 @@
* sched_setparam(), sched_setscheduler() now correctly set
errno; pthread_setscheduler() now returns the correct errno.
* Added pthread_setschedprio().
+ * Added directories to hold board-specific header files
* Started m68322
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index f1ac32c4852..c970198fce0 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -173,12 +173,12 @@ below and discussed in the following paragraphs:
<arch-name>
- |-- include
+ |-- include/
| |-- arch.h
| |-- irq.h
| |-- types.h
| `-- limits.h
- `-- src
+ `-- src/
|-- Makefile
`-- (architecture-specific source files)
@@ -294,6 +294,7 @@ below and discussed in the following paragraphs:
<board-name>
+ |-- include/
|-- Make.defs
|-- defconfig
`-- setenv.sh
@@ -301,6 +302,14 @@ below and discussed in the following paragraphs:
+ -
+
include/:
+ This directory contains board specific header files.
+ This directory will be linked as include/arch/board at configuration time
+ and can be included via #include <arch/board/header.h>.
+ These header file can only be included by files in arch/<arch-name>/include/
+ and arch/<arch-name>/src/.
+
-
Make.defs: This makefile fragment provides architecture and
tool-specific build options. It will be included by all other
@@ -316,6 +325,7 @@ below and discussed in the following paragraphs:
fragment may include ${TOPDIR}/.config to perform configuration
specific settings. For example, the CFLAGS will most likely be
different if CONFIG_DEBUG=y.
+
-
defconfig: This is a configuration file similar to the Linux
diff --git a/Makefile b/Makefile
index e41e9cbb153..34cc90910bc 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@ TOPDIR = ${shell pwd}
ARCH_DIR = arch/$(CONFIG_ARCH)
ARCH_SRC = $(ARCH_DIR)/src
+BOARD_DIR = configs/$(CONFIG_BOARD)
SUBDIRS = sched lib $(ARCH_SRC) mm fs drivers examples/$(CONFIG_EXAMPLE)
@@ -57,7 +58,7 @@ tools/mkconfig:
include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig
tools/mkconfig $(TOPDIR) > include/nuttx/config.h
-include/arch: include/nuttx/config.h
+include/arch: Make.defs
@if [ -e include/arch ]; then \
if [ -h include/arch ]; then \
rm -f include/arch ; \
@@ -68,11 +69,23 @@ include/arch: include/nuttx/config.h
fi
@ln -s $(TOPDIR)/$(ARCH_DIR)/include include/arch
-context: check_context include/nuttx/config.h include/arch
+include/arch/board: Make.defs include/arch
+ @if [ -e include/arch/board ]; then \
+ if [ -h include/arch/board ]; then \
+ rm -f include/arch/board ; \
+ else \
+ echo "include/arch/board exists but is not a symbolic link" ; \
+ exit 1 ; \
+ fi ; \
+ fi
+ @ln -s $(TOPDIR)/$(BOARD_DIR)/include include/arch/board
+
+context: check_context include/nuttx/config.h include/arch include/arch/board
clean_context:
rm -f include/nuttx/config.h
rm -f include/arch
+ rm -f include/arch/board
check_context:
@if [ ! -e ${TOPDIR}/.config -o ! -e ${TOPDIR}/Make.defs ]; then \
diff --git a/TODO b/TODO
index cd6e9b85ee0..9f83c3e42e9 100644
--- a/TODO
+++ b/TODO
@@ -9,7 +9,6 @@ Task/Scheduler
- Implement sys/mman.h and functions
- Implement sys/wait.h and functions
- Implement priority inheritance
-- Implement vfork(). Could be tricky because of stack references.
- Make the system timer frequency configurable via defconfig. See:
_POSIX_CLOCKRES_MIN in limits.h
CLK_TCK in time.h
diff --git a/arch/c5471/src/c5471.h b/arch/c5471/src/c5471.h
index df49a7eb009..b91c9f3d158 100644
--- a/arch/c5471/src/c5471.h
+++ b/arch/c5471/src/c5471.h
@@ -40,10 +40,18 @@
* Included Files
************************************************************/
+#include
+
#ifndef __ASSEMBLY__
# include
#endif
+#if defined(CONFIG_BOARD_C5471EVM)
+# include
+#else
+# warning "Undefined C5471 Board"
+#endif
+
/************************************************************
* Definitions
************************************************************/
@@ -72,10 +80,6 @@
#define CC_Z_BIT (1 << 30)
#define CC_N_BIT (1 << 31)
-/* Clocking *************************************************/
-
-#define C5471_CLOCK 47500000 /* 47.5 MHz */
-
/* UARTs ****************************************************/
#define UART_IRDA_BASE 0xffff0800
@@ -370,11 +374,6 @@ static inline void putreg16(uint16 val, unsigned int addr)
__asm__ __volatile__("\tstrh %0, [%1]\n\t": : "r"(val), "r"(addr));
}
-/* Most C5471 registers are 16-bits wide */
-
-#define getreg(a) getreg16(1)
-#define putreg(v,a) putreg16(v,a)
-
#endif
#endif /* __C5471_H */
diff --git a/arch/c5471/src/up_internal.h b/arch/c5471/src/up_internal.h
index c50a78483eb..60cc252732e 100644
--- a/arch/c5471/src/up_internal.h
+++ b/arch/c5471/src/up_internal.h
@@ -40,6 +40,14 @@
* Included Files
************************************************************/
+#include
+
+#if defined(CONFIG_BOARD_C5471EVM)
+# include
+#else
+# warning "Undefined C5471 Board"
+#endif
+
/************************************************************
* Definitions
************************************************************/
@@ -55,17 +63,6 @@
#undef CONFIG_SUPPRESS_UART_CONFIG /* Do not reconfig UART */
#undef CONFIG_DUMP_ON_EXIT /* Dump task state on exit */
-/* LED definitions */
-
-#define LED_STARTED 0
-#define LED_HEAPALLOCATE 1
-#define LED_IRQSENABLED 2
-#define LED_STACKCREATED 3
-#define LED_INIRQ 4
-#define LED_SIGNAL 5
-#define LED_ASSERTION 6
-#define LED_PANIC 7
-
/************************************************************
* Public Types
************************************************************/
diff --git a/arch/c5471/src/up_leds.c b/arch/c5471/src/up_leds.c
index ee1241edeb9..9ecd74d8655 100644
--- a/arch/c5471/src/up_leds.c
+++ b/arch/c5471/src/up_leds.c
@@ -45,8 +45,12 @@
* Definitions
************************************************************/
-#define CS2 *(volatile uint32*)0xffff2e08
-#define LEDS *(volatile uint32*)0x01000000
+#if defined(CONFIG_BOARD_C5471EVM)
+# define CS2 *(volatile uint32*)0xffff2e08
+# define LEDS *(volatile uint32*)0x01000000
+#else
+# warning "Undefined C5471 board"
+#endif
/************************************************************
* Private Data
@@ -69,7 +73,8 @@ static uint32 g_ledstate;
#ifdef CONFIG_C5471_LEDS
void up_ledinit(void)
{
- /* Enable acces to LEDs */
+#if defined(CONFIG_BOARD_C5471EVM)
+ /* Enable access to LEDs */
CS2 = 0x000013db;
@@ -77,6 +82,7 @@ void up_ledinit(void)
g_ledstate = 0x000000fe;
LEDS = g_ledstate;
+#endif
}
/************************************************************
diff --git a/arch/dm320/src/dm320.h b/arch/dm320/src/dm320.h
index 7bfb845c6f9..6f0f89e1652 100644
--- a/arch/dm320/src/dm320.h
+++ b/arch/dm320/src/dm320.h
@@ -40,12 +40,19 @@
* Included Files
************************************************************************************/
+#include
#ifndef __ASSEMBLY__
# include
#endif
#include "arm9.h"
-#include "ntosd.h"
+
+#if defined(CONFIG_BOARD_NTOSD_DM320)
+# include
+#else
+# warning "Unknown DM320 board"
+#endif
+
#include "dm320-memorymap.h"
#include "dm320-uart.h"
#include "dm320-timer.h"
diff --git a/arch/dm320/src/ntosd.h b/arch/dm320/src/ntosd.h
deleted file mode 100644
index 271e0472600..00000000000
--- a/arch/dm320/src/ntosd.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/************************************************************************************
- * ntosd.h
- *
- * Copyright (C) 2007 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ************************************************************************************/
-
-#ifndef __NTOSD_H
-#define __NTOSD_H
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#ifndef __ASSEMBLY__
-# include
-#endif
-
-/************************************************************************************
- * Definitions
- ************************************************************************************/
-
-/* This platform has the ARM at 175 MHz and the DSP at 101.25 MHz */
-
-#define DM320_ARM_CLOCK 175500000
-#define DM320_SDR_CLOCK 101250000
-#define DM320_DSP_CLOCK 101250000
-#define DM320_AXL_CLOCK 175500000
-#define DM320_AHB_CLOCK 87750000
-
-/*
- * configration for dm9000 network device
- */
-#define DM9000_BASE CONFIG_DM9000_BASE
-
-/* GIO keyboard (GIO 1-5) */
-
-#define KEY_MASK 0x003E
-#define KEY_SCAN0_BIT 0x0002
-#define KEY_SCAN1_BIT 0x0004
-#define KEY_SCAN2_BIT 0x0008
-#define KEY_SCAN3_BIT 0x0010
-#define KEY_SCAN4_BIT 0x0020
-
-#define KEY_GIO_DIR0_VAL KEY_MASK /* Configure as INPUT */
-#define KEY_GIO_INV0_VAL KEY_MASK /* All inverted */
-#define KEY_GIO_SET0_VAL (0) /* Initialized to zero */
-#define KEY_GIO_CLR0_VAL (0)
-
-#define GIO_KEY_SCAN0 1
-#define GIO_KEY_SCAN1 2
-#define GIO_KEY_SCAN2 3
-#define GIO_KEY_SCAN3 4
-#define GIO_KEY_SCAN4 5
-#define GIO_MS_DETECT 5
-#define GIO_MMC_DETECT 8
-#define GIO_CFC_DETECT 9
-#define GIO_VIDEO_IN 10
-#define GIO_LED_RED 16
-#define GIO_LED_GREEN 17
-#define GIO_CFC_ENABLE 25
-#define GIO_I2C_SCL 30
-#define GIO_I2C_SDA 31
-#define GIO_ENA_VIDEO 32
-#define GIO_CFC_RESET 36
-#define GIO_CFC_STSCHG 37
-
-/************************************************************************************
- * Inline Functions
- ************************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-#endif
-
-#endif /* __NTOSD_H */
diff --git a/arch/pjrc-8051/src/pjrc.h b/arch/pjrc-8051/src/pjrc.h
deleted file mode 100644
index 0934c78bea5..00000000000
--- a/arch/pjrc-8051/src/pjrc.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/**************************************************************************
- * pjrc.h
- *
- * Copyright (C) 2007 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- **************************************************************************/
-
-#ifndef __PJRC_H
-#define __PJRC_H
-
-/**************************************************************************
- * Included Files
- **************************************************************************/
-
-#include
-
-/**************************************************************************
- * Public Definitions
- **************************************************************************/
-
-/**************************************************************************
- * Public Types
- **************************************************************************/
-
-/**************************************************************************
- * Public Variables
- **************************************************************************/
-
-/* Memory Map
- *
- * BEGIN END DESCRIPTION
- * 0x0000 0x1fff CODE: ROM containg PAULMON2
- * DATA: RAM for program variables
- * 0x2000 0x7fff COMMON: RAM for program code or
- * variables
- * 0x8000 0xf7ff COMMON: FLASH for program code
- * 0xf800 0xfeff COMMON: Peripherals
- * 0xff00 0xffff COMMON: unused
- *
- * Program code may be loaded at the RAM location 0x2000-0x7fff
- * for testing. If loaded into the FLASH location at
- * 0x8000-0xf7ff, PAULMON2 will automatically write the program
- * into flash. The program is configured in the RAM-based test
- * configuration:
- */
-
-#define RAM_BLOCK_START IRAM_SIZE
-#define RAM_BLOCK_END 0x1fff
-
-#define PROGRAM_BASE 0x2000
-#define PROGRAM_END 0x7fff
-
-#define FLASH_BASE 0x8000
-#define FLASH_END 0xf7ff
-
-/* Well-known entry points to access PAULMON2's built-in functions */
-
-#define PM2_ENTRY_PHEX1 0x002e
-#define PM2_ENTRY_COUT 0x0030
-#define PM2_ENTRY_CIN 0x0032
-#define PM2_ENTRY_PHEX 0x0034
-#define PM2_ENTRY_PHEX16 0x0036
-#define PM2_ENTRY_PSTR 0x0038
-#define PM2_ENTRY_ESC 0x003e
-#define PM2_ENTRY_UPPER 0x0040
-#define PM2_ENTRY_PINT8U 0x004D
-#define PM2_ENTRY_PINT8 0x0050
-#define PM2_ENTRY_PINT16U 0x0053
-#define PM2_ENTRY_NEWLINE 0x0048
-#define PM2_ENTRY_PRGM 0x0059
-#define PM2_ENTRY_ERBLOCK 0x0067
-
-/* PAULMON2 captures all interrupt vectors in ROM but relays them
- * through the following RAM addresses:
- */
-
-#define PM2_VECTOR_BASE PROGRAM_BASE
-#define PM2_VECTOR_EXTINT0 (PM2_VECTOR_BASE + 3)
-#define PM2_VECTOR_TIMER0 (PM2_VECTOR_BASE + 11)
-#define PM2_VECTOR_EXTINT1 (PM2_VECTOR_BASE + 19)
-#define PM2_VECTOR_TIMER1 (PM2_VECTOR_BASE + 27)
-#define PM2_VECTOR_UART (PM2_VECTOR_BASE + 35)
-#define PM2_VECTOR_TIMER2 (PM2_VECTOR_BASE + 43)
-
-/* Peripheral Mapping
- *
- * Begin End Peripheral Addr Acc Function
- * F800 F8FF 82C55 (A, B, C) F800 R/W Port A
- * F801 R/W Port B
- * F802 R/W Port C
- * F803 W Config A,B,C
- * F900 F9FF 82C55 (D, E, F) F900 R/W Port D
- * F901 R/W Port E (LEDs)
- * F902 R/W Port F
- * F903 W Config D,E,F
- * FA00 FAFF User Expansion
- * FB00 FBFF User Expansion
- * FC00 FCFF User Expansion
- * FD00 FDFF User Expansion
- * FE00 FEFF LCD Port FE00 W Command Register
- * FE01 R Status Register
- * FE02 W Display or CGRAM Buffer
- * FE03 R " " "" " " " "
- *
- * These are the memory-mapped locations used to access the two 82C55
- * chips
- */
-
-#ifndef __ASSEMBLY__
-xdata at 0xF800 ubyte p82c55_port_a;
-xdata at 0xF801 ubyte p82c55_port_b;
-xdata at 0xF802 ubyte p82c55_port_c;
-xdata at 0xF803 ubyte p82c55_abc_config;
-xdata at 0xF900 ubyte p82c55_port_d;
-xdata at 0xF901 ubyte p82c55_port_e;
-xdata at 0xF902 ubyte p82c55_port_f;
-xdata at 0xF903 ubyte p82c55_def_config;
-#endif
-
-/* LED (Port E) bit definitions */
-
-#define LED_STARTED 0
-#define LED_HEAPALLOCATE 1
-#define LED_IRQSENABLED 2
-#define LED_IDLE 3
-#define LED_UNUSED2 4
-#define LED_INIRQ 5
-#define LED_ASSERTION 6
-#define LED_PANIC 7
-
-/* Registers. 8052 regiser definitions are provided in the SDCC header
- * file 8052.h. However, a few SFR registers are missing from that
- * file (they can be found in mcs51reg.h, but that file is too much
- * when the following simple addtions do the job).
- */
-
-#ifndef __ASSEMBLY__
-sfr at 0xc9 T2MOD ;
-#endif
-
-/* Timing information.
- *
- * The PJRC board is based on a standard 87C52 CPU clocked at 22.1184 MHz.
- * The CPU clock is divided by 12 to yield a clock frequency of 1.8432 MHz.
- */
-
-#define CPU_CLOCK_HZ 22118400L
-#define TIMER_CLOCK_HZ 1843200L
-
-/* The 87C52 has three timers, timer 0, timer 1, and timer 2. On the PJRC
- * board, timer 1 and 2 have dedicated functions. They provide baud support
- * support for the boards two serial ports. Unfortunately, only timer 2
- * can generate the accurate 100Hz timer desired by the OS.
- *
- * Timer 0 provides only a 8-bit auto-reload mode.
- */
-
-#ifdef CONFIG_8052_TIMER2
-
-/* To use timer 2 as the 100Hz system timer, we need to calculate a 16-bit
- * reload value that results in 100Hz overflow interrupts. That value
- * is given by:
- *
- * Timer ticks = TIMER_CLOCK_HZ / (desired ticks-per-second)
- * = 18432
- * Capture value = 0xffff - (Timer ticks)
- * = 47103 = 0x67ff
- */
-
-# define TIMER2_CAPTURE_LOW 0xff
-# define TIMER2_CAPTURE_HIGH 0x67
-
-#else
-
-/* Timer 0, mode 0 can be used as a system timer. In that mode, the
- * 1.8432 is further divided by 32. A single 8-bit value is incremented
- * at 57600 Hz, which results in 225 Timer 0 overflow interrupts per
- * second.
- */
-
-#endif
-
-/**************************************************************************
- * Public Function Prototypes
- **************************************************************************/
-
-#endif /* __PJRC_H */
diff --git a/arch/pjrc-8051/src/up_internal.h b/arch/pjrc-8051/src/up_internal.h
index 80900ca5689..760a0ff2903 100644
--- a/arch/pjrc-8051/src/up_internal.h
+++ b/arch/pjrc-8051/src/up_internal.h
@@ -42,8 +42,11 @@
#include
#include
-#ifdef CONFIG_ARCH_PJRC
-# include "pjrc.h"
+
+#if defined(CONFIG_BOARD_PJRC_87C52)
+# include
+#else
+# warning "805x board not recognized"
#endif
/**************************************************************************
diff --git a/configs/README.txt b/configs/README.txt
index a2faea333ac..5962c34a4a4 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -24,6 +24,7 @@ following characteristics:
+ |-- include/
|-- Make.defs
|-- defconfig
`-- setenv.sh
@@ -31,6 +32,12 @@ following characteristics:
Summary of Files
^^^^^^^^^^^^^^^^
+include/ -- This directoy contains board specific header files. This
+ directory will be linked as include/arch/board at configuration time and
+ can be included via '#include '. These header file
+ can only be included by files in arch/include/ and
+ arch//src
+
Make.defs -- This makefile fragment provides architecture and
tool-specific build options. It will be included by all other
makefiles in the build (once it is installed). This make fragment
diff --git a/configs/c5471evm/Make.defs b/configs/c5471evm/Make.defs
index 11c36ba5f87..f0ef5c8458b 100644
--- a/configs/c5471evm/Make.defs
+++ b/configs/c5471evm/Make.defs
@@ -47,7 +47,7 @@ ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHDEFINES =
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT = -T$(TOPDIR)/configs/c5471evm/ld.script
+ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_BOARD)/ld.script
CROSSDEV = arm-elf-
CC = $(CROSSDEV)gcc
diff --git a/configs/c5471evm/defconfig b/configs/c5471evm/defconfig
index a7d27caad88..a65cdb43583 100644
--- a/configs/c5471evm/defconfig
+++ b/configs/c5471evm/defconfig
@@ -37,6 +37,8 @@
#
# CONFIG_ARCH - identifies the arch subdirectory
# CONFIG_ARCH_name - for use in C code
+# CONFIG_BOARD - identifies the configs subdirectory
+# CONFIG_BARD_name - for use in C code
# CONFIG_ROM_VECTORS - unique to c5471
# CONFIG_DRAM_END - the size of installed DRAM.
# Unique to c5471
@@ -45,6 +47,8 @@
#
CONFIG_ARCH=c5471
CONFIG_ARCH_C5471=y
+CONFIG_BOARD=c5471evm
+CONFIG_BOARD_C5471EVM=y
CONFIG_ROM_VECTORS=n
CONFIG_DRAM_END=0x11000000
CONFIG_C5471_LEDS=y
diff --git a/configs/m68332evb/Make.defs b/configs/m68332evb/Make.defs
index 1b7b65e5013..2dc2d5b2bc5 100644
--- a/configs/m68332evb/Make.defs
+++ b/configs/m68332evb/Make.defs
@@ -47,7 +47,7 @@ ARCHPICFLAGS = -pic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHDEFINES =
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT = -T$(TOPDIR)/configs/m68332evb/ld.script
+ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_BOARD)/ld.script
CROSSDEV = m68k-elf-
CC = $(CROSSDEV)gcc
diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig
index 537d56281e8..86a7e059a55 100644
--- a/configs/m68332evb/defconfig
+++ b/configs/m68332evb/defconfig
@@ -37,12 +37,16 @@
#
# CONFIG_ARCH - identifies the arch subdirectory
# CONFIG_ARCH_name - for use in C code
+# CONFIG_BOARD - identifies the configs subdirectory
+# CONFIG_BARD_name - for use in C code
# CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
#
CONFIG_ARCH=m68332evb
CONFIG_ARCH_M68332=y
CONFIG_ARCH_M68332EVB=y
+CONFIG_BOARD=m68332evb
+CONFIG_BOARD_M68332EVB=y
CONFIG_DRAM_SIZE=0x003000
CONFIG_DRAM_NUTTXENTRY=0x003000
CONFIG_ARCH_STACKDUMP=y
diff --git a/configs/ntosd-dm320/Make.defs b/configs/ntosd-dm320/Make.defs
index 363c8366986..f0ef5c8458b 100644
--- a/configs/ntosd-dm320/Make.defs
+++ b/configs/ntosd-dm320/Make.defs
@@ -47,7 +47,7 @@ ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHDEFINES =
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT = -T$(TOPDIR)/configs/ntosd-dm320/ld.script
+ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_BOARD)/ld.script
CROSSDEV = arm-elf-
CC = $(CROSSDEV)gcc
diff --git a/configs/ntosd-dm320/defconfig b/configs/ntosd-dm320/defconfig
index 4a7ea5c7935..1763fe0f4cc 100644
--- a/configs/ntosd-dm320/defconfig
+++ b/configs/ntosd-dm320/defconfig
@@ -37,12 +37,16 @@
#
# CONFIG_ARCH - identifies the arch subdirectory
# CONFIG_ARCH_name - for use in C code
+# CONFIG_BOARD - identifies the configs subdirectory
+# CONFIG_BARD_name - for use in C code
# CONFIG_ROM_VECTORS - unique to dm320
# CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
#
CONFIG_ARCH=dm320
CONFIG_ARCH_DM320=y
+CONFIG_BOARD=ntosd-dm320
+CONFIG_BOARD_NTOSD_DM320=y
CONFIG_ROM_VECTORS=n
CONFIG_DRAM_SIZE=0x01000000
CONFIG_DRAM_NUTTXENTRY=0x01008000
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index cdb73acdab5..316bda2b4b1 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -38,10 +38,14 @@
# CONFIG_ARCH - identifies the arch subdirectory
# CONFIG_ARCH_8051 - Set if processor is 8051 family
# CONFIG_ARCH_8052 = Set if processor is 8052 family
+# CONFIG_BOARD - identifies the configs subdirectory
+# CONFIG_BARD_name - for use in C code
#
CONFIG_ARCH=pjrc-8051
CONFIG_ARCH_8051=n
CONFIG_ARCH_8052=y
+CONFIG_BOARD=pjrc-8051
+CONFIG_BOARD_PJRC_87C52=y
#
# Architecture-specific settings. These may mean nothing to
diff --git a/configs/sim/defconfig b/configs/sim/defconfig
index 142d1d4136c..13e1030eea0 100644
--- a/configs/sim/defconfig
+++ b/configs/sim/defconfig
@@ -37,9 +37,13 @@
#
# CONFIG_ARCH - identifies the arch subdirectory
# CONFIG_ARCH_name - for use in C code
+# CONFIG_BOARD - identifies the configs subdirectory
+# CONFIG_BARD_name - for use in C code
#
CONFIG_ARCH=sim
CONFIG_ARCH_SIM=y
+CONFIG_BOARD=sim
+CONFIG_BOARD_SIM=y
#
# General OS setup
diff --git a/examples/ostest/posixtimer.c b/examples/ostest/posixtimer.c
index b7d63644e63..1b466c99fb1 100644
--- a/examples/ostest/posixtimer.c
+++ b/examples/ostest/posixtimer.c
@@ -121,7 +121,6 @@ static void timer_expiration(int signo, siginfo_t *info, void *ucontext)
void timer_test(void)
{
- struct sched_param param;
sigset_t sigset;
struct sigaction act;
struct sigaction oact;
diff --git a/lib/lib_sem.c b/lib/lib_sem.c
index 9c105dfca76..604313d3d5b 100644
--- a/lib/lib_sem.c
+++ b/lib/lib_sem.c
@@ -104,9 +104,9 @@ void lib_take_semaphore(FILE *stream)
ASSERT(*get_errno_ptr() == EINTR);
}
- /* We have it. Claim the stak and return */
+ /* We have it. Stake the claim and return */
- stream->holder = my_pid;
+ stream->holder = my_pid;
stream->counts = 1;
}
}
@@ -119,7 +119,7 @@ void lib_give_semaphore(FILE *stream)
{
pid_t my_pid = getpid();
- /* I better be holding at least one reference to the semaphore */
+ /* I better be holding at least one count on the semaphore */
ASSERT(stream->holder == my_pid);