From ae65af401cf1fde61c209eeead2ca7cbadd13dae Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 15 Mar 2007 03:31:49 +0000
Subject: [PATCH] Remove vestiges of very specific fpga support for my
company's board. It isn't relevant to FreeBSD as a whole, breaks the build,
and isn't even needed for my company's boards anymore...
MFC After: 2 weeks
---
sys/boot/arm/at91/bootspi/loader_prompt.c | 37 -----------------------
sys/boot/arm/at91/libat91/Makefile | 2 +-
2 files changed, 1 insertion(+), 38 deletions(-)
diff --git a/sys/boot/arm/at91/bootspi/loader_prompt.c b/sys/boot/arm/at91/bootspi/loader_prompt.c
index f5c8668c31bb..63bc50e536ec 100644
--- a/sys/boot/arm/at91/bootspi/loader_prompt.c
+++ b/sys/boot/arm/at91/bootspi/loader_prompt.c
@@ -43,8 +43,6 @@ static int buffCount;
static char *argv[MAX_COMMAND_PARAMS];
#define FLASH_OFFSET (0 * FLASH_PAGE_SIZE)
-#define FPGA_OFFSET (15 * FLASH_PAGE_SIZE)
-#define FPGA_LEN (212608)
#define KERNEL_OFFSET (220 * FLASH_PAGE_SIZE)
#define KERNEL_LEN (6 * 1024 * FLASH_PAGE_SIZE)
static const char *backspaceString = "\010 \010";
@@ -61,41 +59,10 @@ static const command_entry_t CommandTable[] = {
{COMMAND_LOAD_SPI_KERNEL, "k"},
{COMMAND_REPLACE_KERNEL_VIA_XMODEM, "K"},
{COMMAND_REPLACE_FLASH_VIA_XMODEM, "I"},
- {COMMAND_REPLACE_FPGA_VIA_XMODEM, "F"},
{COMMAND_REPLACE_ID_EEPROM, "E"},
{COMMAND_FINAL_FLAG, 0}
};
-#ifdef TSC_FPGA
-#include "fpga.h"
-
-const struct fpga main_fpga =
-{
- AT91C_BASE_PIOB, AT91C_PIO_PB0,
- AT91C_BASE_PIOC, AT91C_PIO_PC11,
- AT91C_BASE_PIOB, AT91C_PIO_PB2,
- AT91C_BASE_PIOC, AT91C_PIO_PC12
-};
-
-void
-fpga_load(void)
-{
- int len, off, i, offset;
- char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
-
- len = FPGA_LEN;
- offset = FPGA_OFFSET;
- for (i = 0; i < len; i+= FLASH_PAGE_SIZE) {
- off = i + offset;
- SPI_ReadFlash(off, addr + i, FLASH_PAGE_SIZE);
- }
- fpga_init(&main_fpga);
- fpga_clear(&main_fpga);
- fpga_write_bytes(&main_fpga, addr, len);
- fpga_done(&main_fpga);
-}
-#endif
-
/*
* .KB_C_FN_DEFINITION_START
* unsigned BuildIP(void)
@@ -310,10 +277,6 @@ ParseCommand(char *buffer)
printf("Updating KERNEL image\n");
UpdateFlash(KERNEL_OFFSET);
break;
- case COMMAND_REPLACE_FPGA_VIA_XMODEM:
- printf("Updating FPGA image\n");
- UpdateFlash(FPGA_OFFSET);
- break;
case COMMAND_REPLACE_FLASH_VIA_XMODEM:
printf("Updating FLASH image\n");
UpdateFlash(FLASH_OFFSET);
diff --git a/sys/boot/arm/at91/libat91/Makefile b/sys/boot/arm/at91/libat91/Makefile
index 2d9e71543682..08585fd57802 100644
--- a/sys/boot/arm/at91/libat91/Makefile
+++ b/sys/boot/arm/at91/libat91/Makefile
@@ -4,7 +4,7 @@
LIB= at91
INTERNALLIB=
-SRCS=at91rm9200_lowlevel.c delay.c eeprom.c emac.c emac_init.c fpga.c getc.c \
+SRCS=at91rm9200_lowlevel.c delay.c eeprom.c emac.c emac_init.c getc.c \
putchar.c printf.c reset.c spi_flash.c xmodem.c \
sd-card.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \
memset.c memcmp.c