diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/adsvix/Makefile | 51 | ||||
| -rw-r--r-- | board/adsvix/adsvix.c | 75 | ||||
| -rw-r--r-- | board/adsvix/config.mk | 1 | ||||
| -rw-r--r-- | board/adsvix/lowlevel_init.S | 466 | ||||
| -rw-r--r-- | board/adsvix/pcmcia.c | 67 | ||||
| -rw-r--r-- | board/adsvix/pxavoltage.S | 230 | ||||
| -rw-r--r-- | board/adsvix/u-boot.lds | 56 | ||||
| -rw-r--r-- | board/atmel/atngw100/atngw100.c | 2 | ||||
| -rw-r--r-- | board/atmel/atstk1000/atstk1000.c | 2 | ||||
| -rw-r--r-- | board/atmel/atstk1000/flash.c | 2 | ||||
| -rw-r--r-- | board/esd/common/flash.c | 2 | ||||
| -rw-r--r-- | board/freescale/m5275evb/Makefile | 2 | ||||
| -rw-r--r-- | board/freescale/mpc8540ads/u-boot.lds | 37 | ||||
| -rw-r--r-- | board/freescale/mpc8541cds/u-boot.lds | 38 | ||||
| -rw-r--r-- | board/freescale/mpc8544ds/u-boot.lds | 37 | ||||
| -rw-r--r-- | board/freescale/mpc8548cds/u-boot.lds | 37 | ||||
| -rw-r--r-- | board/freescale/mpc8555cds/u-boot.lds | 38 | ||||
| -rw-r--r-- | board/freescale/mpc8560ads/u-boot.lds | 42 | ||||
| -rw-r--r-- | board/freescale/mpc8568mds/u-boot.lds | 40 | ||||
| -rw-r--r-- | board/idmr/mii.c | 2 | ||||
| -rw-r--r-- | board/ids8247/ids8247.c | 2 | ||||
| -rw-r--r-- | board/matrix_vision/mvbc_p/mvbc_p.c | 3 | ||||
| -rw-r--r-- | board/tqc/tqm85xx/tqm85xx.c | 3 | ||||
| -rw-r--r-- | board/w7o/post2.c | 6 | 
24 files changed, 126 insertions, 1115 deletions
| diff --git a/board/adsvix/Makefile b/board/adsvix/Makefile deleted file mode 100644 index 05601b48d..000000000 --- a/board/adsvix/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# 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).a - -COBJS	:= adsvix.o pcmcia.o -SOBJS	:= lowlevel_init.o pxavoltage.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS)) -SOBJS	:= $(addprefix $(obj),$(SOBJS)) - -$(LIB):	$(obj).depend $(OBJS) $(SOBJS) -	$(AR) $(ARFLAGS) $@ $(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/adsvix/adsvix.c b/board/adsvix/adsvix.c deleted file mode 100644 index c430d634e..000000000 --- a/board/adsvix/adsvix.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * (C) Copyright 2004 - * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net - * - * (C) Copyright 2002 - * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net - * - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger@sysgo.de> - * - * 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> - -DECLARE_GLOBAL_DATA_PTR; - -/* ------------------------------------------------------------------------- */ - -/* - * Miscelaneous platform dependent initialisations - */ - -int board_init (void) -{ -	/* memory and cpu-speed are setup before relocation */ -	/* so we do _nothing_ here */ - -	/* arch number of ADSVIX-Board */ -	gd->bd->bi_arch_number = 620; - -	/* adress of boot parameters */ -	gd->bd->bi_boot_params = 0xa000003c; - -	return 0; -} - -int board_late_init(void) -{ -	setenv("stdout", "serial"); -	setenv("stderr", "serial"); -	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; -	gd->bd->bi_dram[1].start = PHYS_SDRAM_2; -	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; -	gd->bd->bi_dram[2].start = PHYS_SDRAM_3; -	gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; -	gd->bd->bi_dram[3].start = PHYS_SDRAM_4; -	gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; - -	return 0; -} diff --git a/board/adsvix/config.mk b/board/adsvix/config.mk deleted file mode 100644 index 98be4ebe0..000000000 --- a/board/adsvix/config.mk +++ /dev/null @@ -1 +0,0 @@ -TEXT_BASE = 0xa1700000 diff --git a/board/adsvix/lowlevel_init.S b/board/adsvix/lowlevel_init.S deleted file mode 100644 index 8dea71c35..000000000 --- a/board/adsvix/lowlevel_init.S +++ /dev/null @@ -1,466 +0,0 @@ -/* - * This was originally from the Lubbock u-boot port. - * - * Most of this taken from Redboot hal_platform_setup.h with cleanup - * - * NOTE: I haven't clean this up considerably, just enough to get it - * running. See hal_platform_setup.h for the source. See - * board/cradle/lowlevel_init.S for another PXA250 setup that is - * much cleaner. - * - * 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> -#include <asm/arch/pxa-regs.h> - -/* wait for coprocessor write complete */ -   .macro CPWAIT reg -   mrc	p15,0,\reg,c2,c0,0 -   mov	\reg,\reg -   sub	pc,pc,#4 -   .endm - - -/* - *	Memory setup - */ - -.globl lowlevel_init -lowlevel_init: - -	/* Set up GPIO pins first ----------------------------------------- */ - -	ldr		r0,	=GPSR0 -	ldr		r1,	=CFG_GPSR0_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPSR1 -	ldr		r1,	=CFG_GPSR1_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPSR2 -	ldr		r1,	=CFG_GPSR2_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPSR3 -	ldr		r1,	=CFG_GPSR3_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPCR0 -	ldr		r1,	=CFG_GPCR0_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPCR1 -	ldr		r1,	=CFG_GPCR1_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPCR2 -	ldr		r1,	=CFG_GPCR2_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPCR3 -	ldr		r1,	=CFG_GPCR3_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPDR0 -	ldr		r1,	=CFG_GPDR0_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPDR1 -	ldr		r1,	=CFG_GPDR1_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPDR2 -	ldr		r1,	=CFG_GPDR2_VAL -	str		r1,   [r0] - -	ldr		r0,	=GPDR3 -	ldr		r1,	=CFG_GPDR3_VAL -	str		r1,   [r0] - -	ldr		r0,	=GAFR0_L -	ldr		r1,	=CFG_GAFR0_L_VAL -	str		r1,   [r0] - -	ldr		r0,	=GAFR0_U -	ldr		r1,	=CFG_GAFR0_U_VAL -	str		r1,   [r0] - -	ldr		r0,	=GAFR1_L -	ldr		r1,	=CFG_GAFR1_L_VAL -	str		r1,   [r0] - -	ldr		r0,	=GAFR1_U -	ldr		r1,	=CFG_GAFR1_U_VAL -	str		r1,   [r0] - -	ldr		r0,	=GAFR2_L -	ldr		r1,	=CFG_GAFR2_L_VAL -	str		r1,   [r0] - -	ldr		r0,	=GAFR2_U -	ldr		r1,	=CFG_GAFR2_U_VAL -	str		r1,   [r0] - -	ldr		r0,	=GAFR3_L -	ldr		r1,	=CFG_GAFR3_L_VAL -	str		r1,   [r0] - -	ldr		r0,	=GAFR3_U -	ldr		r1,	=CFG_GAFR3_U_VAL -	str		r1,   [r0] - -	ldr		r0,	=PSSR		/* enable GPIO pins */ -	ldr		r1,	=CFG_PSSR_VAL -	str		r1,   [r0] - -	/* ---------------------------------------------------------------- */ -	/* Enable memory interface					    */ -	/*								    */ -	/* The sequence below is based on the recommended init steps	    */ -	/* detailed in the Intel PXA250 Operating Systems Developers Guide, */ -	/* Chapter 10.							    */ -	/* ---------------------------------------------------------------- */ - -	/* ---------------------------------------------------------------- */ -	/* Step 1: Wait for at least 200 microsedonds to allow internal	    */ -	/*	   clocks to settle. Only necessary after hard reset...	    */ -	/*	   FIXME: can be optimized later			    */ -	/* ---------------------------------------------------------------- */ - -	ldr r3, =OSCR			/* reset the OS Timer Count to zero */ -	mov r2, #0 -	str r2, [r3] -	ldr r4, =0x300			/* really 0x2E1 is about 200usec,   */ -					/* so 0x300 should be plenty	    */ -1: -	ldr r2, [r3] -	cmp r4, r2 -	bgt 1b - -mem_init: - -	ldr	r1,  =MEMC_BASE		/* get memory controller base addr. */ - -	/* ---------------------------------------------------------------- */ -	/* Step 2a: Initialize Asynchronous static memory controller	    */ -	/* ---------------------------------------------------------------- */ - -	/* MSC registers: timing, bus width, mem type			    */ - -	/* MSC0: nCS(0,1)						    */ -	ldr	r2,   =CFG_MSC0_VAL -	str	r2,   [r1, #MSC0_OFFSET] -	ldr	r2,   [r1, #MSC0_OFFSET]	/* read back to ensure	    */ -						/* that data latches	    */ -	/* MSC1: nCS(2,3)						    */ -	ldr	r2,  =CFG_MSC1_VAL -	str	r2,  [r1, #MSC1_OFFSET] -	ldr	r2,  [r1, #MSC1_OFFSET] - -	/* MSC2: nCS(4,5)						    */ -	ldr	r2,  =CFG_MSC2_VAL -	str	r2,  [r1, #MSC2_OFFSET] -	ldr	r2,  [r1, #MSC2_OFFSET] - -	/* ---------------------------------------------------------------- */ -	/* Step 2b: Initialize Card Interface				    */ -	/* ---------------------------------------------------------------- */ - -	/* MECR: Memory Expansion Card Register				    */ -	ldr	r2,  =CFG_MECR_VAL -	str	r2,  [r1, #MECR_OFFSET] -	ldr	r2,	[r1, #MECR_OFFSET] - -	/* MCMEM0: Card Interface slot 0 timing				    */ -	ldr	r2,  =CFG_MCMEM0_VAL -	str	r2,  [r1, #MCMEM0_OFFSET] -	ldr	r2,	[r1, #MCMEM0_OFFSET] - -	/* MCMEM1: Card Interface slot 1 timing				    */ -	ldr	r2,  =CFG_MCMEM1_VAL -	str	r2,  [r1, #MCMEM1_OFFSET] -	ldr	r2,	[r1, #MCMEM1_OFFSET] - -	/* MCATT0: Card Interface Attribute Space Timing, slot 0	    */ -	ldr	r2,  =CFG_MCATT0_VAL -	str	r2,  [r1, #MCATT0_OFFSET] -	ldr	r2,	[r1, #MCATT0_OFFSET] - -	/* MCATT1: Card Interface Attribute Space Timing, slot 1	    */ -	ldr	r2,  =CFG_MCATT1_VAL -	str	r2,  [r1, #MCATT1_OFFSET] -	ldr	r2,	[r1, #MCATT1_OFFSET] - -	/* MCIO0: Card Interface I/O Space Timing, slot 0		    */ -	ldr	r2,  =CFG_MCIO0_VAL -	str	r2,  [r1, #MCIO0_OFFSET] -	ldr	r2,	[r1, #MCIO0_OFFSET] - -	/* MCIO1: Card Interface I/O Space Timing, slot 1		    */ -	ldr	r2,  =CFG_MCIO1_VAL -	str	r2,  [r1, #MCIO1_OFFSET] -	ldr	r2,	[r1, #MCIO1_OFFSET] - -	/* ---------------------------------------------------------------- */ -	/* Step 2c: Write FLYCNFG  FIXME: what's that???		    */ -	/* ---------------------------------------------------------------- */ -	ldr	r2,  =CFG_FLYCNFG_VAL -	str	r2,  [r1, #FLYCNFG_OFFSET] -	str	r2,	[r1, #FLYCNFG_OFFSET] - -	/* ---------------------------------------------------------------- */ -	/* Step 2d: Initialize Timing for Sync Memory (SDCLK0)		    */ -	/* ---------------------------------------------------------------- */ - -	/* Before accessing MDREFR we need a valid DRI field, so we set	    */ -	/* this to power on defaults + DRI field.			    */ - -	ldr	r4,	[r1, #MDREFR_OFFSET] -	ldr	r2,	=0xFFF -	bic	r4,	r4, r2 - -	ldr	r3,	=CFG_MDREFR_VAL -	and	r3,	r3,  r2 - -	orr	r4,	r4, r3 -	str	r4,	[r1, #MDREFR_OFFSET]	/* write back MDREFR	    */ - -	orr	r4,  r4, #MDREFR_K0RUN -	orr	r4,  r4, #MDREFR_K0DB4 -	orr	r4,  r4, #MDREFR_K0FREE -	orr	r4,  r4, #MDREFR_K0DB2 -	orr	r4,  r4, #MDREFR_K1DB2 -	bic	r4,  r4, #MDREFR_K1FREE -	bic	r4,  r4, #MDREFR_K2FREE - -	str	r4,	[r1, #MDREFR_OFFSET]	/* write back MDREFR	    */ -	ldr	r4,  [r1, #MDREFR_OFFSET] - -	/* Note: preserve the mdrefr value in r4			    */ - - -	/* ---------------------------------------------------------------- */ -	/* Step 3: Initialize Synchronous Static Memory (Flash/Peripherals) */ -	/* ---------------------------------------------------------------- */ - -	/* Initialize SXCNFG register. Assert the enable bits		    */ - -	/* Write SXMRS to cause an MRS command to all enabled banks of	    */ -	/* synchronous static memory. Note that SXLCR need not be written   */ -	/* at this time.						    */ - -	ldr	r2,  =CFG_SXCNFG_VAL -	str	r2,  [r1, #SXCNFG_OFFSET] - -	/* ---------------------------------------------------------------- */ -	/* Step 4: Initialize SDRAM					    */ -	/* ---------------------------------------------------------------- */ - -	bic	r4, r4, #(MDREFR_K2FREE |MDREFR_K1FREE | MDREFR_K0FREE) - -	orr	r4, r4, #MDREFR_K1RUN -	bic	r4, r4, #MDREFR_K2DB2 -	str	r4, [r1, #MDREFR_OFFSET] -	ldr	r4, [r1, #MDREFR_OFFSET] - -	bic	r4, r4, #MDREFR_SLFRSH -	str	r4, [r1, #MDREFR_OFFSET] -	ldr	r4, [r1, #MDREFR_OFFSET] - -	orr	r4, r4, #MDREFR_E1PIN -	str	r4, [r1, #MDREFR_OFFSET] -	ldr	r4, [r1, #MDREFR_OFFSET] - -	nop -	nop - - -	/* Step 4d: write MDCNFG with MDCNFG:DEx deasserted (set to 0), to  */ -	/*	    configure but not enable each SDRAM partition pair.	    */ - -	ldr	r4,	=CFG_MDCNFG_VAL -	bic	r4,	r4,	#(MDCNFG_DE0|MDCNFG_DE1) -	bic	r4,	r4,	#(MDCNFG_DE2|MDCNFG_DE3) - -	str	r4,	[r1, #MDCNFG_OFFSET]	/* write back MDCNFG	    */ -	ldr	r4,	[r1, #MDCNFG_OFFSET] - - -	/* Step 4e: Wait for the clock to the SDRAMs to stabilize,	    */ -	/*	    100..200 µsec.					    */ - -	ldr r3, =OSCR			/* reset the OS Timer Count to zero */ -	mov r2, #0 -	str r2, [r3] -	ldr r4, =0x300			/* really 0x2E1 is about 200usec,   */ -					/* so 0x300 should be plenty	    */ -1: -	    ldr r2, [r3] -	    cmp r4, r2 -	    bgt 1b - - -	/* Step 4f: Trigger a number (usually 8) refresh cycles by	    */ -	/*	    attempting non-burst read or write accesses to disabled */ -	/*	    SDRAM, as commonly specified in the power up sequence   */ -	/*	    documented in SDRAM data sheets. The address(es) used   */ -	/*	    for this purpose must not be cacheable.		    */ - -	ldr	r3,	=CFG_DRAM_BASE -	str	r2,	[r3] -	str	r2,	[r3] -	str	r2,	[r3] -	str	r2,	[r3] -	str	r2,	[r3] -	str	r2,	[r3] -	str	r2,	[r3] -	str	r2,	[r3] - - -	/* Step 4g: Write MDCNFG with enable bits asserted		    */ -	/*	    (MDCNFG:DEx set to 1).				    */ - -	ldr	r3,	[r1, #MDCNFG_OFFSET] -	mov	r4, r3 -	orr	r3,	r3,	#MDCNFG_DE0 -	str	r3,	[r1, #MDCNFG_OFFSET] -	mov	r0, r3 - -	/* Step 4h: Write MDMRS.					    */ - -	ldr	r2,  =CFG_MDMRS_VAL -	str	r2,  [r1, #MDMRS_OFFSET] - -	/* enable APD */ -	ldr	r3,  [r1, #MDREFR_OFFSET] -	orr	r3,  r3,  #MDREFR_APD -	str	r3,  [r1, #MDREFR_OFFSET] - -	/* We are finished with Intel's memory controller initialisation    */ - -setvoltage: - -	mov	r10,	lr -	bl	initPXAvoltage	/* In case the board is rebooting with a    */ -	mov	lr,	r10	/* low voltage raise it up to a good one.   */ - -wakeup: -	/* Are we waking from sleep? */ -	ldr	r0,	=RCSR -	ldr	r1,	[r0] -	and	r1,	r1, #(RCSR_GPR | RCSR_SMR | RCSR_WDR | RCSR_HWR) -	str	r1,	[r0] -	teq	r1,	#RCSR_SMR - -	bne	initirqs - -	ldr	r0,	=PSSR -	mov	r1,	#PSSR_PH -	str	r1,	[r0] - -	/* if so, resume at PSPR */ -	ldr	r0,	=PSPR -	ldr	r1,	[r0] -	mov	pc,	r1 - -	/* ---------------------------------------------------------------- */ -	/* Disable (mask) all interrupts at interrupt controller	    */ -	/* ---------------------------------------------------------------- */ - -initirqs: - -	mov	r1,  #0		/* clear int. level register (IRQ, not FIQ) */ -	ldr	r2,  =ICLR -	str	r1,  [r2] - -	ldr	r2,  =ICMR	/* mask all interrupts at the controller    */ -	str	r1,  [r2] - -	/* ---------------------------------------------------------------- */ -	/* Clock initialisation						    */ -	/* ---------------------------------------------------------------- */ - -initclks: - -	/* Disable the peripheral clocks, and set the core clock frequency  */ - -	/* Turn Off on-chip peripheral clocks (except for memory)	    */ -	/* for re-configuration.					    */ -	ldr	r1,  =CKEN -	ldr	r2,  =CFG_CKEN -	str	r2,  [r1] - -	/* ... and write the core clock config register			    */ -	ldr	r2,  =CFG_CCCR -	ldr	r1,  =CCCR -	str	r2,  [r1] - -	/* Turn on turbo mode */ -	mrc	p14, 0, r2, c6, c0, 0 -	orr	r2, r2, #0xB		/* Turbo, Fast-Bus, Freq change**/ -	mcr	p14, 0, r2, c6, c0, 0 - -	/* Re-write MDREFR */ -	ldr	r1, =MEMC_BASE -	ldr	r2, [r1, #MDREFR_OFFSET] -	str	r2, [r1, #MDREFR_OFFSET] -#ifdef RTC -	/* enable the 32Khz oscillator for RTC and PowerManager		    */ -	ldr	r1,  =OSCC -	mov	r2,  #OSCC_OON -	str	r2,  [r1] - -	/* NOTE:  spin here until OSCC.OOK get set, meaning the PLL	    */ -	/* has settled.							    */ -60: -	ldr	r2, [r1] -	ands	r2, r2, #1 -	beq	60b -#else -#error "RTC not defined" -#endif - -	/* Interrupt init: Mask all interrupts				    */ -    ldr r0, =ICMR /* enable no sources */ -	mov r1, #0 -    str r1, [r0] -	/* FIXME */ - -#ifdef NODEBUG -	/*Disable software and data breakpoints */ -	mov	r0,#0 -	mcr	p15,0,r0,c14,c8,0  /* ibcr0 */ -	mcr	p15,0,r0,c14,c9,0  /* ibcr1 */ -	mcr	p15,0,r0,c14,c4,0  /* dbcon */ - -	/*Enable all debug functionality */ -	mov	r0,#0x80000000 -	mcr	p14,0,r0,c10,c0,0  /* dcsr */ -#endif - -	/* ---------------------------------------------------------------- */ -	/* End lowlevel_init							    */ -	/* ---------------------------------------------------------------- */ - -endlowlevel_init: - -	mov	pc, lr diff --git a/board/adsvix/pcmcia.c b/board/adsvix/pcmcia.c deleted file mode 100644 index ba5be0139..000000000 --- a/board/adsvix/pcmcia.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * (C) Copyright 2004 - * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net - * - * 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 <asm/arch/pxa-regs.h> - -void pcmcia_power_on(void) -{ -#if 0 -	if (!(GPLR(20) & GPIO_bit(20))) { /* 3.3V */ -		GPCR(81) = GPIO_bit(81); -		GPSR(82) = GPIO_bit(82); -	} -	else if (!(GPLR(21) & GPIO_bit(21))) { /* 5.0V */ -		GPCR(81) = GPIO_bit(81); -		GPCR(82) = GPIO_bit(82); -	} -#else -#warning "Board will only supply 5V, wait for next HW spin for selectable power" -	/* 5.0V */ -	GPCR(81) = GPIO_bit(81); -	GPCR(82) = GPIO_bit(82); -#endif - -	udelay(300000); - -	/* reset the card */ -	GPSR(52) = GPIO_bit(52); - -	/* enable PCMCIA */ -	GPCR(83) = GPIO_bit(83); - -	/* clear reset */ -	udelay(10); -	GPCR(52) = GPIO_bit(52); - -	udelay(20000); -} - -void pcmcia_power_off(void) -{ -	/* 0V */ -	GPSR(81) = GPIO_bit(81); -	GPSR(82) = GPIO_bit(82); -	/* disable PCMCIA */ -	GPSR(83) = GPIO_bit(83); -} diff --git a/board/adsvix/pxavoltage.S b/board/adsvix/pxavoltage.S deleted file mode 100644 index 2fe1cabd7..000000000 --- a/board/adsvix/pxavoltage.S +++ /dev/null @@ -1,230 +0,0 @@ -/* - * (C) Copyright 2004 - * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net - * - * 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 <asm/arch/pxa-regs.h> - -#define LTC1663_ADDR    0x20 - -#define LTC1663_SY	0x01	/* Sync ACK */ -#define LTC1663_SD	0x04	/* shutdown */ -#define LTC1663_BG	0x04	/* Internal Voltage Ref */ - -#define VOLT_1_55         18    /* DAC value for 1.55V */ - -		.global	initPXAvoltage - -@ Set the voltage to 1.55V early in the boot process so we can run -@ at a high clock speed and boot quickly.  Note that this is necessary -@ because the reset button does not reset the CPU voltage, so if the -@ voltage was low (say 0.85V) then the CPU would crash without this -@ routine - -@ This routine clobbers r0-r4 - -initializei2c: - -		ldr	r2, =CKEN -		ldr	r3, [r2] -		orr	r3, r3, #CKEN15_PWRI2C -		str	r3, [r2] - -		ldr	r2, =PCFR -		ldr	r3, [r2] -		orr	r3, r3, #PCFR_PI2C_EN -		str	r3, [r2] - -		/* delay for about 250msec -		 */ -		ldr	r3, =OSCR -		mov	r2, #0 -		str	r2, [r3] -		ldr	r1, =0xC0000 - -1: -		ldr	r2, [r3] -		cmp	r1, r2 -		bgt	1b -		ldr	r0, =PWRICR -		ldr	r1, [r0] -		bic	r1, r1, #(ICR_MA | ICR_START | ICR_STOP) -		str	r1, [r0] - -		orr	r1, r1, #ICR_UR -		str	r1, [r0] - -		ldr	r2, =PWRISR -		ldr	r3, =0x7ff -		str	r3, [r2] - -		bic	r1, r1, #ICR_UR -		str	r1, [r0] - -		mov	r1, #(ICR_GCD | ICR_SCLE) -		str	r1, [r0] - -		orr	r1, r1, #ICR_IUE -		str	r1, [r0] - -		orr	r1, r1, #ICR_FM -		str	r1, [r0] - -		/* delay for about 1msec -		 */ -		ldr	r3, =OSCR -		mov	r2, #0 -		str	r2, [r3] -		ldr	r1, =0xC00 - -1: -		ldr	r2, [r3] -		cmp	r1, r2 -		bgt	1b -		mov	pc, lr - -sendbytei2c: -		ldr	r3, =PWRIDBR -		str	r0, [r3] -		ldr	r3, =PWRICR -		ldr	r0, [r3] -		orr	r0, r0, r1 -		bic	r0, r0, r2 -		str	r0, [r3] -		orr	r0, r0, #ICR_TB -		str	r0, [r3] - -		mov	r2, #0x100000 - -waitfortxemptyi2c: - -		ldr	r0, =PWRISR -		ldr	r1, [r0] - -		/* take it from the top if we don't get empty after a while */ -		subs	r2, r2, #1 -		moveq	lr, r4 -		beq	initPXAvoltage - -		tst	r1, #ISR_ITE - -		beq	waitfortxemptyi2c - -		orr	r1, r1, #ISR_ITE -		str	r1, [r0] - -		mov	pc, lr - -initPXAvoltage: - -		mov	r4, lr - -		bl	setleds - -		bl	initializei2c - -		bl	setleds - -		/* now send the real message to set the correct voltage */ -		ldr	r0, =LTC1663_ADDR -		mov	r0, r0, LSL #1 -		mov	r1, #ICR_START -		ldr	r2, =(ICR_STOP | ICR_ALDIE | ICR_ACKNAK) -		bl	sendbytei2c - -		bl	setleds - -		mov	r0, #LTC1663_BG -		mov	r1, #0 -		mov	r2, #(ICR_STOP | ICR_START) -		bl	sendbytei2c - -		bl	setleds - -		ldr	r0, =VOLT_1_55 -		and	r0, r0, #0xff -		mov	r1, #0 -		mov	r2, #(ICR_STOP | ICR_START) -		bl	sendbytei2c - -		bl	setleds - -		ldr	r0, =VOLT_1_55 -		mov	r0, r0, ASR #8 -		and	r0, r0, #0xff -		mov	r1, #ICR_STOP -		mov	r2, #ICR_START -		bl	sendbytei2c - -		bl	setleds - -		@ delay a little for the volatage to stablize -		ldr	r3, =OSCR -		mov	r2, #0 -		str	r2, [r3] -		ldr	r1, =0xC0 - -1: -		ldr	r2, [r3] -		cmp	r1, r2 -		bgt	1b -		mov	pc, r4 - -setleds: -	mov		pc, lr - -	ldr		r5, =0x40e00058 -	ldr		r3, [r5] -	bic		r3, r3, #0x3 -	str		r3, [r5] -	ldr		r5, =0x40e0000c -	ldr		r3, [r5] -	orr		r3, r3, #0x00010000 -	str		r3, [r5] - -	@ inner loop -	mov		r0, #0x2 -1: - -	ldr		r5, =0x40e00018 -	mov		r3, #0x00010000 -	str		r3, [r5] - -	@ outer loop -	mov		r3, #0x00F00000 -2: -	subs		r3, r3, #1 -	bne		2b - -	ldr		r5, =0x40e00024 -	mov		r3, #0x00010000 -	str		r3, [r5] - -	@ outer loop -	mov		r3, #0x00F00000 -3: -	subs		r3, r3, #1 -	bne		3b - -	subs		r0, r0, #1 -	bne		1b - -	mov		pc, lr diff --git a/board/adsvix/u-boot.lds b/board/adsvix/u-boot.lds deleted file mode 100644 index 14d264a68..000000000 --- a/board/adsvix/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * 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 - */ - -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) -ENTRY(_start) -SECTIONS -{ -	. = 0x00000000; - -	. = ALIGN(4); -	.text      : -	{ -	  cpu/pxa/start.o	(.text) -	  *(.text) -	} - -	. = ALIGN(4); -	.rodata : { *(.rodata) } - -	. = ALIGN(4); -	.data : { *(.data) } - -	. = ALIGN(4); -	.got : { *(.got) } - -	. = .; -	__u_boot_cmd_start = .; -	.u_boot_cmd : { *(.u_boot_cmd) } -	__u_boot_cmd_end = .; - -	. = ALIGN(4); -	__bss_start = .; -	.bss (NOLOAD) : { *(.bss) } -	_end = .; -} diff --git a/board/atmel/atngw100/atngw100.c b/board/atmel/atngw100/atngw100.c index f2c3e7979..4ead5336c 100644 --- a/board/atmel/atngw100/atngw100.c +++ b/board/atmel/atngw100/atngw100.c @@ -81,7 +81,7 @@ phys_size_t initdram(int board_type)  	unmap_physmem(sdram_base, EBI_SDRAM_SIZE);  	if (expected_size != actual_size) -		printf("Warning: Only %u of %u MiB SDRAM is working\n", +		printf("Warning: Only %lu of %lu MiB SDRAM is working\n",  				actual_size >> 20, expected_size >> 20);  	return actual_size; diff --git a/board/atmel/atstk1000/atstk1000.c b/board/atmel/atstk1000/atstk1000.c index 6371e2d4e..d284fc143 100644 --- a/board/atmel/atstk1000/atstk1000.c +++ b/board/atmel/atstk1000/atstk1000.c @@ -104,7 +104,7 @@ phys_size_t initdram(int board_type)  	unmap_physmem(sdram_base, EBI_SDRAM_SIZE);  	if (expected_size != actual_size) -		printf("Warning: Only %u of %u MiB SDRAM is working\n", +		printf("Warning: Only %lu of %lu MiB SDRAM is working\n",  				actual_size >> 20, expected_size >> 20);  	return actual_size; diff --git a/board/atmel/atstk1000/flash.c b/board/atmel/atstk1000/flash.c index 12537f314..e2bfd4aff 100644 --- a/board/atmel/atstk1000/flash.c +++ b/board/atmel/atstk1000/flash.c @@ -70,7 +70,7 @@ unsigned long flash_init(void)  void flash_print_info(flash_info_t *info)  { -	printf("Flash: Vendor ID: 0x%02x, Product ID: 0x%02x\n", +	printf("Flash: Vendor ID: 0x%02lx, Product ID: 0x%02lx\n",  	       info->flash_id >> 16, info->flash_id & 0xffff);  	printf("Size: %ld MB in %d sectors\n",  	       info->size >> 10, info->sector_count); diff --git a/board/esd/common/flash.c b/board/esd/common/flash.c index dca10be1b..bda361ead 100644 --- a/board/esd/common/flash.c +++ b/board/esd/common/flash.c @@ -22,7 +22,9 @@   */  #include <common.h> +#ifdef __PPC__  #include <ppc4xx.h> +#endif  #include <asm/processor.h>  flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/ diff --git a/board/freescale/m5275evb/Makefile b/board/freescale/m5275evb/Makefile index f337a7563..74c252869 100644 --- a/board/freescale/m5275evb/Makefile +++ b/board/freescale/m5275evb/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk  LIB	= $(obj)lib$(BOARD).a -OBJS	= $(BOARD).o mii.o +COBJS	= $(BOARD).o mii.o  SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)  OBJS	:= $(addprefix $(obj),$(COBJS)) diff --git a/board/freescale/mpc8540ads/u-boot.lds b/board/freescale/mpc8540ads/u-boot.lds index f200810f0..0e4f5a245 100644 --- a/board/freescale/mpc8540ads/u-boot.lds +++ b/board/freescale/mpc8540ads/u-boot.lds @@ -2,6 +2,8 @@   * (C) Copyright 2002,2003, Motorola,Inc.   * Xianghua Xiao, X.Xiao@motorola.com.   * + * Copyright 2008 Freescale Semiconductor, Inc. + *   * See file CREDITS for list of people who contributed to this   * project.   * @@ -26,16 +28,6 @@ OUTPUT_ARCH(powerpc)     __DYNAMIC = 0;    */  SECTIONS  { -  .resetvec 0xFFFFFFFC : -  { -    *(.resetvec) -  } = 0xffff - -  .bootpg 0xFFFFF000 : -  { -    cpu/mpc85xx/start.o	(.bootpg) -  } = 0xffff -    /* Read-only sections, merged into text segment: */    . = + SIZEOF_HEADERS;    .interp : { *(.interp) } @@ -62,17 +54,6 @@ SECTIONS    .plt : { *(.plt) }    .text      :    { -    cpu/mpc85xx/start.o	(.text) -    cpu/mpc85xx/traps.o (.text) -    cpu/mpc85xx/interrupts.o (.text) -    cpu/mpc85xx/cpu_init.o (.text) -    cpu/mpc85xx/cpu.o (.text) -    cpu/mpc85xx/speed.o (.text) -    cpu/mpc85xx/pci.o (.text) -    common/dlmalloc.o (.text) -    lib_generic/crc32.o (.text) -    lib_ppc/extable.o (.text) -    lib_generic/zlib.o (.text)      *(.text)      *(.fixup)      *(.got1) @@ -134,6 +115,18 @@ SECTIONS    . = ALIGN(256);    __init_end = .; +  .bootpg ADDR(.text) + 0x7f000 : +  { +    cpu/mpc85xx/start.o	(.bootpg) +  } = 0xffff + +  .resetvec ADDR(.text) + 0x7fffc : +  { +    *(.resetvec) +  } = 0xffff + +  . = ADDR(.text) + 0x80000; +    __bss_start = .;    .bss (NOLOAD)       :    { @@ -142,6 +135,8 @@ SECTIONS     *(.bss)     *(COMMON)    } + +  . = ALIGN(4);    _end = . ;    PROVIDE (end = .);  } diff --git a/board/freescale/mpc8541cds/u-boot.lds b/board/freescale/mpc8541cds/u-boot.lds index 5f4dcf021..1c583de83 100644 --- a/board/freescale/mpc8541cds/u-boot.lds +++ b/board/freescale/mpc8541cds/u-boot.lds @@ -1,5 +1,5 @@  /* - * Copyright 2004 Freescale Semiconductor. + * Copyright 2004, 2008 Freescale Semiconductor.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -25,16 +25,6 @@ OUTPUT_ARCH(powerpc)     __DYNAMIC = 0;    */  SECTIONS  { -  .resetvec 0xFFFFFFFC : -  { -    *(.resetvec) -  } = 0xffff - -  .bootpg 0xFFFFF000 : -  { -    cpu/mpc85xx/start.o	(.bootpg) -  } = 0xffff -    /* Read-only sections, merged into text segment: */    . = + SIZEOF_HEADERS;    .interp : { *(.interp) } @@ -61,18 +51,6 @@ SECTIONS    .plt : { *(.plt) }    .text      :    { -    cpu/mpc85xx/start.o	(.text) -    cpu/mpc85xx/traps.o (.text) -    cpu/mpc85xx/interrupts.o (.text) -    cpu/mpc85xx/cpu_init.o (.text) -    cpu/mpc85xx/cpu.o (.text) -    drivers/net/tsec.o (.text) -    cpu/mpc85xx/speed.o (.text) -    cpu/mpc85xx/pci.o (.text) -    common/dlmalloc.o (.text) -    lib_generic/crc32.o (.text) -    lib_ppc/extable.o (.text) -    lib_generic/zlib.o (.text)      *(.text)      *(.fixup)      *(.got1) @@ -134,6 +112,18 @@ SECTIONS    . = ALIGN(256);    __init_end = .; +  .bootpg ADDR(.text) + 0x7f000 : +  { +    cpu/mpc85xx/start.o	(.bootpg) +  } = 0xffff + +  .resetvec ADDR(.text) + 0x7fffc : +  { +    *(.resetvec) +  } = 0xffff + +  . = ADDR(.text) + 0x80000; +    __bss_start = .;    .bss (NOLOAD)       :    { @@ -142,6 +132,8 @@ SECTIONS     *(.bss)     *(COMMON)    } + +  . = ALIGN(4);    _end = . ;    PROVIDE (end = .);  } diff --git a/board/freescale/mpc8544ds/u-boot.lds b/board/freescale/mpc8544ds/u-boot.lds index c66c69fcb..500e6475a 100644 --- a/board/freescale/mpc8544ds/u-boot.lds +++ b/board/freescale/mpc8544ds/u-boot.lds @@ -1,5 +1,5 @@  /* - * Copyright 2007 Freescale Semiconductor, Inc. + * Copyright 2007-2008 Freescale Semiconductor, Inc.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -25,16 +25,6 @@ OUTPUT_ARCH(powerpc)     __DYNAMIC = 0;    */  SECTIONS  { -  .resetvec 0xFFFFFFFC : -  { -    *(.resetvec) -  } = 0xffff - -  .bootpg 0xFFFFF000 : -  { -    cpu/mpc85xx/start.o	(.bootpg) -  } = 0xffff -    /* Read-only sections, merged into text segment: */    . = + SIZEOF_HEADERS;    .interp : { *(.interp) } @@ -61,17 +51,6 @@ SECTIONS    .plt : { *(.plt) }    .text      :    { -    cpu/mpc85xx/start.o	(.text) -    cpu/mpc85xx/traps.o (.text) -    cpu/mpc85xx/interrupts.o (.text) -    cpu/mpc85xx/cpu_init.o (.text) -    cpu/mpc85xx/cpu.o (.text) -    cpu/mpc85xx/speed.o (.text) -    common/dlmalloc.o (.text) -    lib_generic/crc32.o (.text) -    lib_ppc/extable.o (.text) -    lib_generic/zlib.o (.text) -    drivers/bios_emulator/atibios.o (.text)      *(.text)      *(.fixup)      *(.got1) @@ -133,6 +112,18 @@ SECTIONS    . = ALIGN(256);    __init_end = .; +  .bootpg ADDR(.text) + 0x7f000 : +  { +    cpu/mpc85xx/start.o	(.bootpg) +  } = 0xffff + +  .resetvec ADDR(.text) + 0x7fffc : +  { +    *(.resetvec) +  } = 0xffff + +  . = ADDR(.text) + 0x80000; +    __bss_start = .;    .bss (NOLOAD)       :    { @@ -141,6 +132,8 @@ SECTIONS     *(.bss)     *(COMMON)    } + +  . = ALIGN(4);    _end = . ;    PROVIDE (end = .);  } diff --git a/board/freescale/mpc8548cds/u-boot.lds b/board/freescale/mpc8548cds/u-boot.lds index eba7e8a9d..6b9339511 100644 --- a/board/freescale/mpc8548cds/u-boot.lds +++ b/board/freescale/mpc8548cds/u-boot.lds @@ -1,5 +1,5 @@  /* - * Copyright 2004, 2007 Freescale Semiconductor. + * Copyright 2004, 2007-2008 Freescale Semiconductor, Inc.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -25,16 +25,6 @@ OUTPUT_ARCH(powerpc)     __DYNAMIC = 0;    */  SECTIONS  { -  .resetvec 0xFFFFFFFC : -  { -    *(.resetvec) -  } = 0xffff - -  .bootpg 0xFFFFF000 : -  { -    cpu/mpc85xx/start.o	(.bootpg) -  } = 0xffff -    /* Read-only sections, merged into text segment: */    . = + SIZEOF_HEADERS;    .interp : { *(.interp) } @@ -61,17 +51,6 @@ SECTIONS    .plt : { *(.plt) }    .text      :    { -    cpu/mpc85xx/start.o	(.text) -    cpu/mpc85xx/traps.o (.text) -    cpu/mpc85xx/interrupts.o (.text) -    cpu/mpc85xx/cpu_init.o (.text) -    cpu/mpc85xx/cpu.o (.text) -    drivers/net/tsec.o (.text) -    cpu/mpc85xx/speed.o (.text) -    common/dlmalloc.o (.text) -    lib_generic/crc32.o (.text) -    lib_ppc/extable.o (.text) -    lib_generic/zlib.o (.text)      *(.text)      *(.fixup)      *(.got1) @@ -133,6 +112,18 @@ SECTIONS    . = ALIGN(256);    __init_end = .; +  .bootpg ADDR(.text) + 0x7f000 : +  { +    cpu/mpc85xx/start.o	(.bootpg) +  } = 0xffff + +  .resetvec ADDR(.text) + 0x7fffc : +  { +    *(.resetvec) +  } = 0xffff + +  . = ADDR(.text) + 0x80000; +    __bss_start = .;    .bss (NOLOAD)       :    { @@ -141,6 +132,8 @@ SECTIONS     *(.bss)     *(COMMON)    } + +  . = ALIGN(4);    _end = . ;    PROVIDE (end = .);  } diff --git a/board/freescale/mpc8555cds/u-boot.lds b/board/freescale/mpc8555cds/u-boot.lds index 5f4dcf021..a18b3a7b5 100644 --- a/board/freescale/mpc8555cds/u-boot.lds +++ b/board/freescale/mpc8555cds/u-boot.lds @@ -1,5 +1,5 @@  /* - * Copyright 2004 Freescale Semiconductor. + * Copyright 2004, 2008 Freescale Semiconductor, Inc.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -25,16 +25,6 @@ OUTPUT_ARCH(powerpc)     __DYNAMIC = 0;    */  SECTIONS  { -  .resetvec 0xFFFFFFFC : -  { -    *(.resetvec) -  } = 0xffff - -  .bootpg 0xFFFFF000 : -  { -    cpu/mpc85xx/start.o	(.bootpg) -  } = 0xffff -    /* Read-only sections, merged into text segment: */    . = + SIZEOF_HEADERS;    .interp : { *(.interp) } @@ -61,18 +51,6 @@ SECTIONS    .plt : { *(.plt) }    .text      :    { -    cpu/mpc85xx/start.o	(.text) -    cpu/mpc85xx/traps.o (.text) -    cpu/mpc85xx/interrupts.o (.text) -    cpu/mpc85xx/cpu_init.o (.text) -    cpu/mpc85xx/cpu.o (.text) -    drivers/net/tsec.o (.text) -    cpu/mpc85xx/speed.o (.text) -    cpu/mpc85xx/pci.o (.text) -    common/dlmalloc.o (.text) -    lib_generic/crc32.o (.text) -    lib_ppc/extable.o (.text) -    lib_generic/zlib.o (.text)      *(.text)      *(.fixup)      *(.got1) @@ -134,6 +112,18 @@ SECTIONS    . = ALIGN(256);    __init_end = .; +  .bootpg ADDR(.text) + 0x7f000 : +  { +    cpu/mpc85xx/start.o	(.bootpg) +  } = 0xffff + +  .resetvec ADDR(.text) + 0x7fffc : +  { +    *(.resetvec) +  } = 0xffff + +  . = ADDR(.text) + 0x80000; +    __bss_start = .;    .bss (NOLOAD)       :    { @@ -142,6 +132,8 @@ SECTIONS     *(.bss)     *(COMMON)    } + +  . = ALIGN(4);    _end = . ;    PROVIDE (end = .);  } diff --git a/board/freescale/mpc8560ads/u-boot.lds b/board/freescale/mpc8560ads/u-boot.lds index cb30ea9a2..0e4f5a245 100644 --- a/board/freescale/mpc8560ads/u-boot.lds +++ b/board/freescale/mpc8560ads/u-boot.lds @@ -1,7 +1,9 @@  /* - * (C) Copyright 2002,2003,Motorola,Inc. + * (C) Copyright 2002,2003, Motorola,Inc.   * Xianghua Xiao, X.Xiao@motorola.com.   * + * Copyright 2008 Freescale Semiconductor, Inc. + *   * See file CREDITS for list of people who contributed to this   * project.   * @@ -26,16 +28,6 @@ OUTPUT_ARCH(powerpc)     __DYNAMIC = 0;    */  SECTIONS  { -  .resetvec 0xFFFFFFFC : -  { -    *(.resetvec) -  } = 0xffff - -  .bootpg 0xFFFFF000 : -  { -    cpu/mpc85xx/start.o	(.bootpg) -  } = 0xffff -    /* Read-only sections, merged into text segment: */    . = + SIZEOF_HEADERS;    .interp : { *(.interp) } @@ -62,20 +54,6 @@ SECTIONS    .plt : { *(.plt) }    .text      :    { -    cpu/mpc85xx/start.o	(.text) -    cpu/mpc85xx/commproc.o (.text) -    cpu/mpc85xx/traps.o (.text) -    cpu/mpc85xx/interrupts.o (.text) -    cpu/mpc85xx/serial_scc.o (.text) -    cpu/mpc85xx/ether_fcc.o (.text) -    cpu/mpc85xx/cpu_init.o (.text) -    cpu/mpc85xx/cpu.o (.text) -    cpu/mpc85xx/speed.o (.text) -    cpu/mpc85xx/spd_sdram.o (.text) -    common/dlmalloc.o (.text) -    lib_generic/crc32.o (.text) -    lib_ppc/extable.o (.text) -    lib_generic/zlib.o (.text)      *(.text)      *(.fixup)      *(.got1) @@ -137,6 +115,18 @@ SECTIONS    . = ALIGN(256);    __init_end = .; +  .bootpg ADDR(.text) + 0x7f000 : +  { +    cpu/mpc85xx/start.o	(.bootpg) +  } = 0xffff + +  .resetvec ADDR(.text) + 0x7fffc : +  { +    *(.resetvec) +  } = 0xffff + +  . = ADDR(.text) + 0x80000; +    __bss_start = .;    .bss (NOLOAD)       :    { @@ -145,6 +135,8 @@ SECTIONS     *(.bss)     *(COMMON)    } + +  . = ALIGN(4);    _end = . ;    PROVIDE (end = .);  } diff --git a/board/freescale/mpc8568mds/u-boot.lds b/board/freescale/mpc8568mds/u-boot.lds index 1b83834c8..9d245e4ec 100644 --- a/board/freescale/mpc8568mds/u-boot.lds +++ b/board/freescale/mpc8568mds/u-boot.lds @@ -1,5 +1,5 @@  /* - * Copyright 2004-2007 Freescale Semiconductor. + * Copyright 2004-2008 Freescale Semiconductor, Inc.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -23,21 +23,8 @@  OUTPUT_ARCH(powerpc)  /* Do we need any of these for elf?     __DYNAMIC = 0;    */ -  SECTIONS  { - /* ELIOR - From RAM:  From FLASH: 0xFFFFFFFC*/ -  .resetvec 0xFFFFFFFC: -  { -    *(.resetvec) -  } = 0xffff - -  /*(ELIOR - From RAM:  From FLASH: 0xFFFFF000*/ -  .bootpg 0xFFFFF000: -  { -	cpu/mpc85xx/start.o	(.bootpg) -  } = 0xffff -    /* Read-only sections, merged into text segment: */    . = + SIZEOF_HEADERS;    .interp : { *(.interp) } @@ -64,17 +51,6 @@ SECTIONS    .plt : { *(.plt) }    .text      :    { -    cpu/mpc85xx/start.o	(.text) -    cpu/mpc85xx/traps.o (.text) -    cpu/mpc85xx/interrupts.o (.text) -    cpu/mpc85xx/cpu_init.o (.text) -    cpu/mpc85xx/cpu.o (.text) -    cpu/mpc85xx/speed.o (.text) -    cpu/mpc85xx/pci.o (.text) -    common/dlmalloc.o (.text) -    lib_generic/crc32.o (.text) -    lib_ppc/extable.o (.text) -    lib_generic/zlib.o (.text)      *(.text)      *(.fixup)      *(.got1) @@ -136,6 +112,18 @@ SECTIONS    . = ALIGN(256);    __init_end = .; +  .bootpg ADDR(.text) + 0x7f000 : +  { +    cpu/mpc85xx/start.o	(.bootpg) +  } = 0xffff + +  .resetvec ADDR(.text) + 0x7fffc : +  { +    *(.resetvec) +  } = 0xffff + +  . = ADDR(.text) + 0x80000; +    __bss_start = .;    .bss (NOLOAD)       :    { @@ -144,6 +132,8 @@ SECTIONS     *(.bss)     *(COMMON)    } + +  . = ALIGN(4);    _end = . ;    PROVIDE (end = .);  } diff --git a/board/idmr/mii.c b/board/idmr/mii.c index f130e6e53..78a7028bc 100644 --- a/board/idmr/mii.c +++ b/board/idmr/mii.c @@ -200,7 +200,7 @@ int mii_discover_phy(struct eth_device *dev)  }  #endif				/* CFG_DISCOVER_PHY */ -int mii_init(void) __attribute__((weak,alias("__mii_init"))); +void mii_init(void) __attribute__((weak,alias("__mii_init")));  void __mii_init(void)  { diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c index 44fc79cd5..065014a11 100644 --- a/board/ids8247/ids8247.c +++ b/board/ids8247/ids8247.c @@ -321,7 +321,7 @@ nand_init (void)  	printf ("%4lu MB\n", totlen >>20);  } -#endif	/* CFG_CMD_NAND */ +#endif	/* CONFIG_CMD_NAND */  #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)  /* diff --git a/board/matrix_vision/mvbc_p/mvbc_p.c b/board/matrix_vision/mvbc_p/mvbc_p.c index b61e84e38..5c71dec82 100644 --- a/board/matrix_vision/mvbc_p/mvbc_p.c +++ b/board/matrix_vision/mvbc_p/mvbc_p.c @@ -32,6 +32,7 @@  #include <malloc.h>  #include <pci.h>  #include <i2c.h> +#include <fpga.h>  #include <environment.h>  #include <fdt_support.h>  #include <asm/io.h> @@ -109,7 +110,7 @@ void mvbc_init_gpio(void)  	struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio*)MPC5XXX_GPIO;  	printf("Ports : 0x%08x\n", gpio->port_config); -	printf("PORCFG: 0x%08x\n", *(vu_long*)MPC5XXX_CDM_PORCFG); +	printf("PORCFG: 0x%08lx\n", *(vu_long*)MPC5XXX_CDM_PORCFG);  	out_be32(&gpio->simple_ddr, SIMPLE_DDR);  	out_be32(&gpio->simple_dvo, SIMPLE_DVO); diff --git a/board/tqc/tqm85xx/tqm85xx.c b/board/tqc/tqm85xx/tqm85xx.c index f1c2e58ed..ae3c2456f 100644 --- a/board/tqc/tqm85xx/tqm85xx.c +++ b/board/tqc/tqm85xx/tqm85xx.c @@ -464,7 +464,8 @@ void local_bus_init (void)  	if (lbc_mhz < 66) {  		lbc->lcrr = CFG_LBC_LCRR | LCRR_DBYP;	/* DLL Bypass */ -		lbc->ltedr = 0xa4c80000;	/* DK: !!! */ +		lbc->ltedr = LTEDR_BMD | LTEDR_PARD | LTEDR_WPD | LTEDR_WARA | +			     LTEDR_RAWA | LTEDR_CSD;	/* Disable all error checking */  	} else if (lbc_mhz >= 133) {  		lbc->lcrr = CFG_LBC_LCRR & (~LCRR_DBYP);	/* DLL Enabled */ diff --git a/board/w7o/post2.c b/board/w7o/post2.c index e59012824..6ee33eba3 100644 --- a/board/w7o/post2.c +++ b/board/w7o/post2.c @@ -29,6 +29,12 @@  #include "errors.h"  #include "dtt.h" +/* for LM75 DTT POST test */ +#define DTT_READ_TEMP		0x0 +#define DTT_CONFIG		0x1 +#define DTT_TEMP_HYST		0x2 +#define DTT_TEMP_SET		0x3 +  #if defined(CONFIG_RTC_M48T35A)  void rtctest(void)  { |