Merge remote-tracking branch 'u-boot/master'

8 files changed, 0 insertions, 950 deletions

diff --git a/board/BuS/eb_cpux9k2/Kconfig b/board/BuS/eb_cpux9k2/Kconfig
deleted file mode 100644
index e2a787a..0000000
--- a/board/BuS/eb_cpux9k2/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_EB_CPUX9K2
-
-config SYS_BOARD
-	default "eb_cpux9k2"
-
-config SYS_VENDOR
-	default "BuS"
-
-config SYS_CONFIG_NAME
-	default "eb_cpux9k2"
-
-endif
diff --git a/board/BuS/eb_cpux9k2/MAINTAINERS b/board/BuS/eb_cpux9k2/MAINTAINERS
deleted file mode 100644
index 81c4349..0000000
--- a/board/BuS/eb_cpux9k2/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-EB_CPUX9K2 BOARD
-M:	Jens Scharsig <esw@bus-elektronik.de>
-S:	Maintained
-F:	board/BuS/eb_cpux9k2/
-F:	include/configs/eb_cpux9k2.h
-F:	configs/eb_cpux9k2_defconfig
-F:	configs/eb_cpux9k2_ram_defconfig
diff --git a/board/BuS/eb_cpux9k2/Makefile b/board/BuS/eb_cpux9k2/Makefile
deleted file mode 100644
index b2ec389..0000000
--- a/board/BuS/eb_cpux9k2/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# (C) Copyright 2003-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y	:= cpux9k2.o
diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c
deleted file mode 100644
index 3880a06..0000000
--- a/board/BuS/eb_cpux9k2/cpux9k2.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * (C) Copyright 2008-2009
- * BuS Elektronik GmbH & Co. KG <www.bus-elektronik.de>
- * Jens Scharsig <esw@bus-elektronik.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <exports.h>
-#include <net.h>
-#include <netdev.h>
-#include <nand.h>
-
-#include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_mc.h>
-#include <asm/arch/at91_common.h>
-
-#ifdef CONFIG_STATUS_LED
-#include <status_led.h>
-#endif
-
-#ifdef CONFIG_VIDEO
-#include <bus_vcxk.h>
-
-extern unsigned long display_width;
-extern unsigned long display_height;
-#endif
-
-#ifdef CONFIG_CMD_NAND
-void cpux9k2_nand_hw_init(void);
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-int board_init(void)
-{
-	at91_pio_t *pio	= (at91_pio_t *) ATMEL_BASE_PIO;
-
-	/* Correct IRDA resistor problem / Set PA23_TXD in Output */
-	writel(ATMEL_PMX_AA_TXD2, &pio->pioa.oer);
-
-	gd->bd->bi_arch_number = MACH_TYPE_EB_CPUX9K2;
-	/* adress of boot parameters */
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-#ifdef CONFIG_STATUS_LED
-	status_led_set(STATUS_LED_BOOT, STATUS_LED_ON);
-#endif
-#ifdef CONFIG_CMD_NAND
-	cpux9k2_nand_hw_init();
-#endif
-	return 0;
-}
-
-int board_early_init_f(void)
-{
-	at91_seriald_hw_init();
-	return 0;
-}
-
-#ifdef CONFIG_MISC_INIT_R
-
-int misc_init_r(void)
-{
-	uchar	mac[8];
-	uchar	tm;
-	uchar	midx;
-	uchar	macn6, macn7;
-
-	if (getenv("ethaddr") == NULL) {
-		if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0x00,
-				CONFIG_SYS_I2C_EEPROM_ADDR_LEN,
-				(uchar *) &mac, sizeof(mac)) != 0) {
-			puts("Error reading MAC from EEPROM\n");
-		} else {
-			tm = 0;
-			macn6 = 0;
-			macn7 = 0xFF;
-			for (midx = 0; midx < 6; midx++) {
-				if ((mac[midx] != 0) && (mac[midx] != 0xFF))
-					tm++;
-				macn6 += mac[midx];
-				macn7 ^= mac[midx];
-			}
-			if ((macn6 != mac[6]) || (macn7 != mac[7]))
-				tm = 0;
-			if (tm)
-				eth_setenv_enetaddr("ethaddr", mac);
-			 else
-				puts("Error: invalid MAC at EEPROM\n");
-		}
-	}
-	gd->jt->do_reset = do_reset;
-
-#ifdef CONFIG_STATUS_LED
-	status_led_set(STATUS_LED_BOOT, STATUS_LED_BLINKING);
-#endif
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_RESET_PHY_R
-void reset_phy(void)
-{
-	udelay(10000);
-	eth_init();
-}
-#endif
-
-/*
- * DRAM initialisations
- */
-
-int dram_init(void)
-{
-	gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
-			CONFIG_SYS_SDRAM_SIZE);
-	return 0;
-}
-
-/*
- * Ethernet initialisations
- */
-
-#ifdef CONFIG_DRIVER_AT91EMAC
-int board_eth_init(bd_t *bis)
-{
-	int rc = 0;
-	rc = at91emac_register(bis, (u32) ATMEL_BASE_EMAC);
-	return rc;
-}
-#endif
-
-/*
- * Disk On Chip (NAND) Millenium initialization.
- * The NAND lives in the CS2* space
- */
-#if defined(CONFIG_CMD_NAND)
-
-#define	MASK_ALE	(1 << 22)	/* our ALE is AD22 */
-#define	MASK_CLE	(1 << 21)	/* our CLE is AD21 */
-
-void cpux9k2_nand_hw_init(void)
-{
-	unsigned long csr;
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
-	at91_mc_t *mc = (at91_mc_t *) ATMEL_BASE_MC;
-
-	/* Setup Smart Media, fitst enable the address range of CS3 */
-	writel(readl(&mc->ebi.csa) | AT91_EBI_CSA_CS3A, &mc->ebi.csa);
-
-	/* RWH = 1 | RWS = 0 | TDF = 1 | NWS = 3 */
-	csr =	AT91_SMC_CSR_RWHOLD(1) | AT91_SMC_CSR_TDF(1) |
-		AT91_SMC_CSR_NWS(3) |
-		AT91_SMC_CSR_ACSS_STANDARD | AT91_SMC_CSR_DBW_8 |
-		AT91_SMC_CSR_WSEN;
-	writel(csr, &mc->smc.csr[3]);
-
-	writel(ATMEL_PMX_CA_SMOE | ATMEL_PMX_CA_SMWE, &pio->pioc.asr);
-	writel(ATMEL_PMX_CA_BFCK | ATMEL_PMX_CA_SMOE | ATMEL_PMX_CA_SMWE,
-		&pio->pioc.pdr);
-
-	/* Configure PC2 as input (signal Nand READY ) */
-	writel(ATMEL_PMX_CA_BFAVD, &pio->pioc.per);
-	writel(ATMEL_PMX_CA_BFAVD, &pio->pioc.odr); /* disable output */
-	writel(ATMEL_PMX_CA_BFCK, &pio->pioc.codr);
-
-	/* PIOC clock enabling */
-	writel(1 << ATMEL_ID_PIOC, &pmc->pcer);
-}
-
-static void board_nand_hwcontrol(struct mtd_info *mtd,
-	int cmd, unsigned int ctrl)
-{
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	struct nand_chip *this = mtd->priv;
-	ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
-
-	if (ctrl & NAND_CTRL_CHANGE) {
-		IO_ADDR_W &= ~(MASK_ALE | MASK_CLE);
-
-		if (ctrl & NAND_CLE)
-			IO_ADDR_W |= MASK_CLE;
-		if (ctrl & NAND_ALE)
-			IO_ADDR_W |= MASK_ALE;
-
-		if ((ctrl & NAND_NCE))
-			writel(1, &pio->pioc.codr);
-		else
-			writel(1, &pio->pioc.sodr);
-
-		this->IO_ADDR_W = (void *) IO_ADDR_W;
-	}
-	if (cmd != NAND_CMD_NONE)
-		writeb(cmd, this->IO_ADDR_W);
-}
-
-static int board_nand_dev_ready(struct mtd_info *mtd)
-{
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	return ((readl(&pio->pioc.pdsr) & (1 << 2)) != 0);
-}
-
-int board_nand_init(struct nand_chip *nand)
-{
-	cpux9k2_nand_hw_init();
-	nand->ecc.mode = NAND_ECC_SOFT;
-	nand->cmd_ctrl = board_nand_hwcontrol;
-	nand->dev_ready = board_nand_dev_ready;
-	nand->chip_delay = 20;
-	return 0;
-}
-
-#endif
-
-#if defined(CONFIG_VIDEO)
-/*
- * drv_video_init
- * FUNCTION: initialize VCxK device
- */
-
-int drv_video_init(void)
-{
-#ifdef CONFIG_SPLASH_SCREEN
-	unsigned long splash;
-#endif
-	char *s;
-	unsigned long csr;
-	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
-	at91_mc_t *mc = (at91_mc_t *) ATMEL_BASE_MC;
-
-	printf("Init Video as ");
-	s = getenv("displaywidth");
-	if (s != NULL)
-		display_width = simple_strtoul(s, NULL, 10);
-	else
-		display_width = 256;
-	s = getenv("displayheight");
-	if (s != NULL)
-		display_height = simple_strtoul(s, NULL, 10);
-	else
-		display_height = 256;
-	printf("%ld x %ld pixel matrix\n", display_width, display_height);
-
-	/* RWH = 2 | RWS =2  | TDF = 4 | NWS = 0x6 */
-	csr =	AT91_SMC_CSR_RWHOLD(2) | AT91_SMC_CSR_RWSETUP(2) |
-		AT91_SMC_CSR_TDF(4) | AT91_SMC_CSR_NWS(6) |
-		AT91_SMC_CSR_ACSS_STANDARD | AT91_SMC_CSR_DBW_16 |
-		AT91_SMC_CSR_BAT_16 | AT91_SMC_CSR_WSEN;
-	writel(csr, &mc->smc.csr[2]);
-	writel(1 << ATMEL_ID_PIOB, &pmc->pcer);
-
-	vcxk_init(display_width, display_height);
-#ifdef CONFIG_SPLASH_SCREEN
-	s = getenv("splashimage");
-	if (s != NULL) {
-		splash = simple_strtoul(s, NULL, 16);
-		printf("use splashimage: %lx\n", splash);
-		video_display_bitmap(splash, 0, 0);
-	}
-#endif
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_SYS_I2C_SOFT
-
-void i2c_init_board(void)
-{
-	u32 pin;
-	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-
-	writel(1 << ATMEL_ID_PIOA, &pmc->pcer);
-	pin = ATMEL_PMX_AA_TWD | ATMEL_PMX_AA_TWCK;
-	writel(pin, &pio->pioa.idr);
-	writel(pin, &pio->pioa.pudr);
-	writel(pin, &pio->pioa.per);
-	writel(pin, &pio->pioa.oer);
-	writel(pin, &pio->pioa.sodr);
-}
-
-#endif
-
-/*--------------------------------------------------------------------------*/
-
-#ifdef CONFIG_STATUS_LED
-
-void __led_toggle(led_id_t mask)
-{
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-
-	if (readl(&pio->piod.odsr) & mask)
-		writel(mask, &pio->piod.codr);
-	else
-		writel(mask, &pio->piod.codr);
-}
-
-void __led_init(led_id_t mask, int state)
-{
-	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-
-	writel(1 << ATMEL_ID_PIOD, &pmc->pcer);	/* Enable PIOB clock */
-	/* Disable peripherals on LEDs */
-	writel(STATUS_LED_BIT | STATUS_LED_BIT1, &pio->piod.per);
-	/* Enable pins as outputs */
-	writel(STATUS_LED_BIT | STATUS_LED_BIT1, &pio->piod.oer);
-	/* Turn all LEDs OFF */
-	writel(STATUS_LED_BIT | STATUS_LED_BIT1, &pio->piod.sodr);
-
-	__led_set(mask, state);
-}
-
-void __led_set(led_id_t mask, int state)
-{
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	if (state == STATUS_LED_ON)
-		writel(mask, &pio->piod.codr);
-	else
-		writel(mask, &pio->piod.sodr);
-}
-
-#endif
-
-/*---------------------------------------------------------------------------*/
-
-int do_brightness(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-	int rcode = 0;
-	ulong side;
-	ulong bright;
-
-	switch (argc) {
-	case 3:
-		side = simple_strtoul(argv[1], NULL, 10);
-		bright = simple_strtoul(argv[2], NULL, 10);
-		if ((side >= 0) && (side <= 3) &&
-				(bright >= 0) && (bright <= 1000)) {
-			vcxk_setbrightness(side, bright);
-			rcode = 0;
-		} else {
-			printf("parameters out of range\n");
-			printf("Usage:\n%s\n", cmdtp->usage);
-			rcode = 1;
-		}
-		break;
-	default:
-		printf("Usage:\n%s\n", cmdtp->usage);
-		rcode = 1;
-		break;
-	}
-	return rcode;
-}
-
-/*---------------------------------------------------------------------------*/
-
-U_BOOT_CMD(
-	bright,	3,	0,	do_brightness,
-	"bright  - sets the display brightness\n",
-	" <side> <0..1000>\n        side: 0/3=both; 1=first; 2=second\n"
-);
-
-/* EOF cpu9k2.c */
diff --git a/board/BuS/vl_ma2sc/Kconfig b/board/BuS/vl_ma2sc/Kconfig
deleted file mode 100644
index 848177f..0000000
--- a/board/BuS/vl_ma2sc/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_VL_MA2SC
-
-config SYS_BOARD
-	default "vl_ma2sc"
-
-config SYS_VENDOR
-	default "BuS"
-
-config SYS_CONFIG_NAME
-	default "vl_ma2sc"
-
-endif
diff --git a/board/BuS/vl_ma2sc/MAINTAINERS b/board/BuS/vl_ma2sc/MAINTAINERS
deleted file mode 100644
index b70104d..0000000
--- a/board/BuS/vl_ma2sc/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-VL_MA2SC BOARD
-M:	Jens Scharsig <esw@bus-elektronik.de>
-S:	Maintained
-F:	board/BuS/vl_ma2sc/
-F:	include/configs/vl_ma2sc.h
-F:	configs/vl_ma2sc_defconfig
-F:	configs/vl_ma2sc_ram_defconfig
diff --git a/board/BuS/vl_ma2sc/Makefile b/board/BuS/vl_ma2sc/Makefile
deleted file mode 100644
index d4b24ac..0000000
--- a/board/BuS/vl_ma2sc/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# (C) Copyright 2003-2008
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2009-2012
-# Jens Scharsig  <esw@bus-elekronik.de>
-# BuS Elektronik GmbH & Co. KG
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y += vl_ma2sc.o
diff --git a/board/BuS/vl_ma2sc/vl_ma2sc.c b/board/BuS/vl_ma2sc/vl_ma2sc.c
deleted file mode 100644
index e4e1a85..0000000
--- a/board/BuS/vl_ma2sc/vl_ma2sc.c
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * (C) Copyright 2009-2012
- * Jens Scharsig  <esw@bus-elekronik.de>
- * BuS Elektronik GmbH & Co. KG
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <config.h>
-#include <common.h>
-#include <linux/sizes.h>
-#include <asm/io.h>
-#include <asm/gpio.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/clk.h>
-#include <asm/arch/at91_matrix.h>
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/at91sam9263.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91_common.h>
-#include <lcd.h>
-#include <i2c.h>
-#include <atmel_lcdc.h>
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-#include <net.h>
-#endif
-#include <netdev.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_CMD_NAND
-static void vl_ma2sc_nand_hw_init(void)
-{
-	unsigned long csa;
-	at91_smc_t	*smc	= (at91_smc_t *) ATMEL_BASE_SMC0;
-	at91_matrix_t	*matrix = (at91_matrix_t *) ATMEL_BASE_MATRIX;
-	at91_pmc_t	*pmc	= (at91_pmc_t *) ATMEL_BASE_PMC;
-
-	at91_set_pio_output(AT91_PIO_PORTA, 13, 1);	/* CAN_TX -> H */
-	at91_set_pio_output(AT91_PIO_PORTA, 12, 1);	/* CAN_STB -> H */
-	at91_set_pio_output(AT91_PIO_PORTA, 11, 1);	/* CAN_EN -> H */
-
-	/* Enable CS3 */
-	csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A;
-	writel(csa, &matrix->csa[0]);
-
-	/* Configure SMC CS3 for NAND/SmartMedia */
-	writel(AT91_SMC_SETUP_NWE(1) | AT91_SMC_SETUP_NCS_WR(0) |
-		AT91_SMC_SETUP_NRD(1) | AT91_SMC_SETUP_NCS_RD(0),
-		&smc->cs[3].setup);
-
-	writel(AT91_SMC_PULSE_NWE(3) | AT91_SMC_PULSE_NCS_WR(3) |
-		AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(3),
-		&smc->cs[3].pulse);
-
-	writel(AT91_SMC_CYCLE_NWE(5) | AT91_SMC_CYCLE_NRD(5),
-		&smc->cs[3].cycle);
-	writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
-		AT91_SMC_MODE_DBW_8 |
-		AT91_SMC_MODE_TDF_CYCLE(2),
-		&smc->cs[3].mode);
-	writel((1 << ATMEL_ID_PIOB) | (1 << ATMEL_ID_PIOCDE),
-		&pmc->pcer);
-
-	/* Configure RDY/BSY */
-#ifdef CONFIG_SYS_NAND_READY_PIN
-	gpio_direction_input(CONFIG_SYS_NAND_READY_PIN);
-#endif
-	/* Enable NandFlash */
-	gpio_direction_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
-}
-#endif
-
-#ifdef CONFIG_MACB
-static void vl_ma2sc_macb_hw_init(void)
-{
-	at91_pmc_t	*pmc	= (at91_pmc_t *) ATMEL_BASE_PMC;
-
-	/* Enable clock */
-	writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
-
-	at91_phy_reset();
-
-	at91_macb_hw_init();
-}
-#endif
-
-#ifdef CONFIG_LCD
-vidinfo_t panel_info = {
-	.vl_col =		320,
-	.vl_row =		240,
-	.vl_clk =		6500000,
-	.vl_sync =		ATMEL_LCDC_INVDVAL_INVERTED |
-				ATMEL_LCDC_INVLINE_INVERTED |
-				ATMEL_LCDC_INVVD_INVERTED   |
-				ATMEL_LCDC_INVFRAME_INVERTED,
-	.vl_bpix =		(ATMEL_LCDC_PIXELSIZE_8 >> 5),
-	.vl_tft =		1,
-	.vl_hsync_len =		5,	/* Horiz Sync Pulse Width */
-	.vl_left_margin =	68,	/* horiz back porch */
-	.vl_right_margin =	20,	/* horiz front porch */
-	.vl_vsync_len =		2,	/* vert Sync Pulse Width */
-	.vl_upper_margin =	18,	/* vert back porch */
-	.vl_lower_margin =	4,	/* vert front porch */
-	.mmio =			ATMEL_BASE_LCDC,
-};
-
-void lcd_enable(void)
-{
-}
-
-void lcd_disable(void)
-{
-}
-
-static void vl_ma2sc_lcd_hw_init(void)
-{
-	at91_pmc_t	*pmc	= (at91_pmc_t *) ATMEL_BASE_PMC;
-
-	at91_set_a_periph(AT91_PIO_PORTC, 0, 0);	/* LCDVSYNC */
-	at91_set_a_periph(AT91_PIO_PORTC, 1, 0);	/* LCDHSYNC */
-	at91_set_a_periph(AT91_PIO_PORTC, 2, 0);	/* LCDDOTCK */
-	at91_set_a_periph(AT91_PIO_PORTC, 3, 0);	/* LCDDEN */
-	at91_set_b_periph(AT91_PIO_PORTB, 9, 0);	/* LCDCC */
-
-	at91_set_a_periph(AT91_PIO_PORTC, 4, 0);	/* LCDD0 */
-	at91_set_a_periph(AT91_PIO_PORTC, 5, 0);	/* LCDD1 */
-	at91_set_a_periph(AT91_PIO_PORTC, 6, 0);	/* LCDD2 */
-	at91_set_a_periph(AT91_PIO_PORTC, 7, 0);	/* LCDD3 */
-	at91_set_a_periph(AT91_PIO_PORTC, 8, 0);	/* LCDD4 */
-	at91_set_a_periph(AT91_PIO_PORTC, 9, 0);	/* LCDD5 */
-	at91_set_a_periph(AT91_PIO_PORTC, 10, 0);	/* LCDD6 */
-	at91_set_a_periph(AT91_PIO_PORTC, 11, 0);	/* LCDD7 */
-
-	at91_set_a_periph(AT91_PIO_PORTC, 13, 0);	/* LCDD9 */
-	at91_set_a_periph(AT91_PIO_PORTC, 14, 0);	/* LCDD10 */
-	at91_set_a_periph(AT91_PIO_PORTC, 15, 0);	/* LCDD11 */
-	at91_set_a_periph(AT91_PIO_PORTC, 16, 0);	/* LCDD12 */
-	at91_set_b_periph(AT91_PIO_PORTC, 12, 0);	/* LCDD13 */
-	at91_set_a_periph(AT91_PIO_PORTC, 18, 0);	/* LCDD14 */
-	at91_set_a_periph(AT91_PIO_PORTC, 19, 0);	/* LCDD15 */
-
-	at91_set_a_periph(AT91_PIO_PORTC, 20, 0);	/* LCDD26 */
-	at91_set_a_periph(AT91_PIO_PORTC, 21, 0);	/* LCDD17 */
-	at91_set_a_periph(AT91_PIO_PORTC, 22, 0);	/* LCDD18 */
-	at91_set_a_periph(AT91_PIO_PORTC, 23, 0);	/* LCDD19 */
-	at91_set_a_periph(AT91_PIO_PORTC, 24, 0);	/* LCDD20 */
-	at91_set_b_periph(AT91_PIO_PORTC, 17, 0);	/* LCDD21 */
-	at91_set_a_periph(AT91_PIO_PORTC, 26, 0);	/* LCDD22 */
-	at91_set_a_periph(AT91_PIO_PORTC, 27, 0);	/* LCDD23 */
-
-	at91_set_pio_output(AT91_PIO_PORTE, 0, 0);	/* LCD QXH */
-
-	at91_set_pio_output(AT91_PIO_PORTE, 2, 0);	/* LCD SHUT */
-	at91_set_pio_output(AT91_PIO_PORTE, 3, 1);	/* LCD TopBottom */
-	at91_set_pio_output(AT91_PIO_PORTE, 4, 0);	/* LCD REV */
-	at91_set_pio_output(AT91_PIO_PORTE, 5, 1);	/* LCD RightLeft */
-	at91_set_pio_output(AT91_PIO_PORTE, 6, 0);	/* LCD Color Mode CM */
-	at91_set_pio_output(AT91_PIO_PORTE, 7, 0);	/* LCD BGR */
-
-	at91_set_pio_output(AT91_PIO_PORTB, 9, 0);	/* LCD CC */
-
-	writel(1 << ATMEL_ID_LCDC, &pmc->pcer);
-	gd->fb_base = ATMEL_BASE_SRAM0;
-}
-#endif /* Config LCD */
-
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
-
-	/* Enable clocks for all PIOs */
-	writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) |
-		(1 << ATMEL_ID_PIOCDE),
-		&pmc->pcer);
-
-	at91_seriald_hw_init();
-
-	return 0;
-}
-#endif
-
-int board_init(void)
-{
-	at91_smc_t	*smc	= (at91_smc_t *) ATMEL_BASE_SMC0;
-	at91_pio_t	*pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	u32		pin;
-
-	pin = 0x1F000001;
-	writel(pin, &pio->pioa.idr);
-	writel(pin, &pio->pioa.pudr);
-	writel(pin, &pio->pioa.per);
-	writel(pin, &pio->pioa.oer);
-	writel(pin, &pio->pioa.sodr);
-	writel((1 << 25), &pio->pioa.codr);
-
-	pin = 0x1F000100;
-	writel(pin, &pio->piob.idr);
-	writel(pin, &pio->piob.pudr);
-	writel(pin, &pio->piob.per);
-	writel(pin, &pio->piob.oer);
-	writel(pin, &pio->piob.codr);
-	writel((1 << 24), &pio->piob.sodr);
-
-	pin = 0x40000000;			/* Pullup DRxD enbable */
-	writel(pin, &pio->pioc.puer);
-
-	pin = 0x0000000F;			/* HWversion als Input */
-	writel(pin, &pio->piod.idr);
-	writel(pin, &pio->piod.puer);
-	writel(pin, &pio->piod.per);
-	writel(pin, &pio->piod.odr);
-	writel(pin, &pio->piod.owdr);
-
-	gd->bd->bi_arch_number = MACH_TYPE_VL_MA2SC;
-	/* adress of boot parameters */
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-	writel(CONFIG_SYS_SMC0_MODE0_VAL, &smc->cs[0].setup);
-	writel(CONFIG_SYS_SMC0_CYCLE0_VAL, &smc->cs[0].cycle);
-	writel(CONFIG_SYS_SMC0_PULSE0_VAL, &smc->cs[0].pulse);
-	writel(CONFIG_SYS_SMC0_SETUP0_VAL, &smc->cs[0].setup);
-
-#ifdef CONFIG_CMD_NAND
-	vl_ma2sc_nand_hw_init();
-#endif
-#ifdef CONFIG_MACB
-	vl_ma2sc_macb_hw_init();
-#endif
-#ifdef CONFIG_USB_OHCI_NEW
-	at91_uhp_hw_init();
-#endif
-#ifdef CONFIG_LCD
-	vl_ma2sc_lcd_hw_init();
-#endif
-	return 0;
-}
-
-#ifdef CONFIG_MISC_INIT_R
-int misc_init_r(void)
-{
-	uchar	buffer[8];
-	at91_pio_t	*pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	u32		pin;
-
-	buffer[0] = 0x04;
-	buffer[1] = 0x00;
-	if (i2c_write(0x68, 0x0E, 1, buffer, 2) != 0)
-		puts("error reseting rtc clock\n\0");
-
-	/* read hardware version */
-
-	pin = (readl(&pio->piod.pdsr) & 0x0F) + 0x44;
-	printf("Board: revision %c\n", pin);
-	buffer[0] = pin;
-	buffer[1] = 0;
-	setenv("revision", (char *) buffer);
-
-	pin = 0x40000000;			/* Pullup DRxD enbable */
-	writel(pin, &pio->pioc.puer);
-	return 0;
-}
-#endif
-
-int dram_init(void)
-{
-	gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE,
-			CONFIG_SYS_SDRAM_SIZE);
-	return 0;
-}
-
-#ifdef CONFIG_RESET_PHY_R
-void reset_phy(void)
-{
-#ifdef CONFIG_MACB
-	/*
-	 * Initialize ethernet HW addr prior to starting Linux,
-	 * needed for nfsroot
-	 */
-	eth_init();
-#endif
-}
-#endif
-
-int board_eth_init(bd_t *bis)
-{
-	int rc = 0;
-#ifdef CONFIG_MACB
-	rc = macb_eth_initialize(0, (void *) ATMEL_BASE_EMAC, 0x01);
-#endif
-	return rc;
-}
-
-#ifdef CONFIG_SYS_I2C_SOFT
-void i2c_init_board(void)
-{
-	u32 pin;
-
-	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	u8 sda = (1<<4);
-	u8 scl = (1<<5);
-
-	writel(1 << ATMEL_ID_PIOB, &pmc->pcer);
-	pin = sda | scl;
-	writel(pin, &pio->piob.idr);	/* Disable Interupt */
-	writel(pin, &pio->piob.pudr);
-	writel(pin, &pio->piob.per);
-	writel(pin, &pio->piob.oer);
-	writel(pin, &pio->piob.sodr);
-}
-#endif
-
-void watchdog_reset(void)
-{
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	u32	pin = 0x1;	/* PA0 */
-
-	if ((readl(&pio->pioa.odsr) & pin) > 0)
-		writel(pin, &pio->pioa.codr);
-	else
-		writel(pin, &pio->pioa.sodr);
-}
-
-void enable_caches(void)
-{
-#ifndef CONFIG_SYS_DCACHE_OFF
-	dcache_enable();
-#endif
-}
-
-/*---------------------------------------------------------------------------*/
-
-int do_ledtest(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-	int rcode = 1;
-	int row;
-	int col;
-	u32 pinz;
-	u32 pins;
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-
-	at91_set_pio_output(AT91_PIO_PORTB, 8, 0);	/* LCD DIM */
-
-	pins = 0x1F000000;
-	writel(pins, &pio->pioa.idr);
-	writel(pins, &pio->pioa.pudr);
-	writel(pins, &pio->pioa.per);
-	writel(pins, &pio->pioa.oer);
-	writel(pins, &pio->pioa.sodr);
-
-	pinz = 0x1F000000;
-	writel(pinz, &pio->piob.idr);
-	writel(pinz, &pio->piob.pudr);
-	writel(pinz, &pio->piob.per);
-	writel(pinz, &pio->piob.oer);
-	writel(pinz, &pio->piob.sodr);
-
-	for (row = 0; row < 5; row++) {
-		for (col = 0; col < 5; col++) {
-			writel((0x01000000 << col), &pio->piob.sodr);
-			writel((0x01000000 << row), &pio->pioa.codr);
-			printf("LED Test %d x %d\n", row, col);
-			udelay(1000000);
-			writel(pinz, &pio->piob.codr);
-			writel(pins, &pio->pioa.sodr);
-		}
-	}
-	return rcode;
-}
-
-void poweroff(void)
-{
-	watchdog_reset();
-	at91_set_pio_output(AT91_PIO_PORTA, 13, 1);	/* CAN_TX -> H */
-	udelay(100);
-	at91_set_pio_output(AT91_PIO_PORTA, 12, 0);	/* CAN_STB -> L */
-	udelay(100);
-	at91_set_pio_output(AT91_PIO_PORTA, 11, 0);	/* CAN_EN -> L */
-	udelay(100);
-	while (1)
-		watchdog_reset();
-}
-
-int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc,  char * const argv[])
-{
-	int rcode = 1;
-	poweroff();
-	return rcode;
-}
-
-int do_beep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-	int i;
-	u32 freq;
-	u32 durate;
-	int rcode = 1;
-
-	freq = 1000;
-	durate = 2;
-	switch (argc) {
-	case 3:
-		durate = simple_strtoul(argv[2], NULL, 10);
-	case 2:
-		freq = simple_strtoul(argv[1], NULL, 10);
-	case 1:
-		break;
-	default:
-		cmd_usage(cmdtp);
-		rcode = 1;
-		break;
-	}
-	durate = durate * freq;
-	freq = 500000 / freq;
-	for (i = 0; i < durate; i++) {
-		at91_set_pio_output(AT91_PIO_PORTB, 29, 1);	/* Sound On*/
-		udelay(freq);
-		at91_set_pio_output(AT91_PIO_PORTB, 29, 0);	/* Sound Off*/
-		udelay(freq);
-	}
-	at91_set_pio_output(AT91_PIO_PORTB, 29, 0);	/* Sound Off*/
-	return rcode;
-}
-
-int do_keytest(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-	int rcode = 1;
-	int row;
-	u32 col;
-	u32 pinz;
-	u32 pins;
-	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
-
-	writel((1 << ATMEL_ID_PIOA), &pmc->pcer);
-
-	pins = 0x001F0000;
-	writel(pins, &pio->pioa.idr);
-	writel(pins, &pio->pioa.pudr);
-	writel(pins, &pio->pioa.per);
-	writel(pins, &pio->pioa.odr);
-
-	pinz = 0x000F0000;
-	writel(pinz, &pio->piob.idr);
-	writel(pinz, &pio->piob.pudr);
-	writel(pinz, &pio->piob.per);
-	writel(pinz, &pio->piob.oer);
-	writel(pinz, &pio->piob.codr);
-
-	while (1) {
-		col = 0;
-		for (row = 0; row < 4; row++) {
-			writel((0x00010000 << row), &pio->piob.sodr);
-			udelay(10000);
-			col <<= 4;
-			col |= ((readl(&pio->pioa.pdsr) >> 16) & 0xF) ^ 0xF ;
-			writel(pinz, &pio->piob.codr);
-		}
-		printf("Matix: ");
-		for (row = 0; row < 16; row++) {
-			printf("%1.1d", col & 1);
-			col >>= 1;
-		}
-		printf(" SP %d\r ",
-			1 ^ (1 & (readl(&pio->piob.pdsr) >> 20)));
-		if ((1 & (readl(&pio->pioa.pdsr) >> 1)) == 0) {
-			/* SHUTDOWN */
-			row = 0;
-			while (row < 1000) {
-				if ((1 & (readl(&pio->pioa.pdsr) >> 1)) == 0)
-					row++;
-				udelay(100);
-			}
-			udelay(100000);
-			row = 0;
-			while (row < 1000) {
-				if ((1 & (readl(&pio->pioa.pdsr) >> 1)) > 0) {
-					row++;
-					udelay(1000);
-				}
-			}
-			poweroff();
-			while (1)
-				;
-		}
-	}
-	return rcode;
-}
-
-/*****************************************************************************/
-
-U_BOOT_CMD(
-	ledtest,	1,	0,	do_ledtest,
-	"test ledmatrix",
-	"\n"
-	);
-
-U_BOOT_CMD(
-	keytest,	1,	0,	do_keytest,
-	"test keymatix and special keys, poweroff on pressing ON key",
-	"\n"
-	);
-
-U_BOOT_CMD(
-	poweroff,	1,	0,	do_poweroff,
-	"power off",
-	"\n"
-	);
-
-U_BOOT_CMD(
-	beep,	3,	0,	do_beep,
-	"[freq [duration]]",
-	"freq frequence of beep\nduration duration of beep\n"
-	);
-
-/*****************************************************************************/