]> git.sur5r.net Git - u-boot/commitdiff
arm: Remove otc570 board
authorSimon Glass <sjg@chromium.org>
Mon, 31 Aug 2015 01:19:19 +0000 (19:19 -0600)
committerTom Rini <trini@konsulko.com>
Fri, 11 Sep 2015 18:57:40 +0000 (14:57 -0400)
This board has not been converted to generic board by the deadline.
Remove it.

Signed-off-by: Simon Glass <sjg@chromium.org>
arch/arm/mach-at91/Kconfig
board/esd/otc570/Kconfig [deleted file]
board/esd/otc570/MAINTAINERS [deleted file]
board/esd/otc570/Makefile [deleted file]
board/esd/otc570/otc570.c [deleted file]
board/esd/otc570/partition.c [deleted file]
configs/otc570_dataflash_defconfig [deleted file]
configs/otc570_defconfig [deleted file]
include/configs/otc570.h [deleted file]

index de06416da5151329fbe9decae584e1d530079926..cb2994c281758b827dc0bb12d694dc3f05ebe7ea 100644 (file)
@@ -103,10 +103,6 @@ config TARGET_MEESC
        bool "Support meesc"
        select CPU_ARM926EJS
 
-config TARGET_OTC570
-       bool "Support otc570"
-       select CPU_ARM926EJS
-
 config TARGET_CORVUS
        bool "Support corvus"
        select CPU_ARM926EJS
@@ -144,7 +140,6 @@ source "board/BuS/vl_ma2sc/Kconfig"
 source "board/calao/usb_a9263/Kconfig"
 source "board/egnite/ethernut5/Kconfig"
 source "board/esd/meesc/Kconfig"
-source "board/esd/otc570/Kconfig"
 source "board/mini-box/picosam9g45/Kconfig"
 source "board/ronetix/pm9261/Kconfig"
 source "board/ronetix/pm9263/Kconfig"
