[U-Boot] [PATCH] Custom AFEB9260 board support
Jean-Christophe PLAGNIOL-VILLARD
plagnioj at jcrosoft.com
Fri Oct 24 09:44:08 CEST 2008
On 02:29 Fri 15 Aug , Sergey Lapin wrote:
> This patch provides support for AFEB9260 board, a product of
> OpenSource hardware and software. Some commertial projects
> are made with this design. A board is basically AT91SAM9260-EK
> with some modifications and different peripherals and different
> parts used. Main purpose of this project is to gain experience in
> hardware design.
> More info: http://groups.google.com/group/arm9fpga-evolution-board
> (In Russian only, sorry).
> Subversion repository: svn://194.85.238.22/home/users/george/svn/arm9eb
>
> Signed-off-by: Sergey Lapin <slapin at ossfans.org>
> ---
> Makefile | 3 +
> board/afeb9260/Makefile | 57 +++++++++++
> board/afeb9260/afeb9260.c | 230 ++++++++++++++++++++++++++++++++++++++++++++
> board/afeb9260/config.mk | 1 +
> board/afeb9260/ether.c | 37 +++++++
> board/afeb9260/nand.c | 78 +++++++++++++++
> board/afeb9260/partition.c | 36 +++++++
> include/configs/afeb9260.h | 171 ++++++++++++++++++++++++++++++++
> net/eth.c | 8 +-
> 9 files changed, 619 insertions(+), 2 deletions(-)
> create mode 100644 board/afeb9260/Makefile
> create mode 100644 board/afeb9260/afeb9260.c
> create mode 100644 board/afeb9260/config.mk
> create mode 100644 board/afeb9260/ether.c
> create mode 100644 board/afeb9260/nand.c
> create mode 100644 board/afeb9260/partition.c
> create mode 100644 include/configs/afeb9260.h
>
> diff --git a/Makefile b/Makefile
> index a384d16..8b80c35 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2410,6 +2410,9 @@ at91cap9adk_config : unconfig
> at91sam9260ek_config : unconfig
> @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91
>
> +afeb9260_config : unconfig
> + @$(MKCONFIG) $(@:_config=) arm arm926ejs afeb9260 NULL at91
> +
please keep sorted
> ########################################################################
> ## ARM Integrator boards - see doc/README-integrator for more info.
> integratorap_config \
> diff --git a/board/afeb9260/Makefile b/board/afeb9260/Makefile
> + writel(pin_to_mask(AT91_PIN_PA14) |
> + pin_to_mask(AT91_PIN_PA15) |
> + pin_to_mask(AT91_PIN_PA17) |
> + pin_to_mask(AT91_PIN_PA25) |
> + pin_to_mask(AT91_PIN_PA26) |
> + pin_to_mask(AT91_PIN_PA28),
> + pin_to_controller(AT91_PIN_PA0) + PIO_PUER);
> +
> + at91_set_A_periph(AT91_PIN_PA19, 0); /* ETXCK_EREFCK */
> + at91_set_A_periph(AT91_PIN_PA17, 0); /* ERXDV */
> + at91_set_A_periph(AT91_PIN_PA14, 0); /* ERX0 */
> + at91_set_A_periph(AT91_PIN_PA15, 0); /* ERX1 */
> + at91_set_A_periph(AT91_PIN_PA18, 0); /* ERXER */
> + at91_set_A_periph(AT91_PIN_PA16, 0); /* ETXEN */
> + at91_set_A_periph(AT91_PIN_PA12, 0); /* ETX0 */
> + at91_set_A_periph(AT91_PIN_PA13, 0); /* ETX1 */
> + at91_set_A_periph(AT91_PIN_PA21, 0); /* EMDIO */
> + at91_set_A_periph(AT91_PIN_PA20, 0); /* EMDC */
> +
> +#ifndef CONFIG_RMII
> + at91_set_B_periph(AT91_PIN_PA28, 0); /* ECRS */
> + at91_set_B_periph(AT91_PIN_PA29, 0); /* ECOL */
> + at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */
> + at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */
> + at91_set_B_periph(AT91_PIN_PA27, 0); /* ERXCK */
> + at91_set_B_periph(AT91_PIN_PA10, 0); /* ETX2 */
> + at91_set_B_periph(AT91_PIN_PA11, 0); /* ETX3 */
> + at91_set_B_periph(AT91_PIN_PA22, 0); /* ETXER */
> +#endif
> +
> +}
> +#endif
> +
> +int board_init(void)
> +{
> + /* Enable Ctrlc */
> + console_init_f();
> +
> + /* arch number of AT91SAM9260EK-Board */
> + // gd->bd->bi_arch_number = CONFIG_MACH_AFEB9260
> + gd->bd->bi_arch_number = 1859;
please use the CONFIG and no c++ comment
> + /* adress of boot parameters */
> + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
> +
> + afeb9260_serial_hw_init();
> +#ifdef CONFIG_CMD_NAND
> + afeb9260_nand_hw_init();
> +#endif
> + afeb9260_spi_hw_init();
> +#ifdef CONFIG_MACB
> + afeb9260_macb_hw_init();
> +#endif
> +
> + return 0;
> +}
> +
> +int dram_init(void)
> +{
> + gd->bd->bi_dram[0].start = PHYS_SDRAM;
> + gd->bd->bi_dram[0].size = PHYS_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(gd->bd);
> +#endif
> +}
> +#endif
> +
> +#include <common.h>
> +
> +#include <asm/arch/memory-map.h>
> +
> +extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
> +
> +#if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET)
pleaase move this to Makefile
> +void afeb9260_eth_initialize(bd_t *bi)
> +{
> + macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x01);
> +}
> +#endif
> +
> diff --git a/board/afeb9260/partition.c b/board/afeb9260/partition.c
> new file mode 100644
> index 0000000..2b99c9b
> --- /dev/null
> +++ b/board/afeb9260/partition.c
> @@ -0,0 +1,36 @@
> +/*
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + *
> + */
> +#include <common.h>
> +#include <config.h>
> +#include <asm/hardware.h>
> +#include <dataflash.h>
> +
> +AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS];
> +
> +struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
> + {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */
> + {CFG_DATAFLASH_LOGIC_ADDR_CS1, 1}
> +};
> +
> +/*define the area offsets*/
> +dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
> + {0x00000000, 0x000041FF, FLAG_PROTECT_CLEAR, 0, "Bootstrap"},
^^^
please use tab or remove
> + {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
> + {0x00008400, 0x00041FFF, FLAG_PROTECT_CLEAR, 0, "U-Boot"},
^^^
please use tab or remove
> +};
> diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
> new file mode 100644
> index 0000000..d009a04
> --- /dev/null
> +++ b/include/configs/afeb9260.h
> @@ -0,0 +1,171 @@
> +/*
> + * (C) Copyright 2008 Sergey Lapin
> + *
> + * Configuation settings for the AFEB9260 board.
> + * Based on configuration for AT91SAM9260-EK
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#ifndef __CONFIG_H
> +#define __CONFIG_H
> +
> +/* ARM asynchronous clock */
> +#define AT91_MAIN_CLOCK 18429952 /* from 18.432 MHz crystal */
> +#define AT91_MASTER_CLOCK 89999598 /* peripheral = main / 2 */
> +#define CFG_HZ 1000000 /* 1us resolution */
> +
> +#define AT91_SLOW_CLOCK 32768 /* slow clock */
> +
> +#define CONFIG_AT91SAM9260 1 /* It's an Atmel AT91SAM9260 SoC*/
> +#define CONFIG_AFEB9260 1 /* on an AFEB9260 Board */
> +#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
> +
> +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
> +#define CONFIG_SETUP_MEMORY_TAGS 1
> +#define CONFIG_INITRD_TAG 1
> +
> +#define CONFIG_SKIP_LOWLEVEL_INIT
> +#define CONFIG_SKIP_RELOCATE_UBOOT
> +
> +/*
> + * Hardware drivers
> + */
> +#define CONFIG_ATMEL_USART 1
> +#undef CONFIG_USART0
> +#undef CONFIG_USART1
> +#undef CONFIG_USART2
> +#define CONFIG_USART3 1 /* USART 3 is DBGU */
> +
> +#define CONFIG_BOOTDELAY 3
> +
> +/*
> + * BOOTP options
> + */
> +#define CONFIG_BOOTP_BOOTFILESIZE 1
> +#define CONFIG_BOOTP_BOOTPATH 1
> +#define CONFIG_BOOTP_GATEWAY 1
> +#define CONFIG_BOOTP_HOSTNAME 1
> +
> +/*
> + * Command line configuration.
> + */
> +#include <config_cmd_default.h>
> +#undef CONFIG_CMD_BDI
> +#undef CONFIG_CMD_IMI
> +#undef CONFIG_CMD_AUTOSCRIPT
> +#undef CONFIG_CMD_FPGA
> +#undef CONFIG_CMD_LOADS
> +#undef CONFIG_CMD_IMLS
> +
> +#define CONFIG_CMD_PING 1
> +#define CONFIG_CMD_DHCP 1
> +
> +#define CONFIG_CMD_NAND 1
> +#define CONFIG_CMD_USB 1
> +
> +/* SDRAM */
> +#define CONFIG_NR_DRAM_BANKS 1
> +#define PHYS_SDRAM 0x20000000
> +#define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */
> +
> +/* DataFlash */
> +#define CONFIG_HAS_DATAFLASH 1
> +#define CFG_SPI_WRITE_TOUT (5*CFG_HZ)
please add space between "*"
> +#define CFG_MAX_DATAFLASH_BANKS 2
> +#define CFG_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */
> +#define CFG_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */
> +#define AT91_SPI_CLK 15000000
> +#define DATAFLASH_TCSS (0x1a << 16)
> +#define DATAFLASH_TCHS (0x1 << 24)
> +
> +/* NAND flash */
> +#define NAND_MAX_CHIPS 1
> +#define CFG_MAX_NAND_DEVICE 1
> +#define CFG_NAND_BASE 0x40000000
> +#define CFG_NAND_DBW_8 1
> +
> +/* NOR flash - no real flash on this board */
> +#define CFG_NO_FLASH 1
> +
> +/* Ethernet */
> +#define CONFIG_MACB 1
> +#undef CONFIG_RMII /* We have full MII there */
> +#define CONFIG_RESET_PHY_R 1
> +
> +#define CONFIG_NET_MULTI 1
> +#define CONFIG_NET_RETRY_COUNT 20
> +
> +/* USB */
> +#define CONFIG_USB_OHCI_NEW 1
> +#define LITTLEENDIAN 1
> +#define CONFIG_DOS_PARTITION 1
> +#define CFG_USB_OHCI_CPU_INIT 1
> +#define CFG_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9260_UHP_BASE */
> +#define CFG_USB_OHCI_SLOT_NAME "at91sam9260"
> +#define CFG_USB_OHCI_MAX_ROOT_PORTS 1
> +#define CONFIG_USB_STORAGE 1
> +
> +#define CFG_LOAD_ADDR 0x21000000 /* load address */
> +
> +#define CFG_MEMTEST_START PHYS_SDRAM
> +#define CFG_MEMTEST_END 0x21e00000
> +
> +#undef CFG_USE_DATAFLASH_CS0
> +#define CFG_USE_DATAFLASH_CS1 1
> +#undef CFG_USE_NANDFLASH
> +
> +/* bootstrap + u-boot + env + linux in dataflash on CS1 */
> +#define CFG_ENV_IS_IN_DATAFLASH 1
> +#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
> +#define CFG_ENV_OFFSET 0x4200
> +#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET)
> +#define CFG_ENV_SIZE 0x4200
> +#define CONFIG_BOOTCOMMAND "nand read 0x21000000 0xa0000 0x200000; bootm"
> +#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
> + "root=/dev/mtdblock2 " \
> + "rw rootfstype=jffs2 panic=20"
> +
> +#define CONFIG_BAUDRATE 115200
> +#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
> +
> +#define CFG_PROMPT "U-Boot> "
> +#define CFG_CBSIZE 256
> +#define CFG_MAXARGS 16
> +#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
> +#define CFG_LONGHELP 1
> +#define CONFIG_CMDLINE_EDITING 1
> +
> +#define ROUND(A, B) (((A) + (B)) & ~((B) - 1))
> +/*
> + * Size of malloc() pool
> + */
> +#define CFG_MALLOC_LEN ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000)
please add space between "*"
> +#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
> +
> +#define CONFIG_STACKSIZE (32*1024) /* regular stack */
please add space between "*"
> +
> +#ifdef CONFIG_USE_IRQ
> +#error CONFIG_USE_IRQ not supported
> +#endif
> +
> +#define CONFIG_HW_WATCHDOG 1
> +
> +#endif
> +
> diff --git a/net/eth.c b/net/eth.c
> index 38979aa..3e5204c 100644
> --- a/net/eth.c
> +++ b/net/eth.c
> @@ -75,6 +75,7 @@ extern int atngw100_eth_initialize(bd_t *);
> extern int mcffec_initialize(bd_t*);
> extern int mcdmafec_initialize(bd_t*);
> extern int at91sam9_eth_initialize(bd_t *);
> +extern int afeb9260_eth_initialize(bd_t *);
>
> #ifdef CONFIG_API
> extern void (*push_packet)(volatile void *, int);
> @@ -286,10 +287,13 @@ int eth_initialize(bd_t *bis)
> #if defined(CONFIG_FSLDMAFEC)
> mcdmafec_initialize(bis);
> #endif
> -#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
> - defined(CONFIG_AT91SAM9263)
> +#if !defined(CONFIG_AFEB9260) && (defined(CONFIG_AT91CAP9) || \
> + defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9263))
> at91sam9_eth_initialize(bis);
> #endif
> +#if defined(CONFIG_AFEB9260)
> + afeb9260_eth_initialize(bis);
> +#endif
>
> if (!eth_devices) {
> puts ("No ethernet found.\n");
please update to the new network initialisation scheme.
Please rebase it also against the u-boot-arm/master
Note That just after the apply of your a common code will be create
it will be nice it you can plan to retest it
Best Regards,
J.
More information about the U-Boot
mailing list