diff --git a/configs/Kconfig b/configs/Kconfig index 062052889ae..f5896b20de2 100644 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -1125,6 +1125,7 @@ config ARCH_BOARD_MOXA depends on ARCH_CHIP_MOXART ---help--- Moxa + endchoice if ARCH_BOARD_CUSTOM diff --git a/configs/README.txt b/configs/README.txt index b355da42e5f..4bb6b4d0681 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -349,6 +349,9 @@ configs/moteino-mega on the Atmel AVR ATMega1284P MCU. There is not much there yet and what is there is untested due to tool-related issues. +configs/moxa + Moxa NP51x0 series of 2-port advanced RS-232/422/485 serial device servers. + configs/mx1ads This is a port to the Motorola MX1ADS development board. That board is based on the Freescale i.MX1 processor. The i.MX1 is an ARM920T. diff --git a/configs/moxa/include/board.h b/configs/moxa/include/board.h index 2057c82df26..0a294072b2a 100644 --- a/configs/moxa/include/board.h +++ b/configs/moxa/include/board.h @@ -1,7 +1,7 @@ /************************************************************************************ * configs/arduino-due/include/board.h * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIGS_ARDUINO_DUE_INCLUDE_BOARD_H -#define __CONFIGS_ARDUINO_DUE_INCLUDE_BOARD_H +#ifndef __CONFIGS_MOXA_INCLUDE_BOARD_H +#define __CONFIGS_MOXA_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -45,9 +45,6 @@ #ifndef __ASSEMBLY__ # include # include -# ifdef CONFIG_SAM34_GPIO_IRQ -# include -# endif #endif /************************************************************************************ @@ -55,7 +52,7 @@ ************************************************************************************/ /* Clocking *************************************************************************/ -/* After power-on reset, the SAM3X device is running on a 4MHz internal RC. These +/* After power-on reset, the device is running on a 4MHz internal RC. These * definitions will configure clocking * * MAINOSC: Frequency = 12MHz (crysta) @@ -144,7 +141,7 @@ #define BOARD_FWS 4 /* LED definitions ******************************************************************/ -/* There are three user-controllable LEDs on board the Arduino Due board: +/* There are three user-controllable LEDs on board the Moxa board: * * LED GPIO * ---------------- ----- @@ -198,7 +195,7 @@ */ /* Button definitions ***************************************************************/ -/* There are no buttons on the Arduino Due board. */ +/* There are no buttons on the Moxa board. */ /* GPIO pin configurations **********************************************************/ @@ -211,7 +208,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -226,4 +224,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIGS_ARDUINO_DUE_INCLUDE_BOARD_H */ +#endif /* __CONFIGS_MOXA_INCLUDE_BOARD_H */ diff --git a/configs/moxa/nsh/Make.defs b/configs/moxa/nsh/Make.defs index 63af77e6c5f..5df7ce62de2 100644 --- a/configs/moxa/nsh/Make.defs +++ b/configs/moxa/nsh/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/arduino-due/nsh/Make.defs +# configs/moxa/nsh/Make.defs # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without diff --git a/configs/moxa/nsh/setenv.sh b/configs/moxa/nsh/setenv.sh index d35b22620e1..fde552d1408 100755 --- a/configs/moxa/nsh/setenv.sh +++ b/configs/moxa/nsh/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash -# configs/arduino-due/nsh/setenv.sh +# configs/moxa/nsh/setenv.sh # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -56,6 +56,11 @@ fi # 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/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" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/configs/moxa/src/Makefile b/configs/moxa/src/Makefile index 897bf5c86f6..598ae010585 100644 --- a/configs/moxa/src/Makefile +++ b/configs/moxa/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ -# configs/arduino-due/src/Makefile +# configs/moxa/src/Makefile # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without diff --git a/configs/moxa/src/moxart_boot.c b/configs/moxa/src/moxart_boot.c index 5da6a3b3b94..473f5a54adb 100644 --- a/configs/moxa/src/moxart_boot.c +++ b/configs/moxa/src/moxart_boot.c @@ -1,8 +1,8 @@ /**************************************************************************** * config/moxart/src/moxart_boot.c * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Author: Anton D. Kachalov * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -66,12 +66,16 @@ * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ + #ifdef CONFIG_BOARD_INITIALIZE extern int ftmac100_initialize(int intf); void board_initialize(void) { +#ifdef CONFIG_NET_FTMAC100 /* Perform board-specific initialization */ + ftmac100_initialize(0); +#endif } #endif diff --git a/configs/moxa/src/moxart_nsh.c b/configs/moxa/src/moxart_nsh.c index 0936e7208d0..b21a466c866 100644 --- a/configs/moxa/src/moxart_nsh.c +++ b/configs/moxa/src/moxart_nsh.c @@ -1,8 +1,8 @@ /**************************************************************************** * config/moxart/src/moxart_nsh.c * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Author: Anton D. Kachalov * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -72,8 +72,11 @@ int board_app_initialize(void) { #ifndef CONFIG_BOARD_INITIALIZE +#ifdef CONFIG_NET_FTMAC100 /* Perform board-specific initialization */ + ftmac100_initialize(0); +#endif #endif return OK; }