sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

at91: reworked support for meesc board 

The meesc board support was broken. Within this opportunity, I completely
reworked the board files.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
Signed-off-by: Matthias Fuchs <Matthias.Fuchs@esd.eu>
This commit is contained in:
Matthias Fuchs 2011-07-19 01:56:06 +00:00 committed by Albert ARIBAUD
parent a1118d6042
commit 0cb77bfa7a
3 changed files with 147 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/esd/meesc/config.mk
View File

@ -1 +0,0 @@
CONFIG_SYS_TEXT_BASE = 0x21f00000

49
board/esd/meesc/meesc.c
View File

@ -3,7 +3,7 @@
* Stelian Pop <stelian.pop@leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* (C) Copyright 2009-2010 * (C) Copyright 2009-2011
* Daniel Gorsulowski <daniel.gorsulowski@esd.eu> * Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
* esd electronic system design gmbh <www.esd.eu> * esd electronic system design gmbh <www.esd.eu>
* *
@ -27,7 +27,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/at91sam9263.h> #include <asm/io.h>
#include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91sam9_smc.h>
#include <asm/arch/at91_common.h> #include <asm/arch/at91_common.h>
#include <asm/arch/at91_pmc.h> #include <asm/arch/at91_pmc.h>
@ -35,8 +35,6 @@
#include <asm/arch/at91_matrix.h> #include <asm/arch/at91_matrix.h>
#include <asm/arch/at91_pio.h> #include <asm/arch/at91_pio.h>
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include <asm/arch/hardware.h>
#include <asm/arch/io.h>
#include <netdev.h> #include <netdev.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -67,8 +65,8 @@ int get_hw_rev(void)
static void meesc_nand_hw_init(void) static void meesc_nand_hw_init(void)
{ {
unsigned long csa; unsigned long csa;
at91_smc_t *smc = (at91_smc_t *) AT91_SMC0_BASE; at91_smc_t *smc = (at91_smc_t *) ATMEL_BASE_SMC0;
at91_matrix_t *matrix = (at91_matrix_t *) AT91_MATRIX_BASE; at91_matrix_t *matrix = (at91_matrix_t *) ATMEL_BASE_MATRIX;
/* Enable CS3 */ /* Enable CS3 */
csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A; csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A;
@ -88,7 +86,7 @@ static void meesc_nand_hw_init(void)
writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
AT91_SMC_MODE_EXNW_DISABLE | AT91_SMC_MODE_EXNW_DISABLE |
AT91_SMC_MODE_DBW_8 | AT91_SMC_MODE_DBW_8 |
AT91_SMC_MODE_TDF_CYCLE(2), AT91_SMC_MODE_TDF_CYCLE(3),
&smc->cs[3].mode); &smc->cs[3].mode);
/* Configure RDY/BSY */ /* Configure RDY/BSY */
@ -102,9 +100,9 @@ static void meesc_nand_hw_init(void)
#ifdef CONFIG_MACB #ifdef CONFIG_MACB
static void meesc_macb_hw_init(void) static void meesc_macb_hw_init(void)
{ {
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
/* Enable clock */ /* Enable clock */
writel(1 << AT91SAM9263_ID_EMAC, &pmc->pcer); writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
at91_macb_hw_init(); at91_macb_hw_init();
} }
#endif #endif
@ -117,7 +115,7 @@ static void meesc_macb_hw_init(void)
*/ */
static void meesc_ethercat_hw_init(void) static void meesc_ethercat_hw_init(void)
{ {
at91_smc_t *smc1 = (at91_smc_t *) AT91_SMC1_BASE; at91_smc_t *smc1 = (at91_smc_t *) ATMEL_BASE_SMC1;
/* Configure SMC EBI1_CS0 for EtherCAT */ /* Configure SMC EBI1_CS0 for EtherCAT */
writel(AT91_SMC_SETUP_NWE(0) | AT91_SMC_SETUP_NCS_WR(0) | writel(AT91_SMC_SETUP_NWE(0) | AT91_SMC_SETUP_NCS_WR(0) |
@ -142,8 +140,9 @@ static void meesc_ethercat_hw_init(void)
int dram_init(void) int dram_init(void)
{ {
gd->bd->bi_dram[0].start = PHYS_SDRAM; gd->ram_size = get_ram_size(
gd->bd->bi_dram[0].size = get_ram_size((long *) PHYS_SDRAM, (1 << 27)); (void *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0; return 0;
} }
@ -151,7 +150,7 @@ int board_eth_init(bd_t *bis)
{ {
int rc = 0; int rc = 0;
#ifdef CONFIG_MACB #ifdef CONFIG_MACB
rc = macb_eth_initialize(0, (void *)AT91_EMAC_BASE, 0x00); rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x00);
#endif #endif
return rc; return rc;
} }
@ -225,7 +224,7 @@ int misc_init_r(void)
{ {
char *str; char *str;
char buf[32]; char buf[32];
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
/* /*
* Normally the processor clock has a divisor of 2. * Normally the processor clock has a divisor of 2.
@ -246,24 +245,28 @@ int misc_init_r(void)
} }
#endif /* CONFIG_MISC_INIT_R */ #endif /* CONFIG_MISC_INIT_R */
int board_init(void) int board_early_init_f(void)
{ {
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
/* Peripheral Clock Enable Register */ /* enable all clocks */
writel(1 << AT91SAM9263_ID_PIOA | writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) |
1 << AT91SAM9263_ID_PIOB | (1 << ATMEL_ID_PIOCDE) | (1 << ATMEL_ID_UHP),
1 << AT91SAM9263_ID_PIOCDE |
1 << AT91SAM9263_ID_UHP,
&pmc->pcer); &pmc->pcer);
at91_seriald_hw_init();
return 0;
}
int board_init(void)
{
/* initialize ET1100 Controller */ /* initialize ET1100 Controller */
meesc_ethercat_hw_init(); meesc_ethercat_hw_init();
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
at91_serial_hw_init();
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
meesc_nand_hw_init(); meesc_nand_hw_init();
#endif #endif

208
include/configs/meesc.h
View File

@ -3,7 +3,7 @@
* Stelian Pop <stelian.pop@leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* (C) Copyright 2009-2010 * (C) Copyright 2009-2011
* Daniel Gorsulowski <daniel.gorsulowski@esd.eu> * Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
* esd electronic system design gmbh <www.esd.eu> * esd electronic system design gmbh <www.esd.eu>
* *
@ -31,49 +31,68 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
/* Common stuff */ /*
#define CONFIG_MEESC 1 /* Board is esd MEESC */ * SoC must be defined first, before hardware.h is included.
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ * In this case SoC is defined in boards.cfg.
#define CONFIG_AT91SAM9263 1 /* It's an AT91SAM9263 SoC */ */
#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
/* 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 */ #define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* 16.0 MHz crystal */
#define CONFIG_SYS_HZ 1000 /* decrementer freq */ #define CONFIG_SYS_HZ 1000 /* decrementer freq */
#define CONFIG_DISPLAY_BOARDINFO 1
#define CONFIG_DISPLAY_CPUINFO 1 /* display cpu info and speed */ /* Misc CPU related */
#define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ #define CONFIG_ARCH_CPU_INIT
#define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */
#define CONFIG_INITRD_TAG 1 #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_SERIAL_TAG 1 #define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG 1 #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 */
#undef CONFIG_USE_IRQ /* don't need IRQ/FIQ stuff */ #undef CONFIG_USE_IRQ /* don't need IRQ/FIQ stuff */
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_DISPLAY_BOARDINFO /* call checkboard() */
#define CONFIG_MISC_INIT_R /* Call misc_init_r */ #define CONFIG_DISPLAY_CPUINFO /* display cpu info and speed */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_ARCH_CPU_INIT
/* /*
* Hardware drivers * Hardware drivers
*/ */
/* Console output */ /* required until arch/arm/include/asm/arch-at91/at91sam9263.h is reworked */
#define CONFIG_AT91_GPIO 1 #define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP
#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 /* general purpose I/O */
#define CONFIG_ZERO_BOOTDELAY_CHECK 1 #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_SYS_BAUDRATE_TABLE {115200, 19200, 38400, 57600, 9600}
#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* /*
* BOOTP options * BOOTP options
*/ */
#define CONFIG_BOOTP_BOOTFILESIZE 1 #define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH 1 #define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY 1 #define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME 1 #define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
@ -84,97 +103,112 @@
#undef CONFIG_CMD_LOADS #undef CONFIG_CMD_LOADS
#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_IMLS
#define CONFIG_CMD_PING 1 #define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP 1 #define CONFIG_CMD_DHCP
#define CONFIG_CMD_NAND 1 #define CONFIG_CMD_NAND
#define CONFIG_CMD_USB 1 #define CONFIG_CMD_USB
/* LED */ /* LED */
#define CONFIG_AT91_LED 1 #define CONFIG_AT91_LED
/* SDRAM */ /*
#define CONFIG_NR_DRAM_BANKS 1 * SDRAM: 1 bank, min 32, max 128 MB
#define PHYS_SDRAM 0x20000000 * 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 0x02000000
#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 */ /* DataFlash */
#define CONFIG_ATMEL_DATAFLASH_SPI #ifdef CONFIG_SYS_USE_DATAFLASH
#define CONFIG_HAS_DATAFLASH 1 # define CONFIG_ATMEL_DATAFLASH_SPI
#define CONFIG_SYS_SPI_WRITE_TOUT (5 * CONFIG_SYS_HZ) # define CONFIG_HAS_DATAFLASH
#define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 # define CONFIG_SYS_SPI_WRITE_TOUT (5 * CONFIG_SYS_HZ)
#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */ # define CONFIG_SYS_MAX_DATAFLASH_BANKS 1
#define AT91_SPI_CLK 15000000 # define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */
#define DATAFLASH_TCSS (0x1a << 16) # define AT91_SPI_CLK 15000000
#define DATAFLASH_TCHS (0x1 << 24) # define DATAFLASH_TCSS (0x1a << 16)
# define DATAFLASH_TCHS (0x1 << 24)
#endif
/* NOR flash is not populated, disable it */ /* NOR flash is not populated, disable it */
#define CONFIG_SYS_NO_FLASH 1 #define CONFIG_SYS_NO_FLASH
/* NAND flash */ /* NAND flash */
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
#define CONFIG_NAND_ATMEL # define CONFIG_NAND_ATMEL
#define CONFIG_SYS_MAX_NAND_DEVICE 1 # define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x40000000 # define CONFIG_SYS_NAND_BASE 0x40000000 /* ATMEL_BASE_CS3 */
#define CONFIG_SYS_NAND_DBW_8 1 # define CONFIG_SYS_NAND_DBW_8
/* our ALE is AD21 */ # define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) # define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
/* our CLE is AD22 */ # define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIO_PORTD, 15
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) # define CONFIG_SYS_NAND_READY_PIN AT91_PIO_PORTA, 22
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIO_PORTD, 15 # define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#define CONFIG_SYS_NAND_READY_PIN AT91_PIO_PORTA, 22
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* Ethernet */ /* Ethernet */
#define CONFIG_MACB 1 #define CONFIG_MACB
#define CONFIG_RMII 1 #define CONFIG_RMII
#define CONFIG_NET_MULTI 1 #define CONFIG_NET_MULTI
#define CONFIG_FIT
#define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_NET_RETRY_COUNT 20
#undef CONFIG_RESET_PHY_R #undef CONFIG_RESET_PHY_R
/* USB */ /* USB */
#define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL
#define CONFIG_USB_OHCI_NEW 1 #define CONFIG_USB_OHCI_NEW
#define CONFIG_DOS_PARTITION 1 #define CONFIG_DOS_PARTITION
#define CONFIG_SYS_USB_OHCI_CPU_INIT 1 #define CONFIG_SYS_USB_OHCI_CPU_INIT
#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00a00000 #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00a00000
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263"
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
#define CONFIG_USB_STORAGE 1
#define CONFIG_CMD_FAT 1
#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
#define CONFIG_SYS_MEMTEST_END 0x21e00000
#define CONFIG_SYS_USE_DATAFLASH 1
#undef CONFIG_SYS_USE_NANDFLASH
/* CAN */ /* CAN */
#define CONFIG_AT91_CAN 1 #define CONFIG_AT91_CAN
/* hw-controller addresses */ /* hw-controller addresses */
#define CONFIG_ET1100_BASE 0x70000000 #define CONFIG_ET1100_BASE 0x70000000
#ifdef CONFIG_SYS_USE_DATAFLASH
/* bootstrap + u-boot + env in dataflash on CS0 */ /* bootstrap + u-boot + env in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1 # define CONFIG_ENV_IS_IN_DATAFLASH
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \ # define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
0x8400) 0x8400)
#define CONFIG_ENV_OFFSET 0x4200 # define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \ # define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
CONFIG_ENV_OFFSET) CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x4200 # define CONFIG_ENV_SIZE 0x4200
#define CONFIG_BAUDRATE 115200 #elif CONFIG_SYS_USE_NANDFLASH
#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
/* 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_PROMPT "=> " #define CONFIG_SYS_PROMPT "=> "
#define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16) sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP 1 #define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING 1 #define CONFIG_CMDLINE_EDITING
/* /*
* Size of malloc() pool * Size of malloc() pool
@ -185,7 +219,7 @@
#define CONFIG_STACKSIZE (32 * 1024) /* regular stack */ #define CONFIG_STACKSIZE (32 * 1024) /* regular stack */
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
#error CONFIG_USE_IRQ not supported # error CONFIG_USE_IRQ not supported
#endif #endif
#endif #endif