Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:

	cpu/arm920t/ep93xx/timer.c

Signed-off-by: Minkyu Kang <[email protected]>

22 files changed, 123 insertions, 648 deletions

diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index af1b0bd8bc7..87545638023 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -394,4 +394,3 @@ int checkboard(void)
 	puts("]\n");
 	return 0;
 }
-
diff --git a/board/ipek01/ipek01.c b/board/ipek01/ipek01.c
index 463a81be20e..85cd0a02722 100644
--- a/board/ipek01/ipek01.c
+++ b/board/ipek01/ipek01.c
@@ -92,8 +92,8 @@ static void sdram_start (int hi_addr)
 
 /*
  * ATTENTION: Although partially referenced initdram does NOT make real
- *            use of CONFIG_SYS_SDRAM_BASE. The code does not work if
- *            CONFIG_SYS_SDRAM_BASE is something else than 0x00000000.
+ *	      use of CONFIG_SYS_SDRAM_BASE. The code does not work if
+ *	      CONFIG_SYS_SDRAM_BASE is something else than 0x00000000.
  */
 
 phys_size_t initdram (int board_type)
@@ -221,8 +221,8 @@ void ft_board_setup (void *blob, bd_t * bd)
 
 int board_eth_init(bd_t *bis)
 {
-        cpu_eth_init(bis); /* Built in FEC comes first */
-        return pci_eth_init(bis);
+	cpu_eth_init(bis); /* Built in FEC comes first */
+	return pci_eth_init(bis);
 }
 
 #ifdef CONFIG_VIDEO
diff --git a/board/karo/tx25/Makefile b/board/karo/tx25/Makefile
index b0e610fc352..88c37c11855 100644
--- a/board/karo/tx25/Makefile
+++ b/board/karo/tx25/Makefile
@@ -48,4 +48,3 @@ include $(SRCTREE)/rules.mk
 sinclude $(obj).depend
 
 #########################################################################
