diff options
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | board/assabet/Makefile | 53 | ||||
| -rw-r--r-- | board/assabet/assabet.c | 131 | ||||
| -rw-r--r-- | board/assabet/config.mk | 7 | ||||
| -rw-r--r-- | board/assabet/setup.S | 136 | ||||
| -rw-r--r-- | boards.cfg | 1 | ||||
| -rw-r--r-- | doc/README.scrapyard | 1 | ||||
| -rw-r--r-- | include/configs/assabet.h | 173 | 
8 files changed, 1 insertions, 502 deletions
| diff --git a/MAINTAINERS b/MAINTAINERS index 7982c3663..74191ad6a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -632,7 +632,6 @@ Eric Cooper <ecc@cmu.edu>  George G. Davis <gdavis@mvista.com> -	assabet		SA1100  	gcplus		SA1100  Wolfgang Denk <wd@denx.de> diff --git a/board/assabet/Makefile b/board/assabet/Makefile deleted file mode 100644 index b3cf4aa01..000000000 --- a/board/assabet/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# 2004 (c) MontaVista Software, Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(BOARD).o - -COBJS	:= assabet.o -SOBJS	:= setup.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS)) -SOBJS	:= $(addprefix $(obj),$(SOBJS)) - -$(LIB):	$(obj).depend $(OBJS) $(SOBJS) -	$(call cmd_link_o_target, $(OBJS) $(SOBJS)) - -clean: -	rm -f $(SOBJS) $(OBJS) - -distclean:	clean -	rm -f $(LIB) core *.bak $(obj).depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/board/assabet/assabet.c b/board/assabet/assabet.c deleted file mode 100644 index 753c8d243..000000000 --- a/board/assabet/assabet.c +++ /dev/null @@ -1,131 +0,0 @@ -/* - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger@sysgo.de> - * - * 2004 (c) MontaVista Software, Inc. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include <common.h> -#include <netdev.h> -#include <SA-1100.h> - -DECLARE_GLOBAL_DATA_PTR; - -/* ------------------------------------------------------------------------- */ - -/* - * Board dependent initialisation - */ - -#define ECOR			0x8000 -#define ECOR_RESET		0x80 -#define ECOR_LEVEL_IRQ		0x40 -#define ECOR_WR_ATTRIB		0x04 -#define ECOR_ENABLE		0x01 - -#define ECSR			0x8002 -#define ECSR_IOIS8		0x20 -#define ECSR_PWRDWN		0x04 -#define ECSR_INT		0x02 -#define SMC_IO_SHIFT		2 -#define NCR_0			(*((volatile u_char *)(0x100000a0))) -#define NCR_ENET_OSC_EN		(1<<3) - -static inline u8 -readb(volatile u8 * p) -{ -	return *p; -} - -static inline void -writeb(u8 v, volatile u8 * p) -{ -	*p = v; -} - -static void -smc_init(void) -{ -	u8 ecor; -	u8 ecsr; -	volatile u8 *addr = (volatile u8 *)(0x18000000 + (1 << 25)); - -	NCR_0 |= NCR_ENET_OSC_EN; -	udelay(100); - -	ecor = readb(addr + (ECOR << SMC_IO_SHIFT)) & ~ECOR_RESET; -	writeb(ecor | ECOR_RESET, addr + (ECOR << SMC_IO_SHIFT)); -	udelay(100); - -	/* -	 * The device will ignore all writes to the enable bit while -	 * reset is asserted, even if the reset bit is cleared in the -	 * same write.  Must clear reset first, then enable the device. -	 */ -	writeb(ecor, addr + (ECOR << SMC_IO_SHIFT)); -	writeb(ecor | ECOR_ENABLE, addr + (ECOR << SMC_IO_SHIFT)); - -	/* -	 * Set the appropriate byte/word mode. -	 */ -	ecsr = readb(addr + (ECSR << SMC_IO_SHIFT)) & ~ECSR_IOIS8; -	ecsr |= ECSR_IOIS8; -	writeb(ecsr, addr + (ECSR << SMC_IO_SHIFT)); -	udelay(100); -} - -static void -neponset_init(void) -{ -	smc_init(); -} - -int -board_init(void) -{ -	gd->bd->bi_arch_number = MACH_TYPE_ASSABET; -	gd->bd->bi_boot_params = 0xc0000100; - -	neponset_init(); - -	return 0; -} - -int -dram_init(void) -{ -	gd->bd->bi_dram[0].start = PHYS_SDRAM_1; -	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; - -	return (0); -} - -#ifdef CONFIG_CMD_NET -int board_eth_init(bd_t *bis) -{ -	int rc = 0; -#ifdef CONFIG_LAN91C96 -	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE); -#endif -	return rc; -} -#endif diff --git a/board/assabet/config.mk b/board/assabet/config.mk deleted file mode 100644 index d9866a0eb..000000000 --- a/board/assabet/config.mk +++ /dev/null @@ -1,7 +0,0 @@ -# -# SA-1110 based Intel Assabet board -# -# The Intel Assabet 1 bank of 32 MiB SDRAM -# - -CONFIG_SYS_TEXT_BASE = 0xc1f00000 diff --git a/board/assabet/setup.S b/board/assabet/setup.S deleted file mode 100644 index 56ea0dd92..000000000 --- a/board/assabet/setup.S +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Memory Setup stuff - taken from blob memsetup.S - * - * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) and - *		       Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl) - * 2004 (c) MontaVista Software, Inc. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - - -#include "config.h" -#include "version.h" - - -/*----------------------------------------------------------------------- - * Board defines: - */ - -#define MDCNFG		0x00 -#define MDCAS00		0x04 -#define MDCAS01		0x08 -#define MDCAS02		0x0C -#define MSC0		0x10 -#define MSC1		0x14 -#define MECR		0x18 -#define MDREFR		0x1C -#define MDCAS20		0x20 -#define MDCAS21		0x24 -#define MDCAS22		0x28 -#define MSC2		0x2C -#define SMCNFG		0x30 - -#define ASSABET_BCR		(0x12000000) -#define ASSABET_BCR_DB1110	(0x00a07490 | (0<<16) | (0<<17)) -#define ASSABET_SCR_nNEPONSET	(1 << 9) -#define NEPONSET_LEDS		(0x10000010) - - -/*----------------------------------------------------------------------- - * Setup parameters for the board: - */ - - -MEM_BASE:	.long	0xa0000000 -MEM_START:	.long	0xc0000000 - -mdcnfg:		.long	0x72547254 -mdcas00:	.long	0xaaaaaa7f -mdcas01:	.long	0xaaaaaaaa -mdcas02:	.long	0xaaaaaaaa -msc0:		.long	0x4b384370 -msc1:		.long	0x22212419 -mecr:		.long	0x994a994a -mdrefr:		.long	0x04340327 -mdcas20:	.long	0xaaaaaa7f -mdcas21:	.long	0xaaaaaaaa -mdcas22:	.long	0xaaaaaaaa -msc2:		.long	0x42196669 -smcnfg:		.long	0x00000000 - -BCR:		.long	ASSABET_BCR -BCR_DB1110:	.long	ASSABET_BCR_DB1110 -LEDS:		.long	NEPONSET_LEDS - - -	.globl lowlevel_init -lowlevel_init: - -	/* Setting up the memory and stuff */ - -	ldr	r0, MEM_BASE -	ldr	r1, mdcas00 -	str	r1, [r0, #MDCAS00] -	ldr	r1, mdcas01 -	str	r1, [r0, #MDCAS01] -	ldr	r1, mdcas02 -	str	r1, [r0, #MDCAS02] -	ldr	r1, mdcas20 -	str	r1, [r0, #MDCAS20] -	ldr	r1, mdcas21 -	str	r1, [r0, #MDCAS21] -	ldr	r1, mdcas22 -	str	r1, [r0, #MDCAS22] -	ldr	r1, mdrefr -	str	r1, [r0, #MDREFR] -	ldr	r1, mecr -	str	r1, [r0, #MECR] -	ldr	r1, msc0 -	str	r1, [r0, #MSC0] -	ldr	r1, msc1 -	str	r1, [r0, #MSC1] -	ldr	r1, msc2 -	str	r1, [r0, #MSC2] -	ldr	r1, smcnfg -	str	r1, [r0, #SMCNFG] - -	ldr	r1, mdcnfg -	str	r1, [r0, #MDCNFG] - -	/* Load something to activate bank */ -	ldr	r2, MEM_START -.rept	8 -	ldr	r3, [r2] -.endr - -	/* Enable SDRAM */ -	orr	r1, r1, #0x00000001 -	str	r1, [r0, #MDCNFG] - -	ldr	r1, BCR -	ldr	r2, BCR_DB1110 -	str	r2, [r1] - -	ldr	r1, LEDS -	mov	r0, #0x3 -	str	r0, [r1] - -	/* All done... */ -	mov	pc, lr diff --git a/boards.cfg b/boards.cfg index 413ab9244..3ab059f5e 100644 --- a/boards.cfg +++ b/boards.cfg @@ -236,7 +236,6 @@ xm250                        arm         pxa  zipitz2                      arm         pxa  zylonite                     arm         pxa  B2                           arm         s3c44b0     -                   dave -assabet                      arm         sa1100  dnp1110                      arm         sa1100  gcplus                       arm         sa1100  jornada                      arm         sa1100 diff --git a/doc/README.scrapyard b/doc/README.scrapyard index 4cb727f78..e2b2596ae 100644 --- a/doc/README.scrapyard +++ b/doc/README.scrapyard @@ -11,6 +11,7 @@ easily if here is something they might want to dig for...  Board	Arch	CPU	removed	    Commit	last known maintainer/contact  ============================================================================= +assabet	arm	sa1100	-	  2011-07-16	George G. Davis <gdavis@mvista.com>  trab	arm	S3C2400	-	  2011-05-01	Gary Jennejohn <garyj@denx.de>  xsengine ARM	PXA2xx	4262a7c   2010-10-20  wepep250 ARM	PXA2xx	7369478   2010-10-20	Peter Figuli <peposh@etc.sk> diff --git a/include/configs/assabet.h b/include/configs/assabet.h deleted file mode 100644 index dc9bd88ac..000000000 --- a/include/configs/assabet.h +++ /dev/null @@ -1,173 +0,0 @@ -/* - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger@sysgo.de> - * - * 2004 (c) MontaVista Software, Inc. - * - * Configuation settings for the Intel Assabet board. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* - * High Level Configuration Options - * (easy to change) - */ -#define CONFIG_SA1110		1	/* This is an SA1100 CPU        */ -#define CONFIG_ASSABET		1	/* on an Intel Assabet Board    */ - -#undef CONFIG_USE_IRQ -/* we will never enable dcache, because we have to setup MMU first */ -#define CONFIG_SYS_DCACHE_OFF - -#define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs      */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG	 1 - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024) - -/* - * Hardware drivers - */ -#define CONFIG_NET_MULTI -#define CONFIG_LAN91C96	/* we have an SMC9194 on-board */ -#define CONFIG_LAN91C96_BASE	0x18000000 - -/* - * select serial console configuration - */ -#define CONFIG_SA1100_SERIAL -#define CONFIG_SERIAL1          1	/* we use SERIAL 1 on Intel Assabet */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - -#define CONFIG_BAUDRATE		115200 - - -/* - * Command line configuration. - */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_DHCP - - -/* - * BOOTP options - */ -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME -#define CONFIG_BOOTP_BOOTPATH - - -#define CONFIG_BOOTDELAY	3 -#define CONFIG_BOOTARGS		"console=ttySA0,115200n8 root=/dev/nfs ip=bootp" -#define CONFIG_BOOTCOMMAND	"bootp;tftp;bootm" -#define CONFIG_SYS_AUTOLOAD            "n"	/* No autoload */ - -#if defined(CONFIG_CMD_KGDB) -#define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */ -#define CONFIG_KGDB_SER_INDEX	2	/* which serial port to use */ -#endif - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP		/* undef to save memory         */ -#define CONFIG_SYS_PROMPT		"Intel Assabet # "	/* Monitor Command Prompt       */ -#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size      */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */ -#define CONFIG_SYS_MAXARGS		16	/* max number of command args   */ -#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */ - -#define CONFIG_SYS_MEMTEST_START	0xc0400000	/* memtest works on     */ -#define CONFIG_SYS_MEMTEST_END		0xc0800000	/* 4 ... 8 MB in DRAM   */ - -#define CONFIG_SYS_LOAD_ADDR		0xc0000000	/* default load address */ - -#define CONFIG_SYS_HZ			3686400	/* incrementer freq: 3.6864 MHz */ -#define CONFIG_SYS_CPUSPEED		0x0a	/* set core clock to 206MHz */ - -						/* valid baudrates */ -#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 } - -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */ -#ifdef CONFIG_USE_IRQ -#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */ -#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */ -#endif - -/*----------------------------------------------------------------------- - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS	1	/* we have 1 bank of SDRAM */ -#define PHYS_SDRAM_1		0xc0000000	/* SDRAM Bank #1 */ -#define PHYS_SDRAM_1_SIZE	0x02000000	/* 32 MB */ - -#define PHYS_FLASH_1		0x00000000	/* Flash Bank #1 */ -#define PHYS_FLASH_SIZE		0x02000000	/* 32 MB */ -#define PHYS_FLASH_BANK_SIZE    0x01000000	/* 16 MB Banks */ -#define PHYS_FLASH_SECT_SIZE    0x00040000	/* 256 KB sectors (x2) */ - -#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN         (256 * 1024)	/* Reserve 256 KB for Monitor */ - -#if CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_RAMSTART -#endif - -/*----------------------------------------------------------------------- - * FLASH and environment organization - */ - -#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1 -#define CONFIG_SYS_FLASH_SIZE          PHYS_FLASH_SIZE -#define CONFIG_SYS_FLASH_CFI           1	/* flash is CFI conformant      */ -#define CONFIG_FLASH_CFI_DRIVER    1	/* use common cfi driver        */ -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1	/* use buffered writes (20x faster) */ -#define CONFIG_SYS_MAX_FLASH_BANKS     1	/* max # of memory banks        */ -#define CONFIG_SYS_FLASH_INCREMENT     0	/* there is only one bank       */ -#define CONFIG_SYS_MAX_FLASH_SECT      128	/* max # of sectors on one chip */ -#undef CONFIG_SYS_FLASH_PROTECTION -#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE } - -#define CONFIG_ENV_IS_IN_FLASH	1 - -#if defined(CONFIG_ENV_IS_IN_FLASH) -#define CONFIG_ENV_IN_OWN_SECTOR	1 -#define CONFIG_ENV_ADDR		(PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) -#define CONFIG_ENV_SIZE		PHYS_FLASH_SECT_SIZE -#define CONFIG_ENV_SECT_SIZE	PHYS_FLASH_SECT_SIZE -#endif - -#endif /* __CONFIG_H */ |