[U-Boot] [PATCH 09/45] arm: Remove edb9315a board

Simon Glass sjg at chromium.org
Mon Aug 31 15:13:19 CEST 2015


Hi,

On 31 August 2015 at 01:38, sergey kostanbaev
<sergey.kostanbaev at gmail.com> wrote:
> Hi Simon,
>
> It seems I missed moving to generic board CONFIG_SYS_GENERIC_BOARD. So could
> you point what is better to read to adopt it?

Yes - please see doc/README.generic-board which has instructions. It
should be very simple.

Regards,
Simon

>
> Thanks
>
> On Mon, Aug 31, 2015 at 4:19 AM, Simon Glass <sjg at chromium.org> wrote:
>>
>> This board has not been converted to generic board by the deadline.
>> Remove it.
>>
>> Signed-off-by: Simon Glass <sjg at chromium.org>
>> ---
>>
>>  arch/arm/Kconfig                 |   5 -
>>  board/cirrus/edb93xx/Kconfig     |  15 --
>>  board/cirrus/edb93xx/MAINTAINERS |   6 -
>>  board/cirrus/edb93xx/Makefile    |  11 --
>>  board/cirrus/edb93xx/edb93xx.c   | 382
>> ---------------------------------------
>>  board/cirrus/edb93xx/u-boot.lds  | 116 ------------
>>  configs/edb9315a_defconfig       |   6 -
>>  include/configs/edb93xx.h        | 284 -----------------------------
>>  8 files changed, 825 deletions(-)
>>  delete mode 100644 board/cirrus/edb93xx/Kconfig
>>  delete mode 100644 board/cirrus/edb93xx/MAINTAINERS
>>  delete mode 100644 board/cirrus/edb93xx/Makefile
>>  delete mode 100644 board/cirrus/edb93xx/edb93xx.c
>>  delete mode 100644 board/cirrus/edb93xx/u-boot.lds
>>  delete mode 100644 configs/edb9315a_defconfig
>>  delete mode 100644 include/configs/edb93xx.h
>>
>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>> index 5429dc8..fa52901 100644
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@ -69,10 +69,6 @@ choice
>>  config ARCH_AT91
>>         bool "Atmel AT91"
>>
>> -config TARGET_EDB93XX
>> -       bool "Support edb93xx"
>> -       select CPU_ARM920T
>> -
>>  config TARGET_SCB9328
>>         bool "Support scb9328"
>>         select CPU_ARM920T
>> @@ -889,7 +885,6 @@ source "board/boundary/nitrogen6x/Kconfig"
>>  source "board/broadcom/bcm28155_ap/Kconfig"
>>  source "board/broadcom/bcmcygnus/Kconfig"
>>  source "board/broadcom/bcmnsp/Kconfig"
>> -source "board/cirrus/edb93xx/Kconfig"
>>  source "board/compulab/cm_t335/Kconfig"
>>  source "board/compulab/cm_t43/Kconfig"
>>  source "board/compulab/cm_fx6/Kconfig"
>> diff --git a/board/cirrus/edb93xx/Kconfig b/board/cirrus/edb93xx/Kconfig
>> deleted file mode 100644
>> index c5f4897..0000000
>> --- a/board/cirrus/edb93xx/Kconfig
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -if TARGET_EDB93XX
>> -
>> -config SYS_BOARD
>> -       default "edb93xx"
>> -
>> -config SYS_VENDOR
>> -       default "cirrus"
>> -
>> -config SYS_SOC
>> -       default "ep93xx"
>> -
>> -config SYS_CONFIG_NAME
>> -       default "edb93xx"
>> -
>> -endif
>> diff --git a/board/cirrus/edb93xx/MAINTAINERS
>> b/board/cirrus/edb93xx/MAINTAINERS
>> deleted file mode 100644
>> index 3bb2843..0000000
>> --- a/board/cirrus/edb93xx/MAINTAINERS
>> +++ /dev/null
>> @@ -1,6 +0,0 @@
>> -EDB93XX BOARD
>> -M:     Sergey Kostanbaev <sergey.kostanbaev at fairwaves.ru>
>> -S:     Maintained
>> -F:     board/cirrus/edb93xx/
>> -F:     include/configs/edb93xx.h
>> -F:     configs/edb9315a_defconfig
>> diff --git a/board/cirrus/edb93xx/Makefile b/board/cirrus/edb93xx/Makefile
>> deleted file mode 100644
>> index d03c498..0000000
>> --- a/board/cirrus/edb93xx/Makefile
>> +++ /dev/null
>> @@ -1,11 +0,0 @@
>> -#
>> -# (C) Copyright 2013
>> -# Sergey Kostanbaev <sergey.kostanbaev <at> fairwaves.ru>
>> -#
>> -# (C) Copyright 2003-2006
>> -# Wolfgang Denk, DENX Software Engineering, wd <at> denx.de.
>> -#
>> -# * SPDX-License-Identifier:   GPL-2.0+
>> -#
>> -
>> -obj-y  := edb93xx.o
>> diff --git a/board/cirrus/edb93xx/edb93xx.c
>> b/board/cirrus/edb93xx/edb93xx.c
>> deleted file mode 100644
>> index 8963d3a..0000000
>> --- a/board/cirrus/edb93xx/edb93xx.c
>> +++ /dev/null
>> @@ -1,382 +0,0 @@
>> -/*
>> - * Board initialization for EP93xx
>> - *
>> - * Copyright (C) 2013
>> - * Sergey Kostanbaev <sergey.kostanbaev <at> fairwaves.ru>
>> - *
>> - * Copyright (C) 2009
>> - * Matthias Kaehlcke <matthias <at> kaehlcke.net>
>> - *
>> - * (C) Copyright 2002 2003
>> - * Network Audio Technologies, Inc. <www.netaudiotech.com>
>> - * Adam Bezanson <bezanson <at> netaudiotech.com>
>> - *
>> - * SPDX-License-Identifier:    GPL-2.0+
>> - */
>> -
>> -#include <config.h>
>> -#include <common.h>
>> -#include <netdev.h>
>> -#include <asm/io.h>
>> -#include <asm/arch/ep93xx.h>
>> -
>> -DECLARE_GLOBAL_DATA_PTR;
>> -
>> -/*
>> - * usb_div: 4, nbyp2: 1, pll2_en: 1
>> - * pll2_x1: 368640000.000000, pll2_x2ip: 15360000.000000,
>> - * pll2_x2: 384000000.000000, pll2_out: 192000000.000000
>> - */
>> -#define CLKSET2_VAL    (23 << SYSCON_CLKSET_PLL_X2IPD_SHIFT |  \
>> -                       24 << SYSCON_CLKSET_PLL_X2FBD2_SHIFT |  \
>> -                       24 << SYSCON_CLKSET_PLL_X1FBD1_SHIFT |  \
>> -                       1 << SYSCON_CLKSET_PLL_PS_SHIFT |       \
>> -                       SYSCON_CLKSET2_PLL2_EN |                \
>> -                       SYSCON_CLKSET2_NBYP2 |                  \
>> -                       3 << SYSCON_CLKSET2_USB_DIV_SHIFT)
>> -
>> -#define SMC_BCR6_VALUE (2 << SMC_BCR_IDCY_SHIFT | 5 << SMC_BCR_WST1_SHIFT
>> | \
>> -                       SMC_BCR_BLE | 2 << SMC_BCR_WST2_SHIFT | \
>> -                       1 << SMC_BCR_MW_SHIFT)
>> -
>> -/* delay execution before timers are initialized */
>> -static inline void early_udelay(uint32_t usecs)
>> -{
>> -       /* loop takes 4 cycles at 5.0ns (fastest case, running at 200MHz)
>> */
>> -       register uint32_t loops = (usecs * 1000) / 20;
>> -
>> -       __asm__ volatile ("1:\n"
>> -                       "subs %0, %1, #1\n"
>> -                       "bne 1b" : "=r" (loops) : "0" (loops));
>> -}
>> -
>> -#ifndef CONFIG_EP93XX_NO_FLASH_CFG
>> -static void flash_cfg(void)
>> -{
>> -       struct smc_regs *smc = (struct smc_regs *)SMC_BASE;
>> -
>> -       writel(SMC_BCR6_VALUE, &smc->bcr6);
>> -}
>> -#else
>> -#define flash_cfg()
>> -#endif
>> -
>> -int board_init(void)
>> -{
>> -       /*
>> -        * Setup PLL2, PPL1 has been set during lowlevel init
>> -        */
>> -       struct syscon_regs *syscon = (struct syscon_regs *)SYSCON_BASE;
>> -       writel(CLKSET2_VAL, &syscon->clkset2);
>> -
>> -       /*
>> -        * the user's guide recommends to wait at least 1 ms for PLL2 to
>> -        * stabilize
>> -        */
>> -       early_udelay(1000);
>> -
>> -       /* Go to Async mode */
>> -       __asm__ volatile ("mrc p15, 0, r0, c1, c0, 0");
>> -       __asm__ volatile ("orr r0, r0, #0xc0000000");
>> -       __asm__ volatile ("mcr p15, 0, r0, c1, c0, 0");
>> -
>> -       icache_enable();
>> -
>> -#ifdef USE_920T_MMU
>> -       dcache_enable();
>> -#endif
>> -
>> -       /* Machine number, as defined in linux/arch/arm/tools/mach-types
>> */
>> -       gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
>> -
>> -       /* adress of boot parameters */
>> -       gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
>> -
>> -       /* We have a console */
>> -       gd->have_console = 1;
>> -
>> -       enable_interrupts();
>> -
>> -       flash_cfg();
>> -
>> -       green_led_on();
>> -       red_led_off();
>> -
>> -       return 0;
>> -}
>> -
>> -int board_early_init_f(void)
>> -{
>> -       /*
>> -        * set UARTBAUD bit to drive UARTs with 14.7456MHz instead of
>> -        * 14.7456/2 MHz
>> -        */
>> -       struct syscon_regs *syscon = (struct syscon_regs *)SYSCON_BASE;
>> -       writel(SYSCON_PWRCNT_UART_BAUD, &syscon->pwrcnt);
>> -       return 0;
>> -}
>> -
>> -int board_eth_init(bd_t *bd)
>> -{
>> -       return ep93xx_eth_initialize(0, MAC_BASE);
>> -}
>> -
>> -static void dram_fill_bank_addr(unsigned dram_addr_mask, unsigned
>> dram_bank_cnt,
>> -                               unsigned
>> dram_bank_base[CONFIG_NR_DRAM_BANKS])
>> -{
>> -       if (dram_bank_cnt == 1) {
>> -               dram_bank_base[0] = PHYS_SDRAM_1;
>> -       } else {
>> -               /* Table lookup for holes in address space. Maximum memory
>> -                * for the single SDCS may be up to 256Mb. We start
>> scanning
>> -                * banks from 1Mb, so it could be up to 128 banks
>> theoretically.
>> -                * We need at maximum 7 bits for the loockup, 8 slots is
>> -                * enough for the worst case.
>> -                */
>> -               unsigned tbl[8];
>> -               unsigned i = dram_bank_cnt / 2;
>> -               unsigned j = 0x00100000; /* 1 Mb */
>> -               unsigned *ptbl = tbl;
>> -               do {
>> -                       while (!(dram_addr_mask & j)) {
>> -                               j <<= 1;
>> -                       }
>> -                       *ptbl++ = j;
>> -                       j <<= 1;
>> -                       i >>= 1;
>> -               } while (i != 0);
>> -
>> -               for (i = dram_bank_cnt, j = 0;
>> -                    (i != 0) && (j < CONFIG_NR_DRAM_BANKS); --i, ++j) {
>> -                       unsigned addr = PHYS_SDRAM_1;
>> -                       unsigned k;
>> -                       unsigned bit;
>> -
>> -                       for (k = 0, bit = 1; k < 8; k++, bit <<= 1) {
>> -                               if (bit & j)
>> -                                       addr |= tbl[k];
>> -                       }
>> -
>> -                       dram_bank_base[j] = addr;
>> -               }
>> -       }
>> -}
>> -
>> -/* called in board_init_f (before relocation) */
>> -static unsigned dram_init_banksize_int(int print)
>> -{
>> -       /*
>> -        * Collect information of banks that has been filled during
>> lowlevel
>> -        * initialization
>> -        */
>> -       unsigned i;
>> -       unsigned dram_bank_base[CONFIG_NR_DRAM_BANKS];
>> -       unsigned dram_total = 0;
>> -       unsigned dram_bank_size = *(unsigned *)
>> -                                 (PHYS_SDRAM_1 |
>> UBOOT_MEMORYCNF_BANK_SIZE);
>> -       unsigned dram_addr_mask = *(unsigned *)
>> -                                 (PHYS_SDRAM_1 |
>> UBOOT_MEMORYCNF_BANK_MASK);
>> -       unsigned dram_bank_cnt = *(unsigned *)
>> -                                (PHYS_SDRAM_1 |
>> UBOOT_MEMORYCNF_BANK_COUNT);
>> -
>> -       dram_fill_bank_addr(dram_addr_mask, dram_bank_cnt,
>> dram_bank_base);
>> -
>> -       for (i = 0; i < dram_bank_cnt; i++) {
>> -               gd->bd->bi_dram[i].start = dram_bank_base[i];
>> -               gd->bd->bi_dram[i].size = dram_bank_size;
>> -               dram_total += dram_bank_size;
>> -       }
>> -       for (; i < CONFIG_NR_DRAM_BANKS; i++) {
>> -               gd->bd->bi_dram[i].start = 0;
>> -               gd->bd->bi_dram[i].size = 0;
>> -       }
>> -
>> -       if (print) {
>> -               printf("DRAM mask: %08x\n", dram_addr_mask);
>> -               printf("DRAM total %u banks:\n", dram_bank_cnt);
>> -               printf("bank          base-address          size\n");
>> -
>> -               if (dram_bank_cnt > CONFIG_NR_DRAM_BANKS) {
>> -                       printf("WARNING! UBoot was configured for %u
>> banks,\n"
>> -                               "but %u has been found. "
>> -                               "Supressing extra memory banks\n",
>> -                                CONFIG_NR_DRAM_BANKS, dram_bank_cnt);
>> -                       dram_bank_cnt = CONFIG_NR_DRAM_BANKS;
>> -               }
>> -
>> -               for (i = 0; i < dram_bank_cnt; i++) {
>> -                       printf("  %u             %08x            %08x\n",
>> -                              i, dram_bank_base[i], dram_bank_size);
>> -               }
>> -               printf("  ------------------------------------------\n"
>> -                       "Total                              %9d\n\n",
>> -                       dram_total);
>> -       }
>> -
>> -       return dram_total;
>> -}
>> -
>> -void dram_init_banksize(void)
>> -{
>> -       dram_init_banksize_int(0);
>> -}
>> -
>> -/* called in board_init_f (before relocation) */
>> -int dram_init(void)
>> -{
>> -       struct syscon_regs *syscon = (struct syscon_regs *)SYSCON_BASE;
>> -       unsigned sec_id = readl(SECURITY_EXTENSIONID);
>> -       unsigned chip_id = readl(&syscon->chipid);
>> -
>> -       printf("CPU: Cirrus Logic ");
>> -       switch (sec_id & 0x000001FE) {
>> -       case 0x00000008:
>> -               printf("EP9301");
>> -               break;
>> -       case 0x00000004:
>> -               printf("EP9307");
>> -               break;
>> -       case 0x00000002:
>> -               printf("EP931x");
>> -               break;
>> -       case 0x00000000:
>> -               printf("EP9315");
>> -               break;
>> -       default:
>> -               printf("<unknown>");
>> -               break;
>> -       }
>> -
>> -       printf(" - Rev. ");
>> -       switch (chip_id & 0xF0000000) {
>> -       case 0x00000000:
>> -               printf("A");
>> -               break;
>> -       case 0x10000000:
>> -               printf("B");
>> -               break;
>> -       case 0x20000000:
>> -               printf("C");
>> -               break;
>> -       case 0x30000000:
>> -               printf("D0");
>> -               break;
>> -       case 0x40000000:
>> -               printf("D1");
>> -               break;
>> -       case 0x50000000:
>> -               printf("E0");
>> -               break;
>> -       case 0x60000000:
>> -               printf("E1");
>> -               break;
>> -       case 0x70000000:
>> -               printf("E2");
>> -               break;
>> -       default:
>> -               printf("?");
>> -               break;
>> -       }
>> -       printf(" (SecExtID=%.8x/ChipID=%.8x)\n", sec_id, chip_id);
>> -
>> -       gd->ram_size = dram_init_banksize_int(1);
>> -       return 0;
>> -}
>> -
>> -
>> -#ifdef CONFIG_EP93XX_SPI
>> -#include <spi.h>
>> -
>> -/*
>> - * EGIO0-EGIPO7 -> port A
>> - * EGIO8-EGIP15 -> port B
>> - */
>> -
>> -static void ep93xx_set_epgio(unsigned num)
>> -{
>> -       struct gpio_regs *regs = (struct gpio_regs *)GPIO_BASE;
>> -       if (num < 8)
>> -               writel(readl(&regs->padr) | (1<<num), &regs->padr);
>> -       else
>> -               writel(readl(&regs->pbdr) | (1<<(num-8)), &regs->pbdr);
>> -}
>> -
>> -static void ep93xx_clear_epgio(unsigned num)
>> -{
>> -       struct gpio_regs *regs = (struct gpio_regs *)GPIO_BASE;
>> -       if (num < 8)
>> -               writel(readl(&regs->padr) & (~(1<<num)), &regs->padr);
>> -       else
>> -               writel(readl(&regs->pbdr) & (~(1<<(num-8))), &regs->pbdr);
>> -}
>> -
>> -static void ep93xx_dir_epgio_out(unsigned num)
>> -{
>> -       struct gpio_regs *regs = (struct gpio_regs *)GPIO_BASE;
>> -       if (num < 8)
>> -               writel(readl(&regs->paddr) | (1<<num), &regs->paddr);
>> -       else
>> -               writel(readl(&regs->pbddr) | (1<<(num-8)), &regs->pbddr);
>> -}
>> -
>> -int spi_cs_is_valid(unsigned int bus, unsigned int cs)
>> -{
>> -       if (bus == 0 && cs < 16)
>> -               return 1;
>> -
>> -       return 0;
>> -}
>> -
>> -void spi_cs_activate(struct spi_slave *slave)
>> -{
>> -       ep93xx_clear_epgio(slave->cs);
>> -}
>> -
>> -void spi_cs_deactivate(struct spi_slave *slave)
>> -{
>> -       ep93xx_set_epgio(slave->cs);
>> -}
>> -
>> -#ifdef CONFIG_MMC_SPI
>> -#include <mmc.h>
>> -
>> -#ifndef CONFIG_MMC_SPI_CS_EPGIO
>> -# define CONFIG_MMC_SPI_CS_EPGIO       4
>> -#endif
>> -
>> -#ifndef CONFIG_MMC_SPI_SPEED
>> -# define CONFIG_MMC_SPI_SPEED          25000000
>> -#endif
>> -
>> -#ifndef CONFIG_MMC_SPI_MODE
>> -# define CONFIG_MMC_SPI_MODE           SPI_MODE_0
>> -#endif
>> -
>> -int board_mmc_init(bd_t *bis)
>> -{
>> -       struct gpio_regs *regs = (struct gpio_regs *)GPIO_BASE;
>> -
>> -       ep93xx_set_epgio(CONFIG_MMC_SPI_CS_EPGIO);
>> -       ep93xx_dir_epgio_out(CONFIG_MMC_SPI_CS_EPGIO);
>> -
>> -#ifdef CONFIG_MMC_SPI_POWER_EGPIO
>> -       ep93xx_dir_epgio_out(CONFIG_MMC_SPI_POWER_EGPIO);
>> -       ep93xx_set_epgio(CONFIG_MMC_SPI_POWER_EGPIO);
>> -#elif defined(CONFIG_MMC_SPI_NPOWER_EGPIO)
>> -       ep93xx_dir_epgio_out(CONFIG_MMC_SPI_NPOWER_EGPIO);
>> -       ep93xx_clear_epgio(CONFIG_MMC_SPI_NPOWER_EGPIO);
>> -#endif
>> -       struct mmc *mmc = mmc_spi_init(0, CONFIG_MMC_SPI_CS_EPGIO,
>> -                               CONFIG_MMC_SPI_SPEED,
>> CONFIG_MMC_SPI_MODE);
>> -
>> -       if (!mmc) {
>> -               printf("Failed to create MMC Device\n");
>> -               return 1;
>> -       }
>> -       mmc_init(mmc);
>> -       return 0;
>> -}
>> -
>> -
>> -#endif /* CONFIG_MMC_SPI */
>> -#endif /* CONFIG_EP93XX_SPI */
>> diff --git a/board/cirrus/edb93xx/u-boot.lds
>> b/board/cirrus/edb93xx/u-boot.lds
>> deleted file mode 100644
>> index 4aa7891..0000000
>> --- a/board/cirrus/edb93xx/u-boot.lds
>> +++ /dev/null
>> @@ -1,116 +0,0 @@
>> -/*
>> - *
>> - * Copyright (C) 2013
>> - * Sergey Kostanbaev <sergey.kostanbaev <at> fairwaves.ru>
>> - *
>> - * Copyright (c) 2004-2008 Texas Instruments
>> - *
>> - * (C) Copyright 2002
>> - * Gary Jennejohn, DENX Software Engineering, <garyj at denx.de>
>> - *
>> - * SPDX-License-Identifier:    GPL-2.0+
>> - */
>> -
>> -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
>> -OUTPUT_ARCH(arm)
>> -ENTRY(_start)
>> -SECTIONS
>> -{
>> -       . = 0x00000000;
>> -
>> -       . = ALIGN(4);
>> -       .text : {
>> -               *(.__image_copy_start)
>> -               *(.vectors)
>> -               arch/arm/cpu/arm920t/start.o (.text*)
>> -               . = 0x1000;
>> -
>> -               LONG(0x53555243)
>> -               *(.text*)
>> -       }
>> -
>> -       . = ALIGN(4);
>> -       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
>> -
>> -       . = ALIGN(4);
>> -       .data : {
>> -               *(.data*)
>> -       }
>> -
>> -       . = ALIGN(4);
>> -
>> -       . = .;
>> -
>> -       . = ALIGN(4);
>> -       .u_boot_list : {
>> -               KEEP(*(SORT(.u_boot_list*)));
>> -       }
>> -
>> -       . = ALIGN(4);
>> -
>> -       .image_copy_end :
>> -       {
>> -               *(.__image_copy_end)
>> -       }
>> -
>> -       .rel_dyn_start :
>> -       {
>> -               *(.__rel_dyn_start)
>> -       }
>> -
>> -       .rel.dyn : {
>> -               *(.rel*)
>> -       }
>> -
>> -       .rel_dyn_end :
>> -       {
>> -               *(.__rel_dyn_end)
>> -       }
>> -
>> -       .end :
>> -       {
>> -               *(.__end)
>> -       }
>> -
>> -       _image_binary_end = .;
>> -
>> -       /*
>> -        * Deprecated: this MMU section is used by pxa at present but
>> -        * should not be used by new boards/CPUs.
>> -        */
>> -       . = ALIGN(4096);
>> -       .mmutable : {
>> -               *(.mmutable)
>> -       }
>> -
>> -/*
>> - * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
>> - * __bss_base and __bss_limit are for linker only (overlay ordering)
>> - */
>> -
>> -       .bss_start __rel_dyn_start (OVERLAY) : {
>> -               KEEP(*(.__bss_start));
>> -               __bss_base = .;
>> -       }
>> -
>> -       .bss __bss_base (OVERLAY) : {
>> -               *(.bss*)
>> -                . = ALIGN(4);
>> -                __bss_limit = .;
>> -       }
>> -
>> -       .bss_end __bss_limit (OVERLAY) : {
>> -               KEEP(*(.__bss_end));
>> -       }
>> -
>> -       .dynsym _image_binary_end : { *(.dynsym) }
>> -       .dynbss : { *(.dynbss) }
>> -       .dynstr : { *(.dynstr*) }
>> -       .dynamic : { *(.dynamic*) }
>> -       .plt : { *(.plt*) }
>> -       .interp : { *(.interp*) }
>> -       .gnu.hash : { *(.gnu.hash) }
>> -       .gnu : { *(.gnu*) }
>> -       .ARM.exidx : { *(.ARM.exidx*) }
>> -       .gnu.linkonce.armexidx : { *(.gnu.linkonce.armexidx.*) }
>> -}
>> diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig
>> deleted file mode 100644
>> index 452bf0d..0000000
>> --- a/configs/edb9315a_defconfig
>> +++ /dev/null
>> @@ -1,6 +0,0 @@
>> -CONFIG_ARM=y
>> -CONFIG_TARGET_EDB93XX=y
>> -CONFIG_SYS_EXTRA_OPTIONS="MK_edb9315a"
>> -# CONFIG_CMD_XIMG is not set
>> -# CONFIG_CMD_FPGA is not set
>> -# CONFIG_CMD_SETEXPR is not set
>> diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
>> deleted file mode 100644
>> index efe2a9d..0000000
>> --- a/include/configs/edb93xx.h
>> +++ /dev/null
>> @@ -1,284 +0,0 @@
>> -/*
>> - * U-boot - Configuration file for Cirrus Logic EDB93xx boards
>> - */
>> -
>> -#ifndef __CONFIG_H
>> -#define __CONFIG_H
>> -
>> -#ifdef CONFIG_MK_edb9301
>> -#define CONFIG_EDB9301
>> -#elif defined(CONFIG_MK_edb9302)
>> -#define CONFIG_EDB9302
>> -#elif defined(CONFIG_MK_edb9302a)
>> -#define CONFIG_EDB9302A
>> -#elif defined(CONFIG_MK_edb9307)
>> -#define CONFIG_EDB9307
>> -#elif defined(CONFIG_MK_edb9307a)
>> -#define CONFIG_EDB9307A
>> -#elif defined(CONFIG_MK_edb9312)
>> -#define CONFIG_EDB9312
>> -#elif defined(CONFIG_MK_edb9315)
>> -#define CONFIG_EDB9315
>> -#elif defined(CONFIG_MK_edb9315a)
>> -#define CONFIG_EDB9315A
>> -#else
>> -#error "no board defined"
>> -#endif
>> -
>> -/* Initial environment and monitor configuration options. */
>> -#define CONFIG_BOOTDELAY               2
>> -#define CONFIG_CMDLINE_TAG             1
>> -#define CONFIG_INITRD_TAG              1
>> -#define CONFIG_SETUP_MEMORY_TAGS       1
>> -#define CONFIG_BOOTARGS                "root=/dev/nfs
>> console=ttyAM0,115200 ip=dhcp"
>> -#define CONFIG_BOOTFILE                "edb93xx.img"
>> -
>> -#define CONFIG_SYS_HUSH_PARSER         1
>> -#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
>> -
>> -
>> -#define CONFIG_SYS_LDSCRIPT    "board/cirrus/edb93xx/u-boot.lds"
>> -
>> -#undef CONFIG_SYS_PROMPT
>> -#ifdef CONFIG_EDB9301
>> -#define CONFIG_EP9301
>> -#define CONFIG_MACH_TYPE               MACH_TYPE_EDB9301
>> -#define CONFIG_SYS_PROMPT              "EDB9301> "
>> -#define CONFIG_ENV_SECT_SIZE           0x00020000
>> -#elif defined(CONFIG_EDB9302)
>> -#define CONFIG_EP9302
>> -#define CONFIG_MACH_TYPE               MACH_TYPE_EDB9302
>> -#define CONFIG_SYS_PROMPT              "EDB9302> "
>> -#define CONFIG_ENV_SECT_SIZE           0x00020000
>> -#elif defined(CONFIG_EDB9302A)
>> -#define CONFIG_EP9302
>> -#define CONFIG_MACH_TYPE               MACH_TYPE_EDB9302A
>> -#define CONFIG_SYS_PROMPT              "EDB9302A> "
>> -#define CONFIG_ENV_SECT_SIZE           0x00020000
>> -#elif defined(CONFIG_EDB9307)
>> -#define CONFIG_EP9307
>> -#define CONFIG_MACH_TYPE               MACH_TYPE_EDB9307
>> -#define CONFIG_SYS_PROMPT              "EDB9307> "
>> -#define CONFIG_ENV_SECT_SIZE           0x00040000
>> -#elif defined(CONFIG_EDB9307A)
>> -#define CONFIG_EP9307
>> -#define CONFIG_MACH_TYPE               MACH_TYPE_EDB9307A
>> -#define CONFIG_SYS_PROMPT              "EDB9307A> "
>> -#define CONFIG_ENV_SECT_SIZE           0x00020000
>> -#elif defined(CONFIG_EDB9312)
>> -#define CONFIG_EP9312
>> -#define CONFIG_MACH_TYPE               MACH_TYPE_EDB9312
>> -#define CONFIG_SYS_PROMPT              "EDB9312> "
>> -#define CONFIG_ENV_SECT_SIZE           0x00040000
>> -#elif defined(CONFIG_EDB9315)
>> -#define CONFIG_EP9315
>> -#define CONFIG_MACH_TYPE               MACH_TYPE_EDB9315
>> -#define CONFIG_SYS_PROMPT              "EDB9315> "
>> -#define CONFIG_ENV_SECT_SIZE           0x00040000
>> -#elif defined(CONFIG_EDB9315A)
>> -#define CONFIG_EP9315
>> -#define CONFIG_MACH_TYPE               MACH_TYPE_EDB9315A
>> -#define CONFIG_SYS_PROMPT              "EDB9315A> "
>> -#define CONFIG_ENV_SECT_SIZE           0x00020000
>> -#else
>> -#error "no board defined"
>> -#endif
>> -
>> -/* High-level configuration options */
>> -#define CONFIG_EP93XX          1               /* This is a Cirrus Logic
>> 93xx SoC */
>> -
>> -#define CONFIG_SYS_CLK_FREQ    14745600        /* EP93xx has a 14.7456
>> clock */
>> -#undef CONFIG_USE_IRQ                          /* Don't need IRQ/FIQ */
>> -
>> -/* Monitor configuration */
>> -#undef CONFIG_CMD_DATE
>> -#define CONFIG_CMD_DHCP
>> -#define CONFIG_CMD_JFFS2
>> -
>> -#define CONFIG_SYS_LONGHELP                    /* Enable "long" help in
>> mon */
>> -#define CONFIG_SYS_CBSIZE              1024    /* Console I/O buffer size
>> */
>> -/* Print buffer size */
>> -#define CONFIG_SYS_PBSIZE
>> (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
>> -/* Boot argument buffer size */
>> -#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
>> -#define CONFIG_SYS_MAXARGS     16              /* Max number of command
>> args */
>> -
>> -/* Serial port hardware configuration */
>> -#define CONFIG_PL010_SERIAL
>> -#define CONFIG_CONS_INDEX              0
>> -#define CONFIG_BAUDRATE                        115200
>> -#define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, \
>> -                        115200, 230400}
>> -#define CONFIG_SYS_SERIAL0             0x808C0000
>> -#define CONFIG_SYS_SERIAL1             0x808D0000
>> -/*#define CONFIG_PL01x_PORTS   {(void *)CONFIG_SYS_SERIAL0, \
>> -            (void *)CONFIG_SYS_SERIAL1} */
>> -
>> -#define CONFIG_PL01x_PORTS     {(void *)CONFIG_SYS_SERIAL0}
>> -
>> -/* Status LED */
>> -#define CONFIG_STATUS_LED              1 /* Status LED enabled */
>> -#define CONFIG_BOARD_SPECIFIC_LED      1
>> -#define STATUS_LED_GREEN               0
>> -#define STATUS_LED_RED                 1
>> -/* Green */
>> -#define STATUS_LED_BIT                 STATUS_LED_GREEN
>> -#define STATUS_LED_STATE               STATUS_LED_ON
>> -#define STATUS_LED_PERIOD              (CONFIG_SYS_HZ / 2)
>> -/* Red */
>> -#define STATUS_LED_BIT1                        STATUS_LED_RED
>> -#define STATUS_LED_STATE1              STATUS_LED_OFF
>> -#define STATUS_LED_PERIOD1             (CONFIG_SYS_HZ / 2)
>> -/* Optional value */
>> -#define STATUS_LED_BOOT                        STATUS_LED_BIT
>> -
>> -/* Network hardware configuration */
>> -#define CONFIG_DRIVER_EP93XX_MAC
>> -#define CONFIG_MII_SUPPRESS_PREAMBLE
>> -#define CONFIG_MII
>> -#define CONFIG_PHY_ADDR                1
>> -#undef CONFIG_NETCONSOLE
>> -
>> -/* SDRAM configuration */
>> -#if defined(CONFIG_EDB9301) || defined(CONFIG_EDB9302) || \
>> -    defined(CONFIG_EDB9307) || defined CONFIG_EDB9312 || \
>> -    defined(CONFIG_EDB9315)
>> -/*
>> - * EDB9301/2 has 4 banks of SDRAM consisting of 1x Samsung
>> K4S561632E-TC75
>> - * 256 Mbit SDRAM on a 16-bit data bus, for a total of 32MB of SDRAM. We
>> set
>> - * the SROMLL bit on the processor, resulting in this non-contiguous
>> memory map.
>> - *
>> - * The EDB9307, EDB9312, and EDB9315 have 2 banks of SDRAM consisting of
>> - * 2x Samsung K4S561632E-TC75 256 Mbit on a 32-bit data bus, for a total
>> of
>> - * 64 MB of SDRAM.
>> - */
>> -
>> -#define CONFIG_EDB93XX_SDCS3
>> -
>> -#elif defined(CONFIG_EDB9302A) || \
>> -    defined(CONFIG_EDB9307A) || defined(CONFIG_EDB9315A)
>> -/*
>> - * EDB9302a has 4 banks of SDRAM consisting of 1x Samsung K4S561632E-TC75
>> - * 256 Mbit SDRAM on a 16-bit data bus, for a total of 32MB of SDRAM. We
>> set
>> - * the SROMLL bit on the processor, resulting in this non-contiguous
>> memory map.
>> - *
>> - * The EDB9307A and EDB9315A have 2 banks of SDRAM consisting of 2x
>> Samsung
>> - * K4S561632E-TC75 256 Mbit on a 32-bit data bus, for a total of 64 MB of
>> SDRAM.
>> - */
>> -#define CONFIG_EDB93XX_SDCS0
>> -
>> -#else
>> -#error "no SDCS configuration for this board"
>> -#endif
>> -
>> -
>> -#if defined(CONFIG_EDB93XX_SDCS3)
>> -#define CONFIG_SYS_LOAD_ADDR   0x01000000      /* Default load address */
>> -#define PHYS_SDRAM_1           0x00000000
>> -#elif defined(CONFIG_EDB93XX_SDCS0)
>> -#define CONFIG_SYS_LOAD_ADDR   0xc1000000      /* Default load address */
>> -#define PHYS_SDRAM_1           0xc0000000
>> -#endif
>> -
>> -#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
>> -#define CONFIG_NR_DRAM_BANKS           8
>> -
>> -#define CONFIG_SYS_INIT_SP_ADDR \
>> -    (CONFIG_SYS_SDRAM_BASE + 32*1024 - GENERATED_GBL_DATA_SIZE)
>> -
>> -
>> -/* Must match kernel config */
>> -#define LINUX_BOOT_PARAM_ADDR  (PHYS_SDRAM_1 + 0x100)
>> -
>> -/* Run-time memory allocatons */
>> -#define CONFIG_SYS_GBL_DATA_SIZE       128
>> -#define CONFIG_STACKSIZE               (128 * 1024)
>> -
>> -#if defined(CONFIG_USE_IRQ)
>> -#define CONFIG_STACKSIZE_IRQ   (4 * 1024)
>> -#define CONFIG_STACKSIZE_FIQ   (4 * 1024)
>> -#endif
>> -
>> -#define CONFIG_SYS_MALLOC_LEN          (512 * 1024)
>> -
>> -/*
>> -----------------------------------------------------------------------------
>> - * FLASH and environment organization
>> - *
>> - * The EDB9301, EDB9302(a), EDB9307a, EDB9315a have 1 bank of flash
>> memory at
>> - * 0x60000000 consisting of 1x Intel TE28F128J3C-150 128 Mbit flash on a
>> 16-bit
>> - * data bus, for a total of 16 MB of CFI-compatible flash.
>> - *
>> - * The EDB9307, EDB9312, and EDB9315 have 1 bank of flash memory at
>> - * 0x60000000 consisting of 2x Micron MT28F128J3-12 128 Mbit flash on a
>> 32-bit
>> - * data bus, for a total of 32 MB of CFI-compatible flash.
>> - *
>> - *
>> - *                            EDB9301/02(a)7a/15a    EDB9307/12/15
>> - * 0x60000000 - 0x0003FFFF    u-boot                 u-boot
>> - * 0x60040000 - 0x0005FFFF    environment #1         environment #1
>> - * 0x60060000 - 0x0007FFFF    environment #2         environment #1
>> (continued)
>> - * 0x60080000 - 0x0009FFFF    unused                 environment #2
>> - * 0x600A0000 - 0x000BFFFF    unused                 environment #2
>> (continued)
>> - * 0x600C0000 - 0x00FFFFFF    unused                 unused
>> - * 0x61000000 - 0x01FFFFFF    not present            unused
>> - */
>> -#define CONFIG_SYS_FLASH_CFI
>> -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
>> -
>> -
>> -#define CONFIG_SYS_FLASH_PROTECTION
>> -#define CONFIG_FLASH_CFI_DRIVER
>> -#define CONFIG_SYS_MAX_FLASH_BANKS     1
>> -#define CONFIG_SYS_MAX_FLASH_SECT      (256+8)
>> -
>> -#define CONFIG_SYS_TEXT_BASE           0x60000000
>> -#define PHYS_FLASH_1                   CONFIG_SYS_TEXT_BASE
>> -#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE
>> -
>> -#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
>> -#define CONFIG_SYS_MONITOR_LEN         (256 * 1024)
>> -
>> -#define CONFIG_ENV_OVERWRITE           /* Vendor params unprotected */
>> -#define CONFIG_ENV_IS_IN_FLASH
>> -
>> -#define CONFIG_ENV_ADDR                        0x60040000
>> -#define CONFIG_ENV_ADDR_REDUND         (CONFIG_ENV_ADDR +
>> CONFIG_ENV_SECT_SIZE)
>> -
>> -#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
>> -#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
>> -
>> -/* Define to enable MMC on SPI support */
>> -/* #define CONFIG_EP93XX_SPI_MMC */
>> -
>> -#ifdef CONFIG_EP93XX_SPI_MMC
>> -#define CONFIG_EP93XX_SPI
>> -#define CONFIG_MMC
>> -#define CONFIG_GENERIC_MMC
>> -#define CONFIG_MMC_SPI
>> -#define CONFIG_CMD_MMC
>> -#define CONFIG_MMC_SPI_NPOWER_EGPIO    9
>> -#endif
>> -
>> -#define CONFIG_USB_STORAGE
>> -#define CONFIG_USB_OHCI_NEW
>> -#define CONFIG_USB_OHCI_EP93XX
>> -#define CONFIG_SYS_USB_OHCI_CPU_INIT
>> -#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     3
>> -#define CONFIG_SYS_USB_OHCI_SLOT_NAME          "ep93xx-ohci"
>> -#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x80020000
>> -
>> -#define CONFIG_CMD_EXT2
>> -#define CONFIG_CMD_EXT4
>> -#define CONFIG_CMD_FAT
>> -#define CONFIG_CMD_USB
>> -
>> -#define CONFIG_BOARD_EARLY_INIT_F
>> -#define CONFIG_CMD_BOOTZ
>> -
>> -/* Define to disable flash configuration*/
>> -/* #define CONFIG_EP93XX_NO_FLASH_CFG */
>> -
>> -/* Define this for indusrial rated chips */
>> -/* #define CONFIG_EDB93XX_INDUSTRIAL */
>> -
>> -#endif /* !defined (__CONFIG_H) */
>> --
>> 2.5.0.457.gab17608
>>
>


More information about the U-Boot mailing list