Merge branch 'u-boot/master'

Conflicts:
	drivers/net/Makefile

(trivial merge)

1 files changed, 0 insertions, 110 deletions

diff --git a/board/incaip/incaip.c b/board/incaip/incaip.c
deleted file mode 100644
index 217b8af..0000000
--- a/board/incaip/incaip.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * (C) Copyright 2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <command.h>
-#include <netdev.h>
-#include <asm/addrspace.h>
-#include <asm/inca-ip.h>
-#include <asm/io.h>
-#include <asm/reboot.h>
-
-extern uint incaip_get_cpuclk(void);
-
-void _machine_restart(void)
-{
-	*INCA_IP_WDT_RST_REQ = 0x3f;
-}
-
-static ulong max_sdram_size(void)
-{
-	/* The only supported SDRAM data width is 16bit.
-	 */
-#define CONFIG_SYS_DW	2
-
-	/* The only supported number of SDRAM banks is 4.
-	 */
-#define CONFIG_SYS_NB	4
-
-	ulong cfgpb0 = *INCA_IP_SDRAM_MC_CFGPB0;
-	int   cols   = cfgpb0 & 0xF;
-	int   rows   = (cfgpb0 & 0xF0) >> 4;
-	ulong size   = (1 << (rows + cols)) * CONFIG_SYS_DW * CONFIG_SYS_NB;
-
-	return size;
-}
-
-phys_size_t initdram(int board_type)
-{
-	int   rows, cols, best_val = *INCA_IP_SDRAM_MC_CFGPB0;
-	ulong size, max_size       = 0;
-	ulong our_address;
-
-	asm volatile ("move %0, $25" : "=r" (our_address) :);
-
-		/* Can't probe for RAM size unless we are running from Flash.
-		 */
-	if (CPHYSADDR(our_address) < CPHYSADDR(PHYS_FLASH_1))
-	{
-		return max_sdram_size();
-	}
-
-	for (cols = 0x8; cols <= 0xC; cols++)
-	{
-		for (rows = 0xB; rows <= 0xD; rows++)
-		{
-			*INCA_IP_SDRAM_MC_CFGPB0 = (0x14 << 8) |
-						   (rows << 4) | cols;
-			size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
-							     max_sdram_size());
-
-			if (size > max_size)
-			{
-				best_val = *INCA_IP_SDRAM_MC_CFGPB0;
-				max_size = size;
-			}
-		}
-	}
-
-	*INCA_IP_SDRAM_MC_CFGPB0 = best_val;
-	return max_size;
-}
-
-int checkboard (void)
-{
-	unsigned long chipid = *INCA_IP_WDT_CHIPID;
-	int part_num;
-
-	puts ("Board: INCA-IP ");
-	part_num = (chipid >> 12) & 0xffff;
-	switch (part_num) {
-	case 0xc0:
-		printf ("Standard Version, ");
-		break;
-	case 0xc1:
-		printf ("Basic Version, ");
-		break;
-	default:
-		printf ("Unknown Part Number 0x%x ", part_num);
-		break;
-	}
-
-	printf ("Chip V1.%ld, ", (chipid >> 28));
-
-	printf("CPU Speed %d MHz\n", incaip_get_cpuclk()/1000000);
-
-	set_io_port_base(0);
-
-	return 0;
-}
-
-#if defined(CONFIG_INCA_IP_SWITCH)
-int board_eth_init(bd_t *bis)
-{
-	return inca_switch_initialize(bis);
-}
-#endif