Refresh Lincoln60 configuration

This commit is contained in:
Gregory Nutt
2015-06-03 15:52:49 -06:00
parent f676e1f8c5
commit 5df7ae9b64
7 changed files with 230 additions and 171 deletions
+14 -11
View File
@@ -34,8 +34,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __ARCH_BOARD_BOARD_H #ifndef __CONFIGS_LINCOLN60_INCLUDE_BOARD_H
#define __ARCH_BOARD_BOARD_H #define __CONFIGS_LINCOLN60_INCLUDE_BOARD_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@@ -180,7 +180,8 @@
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
@@ -193,24 +194,26 @@ extern "C" {
* Name: lpc17_boardinitialize * Name: lpc17_boardinitialize
* *
* Description: * Description:
* All LPC17xx architectures must provide the following entry point. This entry point * All LPC17xx architectures must provide the following entry point.
* is called early in the intitialization -- after all memory has been configured * This entry point is called early in the initialization -- after all
* and mapped but before any devices have been initialized. * memory has been configured and mapped but before any devices have been
* initialized.
* *
****************************************************************************/ ****************************************************************************/
EXTERN void lpc17_boardinitialize(void); void lpc17_boardinitialize(void);
/**************************************************************************** /****************************************************************************
* Name: lpc17_led * Name: lpc17_led
* *
* Description: * Description:
* Once the system has booted, these functions can be used to control LEDs 1 & 2 * Once the system has booted, these functions can be used to control
* LEDs 1 & 2
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
EXTERN void lpc17_led(int lednum, int state); void lpc17_led(int lednum, int state);
#endif #endif
#undef EXTERN #undef EXTERN
@@ -219,4 +222,4 @@ EXTERN void lpc17_led(int lednum, int state);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __ARCH_BOARD_BOARD_H */ #endif /* __CONFIGS_LINCOLN60_INCLUDE_BOARD_H */
File diff suppressed because it is too large Load Diff
+20 -5
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/lincoln60/nsh/setenv.sh # configs/lincoln60/nsh/setenv.sh
# #
# Copyright (C) 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,7 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
if [ "$_" = "$0" ] ; then if [ "$_" = "$0" ] ; then
echo "You must source this script, not run it!" 1>&2 echo "You must source this script, not run it!" 1>&2
exit 1 exit 1
@@ -47,12 +48,26 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}" export PATH_ORIG="${PATH}"
fi fi
# TOOLCHAIN_BIN must be defined to the full path to the location where you # This is the Cygwin path to the location where I installed the CodeSourcery
# have installed the toolchain of your choice. Modify the following: # toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
# export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2014q4/bin"
# This is the path to the location where I installed the devkitARM toolchain
# You can get this free toolchain from http://devkitpro.org/ or http://sourceforge.net/projects/devkitpro/
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/devkitARM/bin"
# This is the Cygwin path to the location where I build the buildroot
# toolchain.
export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin" export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
# Andd add the toolchain path to the PATH variable # Add the path to the toolchain to the PATH varialble
export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
echo "PATH : ${PATH}" echo "PATH : ${PATH}"
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/lincoln60/src/lincoln60_internal.h * configs/lincoln60/src/lincoln60.h
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef _CONFIGS_LINCOLN60_SRC_LINCOLN60_INTERNAL_H #ifndef _CONFIGS_LINCOLN60_SRC_LINCOLN60_H
#define _CONFIGS_LINCOLN60_SRC_LINCOLN60_INTERNAL_H #define _CONFIGS_LINCOLN60_SRC_LINCOLN60_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@@ -100,5 +100,4 @@
void weak_function lincoln60_sspinitialize(void); void weak_function lincoln60_sspinitialize(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _CONFIGS_LINCOLN60_SRC_LINCOLN60_INTERNAL_H */ #endif /* _CONFIGS_LINCOLN60_SRC_LINCOLN60_H */
+1 -1
View File
@@ -47,7 +47,7 @@
#include "up_arch.h" #include "up_arch.h"
#include "up_internal.h" #include "up_internal.h"
#include "lincoln60_internal.h" #include "lincoln60.h"
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
+1 -1
View File
@@ -49,7 +49,7 @@
#include <arch/board/board.h> #include <arch/board/board.h>
#include "lpc17_gpio.h" #include "lpc17_gpio.h"
#include "lincoln60_internal.h" #include "lincoln60.h"
#ifdef CONFIG_ARCH_BUTTONS #ifdef CONFIG_ARCH_BUTTONS
+1 -1
View File
@@ -52,7 +52,7 @@
#include "lpc17_gpio.h" #include "lpc17_gpio.h"
#include "lincoln60_internal.h" #include "lincoln60.h"
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS