PowerPC: drop some 74xx_7xx boards and related code

The file  board/Marvell/include/mv_gen_reg.h  is incompatible with
the GPL (see for example the "MARVELL RESERVES THE RIGHT AT ITS SOLE
DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO
MARVELL" clause).  As this cannot be fixed, we remove the file and all
code that depends on it.  Fortunately this only affects some very old
boards that have long reached EOL:
	CPCI750
	DB64360
	DB64460
	p3m750
	p3m7448

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Roger Meier <r.meier@siemens.com>

5 files changed, 0 insertions, 2073 deletions

diff --git a/board/Marvell/common/flash.c b/board/Marvell/common/flash.c
deleted file mode 100644
index 32f226d..0000000
--- a/board/Marvell/common/flash.c
+++ /dev/null
@@ -1,1056 +0,0 @@
-/*
- * (C) Copyright 2001
- * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-/*
- * flash.c - flash support for the 512k, 8bit boot flash
-	and the 8MB 32bit extra flash on the DB64360
- *           most of this file was based on the existing U-Boot
- *           flash drivers.
- *
- * written or collected and sometimes rewritten by
- * Ingo Assmus <ingo.assmus@keymile.com>
- *
- */
-
-#include <common.h>
-#include <mpc8xx.h>
-#include "../include/mv_gen_reg.h"
-#include "../include/memory.h"
-#include "intel_flash.h"
-
-#define FLASH_ROM       0xFFFD	/* unknown flash type                   */
-#define FLASH_RAM       0xFFFE	/* unknown flash type                   */
-#define FLASH_MAN_UNKNOWN 0xFFFF0000
-
-/* #define DEBUG */
-
-/* Intel flash commands */
-int flash_erase_intel (flash_info_t * info, int s_first, int s_last);
-int write_word_intel (bank_addr_t addr, bank_word_t value);
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* info for FLASH chips */
-
-/*-----------------------------------------------------------------------
- * Functions
- */
-static ulong flash_get_size (int portwidth, vu_long * addr,
-			     flash_info_t * info);
-static int write_word (flash_info_t * info, ulong dest, ulong data);
-static void flash_get_offsets (ulong base, flash_info_t * info);
-
-/*-----------------------------------------------------------------------
- */
-
-unsigned long flash_init (void)
-{
-	unsigned int i;
-	unsigned long size_b0 = 0, size_b1 = 0;
-	unsigned long base, flash_size;
-
-	/* Init: no FLASHes known */
-	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
-		flash_info[i].flash_id = FLASH_UNKNOWN;
-	}
-
-	/* the boot flash */
-	base = CONFIG_SYS_FLASH_BASE;
-	size_b0 =
-		flash_get_size (CONFIG_SYS_BOOT_FLASH_WIDTH, (vu_long *) base,
-				&flash_info[0]);
-
-	printf ("[%ldkB@%lx] ", size_b0 / 1024, base);
-
-	if (flash_info[0].flash_id == FLASH_UNKNOWN) {
-		printf ("## Unknown FLASH at %08lx: Size = 0x%08lx = %ld MB\n", base, size_b0, size_b0 << 20);
-	}
-
-	base = memoryGetDeviceBaseAddress (CONFIG_SYS_EXTRA_FLASH_DEVICE);
-/*	base = memoryGetDeviceBaseAddress(DEV_CS3_BASE_ADDR);*/
-	for (i = 1; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
-		unsigned long size =
-			flash_get_size (CONFIG_SYS_EXTRA_FLASH_WIDTH,
-					(vu_long *) base, &flash_info[i]);
-
-		printf ("[%ldMB@%lx] ", size >> 20, base);
-
-		if (flash_info[i].flash_id == FLASH_UNKNOWN) {
-			if (i == 1) {
-				printf ("## Unknown FLASH at %08lx: Size = 0x%08lx = %ld MB\n", base, size_b1, size_b1 << 20);
-			}
-			break;
-		}
-		size_b1 += size;
-		base += size;
-	}
-
-	flash_size = size_b0 + size_b1;
-	return flash_size;
-}
-
-/*-----------------------------------------------------------------------
- */
-static void flash_get_offsets (ulong base, flash_info_t * info)
-{
-	int i;
-	int sector_size;
-
-	if (!info->sector_count)
-		return;
-
-	/* set up sector start address table */
-	switch (info->flash_id & FLASH_TYPEMASK) {
-	case FLASH_AM040:
-	case FLASH_28F128J3A:
-	case FLASH_28F640J3A:
-	case FLASH_RAM:
-		/* this chip has uniformly spaced sectors */
-		sector_size = info->size / info->sector_count;
-		for (i = 0; i < info->sector_count; i++)
-			info->start[i] = base + (i * sector_size);
-		break;
-	default:
-		if (info->flash_id & FLASH_BTYPE) {
-			/* set sector offsets for bottom boot block type    */
-			info->start[0] = base + 0x00000000;
-			info->start[1] = base + 0x00008000;
-			info->start[2] = base + 0x0000C000;
-			info->start[3] = base + 0x00010000;
-			for (i = 4; i < info->sector_count; i++) {
-				info->start[i] =
-					base + (i * 0x00020000) - 0x00060000;
-			}
-		} else {
-			/* set sector offsets for top boot block type               */
-			i = info->sector_count - 1;
-			info->start[i--] = base + info->size - 0x00008000;
-			info->start[i--] = base + info->size - 0x0000C000;
-			info->start[i--] = base + info->size - 0x00010000;
-			for (; i >= 0; i--) {
-				info->start[i] = base + i * 0x00020000;
-			}
-		}
-	}
-}
-
-/*-----------------------------------------------------------------------
- */
-void flash_print_info (flash_info_t * info)
-{
-	int i;
-
-	if (info->flash_id == FLASH_UNKNOWN) {
-		printf ("missing or unknown FLASH type\n");
-		return;
-	}
-
-	switch (info->flash_id & FLASH_VENDMASK) {
-	case FLASH_MAN_STM:
-		printf ("STM ");
-		break;
-	case FLASH_MAN_AMD:
-		printf ("AMD ");
-		break;
-	case FLASH_MAN_FUJ:
-		printf ("FUJITSU ");
-		break;
-	case FLASH_MAN_INTEL:
-		printf ("INTEL ");
-		break;
-	default:
-		printf ("Unknown Vendor ");
-		break;
-	}
-
-	switch (info->flash_id & FLASH_TYPEMASK) {
-	case FLASH_AM040:
-		printf ("AM29LV040B (4 Mbit, bottom boot sect)\n");
-		break;
-	case FLASH_AM400B:
-		printf ("AM29LV400B (4 Mbit, bottom boot sect)\n");
-		break;
-	case FLASH_AM400T:
-		printf ("AM29LV400T (4 Mbit, top boot sector)\n");
-		break;
-	case FLASH_AM800B:
-		printf ("AM29LV800B (8 Mbit, bottom boot sect)\n");
-		break;
-	case FLASH_AM800T:
-		printf ("AM29LV800T (8 Mbit, top boot sector)\n");
-		break;
-	case FLASH_AM160B:
-		printf ("AM29LV160B (16 Mbit, bottom boot sect)\n");
-		break;
-	case FLASH_AM160T:
-		printf ("AM29LV160T (16 Mbit, top boot sector)\n");
-		break;
-	case FLASH_AM320B:
-		printf ("AM29LV320B (32 Mbit, bottom boot sect)\n");
-		break;
-	case FLASH_AM320T:
-		printf ("AM29LV320T (32 Mbit, top boot sector)\n");
-		break;
-	case FLASH_28F640J3A:
-		printf ("28F640J3A (64 Mbit)\n");
-		break;
-	case FLASH_28F128J3A:
-		printf ("28F128J3A (128 Mbit)\n");
-		break;
-	case FLASH_ROM:
-		printf ("ROM\n");
-		break;
-	case FLASH_RAM:
-		printf ("RAM\n");
-		break;
-	default:
-		printf ("Unknown Chip Type\n");
-		break;
-	}
-
-	if ((info->size >> 20) > 0) {
-		printf ("  Size: %ld MB in %d Sectors\n",
-			info->size >> 20, info->sector_count);
-	} else {
-		printf ("  Size: %ld kB in %d Sectors\n",
-			info->size >> 10, 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");
-	return;
-}
-
-/*-----------------------------------------------------------------------
- */
-
-
-/*-----------------------------------------------------------------------
- */
-
-/*
- * The following code cannot be run from FLASH!
- */
-
-static inline void flash_cmd (int width, volatile unsigned char *addr,
-			      int offset, unsigned char cmd)
-{
-	/* supports 1x8, 1x16, and 2x16 */
-	/* 2x8 and 4x8 are not supported */
-	if (width == 4) {
-		/* assuming chips are in 16 bit mode */
-		/* 2x16 */
-		unsigned long cmd32 = (cmd << 16) | cmd;
-
-		*(volatile unsigned long *) (addr + offset * 2) = cmd32;
-	} else {
-		/* 1x16 or 1x8 */
-		*(volatile unsigned char *) (addr + offset) = cmd;
-	}
-}
-
-static ulong
-flash_get_size (int portwidth, vu_long * addr, flash_info_t * info)
-{
-	short i;
-	volatile unsigned char *caddr = (unsigned char *) addr;
-	volatile unsigned short *saddr = (unsigned short *) addr;
-	volatile unsigned long *laddr = (unsigned long *) addr;
-	char old[2], save;
-	ulong id = 0, manu = 0, base = (ulong) addr;
-
-#ifdef DEBUG
-	printf ("%s: enter\n", __FUNCTION__);
-#endif
-	info->portwidth = portwidth;
-
-	save = *caddr;
-
-	flash_cmd (portwidth, caddr, 0, 0xf0);
-	flash_cmd (portwidth, caddr, 0, 0xf0);
-
-	udelay (10);
-
-	old[0] = caddr[0];
-	old[1] = caddr[1];
-
-
-	if (old[0] != 0xf0) {
-		flash_cmd (portwidth, caddr, 0, 0xf0);
-		flash_cmd (portwidth, caddr, 0, 0xf0);
-
-		udelay (10);
-
-		if (*caddr == 0xf0) {
-			/* this area is ROM */
-			*caddr = save;
-			info->flash_id = FLASH_ROM + FLASH_MAN_UNKNOWN;
-			info->sector_count = 8;
-			info->size = 0x80000;
-			flash_get_offsets (base, info);
-			return info->size;
-		}
-	} else {
-		*caddr = 0;
-
-		udelay (10);
-
-		if (*caddr == 0) {
-			/* this area is RAM */
-			*caddr = save;
-			info->flash_id = FLASH_RAM + FLASH_MAN_UNKNOWN;
-			info->sector_count = 8;
-			info->size = 0x80000;
-			flash_get_offsets (base, info);
-			return info->size;
-		}
-		flash_cmd (portwidth, caddr, 0, 0xf0);
-
-		udelay (10);
-	}
-
-	/* Write auto select command: read Manufacturer ID */
-	flash_cmd (portwidth, caddr, 0x555, 0xAA);
-	flash_cmd (portwidth, caddr, 0x2AA, 0x55);
-	flash_cmd (portwidth, caddr, 0x555, 0x90);
-
-	udelay (10);
-
-	if ((caddr[0] == old[0]) && (caddr[1] == old[1])) {
-
-		/* this area is ROM */
-		info->flash_id = FLASH_ROM + FLASH_MAN_UNKNOWN;
-		info->sector_count = 8;
-		info->size = 0x80000;
-		flash_get_offsets (base, info);
-		return info->size;
-#ifdef DEBUG
-	} else {
-		printf ("%px%d: %02x:%02x -> %02x:%02x\n",
-			caddr, portwidth, old[0], old[1], caddr[0], caddr[1]);
-#endif
-	}
-
-	switch (portwidth) {
-	case 1:
-		manu = caddr[0];
-		manu |= manu << 16;
-		id = caddr[1];
-		break;
-	case 2:
-		manu = saddr[0];
-		manu |= manu << 16;
-		id = saddr[1];
-		id |= id << 16;
-		break;
-	case 4:
-		manu = laddr[0];
-		id = laddr[1];
-		break;
-	}
-
-#ifdef DEBUG
-	flash_cmd (portwidth, caddr, 0, 0xf0);
-
-	printf ("\n%08lx:%08lx:%08lx\n", base, manu, id);
-	printf ("%08lx %08lx %08lx %08lx\n",
-		laddr[0], laddr[1], laddr[2], laddr[3]);
-#endif
-
-	switch (manu) {
-	case STM_MANUFACT:
-		info->flash_id = FLASH_MAN_STM;
-		break;
-	case AMD_MANUFACT:
-		info->flash_id = FLASH_MAN_AMD;
-		break;
-	case FUJ_MANUFACT:
-		info->flash_id = FLASH_MAN_FUJ;
-		break;
-	case INTEL_MANUFACT:
-		info->flash_id = FLASH_MAN_INTEL;
-		break;
-	default:
-		flash_cmd (portwidth, caddr, 0, 0xf0);
-
-		printf ("Unknown Mfr [%08lx]:%08lx\n", manu, id);
-		info->flash_id = FLASH_UNKNOWN;
-		info->sector_count = 0;
-		info->size = 0;
-		return (0);	/* no or unknown flash  */
-	}
-
-	switch (id) {
-	case AMD_ID_LV400T:
-		info->flash_id += FLASH_AM400T;
-		info->sector_count = 11;
-		info->size = 0x00100000;
-		info->chipwidth = 1;
-		break;		/* => 1 MB      */
-
-	case AMD_ID_LV400B:
-		info->flash_id += FLASH_AM400B;
-		info->sector_count = 11;
-		info->size = 0x00100000;
-		info->chipwidth = 1;
-		break;		/* => 1 MB      */
-
-	case AMD_ID_LV800T:
-		info->flash_id += FLASH_AM800T;
-		info->sector_count = 19;
-		info->size = 0x00200000;
-		info->chipwidth = 1;
-		break;		/* => 2 MB      */
-
-	case AMD_ID_LV800B:
-		info->flash_id += FLASH_AM800B;
-		info->sector_count = 19;
-		info->size = 0x00200000;
-		info->chipwidth = 1;
-		break;		/* => 2 MB      */
-
-	case AMD_ID_LV160T:
-		info->flash_id += FLASH_AM160T;
-		info->sector_count = 35;
-		info->size = 0x00400000;
-		info->chipwidth = 1;
-		break;		/* => 4 MB      */
-
-	case AMD_ID_LV160B:
-		info->flash_id += FLASH_AM160B;
-		info->sector_count = 35;
-		info->size = 0x00400000;
-		info->chipwidth = 1;
-		break;		/* => 4 MB      */
-#if 0				/* enable when device IDs are available */
-	case AMD_ID_LV320T:
-		info->flash_id += FLASH_AM320T;
-		info->sector_count = 67;
-		info->size = 0x00800000;
-		break;		/* => 8 MB      */
-
-	case AMD_ID_LV320B:
-		info->flash_id += FLASH_AM320B;
-		info->sector_count = 67;
-		info->size = 0x00800000;
-		break;		/* => 8 MB      */
-#endif
-	case AMD_ID_LV040B:
-		info->flash_id += FLASH_AM040;
-		info->sector_count = 8;
-		info->size = 0x80000;
-		info->chipwidth = 1;
-		break;		/* => 512 kB    */
-
-	case INTEL_ID_28F640J3A:
-		info->flash_id += FLASH_28F640J3A;
-		info->sector_count = 64;
-		info->size = 128 * 1024 * 64;	/* 128kbytes x 64 blocks */
-		info->chipwidth = 2;
-		if (portwidth == 4)
-			info->size *= 2;	/* 2x16 */
-		break;
-
-	case INTEL_ID_28F128J3A:
-		info->flash_id += FLASH_28F128J3A;
-		info->sector_count = 128;
-		info->size = 128 * 1024 * 128;	/* 128kbytes x 128 blocks */
-		info->chipwidth = 2;
-		if (portwidth == 4)
-			info->size *= 2;	/* 2x16 */
-		break;
-
-	default:
-		flash_cmd (portwidth, caddr, 0, 0xf0);
-
-		printf ("Unknown id %lx:[%lx]\n", manu, id);
-		info->flash_id = FLASH_UNKNOWN;
-		info->chipwidth = 1;
-		return (0);	/* => no or unknown flash */
-
-	}
-
-	flash_get_offsets (base, info);
-
-
-	/* check for protected sectors */
-	for (i = 0; i < info->sector_count; i++) {
-		/* read sector protection at sector address, (A7 .. A0)=0x02 */
-		/* D0 = 1 if protected */
-		caddr = (volatile unsigned char *) (info->start[i]);
-		saddr = (volatile unsigned short *) (info->start[i]);
-		laddr = (volatile unsigned long *) (info->start[i]);
-		if (portwidth == 1)
-			info->protect[i] = caddr[2] & 1;
-		else if (portwidth == 2)
-			info->protect[i] = saddr[2] & 1;
-		else
-			info->protect[i] = laddr[2] & 1;
-	}
-
-	/*
-	 * Prevent writes to uninitialized FLASH.
-	 */
-	if (info->flash_id != FLASH_UNKNOWN) {
-		caddr = (volatile unsigned char *) info->start[0];
-
-		flash_cmd (portwidth, caddr, 0, 0xF0);	/* reset bank */
-	}
-
-	return (info->size);
-}
-
-int flash_erase (flash_info_t * info, int s_first, int s_last)
-{
-	volatile unsigned char *addr = (uchar *) (info->start[0]);
-	int flag, prot, sect, l_sect;
-	ulong start, now, last;
-
-/* modified to support 2x16 Intel flash */
-/* Note that the code will not exit on a flash erasure error or timeout */
-/* but will print and error message and continue processing sectors */
-/* until they are all erased. */
-/* 10-16-2002 P. Marchese */
-	ulong mask;
-	int timeout;
-
-	if (info->portwidth == 4)
-/*		{
-		printf ("- Warning: erasing of 32Bit (2*16Bit i.e. 2*28F640J3A) not supported yet !!!! \n");
-		return 1;
-		}*/
-	{
-		/* make sure it's Intel flash */
-		if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
-			/* yup! it's an Intel flash */
-			/* is it 16-bits wide? */
-			if (info->chipwidth == 2) {
-				/* yup! it's 16-bits wide */
-				/* are there any sectors to process? */
-				if ((s_first < 0) || (s_first > s_last)) {
-					printf ("Error:  There are no sectors to erase\n");
-					printf ("Either sector %d is less than zero\n", s_first);
-					printf ("or sector %d is greater than sector %d\n", s_first, s_last);
-					return 1;
-				}
-				/* check for protected sectors */
-				prot = 0;
-				for (sect = s_first; sect <= s_last; ++sect)
-					if (info->protect[sect])
-						prot++;
-				/* if variable "prot" is nonzero, there are protected sectors */
-				if (prot)
-					printf ("- Warning: %d protected sectors will not be erased!\n", prot);
-				/* reset the flash */
-				flash_cmd (info->portwidth, addr, 0,
-					   CHIP_CMD_RST);
-				/* Disable interrupts which might cause a timeout here */
-				flag = disable_interrupts ();
-				/* Clear the status register */
-				flash_cmd (info->portwidth, addr, 0,
-					   CHIP_CMD_CLR_STAT);
-				flash_cmd (info->portwidth, addr, 0,
-					   CHIP_CMD_RST);
-				/* Start erase on unprotected sectors */
-				for (sect = s_first; sect <= s_last; sect++) {
-					/* is the sector unprotected? */
-					if (info->protect[sect] == 0) {	/* not protected */
-						/* issue the single block erase command, 0x20 */
-						flash_cmd (info->portwidth,
-							   (volatile unsigned
-							    char *) info->
-							   start[sect], 0,
-							   CHIP_CMD_ERASE1);
-						/* issue the erase confirm command, 0xD0 */
-						flash_cmd (info->portwidth,
-							   (volatile unsigned
-							    char *) info->
-							   start[sect], 0,
-							   CHIP_CMD_ERASE2);
-						l_sect = sect;
-						/* re-enable interrupts if necessary */
-						if (flag)
-							enable_interrupts ();
-						/* poll for erasure completion */
-						/* put flash into read status mode by writing 0x70 to it */
-						flash_cmd (info->portwidth,
-							   addr, 0,
-							   CHIP_CMD_RD_STAT);
-						/* setup the status register mask */
-						mask = CHIP_STAT_RDY |
-							(CHIP_STAT_RDY << 16);
-						/* init. the timeout counter */
-						start = get_timer (0);
-						/* keep looping while the flash is not ready */
-						/* exit the loop by timing out or the flash */
-						/* becomes ready again */
-						timeout = 0;
-						while ((*
-							(volatile unsigned
-							 long *) info->
-							start[sect] & mask) !=
-						       mask) {
-							/* has the timeout limit been reached? */
-							if (get_timer (start)
-							    >
-							    CONFIG_SYS_FLASH_ERASE_TOUT)
-							{
-								/* timeout limit reached */
-								printf ("Time out limit reached erasing sector at address %08lx\n", info->start[sect]);
-								printf ("Continuing with next sector\n");
-								timeout = 1;
-								goto timed_out_error;
-							}
-							/* put flash into read status mode by writing 0x70 to it */
-							flash_cmd (info->
-								   portwidth,
-								   addr, 0,
-								   CHIP_CMD_RD_STAT);
-						}
-						/* did we timeout? */
-					      timed_out_error:if (timeout == 0)
-						{
-							/* didn't timeout, so check the status register */
-							/* create the status mask to check for errors */
-							mask = CHIP_STAT_ECLBS;
-							mask = mask | (mask <<
-								       16);
-							/* put flash into read status mode by writing 0x70 to it */
-							flash_cmd (info->
-								   portwidth,
-								   addr, 0,
-								   CHIP_CMD_RD_STAT);
-							/* are there any errors? */
-							if ((*
-							     (volatile
-							      unsigned long *)
-							     info->
-							     start[sect] &
-							     mask) != 0) {
-								/* We got an erasure error */
-								printf ("Flash erasure error at address 0x%08lx\n", info->start[sect]);
-								printf ("Continuing with next sector\n");
-								/* reset the flash */
-								flash_cmd
-									(info->
-									 portwidth,
-									 addr,
-									 0,
-									 CHIP_CMD_RST);
-							}
-						}
-						/* erasure completed without errors */
-						/* reset the flash */
-						flash_cmd (info->portwidth,
-							   addr, 0,
-							   CHIP_CMD_RST);
-					}	/* end if not protected */
-				}	/* end for loop */
-				printf ("Flash erasure done\n");
-				return 0;
-			} else {
-				/* The Intel flash is not 16-bit wide */
-				/* print and error message and return */
-				/* NOTE: you can add routines here to handle other size flash */
-				printf ("Error: Intel flash device is only %d-bits wide\n", info->chipwidth * 8);
-				printf ("The erasure code only handles Intel 16-bit wide flash memory\n");
-				return 1;
-			}
-		} else {
-			/* Not Intel flash so return an error as a write timeout */
-			/* NOTE: if it's another type flash, stick its routine here */
-			printf ("Error: The flash device is not Intel type\n");
-			printf ("The erasure code only supports Intel flash in a 32-bit port width\n");
-			return 1;
-		}
-	}
-
-	/* end 32-bit wide flash code */
-	if ((info->flash_id & FLASH_TYPEMASK) == FLASH_ROM)
-		return 1;	/* Rom can not be erased */
-	if ((info->flash_id & FLASH_TYPEMASK) == FLASH_RAM) {	/* RAM just copy 0s to RAM */
-		for (sect = s_first; sect <= s_last; sect++) {
-			int sector_size = info->size / info->sector_count;
-
-			addr = (uchar *) (info->start[sect]);
-			memset ((void *) addr, 0, sector_size);
-		}
-		return 0;
-	}
-
-	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_INTEL) {	/* Intel works spezial */
-		return flash_erase_intel (info,
-					  (unsigned short) s_first,
-					  (unsigned short) s_last);
-	}
-#if 0
-	if ((info->flash_id == FLASH_UNKNOWN) ||	/* Flash is unknown to PPCBoot */
-	    (info->flash_id > FLASH_AMD_COMP)) {
-		printf ("Can't erase unknown flash type %08lx - aborted\n",
-			info->flash_id);
-		return 1;
-	}
-#endif
-
-	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");
-	}
-
-	l_sect = -1;
-
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	flash_cmd (info->portwidth, addr, 0x555, 0xAA);	/* start erase routine */
-	flash_cmd (info->portwidth, addr, 0x2AA, 0x55);
-	flash_cmd (info->portwidth, addr, 0x555, 0x80);
-	flash_cmd (info->portwidth, addr, 0x555, 0xAA);
-	flash_cmd (info->portwidth, addr, 0x2AA, 0x55);
-
-	/* Start erase on unprotected sectors */
-	for (sect = s_first; sect <= s_last; sect++) {
-		if (info->protect[sect] == 0) {	/* not protected */
-			addr = (uchar *) (info->start[sect]);
-			flash_cmd (info->portwidth, addr, 0, 0x30);
-			l_sect = sect;
-		}
-	}
-
-	/* re-enable interrupts if necessary */
-	if (flag)
-		enable_interrupts ();
-
-	/* wait at least 80us - let's wait 1 ms */
-	udelay (1000);
-
-	/*
-	 * We wait for the last triggered sector
-	 */
-	if (l_sect < 0)
-		goto DONE;
-
-	start = get_timer (0);
-	last = start;
-	addr = (volatile unsigned char *) (info->start[l_sect]);
-	/* broken for 2x16: TODO */
-	while ((addr[0] & 0x80) != 0x80) {
-		if ((now = get_timer (start)) > CONFIG_SYS_FLASH_ERASE_TOUT) {
-			printf ("Timeout\n");
-			return 1;
-		}
-		/* show that we're waiting */
-		if ((now - last) > 1000) {	/* every second */
-			putc ('.');
-			last = now;
-		}
-	}
-
-      DONE:
-	/* reset to read mode */
-	addr = (volatile unsigned char *) info->start[0];
-	flash_cmd (info->portwidth, addr, 0, 0xf0);
-	flash_cmd (info->portwidth, addr, 0, 0xf0);
-
-	printf (" done\n");
-	return 0;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-
-/* broken for 2x16: TODO */
-int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
-{
-	ulong cp, wp, data;
-	int i, l, rc;
-
-/* Commented out since the below code should work for 32-bit(2x 16 flash) */
-/* 10-16-2002 P. Marchese */
-/*	if(info->portwidth==4) return 1; */
-/*	if(info->portwidth==4) {
-		printf ("- Warning: writting of 32Bit (2*16Bit i.e. 2*28F640J3A) not supported yet !!!! \n");
-		return 1;
-		}*/
-
-	if ((info->flash_id & FLASH_TYPEMASK) == FLASH_ROM)
-		return 0;
-	if ((info->flash_id & FLASH_TYPEMASK) == FLASH_RAM) {
-		memcpy ((void *) addr, src, cnt);
-		return 0;
-	}
-
-	wp = (addr & ~3);	/* get lower word aligned address */
-
-	/*
-	 * handle unaligned start bytes
-	 */
-	if ((l = addr - wp) != 0) {
-		data = 0;
-		for (i = 0, cp = wp; i < l; ++i, ++cp) {
-			data = (data << 8) | (*(uchar *) cp);
-		}
-		for (; i < 4 && cnt > 0; ++i) {
-			data = (data << 8) | *src++;
-			--cnt;
-			++cp;
-		}
-		for (; cnt == 0 && i < 4; ++i, ++cp) {
-			data = (data << 8) | (*(uchar *) cp);
-		}
-
-		if ((rc = write_word (info, wp, data)) != 0) {
-			return (rc);
-		}
-		wp += 4;
-	}
-
-	/*
-	 * handle word aligned part
-	 */
-	while (cnt >= 4) {
-		data = 0;
-		for (i = 0; i < 4; ++i) {
-			data = (data << 8) | *src++;
-		}
-		if ((rc = write_word (info, wp, data)) != 0) {
-			return (rc);
-		}
-		wp += 4;
-		cnt -= 4;
-	}
-
-	if (cnt == 0) {
-		return (0);
-	}
-
-	/*
-	 * handle unaligned tail bytes
-	 */
-	data = 0;
-	for (i = 0, cp = wp; i < 4 && cnt > 0; ++i, ++cp) {
-		data = (data << 8) | *src++;
-		--cnt;
-	}
-	for (; i < 4; ++i, ++cp) {
-		data = (data << 8) | (*(uchar *) cp);
-	}
-
-	return (write_word (info, wp, data));
-}
-
-/*-----------------------------------------------------------------------
- * Write a word to Flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-/* broken for 2x16: TODO */
-static int write_word (flash_info_t * info, ulong dest, ulong data)
-{
-	volatile unsigned char *addr = (uchar *) (info->start[0]);
-	ulong start;
-	int flag, i;
-	ulong mask;
-
-/* modified so that it handles 32-bit(2x16 Intel flash programming */
-/* 10-16-2002 P. Marchese */
-
-	if (info->portwidth == 4)
-/*		{
-		printf ("- Warning: writting of 32Bit (2*16Bit i.e. 2*28F640J3A) not supported yet !!!! \n");
-		return 1;
-		}*/
-	{
-		/* make sure it's Intel flash */
-		if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
-			/* yup! it's an Intel flash */
-			/* is it 16-bits wide? */
-			if (info->chipwidth == 2) {
-				/* yup! it's 16-bits wide */
-				/* so we know how to program it */
-				/* reset the flash */
-				flash_cmd (info->portwidth, addr, 0,
-					   CHIP_CMD_RST);
-				/* Disable interrupts which might cause a timeout here */
-				flag = disable_interrupts ();
-				/* Clear the status register */
-				flash_cmd (info->portwidth, addr, 0,
-					   CHIP_CMD_CLR_STAT);
-				flash_cmd (info->portwidth, addr, 0,
-					   CHIP_CMD_RST);
-				/* 1st cycle of word/byte program */
-				/* write 0x40 to the location to program */
-				flash_cmd (info->portwidth, (uchar *) dest, 0,
-					   CHIP_CMD_PROG);
-				/* 2nd cycle of word/byte program */
-				/* write the data to the destination address */
-				*(ulong *) dest = data;
-				/* re-enable interrupts if necessary */
-				if (flag)
-					enable_interrupts ();
-				/* setup the status register mask */
-				mask = CHIP_STAT_RDY | (CHIP_STAT_RDY << 16);
-				/* put flash into read status mode by writing 0x70 to it */
-				flash_cmd (info->portwidth, addr, 0,
-					   CHIP_CMD_RD_STAT);
-				/* init. the timeout counter */
-				start = get_timer (0);
-				/* keep looping while the flash is not ready */
-				/* exit the loop by timing out or the flash */
-				/* becomes ready again */
-/* 11-13-2002 Paul Marchese */
-/* modified while loop conditional statement */
-/* because we were always timing out.  */
-/* there is a type mismatch, "addr[0]" */
-/* returns a byte but "mask" is a 32-bit value */
-				while ((*(volatile unsigned long *) info->
-					start[0] & mask) != mask)
-/* original code */
-/* while (addr[0] & mask) != mask) */
-				{
-					/* has the timeout limit been reached? */
-					if (get_timer (start) >
-					    CONFIG_SYS_FLASH_WRITE_TOUT) {
-						/* timeout limit reached */
-						printf ("Time out limit reached programming address %08lx with data %08lx\n", dest, data);
-						/* reset the flash */
-						flash_cmd (info->portwidth,
-							   addr, 0,
-							   CHIP_CMD_RST);
-						return (1);
-					}
-					/* put flash into read status mode by writing 0x70 to it */
-					flash_cmd (info->portwidth, addr, 0,
-						   CHIP_CMD_RD_STAT);
-				}
-				/* flash is ready, so check the status */
-				/* create the status mask to check for errors */
-				mask = CHIP_STAT_DPS | CHIP_STAT_VPPS |
-					CHIP_STAT_PSLBS;
-				mask = mask | (mask << 16);
-				/* put flash into read status mode by writing 0x70 to it */
-				flash_cmd (info->portwidth, addr, 0,
-					   CHIP_CMD_RD_STAT);
-				/* are there any errors? */
-				if ((addr[0] & mask) != 0) {
-					/* We got a one of the following errors: */
-					/* Voltage range, Device protect, or programming */
-					/* return the error as a device timeout */
-					/* put flash into read status mode by writing 0x70 to it */
-					flash_cmd (info->portwidth, addr, 0,
-						   CHIP_CMD_RD_STAT);
-					printf ("Flash programming error at address 0x%08lx\n", dest);
-					printf ("Flash status register contains 0x%08lx\n", (unsigned long) addr[0]);
-					/* reset the flash */
-					flash_cmd (info->portwidth, addr, 0,
-						   CHIP_CMD_RST);
-					return 1;
-				}
-				/* write completed without errors */
-				/* reset the flash */
-				flash_cmd (info->portwidth, addr, 0,
-					   CHIP_CMD_RST);
-				return 0;
-			} else {
-				/* it's not 16-bits wide, so return an error as a write timeout */
-				/* NOTE: you can add routines here to handle other size flash */
-				printf ("Error: Intel flash device is only %d-bits wide\n", info->chipwidth * 8);
-				printf ("The write code only handles Intel 16-bit wide flash memory\n");
-				return 1;
-			}
-		} else {
-			/* not Intel flash so return an error as a write timeout */
-			/* NOTE: if it's another type flash, stick its routine here */
-			printf ("Error: The flash device is not Intel type\n");
-			printf ("The code only supports Intel flash in a 32-bit port width\n");
-			return 1;
-		}
-	}
-
-	/* end of 32-bit flash code */
-	if ((info->flash_id & FLASH_TYPEMASK) == FLASH_ROM)
-		return 1;
-	if ((info->flash_id & FLASH_TYPEMASK) == FLASH_RAM) {
-		*(unsigned long *) dest = data;
-		return 0;
-	}
-	if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
-		unsigned short low = data & 0xffff;
-		unsigned short hi = (data >> 16) & 0xffff;
-		int ret = write_word_intel ((bank_addr_t) dest, hi);
-
-		if (!ret)
-			ret = write_word_intel ((bank_addr_t) (dest + 2),
-						low);
-
-		return ret;
-	}
-
-	/* Check if Flash is (sufficiently) erased */
-	if ((*((vu_long *) dest) & data) != data) {
-		return (2);
-	}
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	/* first, perform an unlock bypass command to speed up flash writes */
-	addr[0x555] = 0xAA;
-	addr[0x2AA] = 0x55;
-	addr[0x555] = 0x20;
-
-	/* write each byte out */
-	for (i = 0; i < 4; i++) {
-		char *data_ch = (char *) &data;
-
-		addr[0] = 0xA0;
-		*(((char *) dest) + i) = data_ch[i];
-		udelay (10);	/* XXX */
-	}
-
-	/* we're done, now do an unlock bypass reset */
-	addr[0] = 0x90;
-	addr[0] = 0x00;
-
-	/* re-enable interrupts if necessary */
-	if (flag)
-		enable_interrupts ();
-
-	/* data polling for D7 */
-	start = get_timer (0);
-	while ((*((vu_long *) dest) & 0x00800080) != (data & 0x00800080)) {
-		if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			return (1);
-		}
-	}
-	return (0);
-}
diff --git a/board/Marvell/common/i2c.c b/board/Marvell/common/i2c.c
deleted file mode 100644
index abdde86..0000000
--- a/board/Marvell/common/i2c.c
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- *
- * Hacked for the DB64360 board by Ingo.Assmus@keymile.com
- * extra improvments by Brain Waite
- */
-#include <common.h>
-#include <mpc8xx.h>
-#include <malloc.h>
-#include <i2c.h>
-#include "../include/mv_gen_reg.h"
-#include "../include/core.h"
-
-#define MAX_I2C_RETRYS	    10
-#define I2C_DELAY	    1000	/* Should be at least the # of MHz of Tclk */
-#undef	DEBUG_I2C
-/*#define DEBUG_I2C*/
-
-#ifdef DEBUG_I2C
-#define DP(x) x
-#else
-#define DP(x)
-#endif
-
-/* Assuming that there is only one master on the bus (us) */
-
-void i2c_init (int speed, int slaveaddr)
-{
-	unsigned int n, m, freq, margin, power;
-	unsigned int actualN = 0, actualM = 0;
-	unsigned int control, status;
-	unsigned int minMargin = 0xffffffff;
-	unsigned int tclk = CONFIG_SYS_TCLK;
-	unsigned int i2cFreq = speed;	/* 100000 max. Fast mode not supported */
-
-	DP (puts ("i2c_init\n"));
-/* gtI2cMasterInit */
-	for (n = 0; n < 8; n++) {
-		for (m = 0; m < 16; m++) {
-			power = 2 << n;	/* power = 2^(n+1) */
-			freq = tclk / (10 * (m + 1) * power);
-			if (i2cFreq > freq)
-				margin = i2cFreq - freq;
-			else
-				margin = freq - i2cFreq;
-			if (margin < minMargin) {
-				minMargin = margin;
-				actualN = n;
-				actualM = m;
-			}
-		}
-	}
-
-	DP (puts ("setup i2c bus\n"));
-
-	/* Setup bus */
-/* gtI2cReset */
-	GT_REG_WRITE (I2C_SOFT_RESET, 0);
-
-	DP (puts ("udelay...\n"));
-
-	udelay (I2C_DELAY);
-
-	DP (puts ("set baudrate\n"));
-
-	GT_REG_WRITE (I2C_STATUS_BAUDE_RATE, (actualM << 3) | actualN);
-	GT_REG_WRITE (I2C_CONTROL, (0x1 << 2) | (0x1 << 6));
-
-	udelay (I2C_DELAY * 10);
-
-	DP (puts ("read control, baudrate\n"));
-
-	GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-	GT_REG_READ (I2C_CONTROL, &control);
-}
-
-static uchar i2c_start (void)
-{				/* DB64360 checked -> ok */
-	unsigned int control, status;
-	int count = 0;
-
-	DP (puts ("i2c_start\n"));
-
-	/* Set the start bit */
-
-/* gtI2cGenerateStartBit() */
-
-	GT_REG_READ (I2C_CONTROL, &control);
-	control |= (0x1 << 5);	/* generate the I2C_START_BIT */
-	GT_REG_WRITE (I2C_CONTROL, control);
-
-	GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-
-	count = 0;
-	while ((status & 0xff) != 0x08) {
-		udelay (I2C_DELAY);
-		if (count > 20) {
-			GT_REG_WRITE (I2C_CONTROL, (0x1 << 4));	/*stop */
-			return (status);
-		}
-		GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-		count++;
-	}
-
-	return (0);
-}
-
-static uchar i2c_select_device (uchar dev_addr, uchar read, int ten_bit)
-{
-	unsigned int status, data, bits = 7;
-	int count = 0;
-
-	DP (puts ("i2c_select_device\n"));
-
-	/* Output slave address */
-
-	if (ten_bit) {
-		bits = 10;
-	}
-
-	data = (dev_addr << 1);
-	/* set the read bit */
-	data |= read;
-	GT_REG_WRITE (I2C_DATA, data);
-	/* assert the address */
-	RESET_REG_BITS (I2C_CONTROL, BIT3);
-
-	udelay (I2C_DELAY);
-
-	GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-	count = 0;
-	while (((status & 0xff) != 0x40) && ((status & 0xff) != 0x18)) {
-		udelay (I2C_DELAY);
-		if (count > 20) {
-			GT_REG_WRITE (I2C_CONTROL, (0x1 << 4));	/*stop */
-			return (status);
-		}
-		GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-		count++;
-	}
-
-	if (bits == 10) {
-		printf ("10 bit I2C addressing not yet implemented\n");
-		return (0xff);
-	}
-
-	return (0);
-}
-
-static uchar i2c_get_data (uchar * return_data, int len)
-{
-
-	unsigned int data, status = 0;
-	int count = 0;
-
-	DP (puts ("i2c_get_data\n"));
-
-	while (len) {
-
-		/* Get and return the data */
-
-		RESET_REG_BITS (I2C_CONTROL, (0x1 << 3));
-
-		udelay (I2C_DELAY * 5);
-
-		GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-		count++;
-		while ((status & 0xff) != 0x50) {
-			udelay (I2C_DELAY);
-			if (count > 2) {
-				GT_REG_WRITE (I2C_CONTROL, (0x1 << 4));	/*stop */
-				return 0;
-			}
-			GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-			count++;
-		}
-		GT_REG_READ (I2C_DATA, &data);
-		len--;
-		*return_data = (uchar) data;
-		return_data++;
-	}
-	RESET_REG_BITS (I2C_CONTROL, BIT2 | BIT3);
-	while ((status & 0xff) != 0x58) {
-		udelay (I2C_DELAY);
-		if (count > 200) {
-			GT_REG_WRITE (I2C_CONTROL, (0x1 << 4));	/*stop */
-			return (status);
-		}
-		GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-		count++;
-	}
-	GT_REG_WRITE (I2C_CONTROL, (0x1 << 4));	/* stop */
-
-	return (0);
-}
-
-static uchar i2c_write_data (unsigned int *data, int len)
-{
-	unsigned int status;
-	int count = 0;
-	unsigned int temp;
-	unsigned int *temp_ptr = data;
-
-	DP (puts ("i2c_write_data\n"));
-
-	while (len) {
-		temp = (unsigned int) (*temp_ptr);
-		GT_REG_WRITE (I2C_DATA, temp);
-		RESET_REG_BITS (I2C_CONTROL, (0x1 << 3));
-
-		udelay (I2C_DELAY);
-
-		GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-		count++;
-		while ((status & 0xff) != 0x28) {
-			udelay (I2C_DELAY);
-			if (count > 20) {
-				GT_REG_WRITE (I2C_CONTROL, (0x1 << 4));	/*stop */
-				return (status);
-			}
-			GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-			count++;
-		}
-		len--;
-		temp_ptr++;
-	}
-/* 11-14-2002 Paul Marchese */
-/* Can't have the write issuing a stop command */
-/* it's wrong to have a stop bit in read stream or write stream */
-/* since we don't know if it's really the end of the command */
-/* or whether we have just send the device address + offset */
-/* we will push issuing the stop command off to the original */
-/* calling function */
-	/* set the interrupt bit in the control register */
-	GT_REG_WRITE (I2C_CONTROL, (0x1 << 3));
-	udelay (I2C_DELAY * 10);
-	return (0);
-}
-
-/* 11-14-2002 Paul Marchese */
-/* created this function to get the i2c_write() */
-/* function working properly. */
-/* function to write bytes out on the i2c bus */
-/* this is identical to the function i2c_write_data() */
-/* except that it requires a buffer that is an */
-/* unsigned character array.  You can't use */
-/* i2c_write_data() to send an array of unsigned characters */
-/* since the byte of interest ends up on the wrong end of the bus */
-/* aah, the joys of big endian versus little endian! */
-/* */
-/* returns 0 = success */
-/*         anything other than zero is failure */
-static uchar i2c_write_byte (unsigned char *data, int len)
-{
-	unsigned int status;
-	int count = 0;
-	unsigned int temp;
-	unsigned char *temp_ptr = data;
-
-	DP (puts ("i2c_write_byte\n"));
-
-	while (len) {
-		/* Set and assert the data */
-		temp = *temp_ptr;
-		GT_REG_WRITE (I2C_DATA, temp);
-		RESET_REG_BITS (I2C_CONTROL, (0x1 << 3));
-
-		udelay (I2C_DELAY);
-
-		GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-		count++;
-		while ((status & 0xff) != 0x28) {
-			udelay (I2C_DELAY);
-			if (count > 20) {
-				GT_REG_WRITE (I2C_CONTROL, (0x1 << 4));	/*stop */
-				return (status);
-			}
-			GT_REG_READ (I2C_STATUS_BAUDE_RATE, &status);
-			count++;
-		}
-		len--;
-		temp_ptr++;
-	}
-/* Can't have the write issuing a stop command */
-/* it's wrong to have a stop bit in read stream or write stream */
-/* since we don't know if it's really the end of the command */
-/* or whether we have just send the device address + offset */
-/* we will push issuing the stop command off to the original */
-/* calling function */
-/*	GT_REG_WRITE(I2C_CONTROL, (0x1 << 3) | (0x1 << 4));
-	GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); */
-	/* set the interrupt bit in the control register */
-	GT_REG_WRITE (I2C_CONTROL, (0x1 << 3));
-	udelay (I2C_DELAY * 10);
-
-	return (0);
-}
-
-static uchar
-i2c_set_dev_offset (uchar dev_addr, unsigned int offset, int ten_bit,
-		    int alen)
-{
-	uchar status;
-	unsigned int table[2];
-
-/* initialize the table of address offset bytes */
-/* utilized for 2 byte address offsets */
-/* NOTE: the order is high byte first! */
-	table[1] = offset & 0xff;	/* low byte */
-	table[0] = offset / 0x100;	/* high byte */
-
-	DP (puts ("i2c_set_dev_offset\n"));
-
-	status = i2c_select_device (dev_addr, 0, ten_bit);
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Failed to select device setting offset: 0x%02x\n",
-			status);
-#endif
-		return status;
-	}
-/* check the address offset length */
-	if (alen == 0)
-		/* no address offset */
-		return (0);
-	else if (alen == 1) {
-		/* 1 byte address offset */
-		status = i2c_write_data (&offset, 1);
-		if (status) {
-#ifdef DEBUG_I2C
-			printf ("Failed to write data: 0x%02x\n", status);
-#endif
-			return status;
-		}
-	} else if (alen == 2) {
-		/* 2 bytes address offset */
-		status = i2c_write_data (table, 2);
-		if (status) {
-#ifdef DEBUG_I2C
-			printf ("Failed to write data: 0x%02x\n", status);
-#endif
-			return status;
-		}
-	} else {
-		/* address offset unknown or not supported */
-		printf ("Address length offset %d is not supported\n", alen);
-		return 1;
-	}
-	return 0;		/* sucessful completion */
-}
-
-int
-i2c_read (uchar dev_addr, unsigned int offset, int alen, uchar * data,
-	  int len)
-{
-	uchar status = 0;
-	unsigned int i2cFreq = CONFIG_SYS_I2C_SPEED;
-
-	DP (puts ("i2c_read\n"));
-
-	/* set the i2c frequency */
-	i2c_init (i2cFreq, CONFIG_SYS_I2C_SLAVE);
-
-	status = i2c_start ();
-
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Transaction start failed: 0x%02x\n", status);
-#endif
-		return status;
-	}
-
-	status = i2c_set_dev_offset (dev_addr, offset, 0, alen);	/* send the slave address + offset */
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Failed to set slave address & offset: 0x%02x\n",
-			status);
-#endif
-		return status;
-	}
-
-	/* set the i2c frequency again */
-	i2c_init (i2cFreq, CONFIG_SYS_I2C_SLAVE);
-
-	status = i2c_start ();
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Transaction restart failed: 0x%02x\n", status);
-#endif
-		return status;
-	}
-
-	status = i2c_select_device (dev_addr, 1, 0);	/* send the slave address */
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Address not acknowledged: 0x%02x\n", status);
-#endif
-		return status;
-	}
-
-	status = i2c_get_data (data, len);
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Data not received: 0x%02x\n", status);
-#endif
-		return status;
-	}
-
-	return 0;
-}
-
-/* 11-14-2002 Paul Marchese */
-/* Function to set the I2C stop bit */
-void i2c_stop (void)
-{
-	GT_REG_WRITE (I2C_CONTROL, (0x1 << 4));
-}
-
-/* 11-14-2002 Paul Marchese */
-/* I2C write function */
-/* dev_addr = device address */
-/* offset = address offset */
-/* alen = length in bytes of the address offset */
-/* data = pointer to buffer to read data into */
-/* len = # of bytes to read */
-/* */
-/* returns 0 = succesful */
-/*         anything but zero is failure */
-int
-i2c_write (uchar dev_addr, unsigned int offset, int alen, uchar * data,
-	   int len)
-{
-	uchar status = 0;
-	unsigned int i2cFreq = CONFIG_SYS_I2C_SPEED;
-
-	DP (puts ("i2c_write\n"));
-
-	/* set the i2c frequency */
-	i2c_init (i2cFreq, CONFIG_SYS_I2C_SLAVE);
-
-	status = i2c_start ();	/* send a start bit */
-
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Transaction start failed: 0x%02x\n", status);
-#endif
-		return status;
-	}
-
-	status = i2c_set_dev_offset (dev_addr, offset, 0, alen);	/* send the slave address + offset */
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Failed to set slave address & offset: 0x%02x\n",
-			status);
-#endif
-		return status;
-	}
-
-
-	status = i2c_write_byte (data, len);	/* write the data */
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Data not written: 0x%02x\n", status);
-#endif
-		return status;
-	}
-	/* issue a stop bit */
-	i2c_stop ();
-	return 0;
-}
-
-/* 11-14-2002 Paul Marchese */
-/* function to determine if an I2C device is present */
-/* chip = device address of chip to check for */
-/* */
-/* returns 0 = sucessful, the device exists */
-/*         anything other than zero is failure, no device */
-int i2c_probe (uchar chip)
-{
-
-	/* We are just looking for an <ACK> back. */
-	/* To see if the device/chip is there */
-
-#ifdef DEBUG_I2C
-	unsigned int i2c_status;
-#endif
-	uchar status = 0;
-	unsigned int i2cFreq = CONFIG_SYS_I2C_SPEED;
-
-	DP (puts ("i2c_probe\n"));
-
-	/* set the i2c frequency */
-	i2c_init (i2cFreq, CONFIG_SYS_I2C_SLAVE);
-
-	status = i2c_start ();	/* send a start bit */
-
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Transaction start failed: 0x%02x\n", status);
-#endif
-		return (int) status;
-	}
-
-	status = i2c_set_dev_offset (chip, 0, 0, 0);	/* send the slave address + no offset */
-	if (status) {
-#ifdef DEBUG_I2C
-		printf ("Failed to set slave address: 0x%02x\n", status);
-#endif
-		return (int) status;
-	}
-#ifdef DEBUG_I2C
-	GT_REG_READ (I2C_STATUS_BAUDE_RATE, &i2c_status);
-	printf ("address %#x returned %#x\n", chip, i2c_status);
-#endif
-	/* issue a stop bit */
-	i2c_stop ();
-	return 0;		/* successful completion */
-}
diff --git a/board/Marvell/common/intel_flash.c b/board/Marvell/common/intel_flash.c
deleted file mode 100644
index d6970d4..0000000
--- a/board/Marvell/common/intel_flash.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- *
- * Hacked for the marvell db64360 eval board by
- * Ingo Assmus <ingo.assmus@keymile.com>
- */
-
-#include <common.h>
-#include <mpc8xx.h>
-#include "../include/mv_gen_reg.h"
-#include "../include/memory.h"
-#include "intel_flash.h"
-
-
-/*-----------------------------------------------------------------------
- * Protection Flags:
- */
-#define FLAG_PROTECT_SET	0x01
-#define FLAG_PROTECT_CLEAR	0x02
-
-static void bank_reset (flash_info_t * info, int sect)
-{
-	bank_addr_t addrw, eaddrw;
-
-	addrw = (bank_addr_t) info->start[sect];
-	eaddrw = BANK_ADDR_NEXT_WORD (addrw);
-
-	while (addrw < eaddrw) {
-#ifdef FLASH_DEBUG
-		printf ("  writing reset cmd to addr 0x%08lx\n",
-			(unsigned long) addrw);
-#endif
-		*addrw = BANK_CMD_RST;
-		addrw++;
-	}
-}
-
-static void bank_erase_init (flash_info_t * info, int sect)
-{
-	bank_addr_t addrw, saddrw, eaddrw;
-	int flag;
-
-#ifdef FLASH_DEBUG
-	printf ("0x%08x BANK_CMD_PROG\n", BANK_CMD_PROG);
-	printf ("0x%08x BANK_CMD_ERASE1\n", BANK_CMD_ERASE1);
-	printf ("0x%08x BANK_CMD_ERASE2\n", BANK_CMD_ERASE2);
-	printf ("0x%08x BANK_CMD_CLR_STAT\n", BANK_CMD_CLR_STAT);
-	printf ("0x%08x BANK_CMD_RST\n", BANK_CMD_RST);
-	printf ("0x%08x BANK_STAT_RDY\n", BANK_STAT_RDY);
-	printf ("0x%08x BANK_STAT_ERR\n", BANK_STAT_ERR);
-#endif
-
-	saddrw = (bank_addr_t) info->start[sect];
-	eaddrw = BANK_ADDR_NEXT_WORD (saddrw);
-
-#ifdef FLASH_DEBUG
-	printf ("erasing sector %d, start addr = 0x%08lx "
-		"(bank next word addr = 0x%08lx)\n", sect,
-		(unsigned long) saddrw, (unsigned long) eaddrw);
-#endif
-
-	/* Disable intrs which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	for (addrw = saddrw; addrw < eaddrw; addrw++) {
-#ifdef FLASH_DEBUG
-		printf ("  writing erase cmd to addr 0x%08lx\n",
-			(unsigned long) addrw);
-#endif
-		*addrw = BANK_CMD_ERASE1;
-		*addrw = BANK_CMD_ERASE2;
-	}
-
-	/* re-enable interrupts if necessary */
-	if (flag)
-		enable_interrupts ();
-}
-
-static int bank_erase_poll (flash_info_t * info, int sect)
-{
-	bank_addr_t addrw, saddrw, eaddrw;
-	int sectdone, haderr;
-
-	saddrw = (bank_addr_t) info->start[sect];
-	eaddrw = BANK_ADDR_NEXT_WORD (saddrw);
-
-	sectdone = 1;
-	haderr = 0;
-
-	for (addrw = saddrw; addrw < eaddrw; addrw++) {
-		bank_word_t stat = *addrw;
-
-#ifdef FLASH_DEBUG
-		printf ("  checking status at addr "
-			"0x%08x [0x%08x]\n", (unsigned long) addrw, stat);
-#endif
-		if ((stat & BANK_STAT_RDY) != BANK_STAT_RDY)
-			sectdone = 0;
-		else if ((stat & BANK_STAT_ERR) != 0) {
-			printf (" failed on sector %d "
-				"(stat = 0x%08x) at "
-				"address 0x%p\n", sect, stat, addrw);
-			*addrw = BANK_CMD_CLR_STAT;
-			haderr = 1;
-		}
-	}
-
-	if (haderr)
-		return (-1);
-	else
-		return (sectdone);
-}
-
-int write_word_intel (bank_addr_t addr, bank_word_t value)
-{
-	bank_word_t stat;
-	ulong start;
-	int flag, retval;
-
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	*addr = BANK_CMD_PROG;
-
-	*addr = value;
-
-	/* re-enable interrupts if necessary */
-	if (flag)
-		enable_interrupts ();
-
-	retval = 0;
-
-	/* data polling for D7 */
-	start = get_timer (0);
-	do {
-		if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			retval = 1;
-			goto done;
-		}
-		stat = *addr;
-	} while ((stat & BANK_STAT_RDY) != BANK_STAT_RDY);
-
-	if ((stat & BANK_STAT_ERR) != 0) {
-		printf ("flash program failed (stat = 0x%08lx) "
-			"at address 0x%08lx\n", (ulong) stat, (ulong) addr);
-		*addr = BANK_CMD_CLR_STAT;
-		retval = 3;
-	}
-
-      done:
-	/* reset to read mode */
-	*addr = BANK_CMD_RST;
-
-	return (retval);
-}
-
-/*-----------------------------------------------------------------------
- */
-
-int flash_erase_intel (flash_info_t * info, int s_first, int s_last)
-{
-	int prot, sect, haderr;
-	ulong start, now, last;
-
-#ifdef FLASH_DEBUG
-	printf ("\nflash_erase: erase %d sectors (%d to %d incl.) from\n"
-		"  Bank # %d: ", s_last - s_first + 1, s_first, s_last,
-		(info - flash_info) + 1);
-	flash_print_info (info);
-#endif
-
-	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;
-	}
-
-	prot = 0;
-	for (sect = s_first; sect <= s_last; ++sect) {
-		if (info->protect[sect]) {
-			prot++;
-		}
-	}
-
-	if (prot) {
-		printf ("- Warning: %d protected sector%s will not be erased!\n", prot, (prot > 1 ? "s" : ""));
-	}
-
-	start = get_timer (0);
-	last = 0;
-	haderr = 0;
-
-	for (sect = s_first; sect <= s_last; sect++) {
-		if (info->protect[sect] == 0) {	/* not protected */
-			ulong estart;
-			int sectdone;
-
-			bank_erase_init (info, sect);
-
-			/* wait at least 80us - let's wait 1 ms */
-			udelay (1000);
-
-			estart = get_timer (start);
-
-			do {
-				now = get_timer (start);
-
-				if (now - estart > CONFIG_SYS_FLASH_ERASE_TOUT) {
-					printf ("Timeout (sect %d)\n", sect);
-					haderr = 1;
-					break;
-				}
-#ifndef FLASH_DEBUG
-				/* show that we're waiting */
-				if ((now - last) > 1000) {	/* every second */
-					putc ('.');
-					last = now;
-				}
-#endif
-
-				sectdone = bank_erase_poll (info, sect);
-
-				if (sectdone < 0) {
-					haderr = 1;
-					break;
-				}
-
-			} while (!sectdone);
-
-			if (haderr)
-				break;
-		}
-	}
-
-	if (haderr > 0)
-		printf (" failed\n");
-	else
-		printf (" done\n");
-
-	/* reset to read mode */
-	for (sect = s_first; sect <= s_last; sect++) {
-		if (info->protect[sect] == 0) {	/* not protected */
-			bank_reset (info, sect);
-		}
-	}
-	return haderr;
-}
diff --git a/board/Marvell/common/misc.S b/board/Marvell/common/misc.S
deleted file mode 100644
index b3a0898..0000000
--- a/board/Marvell/common/misc.S
+++ /dev/null
@@ -1,235 +0,0 @@
-#include <config.h>
-#include <74xx_7xx.h>
-#include "version.h"
-
-#include <ppc_asm.tmpl>
-#include <ppc_defs.h>
-
-#include <asm/cache.h>
-#include <asm/mmu.h>
-
-#include "../include/mv_gen_reg.h"
-
-#ifdef CONFIG_ECC
-	/* Galileo specific asm code for initializing ECC */
-	.globl board_relocate_rom
-board_relocate_rom:
-	mflr	r7
-	/* update the location of the GT registers */
-	lis	r11, CONFIG_SYS_GT_REGS@h
-	/* if we're using ECC, we must use the DMA engine to copy ourselves */
-	bl	start_idma_transfer_0
-	bl	wait_for_idma_0
-	bl	stop_idma_engine_0
-
-	mtlr	r7
-	blr
-
-	.globl board_init_ecc
-board_init_ecc:
-	mflr	r7
-	/* NOTE: r10 still contains the location we've been relocated to
-	 * which happens to be TOP_OF_RAM - CONFIG_SYS_MONITOR_LEN */
-
-	/* now that we're running from ram, init the rest of main memory
-	 * for ECC use */
-	lis	r8, CONFIG_SYS_MONITOR_LEN@h
-	ori	r8, r8, CONFIG_SYS_MONITOR_LEN@l
-
-	divw	r3, r10, r8
-
-	/* set up the counter, and init the starting address */
-	mtctr	r3
-	li	r12, 0
-
-	/* bytes per transfer */
-	mr	r5, r8
-about_to_init_ecc:
-1:	mr	r3, r12
-	mr	r4, r12
-	bl	start_idma_transfer_0
-	bl	wait_for_idma_0
-	bl	stop_idma_engine_0
-	add	r12, r12, r8
-	bdnz	1b
-
-	mtlr	r7
-	blr
-
-	/* r3:	dest addr
-	 * r4:	source addr
-	 * r5:	byte count
-	 * r11: gt regbase
-	 * trashes:	 r6, r5
-	 */
-start_idma_transfer_0:
-	/* set the byte count, including the OWN bit */
-	mr	r6, r11
-	ori	r6, r6, CHANNEL0_DMA_BYTE_COUNT
-	stwbrx	r5, 0, (r6)
-
-	/* set the source address */
-	mr	r6, r11
-	ori	r6, r6, CHANNEL0_DMA_SOURCE_ADDRESS
-	stwbrx	r4, 0, (r6)
-
-	/* set the dest address */
-	mr	r6, r11
-	ori	r6, r6, CHANNEL0_DMA_DESTINATION_ADDRESS
-	stwbrx	r3, 0, (r6)
-
-	/* set the next record pointer */
-	li	r5, 0
-	mr	r6, r11
-	ori	r6, r6, CHANNEL0NEXT_RECORD_POINTER
-	stwbrx	r5, 0, (r6)
-
-	/* set the low control register */
-	/* bit 9 is NON chained mode, bit 31 is new style descriptors.
-	   bit 12 is channel enable */
-	ori	r5, r5, (1 << 12) | (1 << 12) | (1 << 11)
-	/* 15 shifted by 16 (oris) == bit 31 */
-	oris	r5, r5, (1 << 15)
-	mr	r6, r11
-	ori	r6, r6, CHANNEL0CONTROL
-	stwbrx	r5, 0, (r6)
-
-	blr
-
-	/* this waits for the bytecount to return to zero, indicating
-	 * that the trasfer is complete */
-wait_for_idma_0:
-	mr	r5, r11
-	lis	r6, 0xff
-	ori	r6, r6, 0xffff
-	ori	r5, r5, CHANNEL0_DMA_BYTE_COUNT
-1:	lwbrx	r4, 0, (r5)
-	and.	r4, r4, r6
-	bne	1b
-
-	blr
-
-	/* this turns off channel 0 of the idma engine */
-stop_idma_engine_0:
-	/* shut off the DMA engine */
-	li	r5, 0
-	mr	r6, r11
-	ori	r6, r6, CHANNEL0CONTROL
-	stwbrx	r5, 0, (r6)
-
-	blr
-#endif
-
-#ifdef CONFIG_SYS_BOARD_ASM_INIT
-	/* NOTE: trashes r3-r7 */
-	.globl board_asm_init
-board_asm_init:
-	/* just move the GT registers to where they belong */
-	lis	r3, CONFIG_SYS_DFL_GT_REGS@h
-	ori	r3, r3, CONFIG_SYS_DFL_GT_REGS@l
-	lis	r4, CONFIG_SYS_GT_REGS@h
-	ori	r4, r4, CONFIG_SYS_GT_REGS@l
-	li	r5, INTERNAL_SPACE_DECODE
-
-	/* test to see if we've already moved */
-	lwbrx	r6, r5, r4
-	andi.	r6, r6, 0xffff
-	/* check loading of R7 is: 0x0F80 should: 0xf800: DONE */
-/*	rlwinm	r7, r4, 8, 16, 31
-	rlwinm	r7, r4, 12, 16, 31	*/ /* original */
-	rlwinm	r7, r4, 16, 16, 31
-	/* -----------------------------------------------------*/
-	cmp	cr0, r7, r6
-	beqlr
-
-	/* nope, have to move the registers */
-	lwbrx	r6, r5, r3
-	andis.	r6, r6, 0xffff
-	or	r6, r6, r7
-	stwbrx	r6, r5, r3
-
-	/* now, poll for the change */
-1:	lwbrx	r7, r5, r4
-	cmp	cr0, r7, r6
-	bne	1b
-
-	/* done! */
-	blr
-#endif
-
-/* For use of the debug LEDs */
-	.global led_on0_relocated
-led_on0_relocated:
-	xor	r21, r21, r21
-	xor	r18, r18, r18
-	lis	r18, 0xFC80
-	ori	r18, r18, 0x8000
-	stw	r21, 0x0(r18)
-/*	  stw	  r18, 0x0(r18) */
-	sync
-	blr
-
-	.global led_off0_relocated
-led_off0_relocated:
-	xor	r21, r21, r21
-	xor	r18, r18, r18
-	lis	r18, 0xFC81
-	ori	r18, r18, 0x4000
-	stw	r21, 0x0(r18)
-/*	  stw	  r18, 0x0(r18) */
-	sync
-	blr
-
-	.global led_on0
-led_on0:
-	xor	r18, r18, r18
-	lis	r18, 0x1c80
-	ori	r18, r18, 0x8000
-	stw	r18, 0x0(r18)
-	sync
-	blr
-
-	.global led_off0
-led_off0:
-	xor	r18, r18, r18
-	lis	r18, 0x1c81
-	ori	r18, r18, 0x4000
-	stw	r18, 0x0(r18)
-	sync
-	blr
-
-	.global led_on1
-led_on1:
-	xor	r18, r18, r18
-	lis	r18, 0x1c80
-	ori	r18, r18, 0xc000
-	stw	r18, 0x0(r18)
-	sync
-	blr
-
-	.global led_off1
-led_off1:
-	xor	r18, r18, r18
-	lis	r18, 0x1c81
-	ori	r18, r18, 0x8000
-	stw	r18, 0x0(r18)
-	sync
-	blr
-
-	.global led_on2
-led_on2:
-	xor	r18, r18, r18
-	lis	r18, 0x1c81
-	ori	r18, r18, 0x0000
-	stw	r18, 0x0(r18)
-	sync
-	blr
-
-	.global led_off2
-led_off2:
-	xor	r18, r18, r18
-	lis	r18, 0x1c81
-	ori	r18, r18, 0xc000
-	stw	r18, 0x0(r18)
-	sync
-	blr
diff --git a/board/Marvell/common/serial.c b/board/Marvell/common/serial.c
index 752492f..432aa06 100644
--- a/board/Marvell/common/serial.c
+++ b/board/Marvell/common/serial.c
@@ -21,14 +21,6 @@
 
 #include "../include/memory.h"
 
-#ifdef CONFIG_DB64360
-#include "../db64360/mpsc.h"
-#endif
-
-#ifdef CONFIG_DB64460
-#include "../db64460/mpsc.h"
-#endif
-
 #include "ns16550.h"
 
 DECLARE_GLOBAL_DATA_PTR;