From ed383c589911d348d6df8df17820fe7bec26d142 Mon Sep 17 00:00:00 2001 From: Jonas Larsson Date: Fri, 27 Mar 2009 10:18:14 +0100 Subject: [PATCH] --- yaml --- r: 141798 b: refs/heads/master c: a16fffdd8eb95ebab7dc22414896fe6493951e0e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/avr32/Kconfig | 14 + trunk/arch/avr32/Makefile | 1 + trunk/arch/avr32/boards/merisc/Kconfig | 5 + trunk/arch/avr32/boards/merisc/Makefile | 1 + trunk/arch/avr32/boards/merisc/display.c | 65 + trunk/arch/avr32/boards/merisc/flash.c | 139 ++ trunk/arch/avr32/boards/merisc/merisc.h | 18 + trunk/arch/avr32/boards/merisc/merisc_sysfs.c | 65 + trunk/arch/avr32/boards/merisc/setup.c | 289 ++++ trunk/arch/avr32/configs/merisc_defconfig | 1237 +++++++++++++++++ 11 files changed, 1835 insertions(+), 1 deletion(-) create mode 100644 trunk/arch/avr32/boards/merisc/Kconfig create mode 100644 trunk/arch/avr32/boards/merisc/Makefile create mode 100644 trunk/arch/avr32/boards/merisc/display.c create mode 100644 trunk/arch/avr32/boards/merisc/flash.c create mode 100644 trunk/arch/avr32/boards/merisc/merisc.h create mode 100644 trunk/arch/avr32/boards/merisc/merisc_sysfs.c create mode 100644 trunk/arch/avr32/boards/merisc/setup.c create mode 100644 trunk/arch/avr32/configs/merisc_defconfig diff --git a/[refs] b/[refs] index f5ace7953f2e..89e4acedc080 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9477ab2b2ae098423af2ed4fb1f7b864abfc14fc +refs/heads/master: a16fffdd8eb95ebab7dc22414896fe6493951e0e diff --git a/trunk/arch/avr32/Kconfig b/trunk/arch/avr32/Kconfig index b189680d18b0..8cee7842d0b2 100644 --- a/trunk/arch/avr32/Kconfig +++ b/trunk/arch/avr32/Kconfig @@ -144,6 +144,19 @@ config BOARD_FAVR_32 bool "Favr-32 LCD-board" select CPU_AT32AP7000 +config BOARD_MERISC + bool "Merisc board" + select CPU_AT32AP7000 + help + Merisc is the family name for a range of AVR32-based boards. + + The boards are designed to be used in a man-machine + interfacing environment, utilizing a touch-based graphical + user interface. They host a vast range of I/O peripherals as + well as a large SDRAM & Flash memory bank. + + For more information see: http://www.martinsson.se/merisc + config BOARD_MIMC200 bool "MIMC200 CPU board" select CPU_AT32AP7000 @@ -153,6 +166,7 @@ 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" +source "arch/avr32/boards/merisc/Kconfig" choice prompt "Boot loader type" diff --git a/trunk/arch/avr32/Makefile b/trunk/arch/avr32/Makefile index f3ef3bbf797c..0b97e14f73f6 100644 --- a/trunk/arch/avr32/Makefile +++ b/trunk/arch/avr32/Makefile @@ -35,6 +35,7 @@ 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_MERISC) += arch/avr32/boards/merisc/ core-$(CONFIG_BOARD_MIMC200) += arch/avr32/boards/mimc200/ core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/ core-y += arch/avr32/kernel/ diff --git a/trunk/arch/avr32/boards/merisc/Kconfig b/trunk/arch/avr32/boards/merisc/Kconfig new file mode 100644 index 000000000000..7e043275d5a9 --- /dev/null +++ b/trunk/arch/avr32/boards/merisc/Kconfig @@ -0,0 +1,5 @@ +# Merisc customization + +if BOARD_MERISC + +endif # BOARD_MERISC diff --git a/trunk/arch/avr32/boards/merisc/Makefile b/trunk/arch/avr32/boards/merisc/Makefile new file mode 100644 index 000000000000..d24c78729bd1 --- /dev/null +++ b/trunk/arch/avr32/boards/merisc/Makefile @@ -0,0 +1 @@ +obj-y += setup.o flash.o display.o merisc_sysfs.o diff --git a/trunk/arch/avr32/boards/merisc/display.c b/trunk/arch/avr32/boards/merisc/display.c new file mode 100644 index 000000000000..85a543cd4abc --- /dev/null +++ b/trunk/arch/avr32/boards/merisc/display.c @@ -0,0 +1,65 @@ +/* + * Display setup code for the Merisc board + * + * Copyright (C) 2008 Martinsson Elektronik AB + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include +#include +#include +#include