-
diff --git a/board/sl8245/Makefile b/board/sl8245/Makefile
deleted file mode 100644
index dcb1907032b..00000000000
--- a/board/sl8245/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# (C) Copyright 2001-2006
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-#
-# 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	= $(BOARD).o flash.o
-
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-SOBJS	:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/sl8245/config.mk b/board/sl8245/config.mk
deleted file mode 100644
index 022512b0ddf..00000000000
--- a/board/sl8245/config.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# (C) Copyright 2001 - 2003
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-#
-# 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
-#
-
-#
-# SL8245 board
-#
-
-TEXT_BASE = 0xFFF00000
-
-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
-PLATFORM_LIBS += $(shell $(CC) -print-libgcc-file-name)
diff --git a/board/sl8245/flash.c b/board/sl8245/flash.c
deleted file mode 100644
index 4455b6387d3..00000000000
--- a/board/sl8245/flash.c
+++ /dev/null
@@ -1,488 +0,0 @@
-/*
- * (C) Copyright 2001 - 2003
- * Wolfgang Denk, DENX Software Engineering, [email protected].
- *
- * 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 <mpc824x.h>
-#include <asm/processor.h>
-
-#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef  CONFIG_ENV_ADDR
-#  define CONFIG_ENV_ADDR	(CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
-# endif
-# ifndef  CONFIG_ENV_SIZE
-#  define CONFIG_ENV_SIZE	CONFIG_ENV_SECT_SIZE
-# endif
-# ifndef  CONFIG_ENV_SECT_SIZE
-#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE
-# endif
-#endif
-
-#define FLASH_BANK_SIZE 0x800000
-#define MAIN_SECT_SIZE  0x40000
-#define PARAM_SECT1_SIZE 0x20000
-#define PARAM_SECT23_SIZE 0x8000
-#define PARAM_SECT4_SIZE 0x10000
-
-flash_info_t    flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
-
-static int write_data (flash_info_t *info, ulong dest, ulong *data);
-static void write_via_fpu(vu_long *addr, ulong *data);
-static __inline__ unsigned long get_msr(void);
-static __inline__ void set_msr(unsigned long msr);
-
-/*---------------------------------------------------------------------*/
-#undef	DEBUG_FLASH
-
-/*---------------------------------------------------------------------*/
-#ifdef DEBUG_FLASH
-#define DEBUGF(fmt,args...) printf(fmt ,##args)
-#else
-#define DEBUGF(fmt,args...)
-#endif
-/*---------------------------------------------------------------------*/
-
-#define __align__ __attribute__ ((aligned (8)))
-static __align__ ulong precmd0[2]   = { 0x00aa00aa, 0x00aa00aa };
-static __align__ ulong precmd1[2]   = { 0x00550055, 0x00550055 };
-static __align__ ulong cmdid[2]     = { 0x00900090, 0x00900090 };
-static __align__ ulong cmderase[2]  = { 0x00800080, 0x00800080 };
-static __align__ ulong cmdersusp[2] = { 0x00b000b0, 0x00b000b0 };
-static __align__ ulong cmdsecter[2] = { 0x00300030, 0x00300030 };
-static __align__ ulong cmdprog[2]   = { 0x00a000a0, 0x00a000a0 };
-static __align__ ulong cmdres[2]    = { 0x00f000f0, 0x00f000f0 };
-
-/*-----------------------------------------------------------------------
- */
-
-unsigned long flash_init (void)
-{
-	int i, j;
-	ulong size = 0;
-
-	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
-		vu_long *addr = (vu_long *) (CONFIG_SYS_FLASH_BASE + i * FLASH_BANK_SIZE);
-
-		write_via_fpu (&addr[0xaaa], precmd0);
-		write_via_fpu (&addr[0x554], precmd1);
-		write_via_fpu (&addr[0xaaa], cmdid);
-
-		DEBUGF ("Flash bank # %d:\n"
-			"\tManuf. ID @ 0x%08lX: 0x%08lX\n"
-			"\tDevice ID @ 0x%08lX: 0x%08lX\n",
-			i,
-			(ulong) (&addr[0]), addr[0],
-			(ulong) (&addr[2]), addr[2]);
-
-		if ((addr[0] == addr[1]) && (addr[0] == AMD_MANUFACT) &&
-			(addr[2] == addr[3]) && (addr[2] == AMD_ID_LV160T)) {
-			flash_info[i].flash_id = (FLASH_MAN_AMD & FLASH_VENDMASK) |
-					(FLASH_AM160T & FLASH_TYPEMASK);
-		} else {
-			flash_info[i].flash_id = FLASH_UNKNOWN;
-			write_via_fpu (addr, cmdres);
-			goto Done;
-		}
-
-		DEBUGF ("flash_id = 0x%08lX\n", flash_info[i].flash_id);
-
-		write_via_fpu (addr, cmdres);
-
-		flash_info[i].size = FLASH_BANK_SIZE;
-		flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT;
-		memset (flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
-		for (j = 0; j < 32; j++) {
-			flash_info[i].start[j] = CONFIG_SYS_FLASH_BASE +
-					i * FLASH_BANK_SIZE + j * MAIN_SECT_SIZE;
-		}
-		flash_info[i].start[32] =
-				flash_info[i].start[31] + PARAM_SECT1_SIZE;
-		flash_info[i].start[33] =
-				flash_info[i].start[32] + PARAM_SECT23_SIZE;
-		flash_info[i].start[34] =
-				flash_info[i].start[33] + PARAM_SECT23_SIZE;
-		size += flash_info[i].size;
-	}
-
-	/* Protect monitor and environment sectors
-	 */
-#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE
-#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE + FLASH_BANK_SIZE
-	flash_protect ( FLAG_PROTECT_SET,
-			CONFIG_SYS_MONITOR_BASE,
-			CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,
-			&flash_info[1]);
-#else
-	flash_protect ( FLAG_PROTECT_SET,
-			CONFIG_SYS_MONITOR_BASE,
-			CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,
-			&flash_info[0]);
-#endif
-#endif
-
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
-#if CONFIG_ENV_ADDR >= CONFIG_SYS_FLASH_BASE + FLASH_BANK_SIZE
-	flash_protect ( FLAG_PROTECT_SET,
-			CONFIG_ENV_ADDR,
-			CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);
-#else
-	flash_protect ( FLAG_PROTECT_SET,
-			CONFIG_ENV_ADDR,
-			CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
-#endif
-#endif
-
-Done:
-	return size;
-}
-
-/*-----------------------------------------------------------------------
- */
-void flash_print_info (flash_info_t * info)
-{
-	int i;
-
-	switch ((i = info->flash_id & FLASH_VENDMASK)) {
-	case (FLASH_MAN_AMD & FLASH_VENDMASK):
-		printf ("Intel: ");
-		break;
-	default:
-		printf ("Unknown Vendor 0x%04x ", i);
-		break;
-	}
-
-	switch ((i = info->flash_id & FLASH_TYPEMASK)) {
-	case (FLASH_AM160T & FLASH_TYPEMASK):
-		printf ("AM29LV160BT (16Mbit)\n");
-		break;
-	default:
-		printf ("Unknown Chip Type 0x%04x\n", i);
-		goto Done;
-		break;
-	}
-
-	printf ("  Size: %ld MB in %d Sectors\n",
-			info->size >> 20, info->sector_count);
-
-	printf ("  Sector Start Addresses:");
-	for (i = 0; i < info->sector_count; i++) {
-		if ((i % 5) == 0) {
-			printf ("\n   ");
-		}
-		printf (" %08lX%s", info->start[i],
-			info->protect[i] ? " (RO)" : "     ");
-	}
-	printf ("\n");
-
-  Done:
-	return;
-}
-
-/*-----------------------------------------------------------------------
- */
-
-int flash_erase (flash_info_t * info, int s_first, int s_last)
-{
-	int flag, prot, sect;
-	ulong start, now, last;
-
-	DEBUGF ("Erase flash bank %d sect %d ... %d\n",
-		info - &flash_info[0], s_first, s_last);
-
-	if ((s_first < 0) || (s_first > s_last)) {
-		if (info->flash_id == FLASH_UNKNOWN) {
-			printf ("- missing\n");
-		} else {
-			printf ("- no sectors to erase\n");
-		}
-		return 1;
-	}
-
-	if ((info->flash_id & FLASH_VENDMASK) !=
-		(FLASH_MAN_AMD & FLASH_VENDMASK)) {
-		printf ("Can erase only AMD flash types - aborted\n");
-		return 1;
-	}
-
-	prot = 0;
-	for (sect = s_first; sect <= s_last; ++sect) {
-		if (info->protect[sect]) {
-			prot++;
-		}
-	}
-
-	if (prot) {
-		printf ("- Warning: %d protected sectors will not be erased!\n",
-			prot);
-	} else {
-		printf ("\n");
-	}
-
-	start = get_timer (0);
-	last = start;
-	/* Start erase on unprotected sectors */
-	for (sect = s_first; sect <= s_last; sect++) {
-		if (info->protect[sect] == 0) {	/* not protected */
-			vu_long *addr = (vu_long *) (info->start[sect]);
-
-			DEBUGF ("Erase sect %d @ 0x%08lX\n", sect, (ulong) addr);
-
-			/* Disable interrupts which might cause a timeout
-			 * here.
-			 */
-			flag = disable_interrupts ();
-
-			write_via_fpu (&addr[0xaaa], precmd0);
-			write_via_fpu (&addr[0x554], precmd1);
-			write_via_fpu (&addr[0xaaa], cmderase);
-			write_via_fpu (&addr[0xaaa], precmd0);
-			write_via_fpu (&addr[0x554], precmd1);
-			write_via_fpu (&addr[0xaaa], cmdsecter);
-
-			/* re-enable interrupts if necessary */
-			if (flag)
-				enable_interrupts ();
-
-			/* wait at least 80us - let's wait 1 ms */
-			udelay (1000);
-
-			while (((addr[0] & 0x00800080) != 0x00800080) ||
-				   ((addr[1] & 0x00800080) != 0x00800080)) {
-				if ((now = get_timer (start)) > CONFIG_SYS_FLASH_ERASE_TOUT) {
-					printf ("Timeout\n");
-					write_via_fpu (addr, cmdersusp);
-					write_via_fpu (addr, cmdres);
-					return 1;
-				}
-
-				/* show that we're waiting */
-				if ((now - last) > 1000) {	/* every second  */
-					putc ('.');
-					last = now;
-				}
-			}
-
-			write_via_fpu (addr, cmdres);
-		}
-	}
-	printf (" done\n");
-	return 0;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- * 4 - Flash not identified
- */
-
-#define	FLASH_WIDTH	8		/* flash bus width in bytes */
-
-int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
-{
-	ulong wp, cp, msr;
-	int l, rc, i;
-	ulong data[2];
-	ulong *datah = &data[0];
-	ulong *datal = &data[1];
-
-	DEBUGF ("Flash write_buff: @ 0x%08lx, src 0x%08lx len %ld\n",
-		addr, (ulong) src, cnt);
-
-	if (info->flash_id == FLASH_UNKNOWN) {
-		return 4;
-	}
-
-	msr = get_msr ();
-	set_msr (msr | MSR_FP);
-
-	wp = (addr & ~(FLASH_WIDTH - 1));	/* get lower aligned address */
-
-	/*
-	 * handle unaligned start bytes
-	 */
-	if ((l = addr - wp) != 0) {
-		*datah = *datal = 0;
-
-		for (i = 0, cp = wp; i < l; i++, cp++) {
-			if (i >= 4) {
-				*datah = (*datah << 8) | ((*datal & 0xFF000000) >> 24);
-			}
-
-			*datal = (*datal << 8) | (*(uchar *) cp);
-		}
-		for (; i < FLASH_WIDTH && cnt > 0; ++i) {
-			char tmp;
-
-			tmp = *src;
-
-			src++;
-
-			if (i >= 4) {
-				*datah = (*datah << 8) | ((*datal & 0xFF000000) >> 24);
-			}
-
-			*datal = (*datal << 8) | tmp;
-
-			--cnt;
-			++cp;
-		}
-
-		for (; cnt == 0 && i < FLASH_WIDTH; ++i, ++cp) {
-			if (i >= 4) {
-				*datah = (*datah << 8) | ((*datal & 0xFF000000) >> 24);
-			}
-
-			*datal = (*datah << 8) | (*(uchar *) cp);
-		}
-
-		if ((rc = write_data (info, wp, data)) != 0) {
-			set_msr (msr);
-			return (rc);
-		}
-
-		wp += FLASH_WIDTH;
-	}
-
-	/*
-	 * handle FLASH_WIDTH aligned part
-	 */
-	while (cnt >= FLASH_WIDTH) {
-		*datah = *(ulong *) src;
-		*datal = *(ulong *) (src + 4);
-		if ((rc = write_data (info, wp, data)) != 0) {
-			set_msr (msr);
-			return (rc);
-		}
-		wp += FLASH_WIDTH;
-		cnt -= FLASH_WIDTH;
-		src += FLASH_WIDTH;
-	}
-
-	if (cnt == 0) {
-		set_msr (msr);
-		return (0);
-	}
-
-	/*
-	 * handle unaligned tail bytes
-	 */
-	*datah = *datal = 0;
-	for (i = 0, cp = wp; i < FLASH_WIDTH && cnt > 0; ++i, ++cp) {
-		char tmp;
-
-		tmp = *src;
-
-		src++;
-
-		if (i >= 4) {
-			*datah = (*datah << 8) | ((*datal & 0xFF000000) >> 24);
-		}
-
-		*datal = (*datal << 8) | tmp;
-
-		--cnt;
-	}
-
-	for (; i < FLASH_WIDTH; ++i, ++cp) {
-		if (i >= 4) {
-			*datah = (*datah << 8) | ((*datal & 0xFF000000) >> 24);
-		}
-
-		*datal = (*datal << 8) | (*(uchar *) cp);
-	}
-
-	rc = write_data (info, wp, data);
-	set_msr (msr);
-
-	return (rc);
-}
-
-/*-----------------------------------------------------------------------
- * Write a word to Flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-static int write_data (flash_info_t * info, ulong dest, ulong * data)
-{
-	vu_long *chip = (vu_long *) (info->start[0]);
-	vu_long *addr = (vu_long *) dest;
-	ulong start;
-	int flag;
-
-	/* Check if Flash is (sufficiently) erased */
-	if (((addr[0] & data[0]) != data[0]) ||
-		((addr[1] & data[1]) != data[1])) {
-		return (2);
-	}
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	write_via_fpu (&chip[0xaaa], precmd0);
-	write_via_fpu (&chip[0x554], precmd1);
-	write_via_fpu (&chip[0xaaa], cmdprog);
-	write_via_fpu (addr, data);
-
-	/* re-enable interrupts if necessary */
-	if (flag)
-		enable_interrupts ();
-
-	start = get_timer (0);
-
-	while (((addr[0] & 0x00800080) != (data[0] & 0x00800080)) ||
-	       ((addr[1] & 0x00800080) != (data[1] & 0x00800080))) {
-		if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			write_via_fpu (chip, cmdres);
-			return (1);
-		}
-	}
-
-	write_via_fpu (chip, cmdres);
-
-	return (0);
-}
-
-/*-----------------------------------------------------------------------
- */
-static void write_via_fpu (vu_long * addr, ulong * data)
-{
-	__asm__ __volatile__ ("lfd  1, 0(%0)"::"r" (data));
-	__asm__ __volatile__ ("stfd 1, 0(%0)"::"r" (addr));
-}
-
-/*-----------------------------------------------------------------------
- */
-static __inline__ unsigned long get_msr (void)
-{
-	unsigned long msr;
-
-	__asm__ __volatile__ ("mfmsr %0":"=r" (msr):);
-
-	return msr;
-}
-
-static __inline__ void set_msr (unsigned long msr)
-{
-	__asm__ __volatile__ ("mtmsr %0"::"r" (msr));
-}
diff --git a/board/sl8245/sl8245.c b/board/sl8245/sl8245.c
deleted file mode 100644
index e849e013d3f..00000000000
--- a/board/sl8245/sl8245.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * (C) Copyright 2003
- * Wolfgang Denk, DENX Software Engineering, [email protected].
- *
- * 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 <mpc824x.h>
-#include <pci.h>
-#include <netdev.h>
-
-int checkboard (void)
-{
-	ulong busfreq  = get_bus_freq(0);
-	char  buf[32];
-
-	printf("Board: SL8245, local bus @ %s MHz\n", strmhz(buf, busfreq));
-	return 0;
-}
-
-phys_size_t initdram (int board_type)
-{
-#ifndef CONFIG_SYS_RAMBOOT
-	long size;
-	long new_bank0_end;
-	long mear1;
-	long emear1;
-
-	size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE);
-
-	new_bank0_end = size - 1;
-	mear1 = mpc824x_mpc107_getreg(MEAR1);
-	emear1 = mpc824x_mpc107_getreg(EMEAR1);
-	mear1 = (mear1  & 0xFFFFFF00) |
-		((new_bank0_end & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT);
-	emear1 = (emear1 & 0xFFFFFF00) |
-		((new_bank0_end & MICR_ADDR_MASK) >> MICR_EADDR_SHIFT);
-	mpc824x_mpc107_setreg(MEAR1, mear1);
-	mpc824x_mpc107_setreg(EMEAR1, emear1);
-
-	return (size);
-#else
-	return CONFIG_SYS_MAX_RAM_SIZE;
-#endif
-}
-
-static struct pci_controller hose;
-
-void pci_init_board(void)
-{
-	pci_mpc824x_init(&hose);
-}
-
-int board_eth_init(bd_t *bis)
-{
-	int rc = 0;
-
-#if defined(CONFIG_SK98)
-	rc = skge_initialize(bis);
-#endif
-	return rc;
-}
diff --git a/board/spear/common/spr_lowlevel_init.S b/board/spear/common/spr_lowlevel_init.S
index 6fbe579a65c..6fbe579a65c 100755..100644
--- a/board/spear/common/spr_lowlevel_init.S
+++ b/board/spear/common/spr_lowlevel_init.S
diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c
index e35691200d1..e35691200d1 100755..100644
--- a/board/spear/common/spr_misc.c
+++ b/board/spear/common/spr_misc.c
diff --git a/board/spear/spear300/Makefile b/board/spear/spear300/Makefile
index b5168ffe883..b5168ffe883 100755..100644
--- a/board/spear/spear300/Makefile
+++ b/board/spear/spear300/Makefile
diff --git a/board/spear/spear300/config.mk b/board/spear/spear300/config.mk
index 35646f2193c..35646f2193c 100755..100644
--- a/board/spear/spear300/config.mk
+++ b/board/spear/spear300/config.mk
diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
index 60ee54470e4..60ee54470e4 100755..100644
--- a/board/spear/spear300/spear300.c
+++ b/board/spear/spear300/spear300.c
diff --git a/board/spear/spear310/Makefile b/board/spear/spear310/Makefile
index e67e941cf90..e67e941cf90 100755..100644
--- a/board/spear/spear310/Makefile
+++ b/board/spear/spear310/Makefile
diff --git a/board/spear/spear310/config.mk b/board/spear/spear310/config.mk
index cba843620c3..cba843620c3 100755..100644
--- a/board/spear/spear310/config.mk
+++ b/board/spear/spear310/config.mk
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index 03dfe16175e..03dfe16175e 100755..100644
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
diff --git a/board/spear/spear320/Makefile b/board/spear/spear320/Makefile
index 1b80586ff13..1b80586ff13 100755..100644
--- a/board/spear/spear320/Makefile
+++ b/board/spear/spear320/Makefile
diff --git a/board/spear/spear320/config.mk b/board/spear/spear320/config.mk
index cba843620c3..cba843620c3 100755..100644
--- a/board/spear/spear320/config.mk
+++ b/board/spear/spear320/config.mk
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
index 2ba2dbb5666..2ba2dbb5666 100755..100644
--- a/board/spear/spear320/spear320.c
+++ b/board/spear/spear320/spear320.c
diff --git a/board/spear/spear600/Makefile b/board/spear/spear600/Makefile
index 1978002fc50..1978002fc50 100755..100644
--- a/board/spear/spear600/Makefile
+++ b/board/spear/spear600/Makefile
diff --git a/board/spear/spear600/config.mk b/board/spear/spear600/config.mk
index 35646f2193c..35646f2193c 100755..100644
--- a/board/spear/spear600/config.mk
+++ b/board/spear/spear600/config.mk
diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
index eef9a3771cf..eef9a3771cf 100755..100644
--- a/board/spear/spear600/spear600.c
+++ b/board/spear/spear600/spear600.c
diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c
index f92c598dd84..53f79e8b80f 100644
--- a/board/tqc/tqm8xx/tqm8xx.c
+++ b/board/tqc/tqm8xx/tqm8xx.c
@@ -22,11 +22,16 @@
  */
 
 #include <common.h>
