From 2e7d8ce7bbce51f9f677897f8bfda9431c1729d5 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 20 Nov 2008 15:59:12 +0100 Subject: [PATCH] --- yaml --- r: 126944 b: refs/heads/master c: c42aa775cc8a8ca558db0cc75979fb8e16667447 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/avr32/Kconfig | 19 - trunk/arch/avr32/Makefile | 1 - trunk/arch/avr32/boards/atngw100/setup.c | 2 +- trunk/arch/avr32/boards/atstk1000/atstk1002.c | 20 +- trunk/arch/avr32/boards/atstk1000/atstk1003.c | 20 +- trunk/arch/avr32/boards/atstk1000/atstk1004.c | 2 +- trunk/arch/avr32/boards/favr-32/setup.c | 20 +- trunk/arch/avr32/boards/hammerhead/Kconfig | 43 - trunk/arch/avr32/boards/hammerhead/Makefile | 1 - trunk/arch/avr32/boards/hammerhead/flash.c | 377 ----- trunk/arch/avr32/boards/hammerhead/flash.h | 6 - trunk/arch/avr32/boards/hammerhead/setup.c | 236 --- trunk/arch/avr32/boards/mimc200/setup.c | 4 +- trunk/arch/avr32/configs/hammerhead_defconfig | 1467 ----------------- trunk/arch/avr32/kernel/process.c | 1 - trunk/arch/avr32/kernel/signal.c | 1 - trunk/arch/avr32/kernel/sys_avr32.c | 1 - trunk/arch/avr32/mach-at32ap/at32ap700x.c | 6 +- trunk/arch/avr32/mach-at32ap/clock.c | 4 +- trunk/arch/avr32/mach-at32ap/clock.h | 3 - .../mach-at32ap/include/mach/at32ap700x.h | 3 - .../avr32/mach-at32ap/include/mach/portmux.h | 2 +- trunk/arch/avr32/mach-at32ap/pio.c | 19 +- trunk/arch/avr32/mm/cache.c | 1 - trunk/drivers/mmc/host/atmel-mci.c | 2 +- trunk/include/asm-avr32/syscalls.h | 39 - .../include/asm => include/linux}/atmel-mci.h | 6 +- 28 files changed, 77 insertions(+), 2231 deletions(-) delete mode 100644 trunk/arch/avr32/boards/hammerhead/Kconfig delete mode 100644 trunk/arch/avr32/boards/hammerhead/Makefile delete mode 100644 trunk/arch/avr32/boards/hammerhead/flash.c delete mode 100644 trunk/arch/avr32/boards/hammerhead/flash.h delete mode 100644 trunk/arch/avr32/boards/hammerhead/setup.c delete mode 100644 trunk/arch/avr32/configs/hammerhead_defconfig delete mode 100644 trunk/include/asm-avr32/syscalls.h rename trunk/{arch/avr32/include/asm => include/linux}/atmel-mci.h (91%) diff --git a/[refs] b/[refs] index 1a8f2234ed53..f1871b1d59e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd5e1339e528197abdb7827663ff0673797fa088 +refs/heads/master: c42aa775cc8a8ca558db0cc75979fb8e16667447 diff --git a/trunk/arch/avr32/Kconfig b/trunk/arch/avr32/Kconfig index b189680d18b0..26eca87f6735 100644 --- a/trunk/arch/avr32/Kconfig +++ b/trunk/arch/avr32/Kconfig @@ -122,24 +122,6 @@ config BOARD_ATNGW100 bool "ATNGW100 Network Gateway" select CPU_AT32AP7000 -config BOARD_HAMMERHEAD - bool "Hammerhead board" - select CPU_AT32AP7000 - select USB_ARCH_HAS_HCD - help - The Hammerhead platform is built around a AVR32 32-bit microcontroller from Atmel. - It offers versatile peripherals, such as ethernet, usb device, usb host etc. - - The board also incooperates a power supply and is a Power over Ethernet (PoE) Powered - Device (PD). - - Additonally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is - mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which - will cover even the most exceptional need of memory bandwidth. Together with the onboard - video decoder the board is ready for video processing. - - For more information see: http://www.miromico.com/hammerhead - config BOARD_FAVR_32 bool "Favr-32 LCD-board" select CPU_AT32AP7000 @@ -151,7 +133,6 @@ endchoice source "arch/avr32/boards/atstk1000/Kconfig" source "arch/avr32/boards/atngw100/Kconfig" -source "arch/avr32/boards/hammerhead/Kconfig" source "arch/avr32/boards/favr-32/Kconfig" choice diff --git a/trunk/arch/avr32/Makefile b/trunk/arch/avr32/Makefile index f3ef3bbf797c..b088e103e753 100644 --- a/trunk/arch/avr32/Makefile +++ b/trunk/arch/avr32/Makefile @@ -33,7 +33,6 @@ head-y += arch/avr32/kernel/head.o core-y += $(machdirs) core-$(CONFIG_BOARD_ATSTK1000) += arch/avr32/boards/atstk1000/ core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/ -core-$(CONFIG_BOARD_HAMMERHEAD) += arch/avr32/boards/hammerhead/ core-$(CONFIG_BOARD_FAVR_32) += arch/avr32/boards/favr-32/ core-$(CONFIG_BOARD_MIMC200) += arch/avr32/boards/mimc200/ core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/ diff --git a/trunk/arch/avr32/boards/atngw100/setup.c b/trunk/arch/avr32/boards/atngw100/setup.c index 32fb9ba0fbdf..05d3722fff18 100644 --- a/trunk/arch/avr32/boards/atngw100/setup.c +++ b/trunk/arch/avr32/boards/atngw100/setup.c @@ -19,8 +19,8 @@ #include #include #include +#include -#include #include #include diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1002.c b/trunk/arch/avr32/boards/atstk1000/atstk1002.c index 11e7800c1632..6d94f74bc5c7 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1002.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1002.c @@ -16,12 +16,12 @@ #include #include #include +#include #include