diff --git a/board/esd/otc570/Kconfig b/board/esd/otc570/Kconfig
deleted file mode 100644 (file)
index 4966f5f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_OTC570
-
-config SYS_BOARD
-       default "otc570"
-
-config SYS_VENDOR
-       default "esd"
-
-config SYS_CONFIG_NAME
-       default "otc570"
-
-endif
diff --git a/board/esd/otc570/MAINTAINERS b/board/esd/otc570/MAINTAINERS
deleted file mode 100644 (file)
index a7e165d..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-OTC570 BOARD
-M:     Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
-S:     Maintained
-F:     board/esd/otc570/
-F:     include/configs/otc570.h
-F:     configs/otc570_defconfig
-F:     configs/otc570_dataflash_defconfig
diff --git a/board/esd/otc570/Makefile b/board/esd/otc570/Makefile
deleted file mode 100644 (file)
index 740bb0a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# (C) Copyright 2003-2008
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2008
-# Stelian Pop <stelian@popies.net>
-# Lead Tech Design <www.leadtechdesign.com>
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y                          += otc570.o
-obj-$(CONFIG_HAS_DATAFLASH)    += partition.o
diff --git a/board/esd/otc570/otc570.c b/board/esd/otc570/otc570.c
deleted file mode 100644 (file)
index 4751d0a..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * (C) Copyright 2010-2011
- * Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
- * esd electronic system design gmbh <www.esd.eu>
- *
- * (C) Copyright 2007-2008
- * Stelian Pop <stelian@popies.net>
- * Lead Tech Design <www.leadtechdesign.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <asm/gpio.h>
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/at91_common.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_matrix.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/clk.h>
-#include <netdev.h>
-#ifdef CONFIG_LCD
-# include <atmel_lcdc.h>
-# include <lcd.h>
-# ifdef CONFIG_LCD_INFO
-#  include <nand.h>
-#  include <version.h>
-# endif
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-static int hw_rev = -1;        /* hardware revision */
-
-int get_hw_rev(void)
-{
-       if (hw_rev >= 0)
-               return hw_rev;
-
-       hw_rev = at91_get_pio_value(AT91_PIO_PORTB, 19);
-       hw_rev |= at91_get_pio_value(AT91_PIO_PORTB, 20) << 1;
-       hw_rev |= at91_get_pio_value(AT91_PIO_PORTB, 21) << 2;
-       hw_rev |= at91_get_pio_value(AT91_PIO_PORTB, 22) << 3;
-
-       if (hw_rev == 15)
-               hw_rev = 0;
-
-       return hw_rev;
-}
-
-#ifdef CONFIG_CMD_NAND
-static void otc570_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;
-
-       /* 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(1) |
-               AT91_SMC_SETUP_NRD(2) | AT91_SMC_SETUP_NCS_RD(2),
-               &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(6) | AT91_SMC_CYCLE_NRD(6),
-               &smc->cs[3].cycle);
-       writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
-               AT91_SMC_MODE_EXNW_DISABLE |
-               AT91_SMC_MODE_DBW_8 |
-               AT91_SMC_MODE_TDF_CYCLE(12),
-               &smc->cs[3].mode);
-
-       /* Configure RDY/BSY */
-       gpio_direction_input(CONFIG_SYS_NAND_READY_PIN);
-
-       /* Enable NandFlash */
-       gpio_direction_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
-}
-#endif /* CONFIG_CMD_NAND */
-
-#ifdef CONFIG_MACB
-static void otc570_macb_hw_init(void)
-{
-       at91_pmc_t      *pmc    = (at91_pmc_t *) ATMEL_BASE_PMC;
-       /* Enable clock */
-       writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
-       at91_macb_hw_init();
-}
-#endif
-
-/*
- * Static memory controller initialization to enable Beckhoff ET1100 EtherCAT
- * controller debugging
- * The ET1100 is located at physical address 0x70000000
- * Its process memory is located at physical address 0x70001000
- */
-static void otc570_ethercat_hw_init(void)
-{
-       at91_smc_t      *smc1   = (at91_smc_t *) ATMEL_BASE_SMC1;
-
-       /* Configure SMC EBI1_CS0 for EtherCAT */
-       writel(AT91_SMC_SETUP_NWE(0) | AT91_SMC_SETUP_NCS_WR(0) |
-               AT91_SMC_SETUP_NRD(0) | AT91_SMC_SETUP_NCS_RD(0),
-               &smc1->cs[0].setup);
-       writel(AT91_SMC_PULSE_NWE(4) | AT91_SMC_PULSE_NCS_WR(9) |
-               AT91_SMC_PULSE_NRD(5) | AT91_SMC_PULSE_NCS_RD(9),
-               &smc1->cs[0].pulse);
-       writel(AT91_SMC_CYCLE_NWE(10) | AT91_SMC_CYCLE_NRD(6),
-               &smc1->cs[0].cycle);
-       /*
-        * Configure behavior at external wait signal, byte-select mode, 16 bit
-        * data bus width, none data float wait states and TDF optimization
-        */
-       writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_EXNW_READY |
-               AT91_SMC_MODE_DBW_16 | AT91_SMC_MODE_TDF_CYCLE(0) |
-               AT91_SMC_MODE_TDF, &smc1->cs[0].mode);
-
-       /* Configure RDY/BSY */
-       at91_set_b_periph(AT91_PIO_PORTE, 20, 0);       /* EBI1_NWAIT */
-}
-
-#ifdef CONFIG_LCD
-/* Number of columns and rows, pixel clock in Hz and hsync/vsync polarity */
-vidinfo_t panel_info = {
-       .vl_col =               640,
-       .vl_row =               480,
-       .vl_clk =               25175000,
-       .vl_sync =              ATMEL_LCDC_INVLINE_INVERTED |
-                               ATMEL_LCDC_INVFRAME_INVERTED,
-
-       .vl_bpix =              LCD_BPP,/* Bits per pixel, 0 = 1bit, 3 = 8bit */
-       .vl_tft =               1,      /* 0 = passive, 1 = TFT */
-       .vl_vsync_len =         1,      /* Length of vertical sync in NOL */
-       .vl_upper_margin =      35,     /* Idle lines at the frame start */
-       .vl_lower_margin =      5,      /* Idle lines at the end of the frame */
-       .vl_hsync_len =         5,      /* Width of the LCDHSYNC pulse */
-       .vl_left_margin =       112,    /* Idle cycles at the line beginning */
-       .vl_right_margin =      1,      /* Idle cycles at the end of the line */
-
-       .mmio =                 ATMEL_BASE_LCDC,
-};
-
-void lcd_enable(void)
-{
-       at91_set_pio_value(AT91_PIO_PORTA, 30, 0); /* power up */
-}
-
-void lcd_disable(void)
-{
-       at91_set_pio_value(AT91_PIO_PORTA, 30, 1); /* power down */
-}
-
-static void otc570_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, 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, 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, 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_PORTA, 30, 1);     /* PCI */
-
-       writel(1 << ATMEL_ID_LCDC, &pmc->pcer);
-}
-
-#ifdef CONFIG_LCD_INFO
-void lcd_show_board_info(void)
-{
-       ulong dram_size, nand_size;
-       int i;
-       char temp[32];
-
-       dram_size = 0;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-               dram_size += gd->bd->bi_dram[i].size;
-       nand_size = 0;
-       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-               nand_size += nand_info[i].size;
-
-       lcd_printf("\n%s\n", U_BOOT_VERSION);
-       lcd_printf("CPU at %s MHz\n", strmhz(temp, get_cpu_clk_rate()));
-       lcd_printf("  %ld MB SDRAM, %ld MB NAND\n",
-               dram_size >> 20,
-               nand_size >> 20 );
-       lcd_printf("  Board            : esd ARM9 HMI Panel - OTC570\n");
-       lcd_printf("  Hardware-revision: 1.%d\n", get_hw_rev());
-       lcd_printf("  Mach-type        : %lu\n", gd->bd->bi_arch_number);
-}
-#endif /* CONFIG_LCD_INFO */
-#endif /* CONFIG_LCD */
-
-int dram_init(void)
-{
-       gd->ram_size = get_ram_size(
-               (void *)CONFIG_SYS_SDRAM_BASE,
-               CONFIG_SYS_SDRAM_SIZE);
-       return 0;
-}
-
-int board_eth_init(bd_t *bis)
-{
-       int rc = 0;
-#ifdef CONFIG_MACB
-       rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x00);
-#endif
-       return rc;
-}
-
-int checkboard(void)
-{
-       char str[32];
-
-       puts("Board            : esd ARM9 HMI Panel - OTC570");
-       if (getenv_f("serial#", str, sizeof(str)) > 0) {
-               puts(", serial# ");
-               puts(str);
-       }
-       printf("\n");
-       printf("Hardware-revision: 1.%d\n", get_hw_rev());
-       printf("Mach-type        : %lu\n", gd->bd->bi_arch_number);
-       return 0;
-}
-
-#ifdef CONFIG_SERIAL_TAG
-void get_board_serial(struct tag_serialnr *serialnr)
-{
-       char *str;
-
-       char *serial = getenv("serial#");
-       if (serial) {
-               str = strchr(serial, '_');
-               if (str && (strlen(str) >= 4)) {
-                       serialnr->high = (*(str + 1) << 8) | *(str + 2);
-                       serialnr->low = simple_strtoul(str + 3, NULL, 16);
-               }
-       } else {
-               serialnr->high = 0;
-               serialnr->low = 0;
-       }
-}
-#endif
-
-#ifdef CONFIG_REVISION_TAG
-u32 get_board_rev(void)
-{
-       return hw_rev | 0x100;
-}
-#endif
-
-#ifdef CONFIG_MISC_INIT_R
-int misc_init_r(void)
-{
-       char            str[64];
-       at91_pmc_t      *pmc    = (at91_pmc_t *) ATMEL_BASE_PMC;
-
-       at91_set_pio_output(AT91_PIO_PORTA, 29, 1);
-       at91_set_a_periph(AT91_PIO_PORTA, 26, 1);       /* TXD0 */
-       at91_set_a_periph(AT91_PIO_PORTA, 27, 0);       /* RXD0 */
-       writel(1 << ATMEL_ID_USART0, &pmc->pcer);
-       /* Set USART_MODE = 1 (RS485) */
-       writel(1, 0xFFF8C004);
-
-       printf("USART0: ");
-
-       if (getenv_f("usart0", str, sizeof(str)) == -1) {
-               printf("No entry - assuming 1-wire\n");
-               /* CTS pin, works as mode select pin (0 = 1-wire; 1 = RS485) */
-               at91_set_pio_output(AT91_PIO_PORTA, 29, 0);
-       } else {
-               if (strcmp(str, "1-wire") == 0) {
-                       printf("%s\n", str);
-                       at91_set_pio_output(AT91_PIO_PORTA, 29, 0);
-               } else if (strcmp(str, "rs485") == 0) {
-                       printf("%s\n", str);
-                       at91_set_pio_output(AT91_PIO_PORTA, 29, 1);
-               } else {
-                       printf("Wrong entry - assuming 1-wire ");
-                       printf("(valid values are '1-wire' or 'rs485')\n");
-                       at91_set_pio_output(AT91_PIO_PORTA, 29, 0);
-               }
-       }
-#ifdef CONFIG_LCD
-       printf("Display memory address: 0x%08lX\n", gd->fb_base);
-#endif
-
-       return 0;
-}
-#endif /* CONFIG_MISC_INIT_R */
-
-int board_early_init_f(void)
-{
-       at91_pmc_t      *pmc    = (at91_pmc_t *) ATMEL_BASE_PMC;
-
-       /* enable all clocks */
-       writel((1 << ATMEL_ID_PIOA) |
-               (1 << ATMEL_ID_PIOB) |
-               (1 << ATMEL_ID_PIOCDE) |
-               (1 << ATMEL_ID_TWI) |
-               (1 << ATMEL_ID_SPI0) |
-#ifdef CONFIG_LCD
-               (1 << ATMEL_ID_LCDC) |
-#endif
-               (1 << ATMEL_ID_UHP),
-               &pmc->pcer);
-
-       at91_seriald_hw_init();
-
-       /* arch number of OTC570-Board */
-       gd->bd->bi_arch_number = MACH_TYPE_OTC570;
-
-       return 0;
-}
-
-int board_init(void)
-{
-       /* initialize ET1100 Controller */
-       otc570_ethercat_hw_init();
-
-       /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-#ifdef CONFIG_CMD_NAND
-       otc570_nand_hw_init();
-#endif
-#ifdef CONFIG_HAS_DATAFLASH
-       at91_spi0_hw_init(1 << 0);
-#endif
-#ifdef CONFIG_MACB
-       otc570_macb_hw_init();
-#endif
-#ifdef CONFIG_AT91_CAN
-       at91_can_hw_init();
-#endif
-#ifdef CONFIG_USB_OHCI_NEW
-       at91_uhp_hw_init();
-#endif
-#ifdef CONFIG_LCD
-       otc570_lcd_hw_init();
-#endif
-       return 0;
-}
diff --git a/board/esd/otc570/partition.c b/board/esd/otc570/partition.c
deleted file mode 100644 (file)
index b6afafc..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * (C) Copyright 2008
- * Ulf Samuelsson <ulf@atmel.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#include <common.h>
-#include <config.h>
-#include <asm/hardware.h>
-#include <dataflash.h>
-
-AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS];
-
-struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
-       {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0},       /* Logical adress, CS */
-};
-
-/* define the area offsets */
-dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
-       {0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
-       {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
-       {0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-};
diff --git a/configs/otc570_dataflash_defconfig b/configs/otc570_dataflash_defconfig
deleted file mode 100644 (file)
index c5ff59a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_AT91=y
-CONFIG_TARGET_OTC570=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_FPGA is not set
-# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/otc570_defconfig b/configs/otc570_defconfig
deleted file mode 100644 (file)
index 8cc55ee..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_AT91=y
-CONFIG_TARGET_OTC570=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_FPGA is not set
-# CONFIG_CMD_SETEXPR is not set
diff --git a/include/configs/otc570.h b/include/configs/otc570.h
deleted file mode 100644 (file)
index 0cada63..0000000
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * (C) Copyright 2010-2011
- * Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
- * esd electronic system design gmbh <www.esd.eu>
- *
- * (C) Copyright 2007-2008
- * Stelian Pop <stelian@popies.net>
- * Lead Tech Design <www.leadtechdesign.com>
- *
- * Configuation settings for the esd OTC570 board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * SoC must be defined first, before hardware.h is included.
- * In this case SoC is defined in boards.cfg.
- */
-#include <asm/hardware.h>
-
-/*
- * Warning: changing CONFIG_SYS_TEXT_BASE requires
- * adapting the initial boot program.
- * Since the linker has to swallow that define, we must use a pure
- * hex number here!
- */
-#define CONFIG_SYS_TEXT_BASE           0x20002000
-
-/*
- * since a number of boards are not being listed in linux
- * arch/arm/tools/mach-types any more, the mach-types have to be
- * defined here
- */
-#define MACH_TYPE_OTC570               2166
-
-/* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768   /* 32.768 kHz crystal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     16000000/* 16.0 MHz crystal */
-
-/* Misc CPU related */
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_BOARD_EARLY_INIT_F              /* call board_early_init_f() */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_SERIAL_TAG
-#define CONFIG_REVISION_TAG
-#define CONFIG_CMDLINE_TAG                     /* enable passing of ATAGs */
-#define CONFIG_MISC_INIT_R                     /* Call misc_init_r */
-
-#define CONFIG_DISPLAY_BOARDINFO               /* call checkboard() */
-#define CONFIG_DISPLAY_CPUINFO                 /* display cpu info and speed */
-#define CONFIG_PREBOOT                         /* enable preboot variable */
-
-/*
- * Hardware drivers
- */
-
-/* required until arch/arm/include/asm/arch-at91/at91sam9263.h is reworked */
-#define ATMEL_PMC_UHP                  AT91SAM926x_PMC_UHP
-
-/* general purpose I/O */
-#define CONFIG_AT91_GPIO
-
-/* Console output */
-#define CONFIG_ATMEL_USART
-#define CONFIG_USART_BASE              ATMEL_BASE_DBGU
-#define CONFIG_USART_ID                        ATMEL_ID_SYS
-#define CONFIG_BAUDRATE                        115200
-
-#define CONFIG_BOOTDELAY               3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
-/* LCD */
-#define CONFIG_LCD
-#undef CONFIG_SPLASH_SCREEN
-
-#ifdef CONFIG_LCD
-# define LCD_BPP                       LCD_COLOR8
-
-# ifndef CONFIG_SPLASH_SCREEN
-#  define CONFIG_LCD_LOGO
-#  define CONFIG_LCD_INFO
-#  undef CONFIG_LCD_INFO_BELOW_LOGO
-# endif /* CONFIG_SPLASH_SCREEN */
-
-# undef LCD_TEST_PATTERN
-# define CONFIG_SYS_WHITE_ON_BLACK
-# define CONFIG_ATMEL_LCD
-# define CONFIG_SYS_CONSOLE_IS_IN_ENV
-# define CONFIG_OTC570_LCD_BASE                (CONFIG_SYS_SDRAM_BASE + 0x03fa5000)
-# define CONFIG_CMD_BMP
-#endif /* CONFIG_LCD */
-
-/* RTC and I2C stuff */
-#define CONFIG_RTC_DS1338
-#define CONFIG_SYS_I2C_RTC_ADDR                0x68
-
-#define CONFIG_SYS_I2C
-#define        CONFIG_SYS_I2C_SOFT     /* I2C bit-banged       */
-#ifdef CONFIG_SYS_I2C_SOFT
-#define CONFIG_SYS_I2C_SOFT_SPEED      100000
-#define CONFIG_SYS_I2C_SOFT_SLAVE      0x7F
-
-/* Configure data and clock pins for pio */
-# define I2C_INIT { \
-       at91_set_pio_output(AT91_PIO_PORTB, 4, 0); \
-       at91_set_pio_output(AT91_PIO_PORTB, 5, 0); \
-}
-# define I2C_SOFT_DECLARATIONS
-/* Configure data pin as output */
-# define I2C_ACTIVE            at91_set_pio_output(AT91_PIO_PORTB, 4, 0)
-/* Configure data pin as input */
-# define I2C_TRISTATE          at91_set_pio_input(AT91_PIO_PORTB, 4, 0)
-/* Read data pin */
-# define I2C_READ              at91_get_pio_value(AT91_PIO_PORTB, 4)
-/* Set data pin */
-# define I2C_SDA(bit)          at91_set_pio_value(AT91_PIO_PORTB, 4, bit)
-/* Set clock pin */
-# define I2C_SCL(bit)          at91_set_pio_value(AT91_PIO_PORTB, 5, bit)
-# define I2C_DELAY             udelay(2) /* 1/4 I2C clock duration */
-#endif /* CONFIG_SYS_I2C_SOFT */
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_USB
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_DATE
-
-/* LED */
-#define CONFIG_AT91_LED
-
-/*
- * SDRAM: 1 bank, min 32, max 128 MB
- * Initialized before u-boot gets started.
- */
-#define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_SYS_SDRAM_BASE          0x20000000 /* ATMEL_BASE_CS1 */
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
-
-#define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE + 0x00100000)
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x01E00000)
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x00100000)
-
-/*
- * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM,
- * leaving the correct space for initial global data structure above
- * that address while providing maximum stack area below.
- */
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (ATMEL_BASE_SRAM0 + 0x1000 - GENERATED_GBL_DATA_SIZE)
-
-/* DataFlash */
-#ifdef CONFIG_SYS_USE_DATAFLASH
-# define CONFIG_ATMEL_DATAFLASH_SPI
-# define CONFIG_HAS_DATAFLASH
-# define CONFIG_SYS_MAX_DATAFLASH_BANKS                1
-# define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0   0xC0000000      /* CS0 */
-# define AT91_SPI_CLK                          15000000
-# define DATAFLASH_TCSS                                (0x1a << 16)
-# define DATAFLASH_TCHS                                (0x1 << 24)
-#endif
-
-/* NOR flash is not populated, disable it */
-#define CONFIG_SYS_NO_FLASH
-
-/* NAND flash */
-#ifdef CONFIG_CMD_NAND
-# define CONFIG_NAND_ATMEL
-# define CONFIG_SYS_MAX_NAND_DEVICE            1
-# define CONFIG_SYS_NAND_BASE                  0x40000000 /* ATMEL_BASE_CS3 */
-# define CONFIG_SYS_NAND_DBW_8
-# define CONFIG_SYS_NAND_MASK_ALE              (1 << 21)
-# define CONFIG_SYS_NAND_MASK_CLE              (1 << 22)
-# define CONFIG_SYS_NAND_ENABLE_PIN            GPIO_PIN_PD(15)
-# define CONFIG_SYS_NAND_READY_PIN             GPIO_PIN_PA(22)
-#endif
-
-/* Ethernet */
-#define CONFIG_MACB
-#define CONFIG_RMII
-#define CONFIG_FIT
-#define CONFIG_NET_RETRY_COUNT                 20
-#undef CONFIG_RESET_PHY_R
-
-/* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_DOS_PARTITION
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00a00000
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9263"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-#define CONFIG_USB_STORAGE
-#define CONFIG_CMD_FAT
-
-/* CAN */
-#define CONFIG_AT91_CAN
-
-/* hw-controller addresses */
-#define CONFIG_ET1100_BASE             0x70000000 /* ATMEL_BASE_CS6 */
-
-#ifdef CONFIG_SYS_USE_DATAFLASH
-
-/* bootstrap + u-boot + env in dataflash on CS0 */
-# define CONFIG_ENV_IS_IN_DATAFLASH
-# define CONFIG_SYS_MONITOR_BASE       (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
-                                       0x8400)
-# define CONFIG_ENV_OFFSET             0x4200
-# define CONFIG_ENV_ADDR               (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
-                                       CONFIG_ENV_OFFSET)
-# define CONFIG_ENV_SIZE               0x4200
-
-#elif CONFIG_SYS_USE_NANDFLASH
-
-/* bootstrap + u-boot + env + linux in nandflash */
-# define CONFIG_ENV_IS_IN_NAND         1
-# define CONFIG_ENV_OFFSET             0xC0000
-# define CONFIG_ENV_SIZE               0x20000
-
-#endif
-
-#define CONFIG_SYS_CBSIZE              512
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                       sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN          ROUND(3 * CONFIG_ENV_SIZE + \
-                                       128*1024, 0x1000)
-
-#endif