From 552573ded0f5b0cd5ea688010ec117b2d2ec6127 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 3 Oct 2010 18:40:51 +0000 Subject: [PATCH] Initial fixes to configuration git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2963 42af7a65-404d-4744-a932-0658087f49c3 --- configs/avr32dev1/include/board.h | 2 +- configs/avr32dev1/ostest/Make.defs | 2 +- configs/avr32dev1/ostest/defconfig | 10 +++++----- configs/avr32dev1/ostest/ld.script | 2 +- configs/avr32dev1/ostest/setenv.sh | 2 +- configs/avr32dev1/src/Makefile | 2 +- .../src/{at91dev1_internal.h => avr32dev1_internal.h} | 4 ++-- configs/avr32dev1/src/up_boot.c | 4 ++-- configs/avr32dev1/src/up_leds.c | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) rename configs/avr32dev1/src/{at91dev1_internal.h => avr32dev1_internal.h} (95%) diff --git a/configs/avr32dev1/include/board.h b/configs/avr32dev1/include/board.h index 25c7613abe..6f93d68a97 100755 --- a/configs/avr32dev1/include/board.h +++ b/configs/avr32dev1/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/at91dev1/include/board.h + * configs/avr32dev1/include/board.h * include/arch/board/board.h * * Copyright (C) 2010 Gregory Nutt. All rights reserved. diff --git a/configs/avr32dev1/ostest/Make.defs b/configs/avr32dev1/ostest/Make.defs index f9135d26e0..acbe503fb8 100755 --- a/configs/avr32dev1/ostest/Make.defs +++ b/configs/avr32dev1/ostest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/at91dev1/ostest/Make.defs +# configs/avr32dev1/ostest/Make.defs # # Copyright (C) 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig index 56c6883099..4ffdae9067 100755 --- a/configs/avr32dev1/ostest/defconfig +++ b/configs/avr32dev1/ostest/defconfig @@ -1,5 +1,5 @@ ############################################################################ -# configs/at91dev1/ostest/defconfig +# configs/avr32dev1/ostest/defconfig # # Copyright (C) 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -72,10 +72,10 @@ CONFIG_ARCH=avr CONFIG_ARCH_AVR=y CONFIG_ARCH_AVR32=y -CONFIG_ARCH_CHIP=at91uc3B0256 -CONFIG_ARCH_CHIP_ATUC3B0256=y -CONFIG_ARCH_BOARD=at91dev1 -CONFIG_ARCH_BOARD_AT91DEV1=y +CONFIG_ARCH_CHIP=at91uc3 +CONFIG_ARCH_CHIP_AT91UC3B0256=y +CONFIG_ARCH_BOARD=avr32dev1 +CONFIG_ARCH_BOARD_AVR32DEV1=y CONFIG_BOARD_LOOPSPERMSEC=7982 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 diff --git a/configs/avr32dev1/ostest/ld.script b/configs/avr32dev1/ostest/ld.script index bea2bd8099..6f1df07fb6 100755 --- a/configs/avr32dev1/ostest/ld.script +++ b/configs/avr32dev1/ostest/ld.script @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/at91dev1/ostest/ld.script + * configs/avr32dev1/ostest/ld.script * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/avr32dev1/ostest/setenv.sh b/configs/avr32dev1/ostest/setenv.sh index 8c47bb4554..d691a05f75 100755 --- a/configs/avr32dev1/ostest/setenv.sh +++ b/configs/avr32dev1/ostest/setenv.sh @@ -1,5 +1,5 @@ #!/bin/bash -# configs/at91dev1/ostest/setenv.sh +# configs/avr32dev1/ostest/setenv.sh # # Copyright (C) 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/avr32dev1/src/Makefile b/configs/avr32dev1/src/Makefile index 687fa5799c..4edb47c81d 100755 --- a/configs/avr32dev1/src/Makefile +++ b/configs/avr32dev1/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# configs/at91dev1/src/Makefile +# configs/avr32dev1/src/Makefile # # Copyright (C) 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/avr32dev1/src/at91dev1_internal.h b/configs/avr32dev1/src/avr32dev1_internal.h similarity index 95% rename from configs/avr32dev1/src/at91dev1_internal.h rename to configs/avr32dev1/src/avr32dev1_internal.h index 8089f2ad1a..79901ea7d2 100755 --- a/configs/avr32dev1/src/at91dev1_internal.h +++ b/configs/avr32dev1/src/avr32dev1_internal.h @@ -1,6 +1,6 @@ /************************************************************************************ - * configs/at91dev1/src/at91dev1_internal.h - * arch/avr/src/board/at91dev1_internal.n + * configs/avr32dev1/src/avr32dev1_internal.h + * arch/avr/src/board/avr32dev1_internal.n * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/avr32dev1/src/up_boot.c b/configs/avr32dev1/src/up_boot.c index a36d168f77..d831389e68 100755 --- a/configs/avr32dev1/src/up_boot.c +++ b/configs/avr32dev1/src/up_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/at91dev1/src/up_boot.c + * configs/avr32dev1/src/up_boot.c * arch/avr/src/board/up_boot.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. @@ -48,7 +48,7 @@ #include "up_internal.h" #include "avr32_internal.h" -#include "at91dev1_internal.h" +#include "avr32dev1_internal.h" /************************************************************************************ * Definitions diff --git a/configs/avr32dev1/src/up_leds.c b/configs/avr32dev1/src/up_leds.c index 51ae3a9e0f..0ea291207f 100755 --- a/configs/avr32dev1/src/up_leds.c +++ b/configs/avr32dev1/src/up_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/at91dev1/src/up_leds.c + * configs/avr32dev1/src/up_leds.c * arch/avr/src/board/up_leds.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. @@ -51,7 +51,7 @@ #include "up_internal.h" #include "avr32_internal.h" -#include "at91dev1_internal.h" +#include "avr32dev1_internal.h" #ifdef CONFIG_ARCH_LEDS @@ -82,7 +82,7 @@ /* Dump GPIO registers */ #ifdef LED_VERBOSE -# define led_dumpgpio(m) avr32_dumpgpio(at91dev1_LED1_A, m) +# warning "Not implemented" #else # define led_dumpgpio(m) #endif