From 76ea067b8f2c7240d29af60b90bdfab005e7b766 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 25 Apr 2009 21:18:19 +0000 Subject: imx update git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1738 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/Documentation/NuttX.html | 42 +++++++++++++++++++-------------- nuttx/ReleaseNotes | 2 +- nuttx/arch/arm/src/imx/imx_gpio.c | 44 ++++++++++++++++++++++------------- nuttx/arch/arm/src/imx/imx_gpio.h | 4 ++-- nuttx/arch/arm/src/imx/imx_serial.c | 28 +++++++++++----------- nuttx/configs/mx1ads/README.txt | 4 ++-- nuttx/configs/mx1ads/ostest/Make.defs | 4 ++-- nuttx/configs/ntosd-dm320/README.txt | 5 ++-- 8 files changed, 77 insertions(+), 56 deletions(-) (limited to 'nuttx') diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index a35dcf871..0f600f2e1 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@

NuttX RTOS

-

Last Updated: April 19, 2009

+

Last Updated: April 25, 2009

@@ -217,6 +217,22 @@ Non-restrictive BSD license.

+ + + + GNU Toolchains + + + +
+ +

+ Compatible GNU toolchains based on buildroot + available for + download + to provide a complete development environment for many architectures. +

+

@@ -1348,14 +1364,14 @@ pascal-0.1.2 2008-02-10 Gregory Nutt <spudmonkey@racsa.co.cr> and eliminate a compiler bug * Changes so that runtime compiles with SDCC. -buildroot-0.1.3 2009-02-28 <spudmonkey@racsa.co.cr> +buildroot-0.1.5 2009-04-25 <spudmonkey@racsa.co.cr> - * Add support for H8/300 toolchain - * Add support for GCC 4.2.4 and binutils 2.19 - * Various fixes for newer Linux environments - * New ARM configuration using GCC 4.2.4 and binutils 2.19 - (Note: this doesn't work with NuttX yet... to nuttx TODO.txt list). - * Add Renesas R8C/M16C/M32C configuration using GCC 4.2.4 and binutils 2.19 + * Replaced config/arm-defconfig-4.2.4 with config/arm920t-defconfig-4.2.4 + and config/arm926t-defconfig-4.2.4 because of differences in the + way that soft floating point is handled between these two + architectures. + * Add support for gcc-4.3.3 and the ARM Cortex-M3 processor (thumb2) + * Add support for binutils 2.19.1 @@ -1371,15 +1387,7 @@ nuttx-0.4.6 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> pascal-0.1.3 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> -buildroot-0.1.4 2009-xx-xx <spudmonkey@racsa.co.cr> - - * Add support for a blackfin toolchain using GCC 4.2.4 and binutils 2.19 - * GCC 4.2.4 no longer attempts to build libstdc++. Now we can build g++! - * The ARM GCC-4.2.4 configuration was changed so that it now builds g++. - * Removed building of initial and final GCC. that is not necessary because - we do not build a libc. Now it builds almost twice as fast. - * Removed logic to build the target GCC. That is never used. - +buildroot-0.1.6 2009-xx-xx <spudmonkey@racsa.co.cr>
diff --git a/nuttx/ReleaseNotes b/nuttx/ReleaseNotes index f06de84de..f5c67b59a 100644 --- a/nuttx/ReleaseNotes +++ b/nuttx/ReleaseNotes @@ -847,7 +847,7 @@ ZDS-II toolchain in Cygwin-based environment. Please report any errors to me. This tarball contains a complete CVS snapshot from March 29, 2009. -nuttx-0.4.4 +nuttx-0.4.5 ^^^^^^^^^^^ This is the 37th release of NuttX. This release focuses on a few new features. diff --git a/nuttx/arch/arm/src/imx/imx_gpio.c b/nuttx/arch/arm/src/imx/imx_gpio.c index 889faaf81..65d1b3d10 100644 --- a/nuttx/arch/arm/src/imx/imx_gpio.c +++ b/nuttx/arch/arm/src/imx/imx_gpio.c @@ -70,16 +70,16 @@ void imxgpio_configoutput(int port, int bit, int value) { - imxgpio_configinput(port, bit); /* Same as input except: */ - imxgpio_dirout(GPIOA, 2); /* Output */ + imxgpio_configinput(port, bit); /* Same as input except: */ + imxgpio_dirout(port, bit); /* Output */ if (value) { - imxgpio_setoutput(GPIOA, 2); /* Set output = 1 */ + imxgpio_setoutput(port, bit); /* Set output = 1 */ } else { - imxgpio_clroutput(GPIOA, 2); /* Set output = 0 */ + imxgpio_clroutput(port, bit); /* Set output = 0 */ } } @@ -89,22 +89,34 @@ void imxgpio_configoutput(int port, int bit, int value) void imxgpio_configinput(int port, int bit) { - imxgpio_pullupdisable(GPIOA, 2); /* No pullup */ - imxgpio_dirin(GPIOA, 2); /* Input */ - imxgpio_gpiofunc(GPIOA, 2); /* Use as GPIO */ - imxgpio_primaryperipheralfunc(GPIOA, 2); /* Not necessary */ - imxgpio_ocrain(GPIOA, 2); /* Output AIN */ - imxgpio_aoutgpio(GPIOA, 2); /* AOUT input is GPIO */ - imxgpio_boutgpio(GPIOA, 2); /* BOUT input is GPIO */ + imxgpio_pullupdisable(port, bit); /* No pullup */ + imxgpio_dirin(port, bit); /* Input */ + imxgpio_gpiofunc(port, bit); /* Use as GPIO */ + imxgpio_primaryperipheralfunc(port, bit); /* Not necessary */ + imxgpio_ocrain(port, bit); /* Output AIN */ + imxgpio_aoutgpio(port, bit); /* AOUT input is GPIO */ + imxgpio_boutgpio(port, bit); /* BOUT input is GPIO */ } /**************************************************************************** - * Name: imxgpio_configprimary + * Name: imxgpio_configpfoutput ****************************************************************************/ -void imxgpio_configprimary(int port, int bit) +void imxgpio_configpfoutput(int port, int bit) { - imxgpio_configinput(port, bit); /* Same as input except: */ - imxgpio_peripheralfunc(GPIOA, 2); /* Use as peripheral */ - imxgpio_primaryperipheralfunc(GPIOA, 2); /* Primary function*/ + imxgpio_configinput(port, bit); /* Same as input except: */ + imxgpio_peripheralfunc(port, bit); /* Use as peripheral */ + imxgpio_primaryperipheralfunc(port, bit); /* Primary function*/ + imxgpio_dirout(port, bit); /* Make output */ +} + +/**************************************************************************** + * Name: imxgpio_configpfinput + ****************************************************************************/ + +void imxgpio_configpfinput(int port, int bit) +{ + imxgpio_configinput(port, bit); /* Same as input except: */ + imxgpio_peripheralfunc(port, bit); /* Use as peripheral */ + imxgpio_primaryperipheralfunc(port, bit); /* Primary function*/ } diff --git a/nuttx/arch/arm/src/imx/imx_gpio.h b/nuttx/arch/arm/src/imx/imx_gpio.h index b1e5fc36a..661021a90 100755 --- a/nuttx/arch/arm/src/imx/imx_gpio.h +++ b/nuttx/arch/arm/src/imx/imx_gpio.h @@ -548,10 +548,10 @@ static inline void imxgpio_clroutput(int port, int bit) /* Useful functions for normal configurations */ -extern void imxgpio_configreset(int port, int bit); extern void imxgpio_configoutput(int port, int bit, int value); extern void imxgpio_configinput(int port, int bit); -extern void imxgpio_configprimary(int port, int bit); +extern void imxgpio_configpfoutput(int port, int bit); +extern void imxgpio_configpfinput(int port, int bit); #endif diff --git a/nuttx/arch/arm/src/imx/imx_serial.c b/nuttx/arch/arm/src/imx/imx_serial.c index aa5140c51..4682a2938 100644 --- a/nuttx/arch/arm/src/imx/imx_serial.c +++ b/nuttx/arch/arm/src/imx/imx_serial.c @@ -1070,10 +1070,10 @@ void up_earlyserialinit(void) /* Configure UART1 pins: RXD, TXD, RTS, and CTS */ - imxgpio_configprimary(GPIOC, 9); - imxgpio_configprimary(GPIOC, 10); - imxgpio_configprimary(GPIOC, 11); - imxgpio_configprimary(GPIOC, 12); + imxgpio_configpfoutput(GPIOC, 9); /* Port C, pin 9: CTS */ + imxgpio_configpfinput(GPIOC, 10); /* Port C, pin 10: RTS */ + imxgpio_configpfoutput(GPIOC, 11); /* Port C, pin 11: TXD */ + imxgpio_configpfinput(GPIOC, 12); /* Port C, pin 12: RXD */ #endif /* Configure and disable the UART2 */ @@ -1083,13 +1083,13 @@ void up_earlyserialinit(void) up_serialout(&g_uart2priv, UART_UCR2, 0); /* Configure UART2 pins: RXD, TXD, RTS, and CTS (only, also - * supports DTR, DCD, RI, and DSR + * supports DTR, DCD, RI, and DSR -- not configured) */ - imxgpio_configprimary(GPIOB, 28); - imxgpio_configprimary(GPIOB, 29); - imxgpio_configprimary(GPIOB, 30); - imxgpio_configprimary(GPIOB, 31); + imxgpio_configpfoutput(GPIOB, 28); /* Port B, pin 28: CTS */ + imxgpio_configpfinput(GPIOB, 29); /* Port B, pin 29: RTS */ + imxgpio_configpfoutput(GPIOB, 30); /* Port B, pin 30: TXD */ + imxgpio_configpfinput(GPIOB, 31); /* Port B, pin 31: RXD */ #endif /* Configure and disable the UART3 */ @@ -1099,13 +1099,13 @@ void up_earlyserialinit(void) up_serialout(&g_uart3priv, UART_UCR2, 0); /* Configure UART2 pins: RXD, TXD, RTS, and CTS (only, also - * supports DTR, DCD, RI, and DSR + * supports DTR, DCD, RI, and DSR -- not configured) */ - imxgpio_configprimary(GPIOC, 28); - imxgpio_configprimary(GPIOC, 29); - imxgpio_configprimary(GPIOC, 30); - imxgpio_configprimary(GPIOC, 31); + imxgpio_configpfoutput(GPIOC, 28); /* Port C, pin 18: CTS */ + imxgpio_configpfinput(GPIOC, 29); /* Port C, pin 29: RTS */ + imxgpio_configpfoutput(GPIOC, 30); /* Port C, pin 30: TXD */ + imxgpio_configpfinput(GPIOC, 31); /* Port C, pin 31: RXD */ #endif /* Then enable the console UART. The others will be initialized diff --git a/nuttx/configs/mx1ads/README.txt b/nuttx/configs/mx1ads/README.txt index 59e98c7ba..aa1df0102 100644 --- a/nuttx/configs/mx1ads/README.txt +++ b/nuttx/configs/mx1ads/README.txt @@ -5,7 +5,7 @@ Toolchain ^^^^^^^^^ A GNU GCC-based toolchain is assumed. The files */setenv.sh should - be modified to point to the correct path to the SH toolchain (if + be modified to point to the correct path to the ARM920T GCC toolchain (if different from the default). If you have no ARM toolchain, one can be downloaded from the NuttX @@ -22,7 +22,7 @@ Toolchain 4. cd /buildroot - 5. cp configs/arm-defconfig-4.2.4 .config + 5. cp configs/arm920t-defconfig-4.2.4 .config 6. make oldconfig diff --git a/nuttx/configs/mx1ads/ostest/Make.defs b/nuttx/configs/mx1ads/ostest/Make.defs index 6ceed36b7..489b6ccce 100644 --- a/nuttx/configs/mx1ads/ostest/Make.defs +++ b/nuttx/configs/mx1ads/ostest/Make.defs @@ -61,9 +61,9 @@ else endif ifeq ($(ARCHCCMAJOR),4) - ARCHCPUFLAGS = -mtune=arm9tdmi -march=armv4t -mfloat-abi=soft + ARCHCPUFLAGS = -mtune=arm920t -march=armv4t -mfloat-abi=soft else - ARCHCPUFLAGS = -mapcs-32 -mtune=arm9tdmi -march=armv4t -msoft-float + ARCHCPUFLAGS = -mapcs-32 -mtune=arm920t -march=armv4t -msoft-float endif ARCHDEFINES = ARCHINCLUDES = -I. -isystem $(TOPDIR)/include diff --git a/nuttx/configs/ntosd-dm320/README.txt b/nuttx/configs/ntosd-dm320/README.txt index 924f2ef02..1b1c45a4d 100644 --- a/nuttx/configs/ntosd-dm320/README.txt +++ b/nuttx/configs/ntosd-dm320/README.txt @@ -5,7 +5,7 @@ Toolchain ^^^^^^^^^ A GNU GCC-based toolchain is assumed. The files */setenv.sh should - be modified to point to the correct path to the SH toolchain (if + be modified to point to the correct path to the ARM926 GCC toolchain (if different from the default). If you have no ARM toolchain, one can be downloaded from the NuttX @@ -22,7 +22,8 @@ Toolchain 4. cd /buildroot - 5. cp configs/arm-defconfig .config + 5. cp configs/arm-defconfig .config OR + cp configs/arm926t_defconfig-4.2.4 .config 6. make oldconfig -- cgit v1.2.3