+#include <hwconfig.h>
 #include <mpc8xx.h>
 #ifdef CONFIG_PS2MULT
 #include <ps2mult.h>
 #endif
 
+#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
+#include <libfdt.h>
+#endif
+
 extern flash_info_t flash_info[];	/* FLASH chips info */
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -599,6 +604,120 @@ void lcd_show_board_info(void)
 }
 #endif /* CONFIG_LCD_INFO */
 
+/*
+ * Device Tree Support
+ */
+#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
+int fdt_set_node_and_value (void *blob,
+				char *nodename,
+				char *regname,
+				void *var,
+				int size)
+{
+	int ret = 0;
+	int nodeoffset = 0;
+
+	nodeoffset = fdt_path_offset (blob, nodename);
+	if (nodeoffset >= 0) {
+		ret = fdt_setprop (blob, nodeoffset, regname, var,
+					size);
+		if (ret < 0) {
+			printf("ft_blob_update(): "
+				"cannot set %s/%s property; err: %s\n",
+				nodename, regname, fdt_strerror (ret));
+		}
+	} else {
+		printf("ft_blob_update(): "
+			"cannot find %s node err:%s\n",
+			nodename, fdt_strerror (nodeoffset));
+	}
+	return ret;
+}
+
+int fdt_del_node_name (void *blob, char *nodename)
+{
+	int ret = 0;
+	int nodeoffset = 0;
+
+	nodeoffset = fdt_path_offset (blob, nodename);
+	if (nodeoffset >= 0) {
+		ret = fdt_del_node (blob, nodeoffset);
+		if (ret < 0) {
+			printf("%s: cannot delete %s; err: %s\n",
+				__func__, nodename, fdt_strerror (ret));
+		}
+	} else {
+		printf("%s: cannot find %s node err:%s\n",
+			__func__, nodename, fdt_strerror (nodeoffset));
+	}
+	return ret;
+}
+
+int fdt_del_prop_name (void *blob, char *nodename, char *propname)
+{
+	int ret = 0;
+	int nodeoffset = 0;
+
+	nodeoffset = fdt_path_offset (blob, nodename);
+	if (nodeoffset >= 0) {
+		ret = fdt_delprop (blob, nodeoffset, propname);
+		if (ret < 0) {
+			printf("%s: cannot delete %s %s; err: %s\n",
+				__func__, nodename, propname,
+				fdt_strerror (ret));
+		}
+	} else {
+		printf("%s: cannot find %s node err:%s\n",
+			__func__, nodename, fdt_strerror (nodeoffset));
+	}
+	return ret;
+}
+
+/*
+ * update "brg" property in the blob
+ */
+void ft_blob_update (void *blob, bd_t *bd)
+{
+	uchar enetaddr[6];
+	ulong brg_data = 0;
+
+	/* BRG */
+	brg_data = cpu_to_be32(bd->bi_busfreq);
+	fdt_set_node_and_value(blob,
+				"/soc/cpm", "brg-frequency",
+				&brg_data, sizeof(brg_data));
+
+	/* MAC addr */
+	if (eth_getenv_enetaddr("ethaddr", enetaddr)) {
+		fdt_set_node_and_value(blob,
+					"ethernet0", "local-mac-address",
+					enetaddr, sizeof(u8) * 6);
+	}
+
+	if (hwconfig_arg_cmp("fec", "off")) {
+		/* no FEC on this plattform, delete DTS nodes */
+		fdt_del_node_name (blob, "ethernet1");
+		fdt_del_node_name (blob, "mdio1");
+		/* also the aliases entries */
+		fdt_del_prop_name (blob, "/aliases", "ethernet1");
+		fdt_del_prop_name (blob, "/aliases", "mdio1");
+	} else {
+		/* adjust local-mac-address for FEC ethernet */
+		if (eth_getenv_enetaddr("eth1addr", enetaddr)) {
+			fdt_set_node_and_value(blob,
+					"ethernet1", "local-mac-address",
+					enetaddr, sizeof(u8) * 6);
+		}
+	}
+}
+
+void ft_board_setup(void *blob, bd_t *bd)
+{
+	ft_cpu_setup(blob, bd);
+	ft_blob_update(blob, bd);
+}
+#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
+
 /* ---------------------------------------------------------------------------- */
 /* TK885D specific initializaion						*/
 /* ---------------------------------------------------------------------------- */