arm, at91: support for the taurus and corvus board
Subsystems (2)
cover arm, at91: support for the taurus and corvus board
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
add support for the two AT91SAM9G20 boards from siemens. For the taurus board, patch 1 from this series add some needed defines.
Heiko Schocher (2):
arm, at91: add Siemens board taurus (based on AT91SAM9G20) arm, at91: add siemens corvus board
Roger Meier (1):
at91: add defines for reset type
arch/arm/include/asm/arch-at91/at91_rstc.h | 7 + board/siemens/corvus/Makefile | 39 ++++ board/siemens/corvus/board.c | 345 +++++++++++++++++++++++++++++ board/siemens/taurus/Makefile | 38 ++++ board/siemens/taurus/taurus.c | 204 +++++++++++++++++ boards.cfg | 3 + include/configs/corvus.h | 185 ++++++++++++++++ include/configs/taurus.h | 163 ++++++++++++++ 8 files changed, 984 insertions(+) create mode 100644 board/siemens/corvus/Makefile create mode 100644 board/siemens/corvus/board.c create mode 100644 board/siemens/taurus/Makefile create mode 100644 board/siemens/taurus/taurus.c create mode 100644 include/configs/corvus.h create mode 100644 include/configs/taurus.h
Signature · 1 line
1.8.3.1
PATCH 1/3 at91: add defines for reset type
From: Roger Meier <[email protected]>
--- arch/arm/include/asm/arch-at91/at91_rstc.h | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/include/asm/arch-at91/at91_rstc.h +7 -0
@@ -38,4 +38,11 @@ typedef struct at91_rstc {#define AT91_RSTC_SR_NRSTL 0x00010000 +#define AT91_RSTC_RSTTYP (7 << 8)/* Reset Type */ +#define AT91_RSTC_RSTTYP_GENERAL (0 << 8) +#define AT91_RSTC_RSTTYP_WAKEUP (1 << 8) +#define AT91_RSTC_RSTTYP_WATCHDOG (2 << 8) +#define AT91_RSTC_RSTTYP_SOFTWARE (3 << 8) +#define AT91_RSTC_RSTTYP_USER (4 << 8) +#endif
Signature · 1 line
1.8.3.1
PATCH 1/3 at91: add defines for reset type
Hi Heiko Schocher,
Quoted 5 lines · Heiko Schocher
From: Roger Meier <[email protected]>
Signed-off-by Roger Meier <[email protected]>Reviewed-by Heiko Schocher <[email protected]>Cc Andreas Bie?mann <[email protected]>
Quoted 11 lines
--- arch/arm/include/asm/arch-at91/at91_rstc.h | 7 +++++++ 1 file changed, 7 insertions(+)arch/arm/include/asm/arch-at91/at91_rstc.h +0
-0@@ -38,4 +38,11 @@ typedef struct at91_rstc {
arch/arm/include/asm/arch-at91/at91_rstc.h typedef struct at91_rstc { · line 48
Quoted 10 lines
arch/arm/include/asm/arch-at91/at91_rstc.h +7
-0#define AT91_RSTC_SR_NRSTL 0x00010000 +#define AT91_RSTC_RSTTYP (7 << 8)/* Reset Type */ +#define AT91_RSTC_RSTTYP_GENERAL (0 << 8) +#define AT91_RSTC_RSTTYP_WAKEUP (1 << 8) +#define AT91_RSTC_RSTTYP_WATCHDOG (2 << 8) +#define AT91_RSTC_RSTTYP_SOFTWARE (3 << 8) +#define AT91_RSTC_RSTTYP_USER (4 << 8) +#endif
Best Regards,
Bo Shen
PATCH 2/3 arm, at91: add Siemens board taurus (based on AT91SAM9G20)
In reply to Heiko Schocher--- board/siemens/taurus/Makefile | 38 ++++++++ board/siemens/taurus/taurus.c | 204 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 2 + include/configs/taurus.h | 163 +++++++++++++++++++++++++++++++++ 4 files changed, 407 insertions(+) create mode 100644 board/siemens/taurus/Makefile create mode 100644 board/siemens/taurus/taurus.c create mode 100644 include/configs/taurus.h
board/siemens/taurus/Makefile new file +38 -0
@@ -0,0 +1,38 @@ +# +# Makefile for Siemens TAURUS (AT91SAM9G20) based board +# (C) Copyright 2013 Siemens AG +# +# Based on: +# U-Boot file: board/atmel/at91sam9260ek/Makefile +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# (C) Copyright 2008 +# Stelian Pop <[email protected]> +# Lead Tech Design <www.leadtechdesign.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += taurus.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################
board/siemens/taurus/taurus.c new file +204 -0
204 lines not on this page · raw message
boards.cfg +2 -0
@@ -139,6 +139,8 @@ Active arm arm926ejs at91 ronetix pm9263 Active arm arm926ejs at91 ronetix pm9g45 pm9g45 pm9g45:AT91SAM9G45 Ilko Iliev <[email protected]> Active arm arm926ejs at91 taskit stamp9g20 portuxg20 stamp9g20:AT91SAM9G20,PORTUXG20 Markus Hubig <[email protected]> Active arm arm926ejs at91 taskit stamp9g20 stamp9g20 stamp9g20:AT91SAM9G20 Markus Hubig <[email protected]> +Active arm arm926ejs at91 siemens taurus axm taurus:AT91SAM9G20,MACH_TYPE=2068 Heiko Schocher <[email protected]> +Active arm arm926ejs at91 siemens taurus taurus taurus:AT91SAM9G20,MACH_TYPE=2067 Heiko Schocher <[email protected]> Active arm arm926ejs davinci ait cam_enc_4xx cam_enc_4xx cam_enc_4xx Heiko Schocher <[email protected]> Active arm arm926ejs davinci Barix ipam390 ipam390 - Heiko Schocher <[email protected]> Active arm arm926ejs davinci davinci da8xxevm da830evm - Nick Thompson <[email protected]>
include/configs/taurus.h new file +163 -0
163 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 2/3 arm, at91: add Siemens board taurus (based on AT91SAM9G20)
Hi Heiko Schocher,
Please add commit message.
Quoted 89 lines · Heiko Schocher
Signed-off-by Roger Meier <[email protected]>Reviewed-by Heiko Schocher <[email protected]>Cc Andreas Bie?mann <[email protected]>--- board/siemens/taurus/Makefile | 38 ++++++++ board/siemens/taurus/taurus.c | 204 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 2 + include/configs/taurus.h | 163 +++++++++++++++++++++++++++++++++ 4 files changed, 407 insertions(+)create mode 100644 board/siemens/taurus/Makefile create mode 100644
board/siemens/taurus/taurus.ccreate mode 100644include/configs/taurus.hboard/siemens/taurus/Makefile new file +38
-0@@ -0,0 +1,38 @@ +# +# Makefile for Siemens TAURUS (AT91SAM9G20) based board +# (C) Copyright 2013 Siemens AG +# +# Based on: +# U-Boot file: board/atmel/at91sam9260ek/Makefile +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# (C) Copyright 2008 +# Stelian Pop <[email protected]> +# Lead Tech Design <www.leadtechdesign.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += taurus.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################board/siemens/taurus/taurus.c new file +26
-0@@ -0,0 +1,204 @@ +/* +* Board functions for Siemens TAURUS (AT91SAM9G20) based boards +* (C) Copyright Siemens AG +* +* Based on: +* U-Boot file: board/atmel/at91sam9260ek/at91sam9260ek.c +* +* (C) Copyright 2007-2008 +* Stelian Pop <[email protected]> +* Lead Tech Design <www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/at91sam9260_matrix.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/gpio.h> +#include <asm/arch/at91sam9_sdramc.h> +#include <atmel_mci.h> + +#if defined(CONFIG_RESET_PHY_R ) && defined(CONFIG_MACB )
board/siemens/taurus/taurus.c line 36
Quoted 10 lines
board/siemens/taurus/taurus.c new file +10
-0+# include <net.h> +#endif +#include <netdev.h> + +DECLARE_GLOBAL_DATA_PTR ; + +/* ------------------------------------------------------------------------- */ +/* +* Miscelaneous platform dependent initialisations +*/
I think this comment no meaning here.
Quoted 54 lines
board/siemens/taurus/taurus.c new file +54
-0+#ifdef CONFIG_CMD_NAND +static void taurus_nand_hw_init (void ) +{ +struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC ; +struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX ; +unsigned long csa; + +/* Assign CS3 to NAND/SmartMedia Interface */ + csa =readl (&matrix->ebicsa); + csa |=AT91_MATRIX_CS3A_SMC_SMARTMEDIA ; +writel (csa, &matrix->ebicsa); + +/* Configure SMC CS3 for NAND/SmartMedia */ +writel (AT91_SMC_SETUP_NWE (2 ) |AT91_SMC_SETUP_NCS_WR (0 ) | +AT91_SMC_SETUP_NRD (2 ) |AT91_SMC_SETUP_NCS_RD (0 ), + &smc->cs[3 ].setup); +writel (AT91_SMC_PULSE_NWE (4 ) |AT91_SMC_PULSE_NCS_WR (3 ) | +AT91_SMC_PULSE_NRD (4 ) |AT91_SMC_PULSE_NCS_RD (3 ), + &smc->cs[3 ].pulse); +writel (AT91_SMC_CYCLE_NWE (7 ) |AT91_SMC_CYCLE_NRD (7 ), + &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 (3 ), + &smc->cs[3 ].mode); + +/* Configure RDY/BSY */ +at91_set_gpio_input (CONFIG_SYS_NAND_READY_PIN ,1 ); + +/* Enable NandFlash */ +at91_set_gpio_output (CONFIG_SYS_NAND_ENABLE_PIN ,1 ); +} +#endif + +#ifdef CONFIG_MACB +static void taurus_macb_hw_init (void ) +{ +struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC ; +struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA ; +struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC ; +unsigned long erstl; + +/* Enable EMAC clock */ +writel (1 <<ATMEL_ID_EMAC0 , &pmc->pcer); + +/* +* Disable pull-up on: +* RXDV (PA17) => PHY normal mode (not Test mode) +* ERX0 (PA14) => PHY ADDR0 +* ERX1 (PA15) => PHY ADDR1 +* ERX2 (PA25) => PHY ADDR2 +* ERX3 (PA26) => PHY ADDR3 +* ECRS (PA28) => PHY ADDR4 => PHYADDR = 0x0
board/siemens/taurus/taurus.c line 101
Quoted 10 lines
board/siemens/taurus/taurus.c new file +10
-0+* +* PHY has internal pull-down +*/ +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 ), + &pioa->pudr);
Call we use GPIO API here?
Quoted 11 lines
board/siemens/taurus/taurus.c new file +11
-0+/* +* Need to reset PHY ?-> 200us reset +* Bug within Atmel CPU (undefined initial states on io-lines)! +* Startup Ethernet Switch delayed so that hardstrap(Switch Config) +* has defined state after cold start (do not break daisy chain!). +*/ +if ((readl (&rstc->sr) &AT91_RSTC_RSTTYP ) ==AT91_RSTC_RSTTYP_GENERAL ) +at91_set_gpio_output (AT91_PIN_PA25 ,0 ); + + + erstl =readl (&rstc->mr) &AT91_RSTC_MR_ERSTL_MASK ;
board/siemens/taurus/taurus.c line 123
Quoted 10 lines
board/siemens/taurus/taurus.c new file +10
-0+ +/* Need to reset PHY -> 500ms reset */ +writel (AT91_RSTC_KEY |AT91_RSTC_MR_ERSTL (13 ) | +AT91_RSTC_MR_URSTEN , &rstc->mr); + +writel (AT91_RSTC_KEY |AT91_RSTC_CR_EXTRST , &rstc->cr); + +/* Wait for end hardware reset */ +while (!(readl (&rstc->sr) &AT91_RSTC_SR_NRSTL )) + ;
Add a timeout here.
board/siemens/taurus/taurus.c line 137
Quoted 13 lines
board/siemens/taurus/taurus.c new file +13
-0+/* Restore NRST value */ +writel (AT91_RSTC_KEY | erstl |AT91_RSTC_MR_URSTEN , &rstc->mr); + +at91_set_gpio_input (AT91_PIN_PA25 ,1 );/* ERST tri-state */ + +/* Re-enable pull-up */ +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 ), + &pioa->puer);
Call we use GPIO API here?
Quoted 20 lines
board/siemens/taurus/taurus.c new file +20
-0+/* Initialize EMAC=MACB hardware */ +at91_macb_hw_init (); +} +#endif + +#ifdef CONFIG_GENERIC_ATMEL_MCI +int board_mmc_init (bd_t *bd) +{ +at91_mci_hw_init (); + +return atmel_mci_init ((void *)ATMEL_BASE_MCI ); +} +#endif + +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) |
board/siemens/taurus/taurus.c line 168
Quoted 10 lines
board/siemens/taurus/taurus.c new file +10
-0+ (1 <<ATMEL_ID_PIOC ), + &pmc->pcer); + +return 0 ; +} + +int board_init (void ) +{ +/* Enable Ctrlc */ +console_init_f ();
This is can be removed.
board/siemens/taurus/taurus.c line 171
Quoted 2 lines
board/siemens/taurus/taurus.c new file +2
-0+/* arch number of board */ + gd->bd->bi_arch_number =CONFIG_MACH_TYPE ;
Move to board related configuration file.
Quoted 11 lines
board/siemens/taurus/taurus.c new file +11
-0+/* adress of boot parameters */ + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ; + +at91_seriald_hw_init (); +#ifdef CONFIG_CMD_NAND +taurus_nand_hw_init (); +#endif +#ifdef CONFIG_MACB +taurus_macb_hw_init (); +#endif +
board/siemens/taurus/taurus.c line 193
Quoted 10 lines
board/siemens/taurus/taurus.c new file +10
-0+return 0 ; +} + +int dram_init (void ) +{ +/* configure ram size based on sdram controller config registers */ +unsigned int sdram_cr_nc; + sdram_cr_nc =readl (AT91_SDRAMC_CR ) &AT91_SDRAMC_NC ; + gd->ram_size =get_ram_size ((void *)CONFIG_SYS_SDRAM_BASE , + (32 <<20 ) << sdram_cr_nc);
Would it be possible the same NC, however different NR?
Quoted 16 lines
board/siemens/taurus/taurus.c new file +11
-0+return 0 ; +} + +int board_eth_init (bd_t *bis) +{ +int rc =0 ; +#ifdef CONFIG_MACB + rc =macb_eth_initialize (0 , (void *)ATMEL_BASE_EMAC0 ,0x00 ); +#endif +return rc; +}boards.cfg +0
-0
boards.cfg Active arm arm926ejs at91 ronetix pm9263 · line 143
Quoted 5 lines
boards.cfg +2
-0@@ -139,6 +139,8 @@ Active arm arm926ejs at91 ronetix pm9263 Active arm arm926ejs at91 ronetix pm9g45 pm9g45 pm9g45:AT91SAM9G45 Ilko Iliev <[email protected]> Active arm arm926ejs at91 taskit stamp9g20 portuxg20 stamp9g20:AT91SAM9G20,PORTUXG20 Markus Hubig <[email protected]> Active arm arm926ejs at91 taskit stamp9g20 stamp9g20 stamp9g20:AT91SAM9G20 Markus Hubig <[email protected]> +Active arm arm926ejs at91 siemens taurus axm taurus:AT91SAM9G20,MACH_TYPE=2068 Heiko Schocher <[email protected]> +Active arm arm926ejs at91 siemens taurus taurus taurus:AT91SAM9G20,MACH_TYPE=2067 Heiko Schocher <[email protected]>
Why two boards here?
Quoted 24 lines
boards.cfg +0
-0Active arm arm926ejs davinci ait cam_enc_4xx cam_enc_4xx cam_enc_4xx Heiko Schocher <[email protected]> Active arm arm926ejs davinci Barix ipam390 ipam390 - Heiko Schocher <[email protected]> Active arm arm926ejs davinci davinci da8xxevm da830evm - Nick Thompson <[email protected]>include/configs/taurus.h new file +15
-0@@ -0,0 +1,163 @@ +/* +* Common board functions for Siemens TAURUS (AT91SAM9G20) based boards +* (C) Copyright 2013 Siemens AG +* +* Based on: +* U-Boot file: include/configs/at91sam9260ek.h +* +* (C) Copyright 2007-2008 +* Stelian Pop <[email protected]> +* Lead Tech Design <www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef __CONFIG_H
include/configs/taurus.h line 25
Quoted 10 lines
include/configs/taurus.h new file +10
-0+#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> + +#define MACH_TYPE_TAURUS 2067 +#define MACH_TYPE_AXM 2068
These two type are the same board?
include/configs/taurus.h line 35
Quoted 10 lines
include/configs/taurus.h new file +10
-0+ +/* +* 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 0x23f00000
This address should be considered (if the memory size is 64MiB) as u-boot is top down map, there is only 1MiB left.
Quoted 17 lines
include/configs/taurus.h new file +17
-0+ +/* ARM asynchronous clock */ +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768/* slow clock xtal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* main clock xtal */ +#define CONFIG_SYS_HZ 1000 + +/* Misc CPU related */ +#define CONFIG_ARCH_CPU_INIT +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_DISPLAY_CPUINFO + +#define CONFIG_CMD_BOOTZ +#define CONFIG_OF_LIBFDT
include/configs/taurus.h line 62
Quoted 10 lines
include/configs/taurus.h new file +10
-0+ +/* general purpose I/O */ +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ +#define CONFIG_AT91_GPIO +#define CONFIG_AT91_GPIO_PULLUP 1/* keep pullups on peripheral pins */ + +/* serial console */ +#define CONFIG_ATMEL_USART +#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CONFIG_USART_ID ATMEL_ID_SYS
replace tab with black space.
Quoted 53 lines
include/configs/taurus.h new file +53
-0+#define CONFIG_BAUDRATE 115200 + +#define CONFIG_BOOTDELAY 3 + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NAND + +/* +* 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 ATMEL_BASE_CS1 +/* +* PHYS_SDRAM_SIZE is dynamically detected according to the +* "Number of Column Bits" set within the SDRAM Configuration +* register, see axm.c for further details +*/ + +/* +* 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_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE) + +/* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE 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 AT91_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 +#endif + +/* NOR flash - no real flash on this board */ +#define CONFIG_SYS_NO_FLASH 1
include/configs/taurus.h line 125
Quoted 10 lines
include/configs/taurus.h new file +10
-0+ +/* Ethernet */ +#define CONFIG_MACB +#define CONFIG_RMII + +/* USB */ +#if (CONFIG_MACH_TYPE ==MACH_TYPE_TAURUS ) +#define CONFIG_USB_ATMEL +#define CONFIG_USB_OHCI_NEW 1 +#define CONFIG_SYS_USB_OHCI_CPU_INIT 1
discard the unnessacery "1"
Quoted 29 lines
include/configs/taurus.h new file +28
-0+#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 +#define CONFIG_USB_STORAGE 1 +#endif + +/* load address */ +#define CONFIG_SYS_LOAD_ADDR 0x22000000 + +/* bootstrap in spi flash , u-boot + env + linux in nandflash */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 +#define CONFIG_ENV_OFFSET_REDUND 0x180000 +#define CONFIG_ENV_SIZE 0x20000/* 1 sector = 128 kB */ +#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \ + "root=/dev/mtdblock7 rw rootfstype=jffs2" + +#define CONFIG_SYS_PROMPT "U-Boot> " +#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_PBSIZE \ + (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_LONGHELP
include/configs/taurus.h line 163
Quoted 10 lines
include/configs/taurus.h new file +10
-0+#define CONFIG_CMDLINE_EDITING +#define CONFIG_AUTO_COMPLETE + +/* +* Size of malloc() pool +*/ +#define CONFIG_SYS_MALLOC_LEN \ + ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) + +#endif
Best Regards,
Bo Shen
PATCH 2/3 arm, at91: add Siemens board taurus (based on AT91SAM9G20)
Hi Heiko,
some additional comments on top of Bo's.
Quoted 173 lines · Bo Shen
Hi Heiko Schocher,
Please add commit message.
Quoted 102 lines · Heiko Schocher
Signed-off-by Roger Meier <[email protected]>Reviewed-by Heiko Schocher <[email protected]>Cc Andreas Bie?mann <[email protected]>--- board/siemens/taurus/Makefile | 38 ++++++++ board/siemens/taurus/taurus.c | 204 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 2 + include/configs/taurus.h | 163 +++++++++++++++++++++++++++++++++ 4 files changed, 407 insertions(+)create mode 100644 board/siemens/taurus/Makefile create mode 100644
board/siemens/taurus/taurus.ccreate mode 100644include/configs/taurus.hboard/siemens/taurus/Makefile new file +38
-0@@ -0,0 +1,38 @@ +# +# Makefile for Siemens TAURUS (AT91SAM9G20) based board +# (C) Copyright 2013 Siemens AG +# +# Based on: +# U-Boot file: board/atmel/at91sam9260ek/Makefile +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# (C) Copyright 2008 +# Stelian Pop <[email protected]> +# Lead Tech Design <www.leadtechdesign.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += taurus.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################board/siemens/taurus/taurus.c new file +33
-1@@ -0,0 +1,204 @@ +/* +* Board functions for Siemens TAURUS (AT91SAM9G20) based boards +* (C) Copyright Siemens AG +* +* Based on: +* U-Boot file: board/atmel/at91sam9260ek/at91sam9260ek.c +* +* (C) Copyright 2007-2008 +* Stelian Pop <[email protected]> +* Lead Tech Design <www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/at91sam9260_matrix.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/gpio.h> +#include <asm/arch/at91sam9_sdramc.h> +#include <atmel_mci.h> + +#if defined(CONFIG_RESET_PHY_R ) && defined(CONFIG_MACB ) +# include <net.h> +#endif +#include <netdev.h> + +DECLARE_GLOBAL_DATA_PTR ; + +/* -------------------------------------------------------------------------Quoted 4 lines
*/
+/*
+ * Miscelaneous platform dependent initialisations
+ */I think this comment no meaning here.
Quoted 59 lines
board/siemens/taurus/taurus.c new file +5
-0+#ifdef CONFIG_CMD_NAND +static void taurus_nand_hw_init (void ) +{ +struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC ; + struct at91_matrix *matrix = (struct at91_matrix*)ATMEL_BASE_MATRIX;
board/siemens/taurus/taurus.c new file +53
-0+unsigned long csa; + +/* Assign CS3 to NAND/SmartMedia Interface */ + csa =readl (&matrix->ebicsa); + csa |=AT91_MATRIX_CS3A_SMC_SMARTMEDIA ; +writel (csa, &matrix->ebicsa); + +/* Configure SMC CS3 for NAND/SmartMedia */ +writel (AT91_SMC_SETUP_NWE (2 ) |AT91_SMC_SETUP_NCS_WR (0 ) | +AT91_SMC_SETUP_NRD (2 ) |AT91_SMC_SETUP_NCS_RD (0 ), + &smc->cs[3 ].setup); +writel (AT91_SMC_PULSE_NWE (4 ) |AT91_SMC_PULSE_NCS_WR (3 ) | +AT91_SMC_PULSE_NRD (4 ) |AT91_SMC_PULSE_NCS_RD (3 ), + &smc->cs[3 ].pulse); +writel (AT91_SMC_CYCLE_NWE (7 ) |AT91_SMC_CYCLE_NRD (7 ), + &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 (3 ), + &smc->cs[3 ].mode); + +/* Configure RDY/BSY */ +at91_set_gpio_input (CONFIG_SYS_NAND_READY_PIN ,1 ); + +/* Enable NandFlash */ +at91_set_gpio_output (CONFIG_SYS_NAND_ENABLE_PIN ,1 ); +} +#endif + +#ifdef CONFIG_MACB +static void taurus_macb_hw_init (void ) +{ +struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC ; +struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA ; +struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC ; +unsigned long erstl; + +/* Enable EMAC clock */ +writel (1 <<ATMEL_ID_EMAC0 , &pmc->pcer); + +/* +* Disable pull-up on: +* RXDV (PA17) => PHY normal mode (not Test mode) +* ERX0 (PA14) => PHY ADDR0 +* ERX1 (PA15) => PHY ADDR1 +* ERX2 (PA25) => PHY ADDR2 +* ERX3 (PA26) => PHY ADDR3 +* ECRS (PA28) => PHY ADDR4 => PHYADDR = 0x0 +* +* PHY has internal pull-down +*/ + writel(pin_to_mask(AT91_PIN_PA14) |
Quoted 8 lines
board/siemens/taurus/taurus.c line 101
Quoted 6 lines
board/siemens/taurus/taurus.c new file +6
-0+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 ), + &pioa->pudr);Call we use GPIO API here?
Unfortunately there is no way to set multiple I/O in one go. Beside that this is more PIO API than GPIO API (same as the kernel side discussion about gpio vs pinmux). I would accept this her in that special case, preferably we could add some API to mux multiple pins in one go.
Quoted 55 lines
Quoted 12 lines
board/siemens/taurus/taurus.c new file +7
-0+/* +* Need to reset PHY ?-> 200us reset +* Bug within Atmel CPU (undefined initial states on io-lines)! +* Startup Ethernet Switch delayed so that hardstrap(Switch Config) +* has defined state after cold start (do not break daisy chain!). +*/ + if ((readl(&rstc->sr) & AT91_RSTC_RSTTYP) ==
AT91_RSTC_RSTTYP_GENERAL)board/siemens/taurus/taurus.c new file +4
-0+at91_set_gpio_output (AT91_PIN_PA25 ,0 ); + + + erstl =readl (&rstc->mr) &AT91_RSTC_MR_ERSTL_MASK ;board/siemens/taurus/taurus.c line 123
Quoted 10 lines
board/siemens/taurus/taurus.c new file +10
-0+ +/* Need to reset PHY -> 500ms reset */ +writel (AT91_RSTC_KEY |AT91_RSTC_MR_ERSTL (13 ) | +AT91_RSTC_MR_URSTEN , &rstc->mr); + +writel (AT91_RSTC_KEY |AT91_RSTC_CR_EXTRST , &rstc->cr); + +/* Wait for end hardware reset */ +while (!(readl (&rstc->sr) &AT91_RSTC_SR_NRSTL )) + ;Add a timeout here.
board/siemens/taurus/taurus.c line 137
Quoted 13 lines
board/siemens/taurus/taurus.c new file +13
-0+/* Restore NRST value */ +writel (AT91_RSTC_KEY | erstl |AT91_RSTC_MR_URSTEN , &rstc->mr); + +at91_set_gpio_input (AT91_PIN_PA25 ,1 );/* ERST tri-state */ + +/* Re-enable pull-up */ +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 ), + &pioa->puer);Call we use GPIO API here?
Quoted 14 lines
board/siemens/taurus/taurus.c new file +14
-0+/* Initialize EMAC=MACB hardware */ + at91_macb_hw_init(); +} +#endif + +#ifdef CONFIG_GENERIC_ATMEL_MCI +int board_mmc_init (bd_t *bd) +{ +at91_mci_hw_init (); + +return atmel_mci_init ((void *)ATMEL_BASE_MCI ); +} +#endif +
Quoted 8 lines
board/siemens/taurus/taurus.c line 160
Quoted 8 lines
board/siemens/taurus/taurus.c new file +8
-0+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_PIOC ), + &pmc->pcer);
Isn't there some API to do this?
To answer myself, I think not. Each AT91 board has this piece of code copied in its board_early_init_f ... we should think about adding a generic function to do that for us.
Quoted 31 lines
board/siemens/taurus/taurus.c line 168
Quoted 8 lines
board/siemens/taurus/taurus.c new file +8
-0+ +return 0 ; +} + +int board_init (void ) +{ +/* Enable Ctrlc */ +console_init_f ();This is can be removed.
board/siemens/taurus/taurus.c line 171
Quoted 2 lines
board/siemens/taurus/taurus.c new file +2
-0+/* arch number of board */ + gd->bd->bi_arch_number =CONFIG_MACH_TYPE ;Move to board related configuration file.
Quoted 15 lines
board/siemens/taurus/taurus.c new file +15
-0+/* adress of boot parameters */ + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ; + +at91_seriald_hw_init (); +#ifdef CONFIG_CMD_NAND +taurus_nand_hw_init (); +#endif +#ifdef CONFIG_MACB +taurus_macb_hw_init (); +#endif + +return 0 ; +} + +int dram_init (void )
Quoted 8 lines
board/siemens/taurus/taurus.c line 193
Quoted 6 lines
board/siemens/taurus/taurus.c new file +6
-0+{ +/* configure ram size based on sdram controller config registers */ +unsigned int sdram_cr_nc; + sdram_cr_nc =readl (AT91_SDRAMC_CR ) &AT91_SDRAMC_NC ; + gd->ram_size =get_ram_size ((void *)CONFIG_SYS_SDRAM_BASE , + (32 <<20 ) << sdram_cr_nc);Would it be possible the same NC, however different NR?
Hasn't the get_ram_size() some feature to detect the real size implemented? Why detect the configured size before?
Quoted 77 lines
Quoted 29 lines
board/siemens/taurus/taurus.c new file +11
-0+return 0 ; +} + +int board_eth_init (bd_t *bis) +{ +int rc =0 ; +#ifdef CONFIG_MACB + rc =macb_eth_initialize (0 , (void *)ATMEL_BASE_EMAC0 ,0x00 ); +#endif +return rc; +}boards.cfg +0
-0@@ -139,6 +139,8 @@ Active arm arm926ejs at91ronetix pm9263
Active arm arm926ejs at91 ronetix
pm9g45 pm9g45
pm9g45:AT91SAM9G45
Ilko Iliev <[email protected]>
Active arm arm926ejs at91 taskit
stamp9g20 portuxg20
stamp9g20:AT91SAM9G20,PORTUXG20
Markus Hubig <[email protected]>
Active arm arm926ejs at91 taskit
stamp9g20 stamp9g20
stamp9g20:AT91SAM9G20
Markus Hubig <[email protected]>Quoted 8 lines
+Active arm arm926ejs at91 siemens
taurus axm
taurus:AT91SAM9G20,MACH_TYPE=2068
Heiko Schocher <[email protected]>
+Active arm arm926ejs at91 siemens
taurus taurus
taurus:AT91SAM9G20,MACH_TYPE=2067
Heiko Schocher <[email protected]>Why two boards here?
Quoted 37 lines
Active arm arm926ejs davinci ait
cam_enc_4xxcam_enc_4xxcam_enc_4xx
Heiko Schocher <[email protected]>
Active arm arm926ejs davinci Barix
ipam390 ipam390
-
Heiko Schocher <[email protected]>
Active arm arm926ejs davinci davinci
da8xxevm da830evm
-
Nick Thompson <[email protected]>include/configs/taurus.h new file +19
-0@@ -0,0 +1,163 @@ +/* +* Common board functions for Siemens TAURUS (AT91SAM9G20) based boards +* (C) Copyright 2013 Siemens AG +* +* Based on: +* U-Boot file: include/configs/at91sam9260ek.h +* +* (C) Copyright 2007-2008 +* Stelian Pop <[email protected]> +* Lead Tech Design <www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* +* SoC must be defined first, before hardware.h is included.
Quoted 8 lines
include/configs/taurus.h line 25
Quoted 6 lines
include/configs/taurus.h new file +6
-0+* In this case SoC is defined in boards.cfg. +*/ +#include <asm/hardware.h> + +#define MACH_TYPE_TAURUS 2067 +#define MACH_TYPE_AXM 2068These two type are the same board?
Isn't the correct type defined by boards.cfg?
Quoted 9 lines
include/configs/taurus.h line 34
Quoted 9 lines
include/configs/taurus.h new file +9
-0+ +/* +* 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! +*/ + +
Could you please remove the empty lines (at least one) here?
Quoted 4 lines
include/configs/taurus.h line 35
Quoted 1 line
include/configs/taurus.h new file +1
-0+#define CONFIG_SYS_TEXT_BASE 0x23f00000This address should be considered (if the memory size is 64MiB) as u-boot is top down map, there is only 1MiB left.
As discussed in the Calo USB-A9263 board, please prove that the address works in all cases (with the given setup in this file). IOW check if now code will be clobbered by relocate_code() and write it down in some comment. A reminder for later adoption in the configuration would also considered helpful ;)
Quoted 52 lines
Quoted 23 lines
include/configs/taurus.h new file +22
-0+ +/* ARM asynchronous clock */ +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768/* slow clock xtal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* main clock xtal */ +#define CONFIG_SYS_HZ 1000 + +/* Misc CPU related */ +#define CONFIG_ARCH_CPU_INIT +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_DISPLAY_CPUINFO + +#define CONFIG_CMD_BOOTZ +#define CONFIG_OF_LIBFDT + +/* general purpose I/O */ +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ +#define CONFIG_AT91_GPIO +#define CONFIG_AT91_GPIO_PULLUP 1/* keep pullups on peripheral pins */
include/configs/taurus.h line 62
Quoted 5 lines
include/configs/taurus.h new file +5
-0+ +/* serial console */ +#define CONFIG_ATMEL_USART +#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CONFIG_USART_ID ATMEL_ID_SYSreplace tab with black space.
Quoted 21 lines
include/configs/taurus.h new file +21
-0+#define CONFIG_BAUDRATE 115200 + +#define CONFIG_BOOTDELAY 3 + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NAND + +/* +* SDRAM: 1 bank, min 32, max 128 MB
Quoted 8 lines
include/configs/taurus.h line 91
Quoted 8 lines
+ * Initialized before u-boot gets started.
+ */include/configs/taurus.h new file +6
-0+#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 +/* +* PHYS_SDRAM_SIZE is dynamically detected according to the +* "Number of Column Bits" set within the SDRAM Configuration +* register, see axm.c for further details
Where is this axm.c located?
Quoted 23 lines
Quoted 23 lines
+ */
include/configs/taurus.h new file +22
-0+ +/* +* 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_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE) + +/* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE 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 AT91_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 +#endif + +/* NOR flash - no real flash on this board */
Quoted 8 lines
include/configs/taurus.h line 122
Quoted 8 lines
include/configs/taurus.h new file +8
-0+#define CONFIG_SYS_NO_FLASH 1 + +/* Ethernet */ +#define CONFIG_MACB +#define CONFIG_RMII + +/* USB */ +#if (CONFIG_MACH_TYPE ==MACH_TYPE_TAURUS )
Ah, got it .. forget the question at beginnign of file.
Quoted 19 lines
include/configs/taurus.h line 125
Quoted 3 lines
include/configs/taurus.h new file +3
-0+#define CONFIG_USB_ATMEL +#define CONFIG_USB_OHCI_NEW 1 +#define CONFIG_SYS_USB_OHCI_CPU_INIT 1discard the unnessacery "1"
Quoted 13 lines
include/configs/taurus.h new file +13
-0+#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 +#define CONFIG_USB_STORAGE 1 +#endif + +/* load address */ +#define CONFIG_SYS_LOAD_ADDR 0x22000000 + +/* bootstrap in spi flash , u-boot + env + linux in nandflash */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 +#define CONFIG_ENV_OFFSET_REDUND 0x180000
Quoted 8 lines
include/configs/taurus.h line 145
Quoted 8 lines
include/configs/taurus.h new file +2
-0+#define CONFIG_ENV_SIZE 0x20000/* 1 sector = 128 kB */ +#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000
0x300000; bootm"include/configs/taurus.h new file +5
-0+#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \
Use mtdparts also in u-boot?
Quoted 11 lines
Quoted 11 lines
include/configs/taurus.h new file +11
-0+ "root=/dev/mtdblock7 rw rootfstype=jffs2" + +#define CONFIG_SYS_PROMPT "U-Boot> " +#define CONFIG_SYS_CBSIZE 256 +#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 +#define CONFIG_AUTO_COMPLETE +
Quoted 8 lines
include/configs/taurus.h line 163
Quoted 8 lines
include/configs/taurus.h new file +7
-0+/* +* Size of malloc() pool +*/ +#define CONFIG_SYS_MALLOC_LEN \ + ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) + +#endif
Best regards
Andreas Bie?mann
PATCH 2/3 arm, at91: add Siemens board taurus (based on AT91SAM9G20)
Hello Andreas,
Am 29.10.2013 10:43, schrieb Andreas Bie?mann:
Quoted 187 lines
Hi Heiko,
some additional comments on top of Bo's.
Quoted 173 lines · Bo Shen
Hi Heiko Schocher,
Please add commit message.
Quoted 102 lines · Heiko Schocher
Signed-off-by Roger Meier<[email protected]>Reviewed-by Heiko Schocher<[email protected]>Cc Andreas Bie?mann<[email protected]>--- board/siemens/taurus/Makefile | 38 ++++++++ board/siemens/taurus/taurus.c | 204 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 2 + include/configs/taurus.h | 163 +++++++++++++++++++++++++++++++++ 4 files changed, 407 insertions(+)create mode 100644 board/siemens/taurus/Makefile create mode 100644
board/siemens/taurus/taurus.ccreate mode 100644include/configs/taurus.hboard/siemens/taurus/Makefile new file +38
-0@@ -0,0 +1,38 @@ +# +# Makefile for Siemens TAURUS (AT91SAM9G20) based board +# (C) Copyright 2013 Siemens AG +# +# Based on: +# U-Boot file: board/atmel/at91sam9260ek/Makefile +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# (C) Copyright 2008 +# Stelian Pop<[email protected]> +# Lead Tech Design<www.leadtechdesign.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += taurus.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################board/siemens/taurus/taurus.c new file +33
-1@@ -0,0 +1,204 @@ +/* +* Board functions for Siemens TAURUS (AT91SAM9G20) based boards +* (C) Copyright Siemens AG +* +* Based on: +* U-Boot file: board/atmel/at91sam9260ek/at91sam9260ek.c +* +* (C) Copyright 2007-2008 +* Stelian Pop<[email protected]> +* Lead Tech Design<www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/at91sam9260_matrix.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/gpio.h> +#include <asm/arch/at91sam9_sdramc.h> +#include <atmel_mci.h> + +#if defined(CONFIG_RESET_PHY_R )&& defined(CONFIG_MACB ) +# include <net.h> +#endif +#include <netdev.h> + +DECLARE_GLOBAL_DATA_PTR ; + +/* -------------------------------------------------------------------------Quoted 4 lines
*/
+/*
+ * Miscelaneous platform dependent initialisations
+ */I think this comment no meaning here.
Quoted 59 lines
board/siemens/taurus/taurus.c new file +5
-0+#ifdef CONFIG_CMD_NAND +static void taurus_nand_hw_init (void ) +{ +struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC ; + struct at91_matrix *matrix = (struct at91_matrix*)ATMEL_BASE_MATRIX;
board/siemens/taurus/taurus.c new file +53
-0+unsigned long csa; + +/* Assign CS3 to NAND/SmartMedia Interface */ + csa =readl (&matrix->ebicsa); + csa |=AT91_MATRIX_CS3A_SMC_SMARTMEDIA ; +writel (csa,&matrix->ebicsa); + +/* Configure SMC CS3 for NAND/SmartMedia */ +writel (AT91_SMC_SETUP_NWE (2 ) |AT91_SMC_SETUP_NCS_WR (0 ) | +AT91_SMC_SETUP_NRD (2 ) |AT91_SMC_SETUP_NCS_RD (0 ), +&smc->cs[3 ].setup); +writel (AT91_SMC_PULSE_NWE (4 ) |AT91_SMC_PULSE_NCS_WR (3 ) | +AT91_SMC_PULSE_NRD (4 ) |AT91_SMC_PULSE_NCS_RD (3 ), +&smc->cs[3 ].pulse); +writel (AT91_SMC_CYCLE_NWE (7 ) |AT91_SMC_CYCLE_NRD (7 ), +&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 (3 ), +&smc->cs[3 ].mode); + +/* Configure RDY/BSY */ +at91_set_gpio_input (CONFIG_SYS_NAND_READY_PIN ,1 ); + +/* Enable NandFlash */ +at91_set_gpio_output (CONFIG_SYS_NAND_ENABLE_PIN ,1 ); +} +#endif + +#ifdef CONFIG_MACB +static void taurus_macb_hw_init (void ) +{ +struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC ; +struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA ; +struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC ; +unsigned long erstl; + +/* Enable EMAC clock */ +writel (1 <<ATMEL_ID_EMAC0 ,&pmc->pcer); + +/* +* Disable pull-up on: +* RXDV (PA17) => PHY normal mode (not Test mode) +* ERX0 (PA14) => PHY ADDR0 +* ERX1 (PA15) => PHY ADDR1 +* ERX2 (PA25) => PHY ADDR2 +* ERX3 (PA26) => PHY ADDR3 +* ECRS (PA28) => PHY ADDR4 => PHYADDR = 0x0 +* +* PHY has internal pull-down +*/ + writel(pin_to_mask(AT91_PIN_PA14) |Quoted 8 lines
board/siemens/taurus/taurus.c line 101
Quoted 6 lines
board/siemens/taurus/taurus.c new file +6
-0+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 ), +&pioa->pudr);Call we use GPIO API here?
Quoted 5 lines
Unfortunately there is no way to set multiple I/O in one go. Beside that this is more PIO API than GPIO API (same as the kernel side discussion about gpio vs pinmux). I would accept this her in that special case, preferably we could add some API to mux multiple pins in one go.
I used "at91_set_pio_pullup" in my new version for this ...
Quoted 60 lines
Quoted 60 lines
Quoted 12 lines
board/siemens/taurus/taurus.c new file +7
-0+/* +* Need to reset PHY ?-> 200us reset +* Bug within Atmel CPU (undefined initial states on io-lines)! +* Startup Ethernet Switch delayed so that hardstrap(Switch Config) +* has defined state after cold start (do not break daisy chain!). +*/ + if ((readl(&rstc->sr)& AT91_RSTC_RSTTYP) ==
AT91_RSTC_RSTTYP_GENERAL)board/siemens/taurus/taurus.c new file +4
-0+at91_set_gpio_output (AT91_PIN_PA25 ,0 ); + + + erstl =readl (&rstc->mr)&AT91_RSTC_MR_ERSTL_MASK ;board/siemens/taurus/taurus.c line 123
Quoted 10 lines
board/siemens/taurus/taurus.c new file +10
-0+ +/* Need to reset PHY -> 500ms reset */ +writel (AT91_RSTC_KEY |AT91_RSTC_MR_ERSTL (13 ) | +AT91_RSTC_MR_URSTEN ,&rstc->mr); + +writel (AT91_RSTC_KEY |AT91_RSTC_CR_EXTRST ,&rstc->cr); + +/* Wait for end hardware reset */ +while (!(readl (&rstc->sr)&AT91_RSTC_SR_NRSTL )) + ;Add a timeout here.
board/siemens/taurus/taurus.c line 137
Quoted 13 lines
board/siemens/taurus/taurus.c new file +13
-0+/* Restore NRST value */ +writel (AT91_RSTC_KEY | erstl |AT91_RSTC_MR_URSTEN ,&rstc->mr); + +at91_set_gpio_input (AT91_PIN_PA25 ,1 );/* ERST tri-state */ + +/* Re-enable pull-up */ +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 ), +&pioa->puer);Call we use GPIO API here?
Quoted 19 lines
board/siemens/taurus/taurus.c new file +19
-0+/* Initialize EMAC=MACB hardware */ + at91_macb_hw_init(); +} +#endif + +#ifdef CONFIG_GENERIC_ATMEL_MCI +int board_mmc_init (bd_t *bd) +{ +at91_mci_hw_init (); + +return atmel_mci_init ((void *)ATMEL_BASE_MCI ); +} +#endif + +int board_early_init_f (void ) +{ +struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC ; + +/* Enable clocks for all PIOs */
Quoted 8 lines
Quoted 3 lines
board/siemens/taurus/taurus.c
Quoted 3 lines
board/siemens/taurus/taurus.c new file +3
-0+writel ((1 <<ATMEL_ID_PIOA ) | (1 <<ATMEL_ID_PIOB ) | + (1 <<ATMEL_ID_PIOC ), +&pmc->pcer);Isn't there some API to do this?
To answer myself, I think not. Each AT91 board has this piece of code copied in itsboard_early_init_f... we should think about adding a generic function to do that for us.
Ok.
Quoted 40 lines
Quoted 31 lines
board/siemens/taurus/taurus.c line 168
Quoted 8 lines
board/siemens/taurus/taurus.c new file +8
-0+ +return 0 ; +} + +int board_init (void ) +{ +/* Enable Ctrlc */ +console_init_f ();This is can be removed.
board/siemens/taurus/taurus.c line 171
Quoted 2 lines
board/siemens/taurus/taurus.c new file +2
-0+/* arch number of board */ + gd->bd->bi_arch_number =CONFIG_MACH_TYPE ;Move to board related configuration file.
Quoted 15 lines
board/siemens/taurus/taurus.c new file +15
-0+/* adress of boot parameters */ + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ; + +at91_seriald_hw_init (); +#ifdef CONFIG_CMD_NAND +taurus_nand_hw_init (); +#endif +#ifdef CONFIG_MACB +taurus_macb_hw_init (); +#endif + +return 0 ; +} + +int dram_init (void )Quoted 8 lines
board/siemens/taurus/taurus.c
Quoted 6 lines
board/siemens/taurus/taurus.c new file +6
-0+{ +/* configure ram size based on sdram controller config registers */ +unsigned int sdram_cr_nc; + sdram_cr_nc =readl (AT91_SDRAMC_CR )&AT91_SDRAMC_NC ; + gd->ram_size =get_ram_size ((void *)CONFIG_SYS_SDRAM_BASE , + (32 <<20 )<< sdram_cr_nc);Would it be possible the same NC, however different NR?
Quoted 2 lines
Hasn't the
get_ram_size()some feature to detect the real size implemented? Why detect the configured size before?
I use now get_ram_size() with the may ram size possible, so no need for sdram_cr_nc anymore ...
Quoted 86 lines
Quoted 77 lines
Quoted 29 lines
board/siemens/taurus/taurus.c new file +11
-0+return 0 ; +} + +int board_eth_init (bd_t *bis) +{ +int rc =0 ; +#ifdef CONFIG_MACB + rc =macb_eth_initialize (0 , (void *)ATMEL_BASE_EMAC0 ,0x00 ); +#endif +return rc; +}boards.cfg +0
-0@@ -139,6 +139,8 @@ Active arm arm926ejs at91ronetix pm9263
Active arm arm926ejs at91 ronetix
pm9g45 pm9g45
pm9g45:AT91SAM9G45
Ilko Iliev<[email protected]>
Active arm arm926ejs at91 taskit
stamp9g20 portuxg20
stamp9g20:AT91SAM9G20,PORTUXG20
Markus Hubig<[email protected]>
Active arm arm926ejs at91 taskit
stamp9g20 stamp9g20
stamp9g20:AT91SAM9G20
Markus Hubig<[email protected]>Quoted 8 lines
+Active arm arm926ejs at91 siemens
taurus axm
taurus:AT91SAM9G20,MACH_TYPE=2068
Heiko Schocher<[email protected]>
+Active arm arm926ejs at91 siemens
taurus taurus
taurus:AT91SAM9G20,MACH_TYPE=2067
Heiko Schocher<[email protected]>Why two boards here?
Quoted 37 lines
Active arm arm926ejs davinci ait
cam_enc_4xxcam_enc_4xxcam_enc_4xx
Heiko Schocher<[email protected]>
Active arm arm926ejs davinci Barix
ipam390 ipam390
-
Heiko Schocher<[email protected]>
Active arm arm926ejs davinci davinci
da8xxevm da830evm
-
Nick Thompson<[email protected]>include/configs/taurus.h new file +19
-0@@ -0,0 +1,163 @@ +/* +* Common board functions for Siemens TAURUS (AT91SAM9G20) based boards +* (C) Copyright 2013 Siemens AG +* +* Based on: +* U-Boot file: include/configs/at91sam9260ek.h +* +* (C) Copyright 2007-2008 +* Stelian Pop<[email protected]> +* Lead Tech Design<www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* +* SoC must be defined first, before hardware.h is included. Quoted 8 lines
include/configs/taurus.h line 25
Quoted 6 lines
include/configs/taurus.h new file +6
-0+* In this case SoC is defined in boards.cfg. +*/ +#include <asm/hardware.h> + +#define MACH_TYPE_TAURUS 2067 +#define MACH_TYPE_AXM 2068These two type are the same board?
Quoted 1 line
Isn't the correct type defined by boards.cfg?
removed.
Quoted 11 lines
Quoted 9 lines
include/configs/taurus.h line 34
Quoted 9 lines
include/configs/taurus.h new file +9
-0+ +/* +* 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! +*/ + +Could you please remove the empty lines (at least one) here?
Yep, done.
Quoted 10 lines
Quoted 4 lines
include/configs/taurus.h line 35
Quoted 1 line
include/configs/taurus.h new file +1
-0+#define CONFIG_SYS_TEXT_BASE 0x23f00000This address should be considered (if the memory size is 64MiB) as u-boot is top down map, there is only 1MiB left.
As discussed in the Calo USB-A9263 board, please prove that the address works in all cases (with the given setup in this file). IOW check if now code will be clobbered by
relocate_code()and write it down in some comment. A reminder for later adoption in the configuration would also considered helpful ;)
Working on it (incl. replace at91bootstrap with U-Boot spl, will take some time ...)
Quoted 54 lines
Quoted 54 lines
Quoted 23 lines
include/configs/taurus.h new file +22
-0+ +/* ARM asynchronous clock */ +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768/* slow clock xtal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* main clock xtal */ +#define CONFIG_SYS_HZ 1000 + +/* Misc CPU related */ +#define CONFIG_ARCH_CPU_INIT +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_DISPLAY_CPUINFO + +#define CONFIG_CMD_BOOTZ +#define CONFIG_OF_LIBFDT + +/* general purpose I/O */ +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ +#define CONFIG_AT91_GPIO +#define CONFIG_AT91_GPIO_PULLUP 1/* keep pullups on peripheral pins */
include/configs/taurus.h line 62
Quoted 5 lines
include/configs/taurus.h new file +5
-0+ +/* serial console */ +#define CONFIG_ATMEL_USART +#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CONFIG_USART_ID ATMEL_ID_SYSreplace tab with black space.
Quoted 23 lines
include/configs/taurus.h new file +23
-0+#define CONFIG_BAUDRATE 115200 + +#define CONFIG_BOOTDELAY 3 + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NAND + +/* +* SDRAM: 1 bank, min 32, max 128 MB +* Initialized before u-boot gets started. +*/
Quoted 8 lines
Quoted 6 lines
include/configs/taurus.h line 91
Quoted 6 lines
include/configs/taurus.h new file +6
-0+#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 +/* +* PHYS_SDRAM_SIZE is dynamically detected according to the +* "Number of Column Bits" set within the SDRAM Configuration +* register, see axm.c for further details Where is this
axm.clocated?
Removed comment, as ramsize gets detected now with get_ram_size()
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
+ */
include/configs/taurus.h new file +24
-0+ +/* +* 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_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE) + +/* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE 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 AT91_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 +#endif + +/* NOR flash - no real flash on this board */ +#define CONFIG_SYS_NO_FLASH 1 +
Quoted 8 lines
Quoted 6 lines
include/configs/taurus.h line 122
Quoted 6 lines
include/configs/taurus.h new file +6
-0+/* Ethernet */ +#define CONFIG_MACB +#define CONFIG_RMII + +/* USB */ +#if (CONFIG_MACH_TYPE ==MACH_TYPE_TAURUS )Ah, got it .. forget the question at beginnign of file.
Hmm, removed this, and replaced with a BOARD_TAURS or BOARD_AXM define.
Quoted 21 lines
Quoted 21 lines
include/configs/taurus.h line 125
Quoted 3 lines
include/configs/taurus.h new file +3
-0+#define CONFIG_USB_ATMEL +#define CONFIG_USB_OHCI_NEW 1 +#define CONFIG_SYS_USB_OHCI_CPU_INIT 1discard the unnessacery "1"
Quoted 15 lines
include/configs/taurus.h new file +15
-0+#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 +#define CONFIG_USB_STORAGE 1 +#endif + +/* load address */ +#define CONFIG_SYS_LOAD_ADDR 0x22000000 + +/* bootstrap in spi flash , u-boot + env + linux in nandflash */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 +#define CONFIG_ENV_OFFSET_REDUND 0x180000 +#define CONFIG_ENV_SIZE 0x20000/* 1 sector = 128 kB */ +#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000
Quoted 8 lines
Quoted 6 lines
include/configs/taurus.h line 145
Quoted 6 lines
0x300000; bootm"include/configs/taurus.h new file +5
-0+#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \Use mtdparts also in u-boot?
Try to find this out ...
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 3/3 arm, at91: add siemens corvus board
In reply to Heiko Schocher--- board/siemens/corvus/Makefile | 39 +++++ board/siemens/corvus/board.c | 345 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/corvus.h | 185 ++++++++++++++++++++++ 4 files changed, 570 insertions(+) create mode 100644 board/siemens/corvus/Makefile create mode 100644 board/siemens/corvus/board.c create mode 100644 include/configs/corvus.h
board/siemens/corvus/Makefile new file +39 -0
@@ -0,0 +1,39 @@ +# +# Makefile for siemens CORVUS (AT91SAM9G45) based board +# (C) Copyright 2013 Siemens AG +# +# Based on: +# U-Boot file: board/atmel/at91sam9m10g45ek/Makefile +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# (C) Copyright 2008 +# Stelian Pop <[email protected]> +# Lead Tech Design <www.leadtechdesign.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += board.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################
board/siemens/corvus/board.c new file +345 -0
345 lines not on this page · raw message
boards.cfg +1 -0
@@ -140,6 +140,7 @@ Active arm arm926ejs at91 ronetix pm9g45 Active arm arm926ejs at91 taskit stamp9g20 portuxg20 stamp9g20:AT91SAM9G20,PORTUXG20 Markus Hubig <[email protected]> Active arm arm926ejs at91 taskit stamp9g20 stamp9g20 stamp9g20:AT91SAM9G20 Markus Hubig <[email protected]> Active arm arm926ejs at91 siemens taurus axm taurus:AT91SAM9G20,MACH_TYPE=2068 Heiko Schocher <[email protected]> +Active arm arm926ejs at91 siemens corvus corvus corvus:AT91SAM9M10G45,SYS_USE_NANDFLASH Heiko Schocher <[email protected]> Active arm arm926ejs at91 siemens taurus taurus taurus:AT91SAM9G20,MACH_TYPE=2067 Heiko Schocher <[email protected]> Active arm arm926ejs davinci ait cam_enc_4xx cam_enc_4xx cam_enc_4xx Heiko Schocher <[email protected]> Active arm arm926ejs davinci Barix ipam390 ipam390 - Heiko Schocher <[email protected]>
include/configs/corvus.h new file +185 -0
185 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 3/3 arm, at91: add siemens corvus board
Hi Heiko Schocher,
Please add commit message.
Quoted 90 lines · Heiko Schocher
Signed-off-by Boris Schmidt <[email protected]>Reviewed-by Heiko Schocher <[email protected]>Cc Andreas Bie?mann <[email protected]>--- board/siemens/corvus/Makefile | 39 +++++ board/siemens/corvus/board.c | 345 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/corvus.h | 185 ++++++++++++++++++++++ 4 files changed, 570 insertions(+)create mode 100644 board/siemens/corvus/Makefile create mode 100644
board/siemens/corvus/board.ccreate mode 100644include/configs/corvus.hboard/siemens/corvus/Makefile new file +39
-0@@ -0,0 +1,39 @@ +# +# Makefile for siemens CORVUS (AT91SAM9G45) based board +# (C) Copyright 2013 Siemens AG +# +# Based on: +# U-Boot file: board/atmel/at91sam9m10g45ek/Makefile +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# (C) Copyright 2008 +# Stelian Pop <[email protected]> +# Lead Tech Design <www.leadtechdesign.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += board.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################board/siemens/corvus/board.c new file +26
-0@@ -0,0 +1,345 @@ +/* +* Board functions for Siemens CORVUS (AT91SAM9G45) based board +* (C) Copyright 2013 Siemens AG +* +* Based on: +* U-Boot file: board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +* (C) Copyright 2007-2008 +* Stelian Pop <[email protected]> +* Lead Tech Design <www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/at91sam9g45_matrix.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/gpio.h> +#include <asm/arch/clk.h> +#include <lcd.h> +#include <atmel_lcdc.h> +#if defined(CONFIG_RESET_PHY_R ) && defined(CONFIG_MACB )
board/siemens/corvus/board.c line 36
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+#include <net.h> +#endif +#include <netdev.h> + +DECLARE_GLOBAL_DATA_PTR ; + +/* ------------------------------------------------------------------------- */ +/* +* Miscelaneous platform dependent initialisations +*/
I think this comment no meaning here.
Quoted 67 lines
board/siemens/corvus/board.c new file +67
-0+#ifdef CONFIG_CMD_NAND +static void corvus_nand_hw_init(void) +{ + struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; + struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + unsigned long csa; + + /* Enable CS3 */ + csa = readl(&matrix->ebicsa); + csa |= AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA; + writel(csa, &matrix->ebicsa); + + /* 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(4) | AT91_SMC_PULSE_NCS_WR(3) | + AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(2), + &smc->cs[3].pulse); + writel(AT91_SMC_CYCLE_NWE(7) | AT91_SMC_CYCLE_NRD(4), + &smc->cs[3].cycle); + writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | + AT91_SMC_MODE_EXNW_DISABLE | +#ifdef CONFIG_SYS_NAND_DBW_16 + AT91_SMC_MODE_DBW_16 | +#else /* CONFIG_SYS_NAND_DBW_8 */ + AT91_SMC_MODE_DBW_8 | +#endif + AT91_SMC_MODE_TDF_CYCLE(3), + &smc->cs[3].mode); + + writel(1 << ATMEL_ID_PIOC, &pmc->pcer); + + /* Configure RDY/BSY */ + at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); + + /* Enable NandFlash */ + at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1); +} +#endif + +#ifdef CONFIG_CMD_USB +static void at91sam9m10g45ek_usb_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + writel(1 << ATMEL_ID_PIODE, &pmc->pcer); + + at91_set_gpio_output(AT91_PIN_PD1, 0); + at91_set_gpio_output(AT91_PIN_PD3, 0); +} +#endif + +#ifdef CONFIG_MACB +static void corvus_macb_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA; + struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC; + unsigned long erstl; + + /* Enable clock */ + writel(1 << ATMEL_ID_EMAC, &pmc->pcer); + + /* + * Disable pull-up on:
board/siemens/corvus/board.c line 114
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+* RXDV (PA15) => PHY normal mode (not Test mode) +* ERX0 (PA12) => PHY ADDR0 +* ERX1 (PA13) => PHY ADDR1 => PHYADDR = 0x0 +* +* PHY has internal pull-down +*/ +writel (pin_to_mask (AT91_PIN_PA15 ) | +pin_to_mask (AT91_PIN_PA12 ) | +pin_to_mask (AT91_PIN_PA13 ), + &pioa->pudr);
Can we use GPIO API here?
board/siemens/corvus/board.c line 126
Quoted 12 lines
board/siemens/corvus/board.c new file +12
-0+ + erstl =readl (&rstc->mr) &AT91_RSTC_MR_ERSTL_MASK ; + +/* Need to reset PHY -> 500ms reset */ +writel (AT91_RSTC_KEY |AT91_RSTC_MR_ERSTL (13 ) | +AT91_RSTC_MR_URSTEN , &rstc->mr); + +writel (AT91_RSTC_KEY |AT91_RSTC_CR_EXTRST , &rstc->cr); + +/* Wait for end hardware reset */ +while (!(readl (&rstc->sr) &AT91_RSTC_SR_NRSTL )) + ;
Add timeout here.
board/siemens/corvus/board.c line 136
Quoted 9 lines
board/siemens/corvus/board.c new file +9
-0+/* Restore NRST value */ +writel (AT91_RSTC_KEY | erstl |AT91_RSTC_MR_URSTEN , + &rstc->mr); + +/* Re-enable pull-up */ +writel (pin_to_mask (AT91_PIN_PA15 ) | +pin_to_mask (AT91_PIN_PA12 ) | +pin_to_mask (AT91_PIN_PA13 ), + &pioa->puer);
Can we use GPIO API here?
Quoted 14 lines
board/siemens/corvus/board.c new file +14
-0+ +/* And the pins. */ +at91_macb_hw_init (); +} +#endif + +#ifdef CONFIG_LCD + +vidinfo_t panel_info = { +vl_col:480 , +vl_row:272 , +vl_clk:9000000 , +vl_sync :ATMEL_LCDC_INVLINE_NORMAL | + ATMEL_LCDC_INVFRAME_NORMAL,
board/siemens/corvus/board.c line 160
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+vl_bpix:3, +vl_tft:1, +vl_hsync_len:45, +vl_left_margin:1, + vl_right_margin:1, +vl_vsync_len:1, + vl_upper_margin:40, + vl_lower_margin:1, + mmio : ATMEL_BASE_LCDC, +};
Change to use ".xxx = xxx", e.g: .vl_col = 480.
Quoted 25 lines
board/siemens/corvus/board.c new file +25
-0+ +void lcd_enable (void ) +{ +at91_set_A_periph (AT91_PIN_PE6 ,1 );/* power up */ +} + +void lcd_disable (void ) +{ +at91_set_A_periph (AT91_PIN_PE6 ,0 );/* power down */ +} + +static void corvus_lcd_hw_init (void ) +{ +struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC ; + +at91_set_A_periph (AT91_PIN_PE0 ,0 );/* LCDDPWR */ +at91_set_A_periph (AT91_PIN_PE2 ,0 );/* LCDCC */ +at91_set_A_periph (AT91_PIN_PE3 ,0 );/* LCDVSYNC */ +at91_set_A_periph (AT91_PIN_PE4 ,0 );/* LCDHSYNC */ +at91_set_A_periph (AT91_PIN_PE5 ,0 );/* LCDDOTCK */ + +at91_set_A_periph (AT91_PIN_PE7 ,0 );/* LCDD0 */ +at91_set_A_periph (AT91_PIN_PE8 ,0 );/* LCDD1 */ +at91_set_A_periph (AT91_PIN_PE9 ,0 );/* LCDD2 */ +at91_set_A_periph (AT91_PIN_PE10 ,0 );/* LCDD3 */
board/siemens/corvus/board.c line 196
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+at91_set_A_periph (AT91_PIN_PE11 ,0 );/* LCDD4 */ +at91_set_A_periph (AT91_PIN_PE12 ,0 );/* LCDD5 */ +at91_set_A_periph (AT91_PIN_PE13 ,0 );/* LCDD6 */ +at91_set_A_periph (AT91_PIN_PE14 ,0 );/* LCDD7 */ +at91_set_A_periph (AT91_PIN_PE15 ,0 );/* LCDD8 */ +at91_set_A_periph (AT91_PIN_PE16 ,0 );/* LCDD9 */ +at91_set_A_periph (AT91_PIN_PE17 ,0 );/* LCDD10 */ +at91_set_A_periph (AT91_PIN_PE18 ,0 );/* LCDD11 */ +at91_set_A_periph (AT91_PIN_PE19 ,0 );/* LCDD12 */ +at91_set_B_periph (AT91_PIN_PE20 ,0 );/* LCDD13 */
There should be A peripheral.
board/siemens/corvus/board.c line 204
Quoted 8 lines
board/siemens/corvus/board.c new file +8
-0+at91_set_A_periph (AT91_PIN_PE21 ,0 );/* LCDD14 */ +at91_set_A_periph (AT91_PIN_PE22 ,0 );/* LCDD15 */ +at91_set_A_periph (AT91_PIN_PE23 ,0 );/* LCDD16 */ +at91_set_A_periph (AT91_PIN_PE24 ,0 );/* LCDD17 */ +at91_set_A_periph (AT91_PIN_PE25 ,0 );/* LCDD18 */ +at91_set_A_periph (AT91_PIN_PE26 ,0 );/* LCDD19 */ +at91_set_A_periph (AT91_PIN_PE27 ,0 );/* LCDD20 */ +at91_set_B_periph (AT91_PIN_PE28 ,0 );/* LCDD21 */
Ditto.
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+at91_set_A_periph (AT91_PIN_PE29 ,0 );/* LCDD22 */ +at91_set_A_periph (AT91_PIN_PE30 ,0 );/* LCDD23 */ + +writel (1 <<ATMEL_ID_LCDC , &pmc->pcer); + + gd->fb_base =CONFIG_AT91SAM9G45_LCD_BASE ; +} + +#ifdef CONFIG_LCD_INFO +#include <nand.h>
board/siemens/corvus/board.c line 224
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+#include <version.h> + +void lcd_show_board_info (void ) +{ +ulong dram_size, nand_size; +int i; +char temp[32 ]; + +lcd_printf ("%s\n" ,U_BOOT_VERSION ); +lcd_printf ("(C) 2009 Siemens SBT\n" );
Remove the "(C)".
Quoted 18 lines
board/siemens/corvus/board.c new file +18
-0+lcd_printf ("www.sbt.siemens.com\n" ); +lcd_printf ("%s CPU at %s MHz\n" , +ATMEL_CPU_NAME , +strmhz (temp,get_cpu_clk_rate ())); + + 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 (" %ld MB SDRAM, %ld MB NAND\n" , + dram_size >>20 , + nand_size >>20 ); +} +#endif /* CONFIG_LCD_INFO */ +#endif +
board/siemens/corvus/board.c line 252
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+int board_early_init_f (void ) +{ +at91_seriald_hw_init (); +return 0 ; +} + +int board_init (void ) +{ +/* Enable Ctrlc */ +console_init_f ();
Remove it.
board/siemens/corvus/board.c line 255
Quoted 2 lines
board/siemens/corvus/board.c new file +2
-0+/* arch number of corvus-Board */ + gd->bd->bi_arch_number =MACH_TYPE_CORVUS ;
move to board related configuration file.
board/siemens/corvus/board.c line 256
Quoted 1 line
board/siemens/corvus/board.c new file +1
-0+/* adress of boot parameters */
s/adress/address
Quoted 32 lines
board/siemens/corvus/board.c new file +32
-0+ gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ; + + +board_early_init_f (); + +#ifdef CONFIG_CMD_NAND +corvus_nand_hw_init (); +#endif +#ifdef CONFIG_HAS_DATAFLASH +at91_spi0_hw_init (1 <<0 ); +#endif +#ifdef CONFIG_ATMEL_SPI +at91_spi0_hw_init (1 <<4 ); +#endif +#ifdef CONFIG_MACB +corvus_macb_hw_init (); +#endif +#ifdef CONFIG_LCD +corvus_lcd_hw_init (); +#endif +#ifdef CONFIG_CMD_USB +at91sam9m10g45ek_usb_hw_init (); +#endif +return 0 ; +} + +int dram_init (void ) +{ + gd->ram_size =get_ram_size ((void *)CONFIG_SYS_SDRAM_BASE , +CONFIG_SYS_SDRAM_SIZE ); +return 0 ; +} +
board/siemens/corvus/board.c line 298
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-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
Please remove this, more information:
--->8---
commit 6bb46790178d111161a487cbd847dd2dba37ca24
Author: Ben Warren <[email protected]> Date: Tue Jun 1 11:55:42 2010 -0700
Write MAC address automatically on MACB-based boards
Also, remove all calls to eth_init() in boards that use MACB
---8<---
Quoted 95 lines
board/siemens/corvus/board.c new file +47
-0+} +#endif + +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; +} + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +int spi_cs_is_valid (unsigned int bus,unsigned int cs) +{ +return bus ==0 && cs <2 ; +} + +void spi_cs_activate (struct spi_slave *slave) +{ +switch (slave->cs) { +case 1 : +at91_set_gpio_output (AT91_PIN_PB18 ,0 ); +break ; +case 0 : +default : +at91_set_gpio_output (AT91_PIN_PB3 ,0 ); +break ; + } +} + +void spi_cs_deactivate (struct spi_slave *slave) +{ +switch (slave->cs) { +case 1 : +at91_set_gpio_output (AT91_PIN_PB18 ,1 ); +break ; +case 0 : +default : +at91_set_gpio_output (AT91_PIN_PB3 ,1 ); +break ; + } +} +#endif /* CONFIG_ATMEL_SPI */ boards.cfg +1
-0@@ -140,6 +140,7 @@ Active arm arm926ejs at91 ronetix pm9g45 Active arm arm926ejs at91 taskit stamp9g20 portuxg20 stamp9g20:AT91SAM9G20,PORTUXG20 Markus Hubig <[email protected]> Active arm arm926ejs at91 taskit stamp9g20 stamp9g20 stamp9g20:AT91SAM9G20 Markus Hubig <[email protected]> Active arm arm926ejs at91 siemens taurus axm taurus:AT91SAM9G20,MACH_TYPE=2068 Heiko Schocher <[email protected]> +Active arm arm926ejs at91 siemens corvus corvus corvus:AT91SAM9M10G45,SYS_USE_NANDFLASH Heiko Schocher <[email protected]> Active arm arm926ejs at91 siemens taurus taurus taurus:AT91SAM9G20,MACH_TYPE=2067 Heiko Schocher <[email protected]> Active arm arm926ejs davinci ait cam_enc_4xx cam_enc_4xx cam_enc_4xx Heiko Schocher <[email protected]> Active arm arm926ejs davinci Barix ipam390 ipam390 - Heiko Schocher <[email protected]>include/configs/corvus.h new file +30
-0@@ -0,0 +1,185 @@ +/* +* Common board functions for siemens AT91SAM9G45 based boards +* (C) Copyright 2013 Siemens AG +* +* Based on: +* U-Boot file: include/configs/at91sam9m10g45ek.h +* (C) Copyright 2007-2008 +* Stelian Pop <[email protected]> +* Lead Tech Design <www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + + + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <asm/hardware.h> + +#define MACH_TYPE_CORVUS 2066 + +/* +* 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 0x73f00000
include/configs/corvus.h line 40
Quoted 10 lines
include/configs/corvus.h new file +10
-0+ +#define CONFIG_AT91_LEGACY +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ + +/* ARM asynchronous clock */ +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ +#define CONFIG_SYS_HZ 1000 + +#define CONFIG_AT91SAM9M10G45EK
No need this define.
Quoted 11 lines
include/configs/corvus.h new file +11
-0+#define CONFIG_AT91FAMILY + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_DISPLAY_CPUINFO + +#define CONFIG_CMD_BOOTZ +#define CONFIG_OF_LIBFDT
include/configs/corvus.h line 61
Quoted 10 lines
include/configs/corvus.h new file +10
-0+ +/* general purpose I/O */ +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ +#define CONFIG_AT91_GPIO +#define CONFIG_AT91_GPIO_PULLUP 1/* keep pullups on peripheral pins */ + +/* serial console */ +#define CONFIG_ATMEL_USART +#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CONFIG_USART_ID ATMEL_ID_SYS
replace tab with black space.
include/configs/corvus.h line 67
Quoted 6 lines
include/configs/corvus.h new file +6
-0+ +/* LCD */ +#define CONFIG_LCD +#define LCD_BPP LCD_COLOR8 +#define CONFIG_LCD_LOGO +#undef LCD_TEST_PATTERN
No where define it, remove it.
Quoted 69 lines
include/configs/corvus.h new file +69
-0+#define CONFIG_LCD_INFO +#define CONFIG_LCD_INFO_BELOW_LOGO +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONFIG_ATMEL_LCD +#define CONFIG_ATMEL_LCD_RGB565 +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +/* board specific(not enough SRAM) */ +#define CONFIG_AT91SAM9G45_LCD_BASE 0x73E00000 + +/* LED */ +#define CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PD31/* this is the user1 led */ +#define CONFIG_GREEN_LED AT91_PIN_PD0/* this is the user2 led */ + +#define CONFIG_BOOTDELAY 3 + +/* +* BOOTP options +*/ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NAND +#define CONFIG_CMD_USB + +/* SDRAM */ +#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 +#define CONFIG_SYS_SDRAM_SIZE 0x08000000 + +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE) + +/* No NOR flash */ +#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 ATMEL_BASE_CS3 +#define CONFIG_SYS_NAND_DBW_8 +/* our ALE is AD21 */ +#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) +/* our CLE is AD22 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8 + +#endif + +/* Ethernet */ +#define CONFIG_MACB +#define CONFIG_RMII +#define CONFIG_NET_RETRY_COUNT 20
include/configs/corvus.h line 146
Quoted 10 lines
include/configs/corvus.h new file +10
-0+#define CONFIG_RESET_PHY_R + +/* USB */ +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_ATMEL +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 +#define CONFIG_DOS_PARTITION +#define CONFIG_USB_STORAGE + +#define CONFIG_SYS_LOAD_ADDR 0x22000000/* load address */
Does this work on your board?
include/configs/corvus.h line 149
Quoted 3 lines
include/configs/corvus.h new file +3
-0+ +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END 0x23e00000
Ditto.
Quoted 26 lines
include/configs/corvus.h new file +25
-0+/* bootstrap + u-boot + env in nandflash */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 +#define CONFIG_ENV_OFFSET_REDUND 0x180000 +#define CONFIG_ENV_SIZE 0x20000 + +#define CONFIG_BOOTCOMMAND \ + "nand read 0x70000000 0x200000 0x300000;" \ + "bootm 0x70000000" +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \ + "root=/dev/mtdblock7 rw rootfstype=jffs2" + +#define CONFIG_BAUDRATE 115200 + +#define CONFIG_SYS_PROMPT "U-Boot> " +#define CONFIG_SYS_CBSIZE 256 +#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
include/configs/corvus.h line 185
Quoted 10 lines
include/configs/corvus.h new file +10
-0+#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_HUSH_PARSER + +/* +* Size of malloc() pool +*/ +#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + \ + 128*1024, 0x1000) + +#endif
Best Regards,
Bo Shen
PATCH 3/3 arm, at91: add siemens corvus board
Hi Heiko,
some additional comments on top of Bo's.
Quoted 351 lines · Bo Shen
Hi Heiko Schocher,
Please add commit message.Quoted 102 lines · Heiko Schocher
Signed-off-by Boris Schmidt <[email protected]>Reviewed-by Heiko Schocher <[email protected]>Cc Andreas Bie?mann <[email protected]>--- board/siemens/corvus/Makefile | 39 +++++ board/siemens/corvus/board.c | 345 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/corvus.h | 185 ++++++++++++++++++++++ 4 files changed, 570 insertions(+)create mode 100644 board/siemens/corvus/Makefile create mode 100644
board/siemens/corvus/board.ccreate mode 100644include/configs/corvus.hboard/siemens/corvus/Makefile new file +39
-0@@ -0,0 +1,39 @@ +# +# Makefile for siemens CORVUS (AT91SAM9G45) based board +# (C) Copyright 2013 Siemens AG +# +# Based on: +# U-Boot file: board/atmel/at91sam9m10g45ek/Makefile +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# (C) Copyright 2008 +# Stelian Pop <[email protected]> +# Lead Tech Design <www.leadtechdesign.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += board.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################board/siemens/corvus/board.c new file +33
-1@@ -0,0 +1,345 @@ +/* +* Board functions for Siemens CORVUS (AT91SAM9G45) based board +* (C) Copyright 2013 Siemens AG +* +* Based on: +* U-Boot file: board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +* (C) Copyright 2007-2008 +* Stelian Pop <[email protected]> +* Lead Tech Design <www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/at91sam9g45_matrix.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/gpio.h> +#include <asm/arch/clk.h> +#include <lcd.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 ; + +/* -------------------------------------------------------------------------Quoted 4 lines
*/
+/*
+ * Miscelaneous platform dependent initialisations
+ */I think this comment no meaning here.
Quoted 68 lines
board/siemens/corvus/board.c new file +5
-0+#ifdef CONFIG_CMD_NAND +static void corvus_nand_hw_init (void ) +{ +struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC ; + struct at91_matrix *matrix = (struct at91_matrix*)ATMEL_BASE_MATRIX;
board/siemens/corvus/board.c new file +62
-0+ struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + unsigned long csa; + + /* Enable CS3 */ + csa = readl(&matrix->ebicsa); + csa |= AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA; + writel(csa, &matrix->ebicsa); + + /* 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(4) | AT91_SMC_PULSE_NCS_WR(3) | + AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(2), + &smc->cs[3].pulse); + writel(AT91_SMC_CYCLE_NWE(7) | AT91_SMC_CYCLE_NRD(4), + &smc->cs[3].cycle); + writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | + AT91_SMC_MODE_EXNW_DISABLE | +#ifdef CONFIG_SYS_NAND_DBW_16 + AT91_SMC_MODE_DBW_16 | +#else /* CONFIG_SYS_NAND_DBW_8 */ + AT91_SMC_MODE_DBW_8 | +#endif + AT91_SMC_MODE_TDF_CYCLE(3), + &smc->cs[3].mode); + + writel(1 << ATMEL_ID_PIOC, &pmc->pcer); + + /* Configure RDY/BSY */ + at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); + + /* Enable NandFlash */ + at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1); +} +#endif + +#ifdef CONFIG_CMD_USB +static void at91sam9m10g45ek_usb_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + writel(1 << ATMEL_ID_PIODE, &pmc->pcer); + + at91_set_gpio_output(AT91_PIN_PD1, 0); + at91_set_gpio_output(AT91_PIN_PD3, 0); +} +#endif + +#ifdef CONFIG_MACB +static void corvus_macb_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA; + struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC; + unsigned long erstl; + + /* Enable clock */ + writel(1 << ATMEL_ID_EMAC, &pmc->pcer); + + /* + * Disable pull-up on:board/siemens/corvus/board.c line 114
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+* RXDV (PA15) => PHY normal mode (not Test mode) +* ERX0 (PA12) => PHY ADDR0 +* ERX1 (PA13) => PHY ADDR1 => PHYADDR = 0x0 +* +* PHY has internal pull-down +*/ +writel (pin_to_mask (AT91_PIN_PA15 ) | +pin_to_mask (AT91_PIN_PA12 ) | +pin_to_mask (AT91_PIN_PA13 ), + &pioa->pudr);Can we use GPIO API here?
board/siemens/corvus/board.c line 126
Quoted 12 lines
board/siemens/corvus/board.c new file +12
-0+ + erstl =readl (&rstc->mr) &AT91_RSTC_MR_ERSTL_MASK ; + +/* Need to reset PHY -> 500ms reset */ +writel (AT91_RSTC_KEY |AT91_RSTC_MR_ERSTL (13 ) | +AT91_RSTC_MR_URSTEN , &rstc->mr); + +writel (AT91_RSTC_KEY |AT91_RSTC_CR_EXTRST , &rstc->cr); + +/* Wait for end hardware reset */ +while (!(readl (&rstc->sr) &AT91_RSTC_SR_NRSTL )) + ;Add timeout here.
board/siemens/corvus/board.c line 136
Quoted 9 lines
board/siemens/corvus/board.c new file +9
-0+/* Restore NRST value */ +writel (AT91_RSTC_KEY | erstl |AT91_RSTC_MR_URSTEN , + &rstc->mr); + +/* Re-enable pull-up */ +writel (pin_to_mask (AT91_PIN_PA15 ) | +pin_to_mask (AT91_PIN_PA12 ) | +pin_to_mask (AT91_PIN_PA13 ), + &pioa->puer);Can we use GPIO API here?
Quoted 14 lines
board/siemens/corvus/board.c new file +14
-0+ +/* And the pins. */ +at91_macb_hw_init (); +} +#endif + +#ifdef CONFIG_LCD + +vidinfo_t panel_info = { +vl_col:480 , +vl_row:272 , +vl_clk:9000000 , +vl_sync :ATMEL_LCDC_INVLINE_NORMAL | + ATMEL_LCDC_INVFRAME_NORMAL,board/siemens/corvus/board.c line 160
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+vl_bpix:3, +vl_tft:1, +vl_hsync_len:45, +vl_left_margin:1, + vl_right_margin:1, +vl_vsync_len:1, + vl_upper_margin:40, + vl_lower_margin:1, + mmio : ATMEL_BASE_LCDC, +};Change to use ".xxx = xxx", e.g: .vl_col = 480.
Quoted 25 lines
board/siemens/corvus/board.c new file +25
-0+ +void lcd_enable (void ) +{ +at91_set_A_periph (AT91_PIN_PE6 ,1 );/* power up */ +} + +void lcd_disable (void ) +{ +at91_set_A_periph (AT91_PIN_PE6 ,0 );/* power down */ +} + +static void corvus_lcd_hw_init (void ) +{ +struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC ; + +at91_set_A_periph (AT91_PIN_PE0 ,0 );/* LCDDPWR */ +at91_set_A_periph (AT91_PIN_PE2 ,0 );/* LCDCC */ +at91_set_A_periph (AT91_PIN_PE3 ,0 );/* LCDVSYNC */ +at91_set_A_periph (AT91_PIN_PE4 ,0 );/* LCDHSYNC */ +at91_set_A_periph (AT91_PIN_PE5 ,0 );/* LCDDOTCK */ + +at91_set_A_periph (AT91_PIN_PE7 ,0 );/* LCDD0 */ +at91_set_A_periph (AT91_PIN_PE8 ,0 );/* LCDD1 */ +at91_set_A_periph (AT91_PIN_PE9 ,0 );/* LCDD2 */ +at91_set_A_periph (AT91_PIN_PE10 ,0 );/* LCDD3 */ board/siemens/corvus/board.c line 196
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+at91_set_A_periph (AT91_PIN_PE11 ,0 );/* LCDD4 */ +at91_set_A_periph (AT91_PIN_PE12 ,0 );/* LCDD5 */ +at91_set_A_periph (AT91_PIN_PE13 ,0 );/* LCDD6 */ +at91_set_A_periph (AT91_PIN_PE14 ,0 );/* LCDD7 */ +at91_set_A_periph (AT91_PIN_PE15 ,0 );/* LCDD8 */ +at91_set_A_periph (AT91_PIN_PE16 ,0 );/* LCDD9 */ +at91_set_A_periph (AT91_PIN_PE17 ,0 );/* LCDD10 */ +at91_set_A_periph (AT91_PIN_PE18 ,0 );/* LCDD11 */ +at91_set_A_periph (AT91_PIN_PE19 ,0 );/* LCDD12 */ +at91_set_B_periph (AT91_PIN_PE20 ,0 );/* LCDD13 */ There should be A peripheral.
board/siemens/corvus/board.c line 204
Quoted 8 lines
board/siemens/corvus/board.c new file +8
-0+at91_set_A_periph (AT91_PIN_PE21 ,0 );/* LCDD14 */ +at91_set_A_periph (AT91_PIN_PE22 ,0 );/* LCDD15 */ +at91_set_A_periph (AT91_PIN_PE23 ,0 );/* LCDD16 */ +at91_set_A_periph (AT91_PIN_PE24 ,0 );/* LCDD17 */ +at91_set_A_periph (AT91_PIN_PE25 ,0 );/* LCDD18 */ +at91_set_A_periph (AT91_PIN_PE26 ,0 );/* LCDD19 */ +at91_set_A_periph (AT91_PIN_PE27 ,0 );/* LCDD20 */ +at91_set_B_periph (AT91_PIN_PE28 ,0 );/* LCDD21 */ Ditto.
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+at91_set_A_periph (AT91_PIN_PE29 ,0 );/* LCDD22 */ +at91_set_A_periph (AT91_PIN_PE30 ,0 );/* LCDD23 */ + +writel (1 <<ATMEL_ID_LCDC , &pmc->pcer); + + gd->fb_base =CONFIG_AT91SAM9G45_LCD_BASE ; +} + +#ifdef CONFIG_LCD_INFO +#include <nand.h> board/siemens/corvus/board.c line 224
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+#include <version.h> + +void lcd_show_board_info (void ) +{ +ulong dram_size, nand_size; +int i; +char temp[32 ]; + +lcd_printf ("%s\n" ,U_BOOT_VERSION ); +lcd_printf ("(C) 2009 Siemens SBT\n" );Remove the "(C)".
Quoted 18 lines
board/siemens/corvus/board.c new file +18
-0+lcd_printf ("www.sbt.siemens.com\n" ); +lcd_printf ("%s CPU at %s MHz\n" , +ATMEL_CPU_NAME , +strmhz (temp,get_cpu_clk_rate ())); + + 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 (" %ld MB SDRAM, %ld MB NAND\n" , + dram_size >>20 , + nand_size >>20 ); +} +#endif /* CONFIG_LCD_INFO */ +#endif +board/siemens/corvus/board.c line 252
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+int board_early_init_f (void ) +{ +at91_seriald_hw_init (); +return 0 ; +} + +int board_init (void ) +{ +/* Enable Ctrlc */ +console_init_f ();Remove it.
Quoted 12 lines
board/siemens/corvus/board.c line 255
Quoted 2 lines
board/siemens/corvus/board.c new file +2
-0+/* arch number of corvus-Board */ + gd->bd->bi_arch_number =MACH_TYPE_CORVUS ;move to board related configuration file.
Quoted 1 line
+ /* adress of boot parameters */
s/adress/address
Quoted 3 lines
board/siemens/corvus/board.c new file +3
-0+ gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ; + + +board_early_init_f ();
Why call board_early_init_f() here? Isn't it called bby generic board code in the init_sequence_f[] when CONFIG_BOARD_EARLY_INIT_F is defined?
Quoted 5 lines
board/siemens/corvus/board.c line 264
Quoted 5 lines
board/siemens/corvus/board.c new file +5
-0+ +#ifdef CONFIG_CMD_NAND +corvus_nand_hw_init (); +#endif +#ifdef CONFIG_HAS_DATAFLASH
Isn't SPI required for dataflash? Consider rearrange the ifdiffery here.
Quoted 46 lines
Quoted 24 lines
board/siemens/corvus/board.c new file +24
-0+at91_spi0_hw_init (1 <<0 ); +#endif +#ifdef CONFIG_ATMEL_SPI +at91_spi0_hw_init (1 <<4 ); +#endif +#ifdef CONFIG_MACB +corvus_macb_hw_init (); +#endif +#ifdef CONFIG_LCD +corvus_lcd_hw_init (); +#endif +#ifdef CONFIG_CMD_USB +at91sam9m10g45ek_usb_hw_init (); +#endif +return 0 ; +} + +int dram_init (void ) +{ + gd->ram_size =get_ram_size ((void *)CONFIG_SYS_SDRAM_BASE , +CONFIG_SYS_SDRAM_SIZE ); +return 0 ; +} +board/siemens/corvus/board.c line 298
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-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 Please remove this, more information:
--->8---
commit6bb46790178d111161a487cbd847dd2dba37ca24Author: Ben Warren <[email protected]> Date: Tue Jun 1 11:55:42 2010 -0700Write MAC address automatically on MACB-based boards
Also, remove all calls to
eth_init()in boards that use MACB
---8<---
Quoted 14 lines
Quoted 4 lines
board/siemens/corvus/board.c new file +4
-0+} +#endif + +int board_eth_init (bd_t *bis)board/siemens/corvus/board.c line 312
Quoted 10 lines
board/siemens/corvus/board.c new file +10
-0+{ +int rc =0 ; +#ifdef CONFIG_MACB + rc =macb_eth_initialize (0 , (void *)ATMEL_BASE_EMAC ,0x00 ); +#endif +return rc; +} + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI
I think this is not required, should be catched by garbage collector.
Quoted 80 lines
Quoted 80 lines
board/siemens/corvus/board.c new file +33
-0+#include <spi.h> + +int spi_cs_is_valid (unsigned int bus,unsigned int cs) +{ +return bus ==0 && cs <2 ; +} + +void spi_cs_activate (struct spi_slave *slave) +{ +switch (slave->cs) { +case 1 : +at91_set_gpio_output (AT91_PIN_PB18 ,0 ); +break ; +case 0 : +default : +at91_set_gpio_output (AT91_PIN_PB3 ,0 ); +break ; + } +} + +void spi_cs_deactivate (struct spi_slave *slave) +{ +switch (slave->cs) { +case 1 : +at91_set_gpio_output (AT91_PIN_PB18 ,1 ); +break ; +case 0 : +default : +at91_set_gpio_output (AT91_PIN_PB3 ,1 ); +break ; + } +} +#endif /* CONFIG_ATMEL_SPI */ boards.cfg +0
-0@@ -140,6 +140,7 @@ Active arm arm926ejs at91ronetix pm9g45
Active arm arm926ejs at91 taskit
stamp9g20 portuxg20
stamp9g20:AT91SAM9G20,PORTUXG20
Markus Hubig <[email protected]>
Active arm arm926ejs at91 taskit
stamp9g20 stamp9g20
stamp9g20:AT91SAM9G20
Markus Hubig <[email protected]>
Active arm arm926ejs at91 siemens
taurus axm
taurus:AT91SAM9G20,MACH_TYPE=2068
Heiko Schocher <[email protected]>
+Active arm arm926ejs at91 siemens
corvus corvus
corvus:AT91SAM9M10G45,SYS_USE_NANDFLASH
Heiko Schocher <[email protected]>
Active arm arm926ejs at91 siemens
taurus taurus
taurus:AT91SAM9G20,MACH_TYPE=2067
Heiko Schocher <[email protected]>
Active arm arm926ejs davinci aitcam_enc_4xxcam_enc_4xxcam_enc_4xx
Heiko Schocher <[email protected]>
Active arm arm926ejs davinci Barix
ipam390 ipam390
-
Heiko Schocher <[email protected]>include/configs/corvus.h new file +7
-0@@ -0,0 +1,185 @@ +/* +* Common board functions for siemens AT91SAM9G45 based boards +* (C) Copyright 2013 Siemens AG +* +* Based on: +* U-Boot file: include/configs/at91sam9m10g45ek.h +* (C) Copyright 2007-2008
Quoted 8 lines
include/configs/corvus.h line 15
Quoted 8 lines
include/configs/corvus.h new file +8
-0+* Stelian Pop <[email protected]> +* Lead Tech Design <www.leadtechdesign.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + + +
remove some of the new lines here.
Quoted 7 lines
Quoted 7 lines
include/configs/corvus.h new file +7
-0+#ifndef __CONFIG_H +#define __CONFIG_H + +#include <asm/hardware.h> + +#define MACH_TYPE_CORVUS 2066 +
Quoted 8 lines
include/configs/corvus.h line 30
Quoted 8 lines
include/configs/corvus.h new file +8
-0+/* +* 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 0x73f00000
Is'nt the RAM placed @0x20000000 for this devices? Ah got it, The sam9m10 has DDR1 @CS0 and DDR0 @CS6
Quoted 3 lines
include/configs/corvus.h line 33
Quoted 3 lines
include/configs/corvus.h new file +3
-0+ +#define CONFIG_AT91_LEGACY +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
The ATMEL_LEGACY is required for dataflash, please consider using the generic mtd sf stuff instead.
Quoted 45 lines
include/configs/corvus.h line 40
Quoted 8 lines
include/configs/corvus.h new file +4
-0+ +/* ARM asynchronous clock */ +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */
include/configs/corvus.h new file +3
-0+#define CONFIG_SYS_HZ 1000 + +#define CONFIG_AT91SAM9M10G45EK No need this define.
Quoted 17 lines
include/configs/corvus.h new file +16
-0+#define CONFIG_AT91FAMILY + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_DISPLAY_CPUINFO + +#define CONFIG_CMD_BOOTZ +#define CONFIG_OF_LIBFDT + +/* general purpose I/O */ +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ +#define CONFIG_AT91_GPIO +#define CONFIG_AT91_GPIO_PULLUP 1/* keep pullups on peripheral pins */
include/configs/corvus.h line 61
Quoted 5 lines
include/configs/corvus.h new file +5
-0+ +/* serial console */ +#define CONFIG_ATMEL_USART +#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CONFIG_USART_ID ATMEL_ID_SYSreplace tab with black space.
include/configs/corvus.h line 67
Quoted 6 lines
include/configs/corvus.h new file +6
-0+ +/* LCD */ +#define CONFIG_LCD +#define LCD_BPP LCD_COLOR8 +#define CONFIG_LCD_LOGO +#undef LCD_TEST_PATTERNNo where define it, remove it.
Quoted 15 lines
Quoted 12 lines
include/configs/corvus.h new file +12
-0+#define CONFIG_LCD_INFO +#define CONFIG_LCD_INFO_BELOW_LOGO +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONFIG_ATMEL_LCD +#define CONFIG_ATMEL_LCD_RGB565 +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +/* board specific(not enough SRAM) */ +#define CONFIG_AT91SAM9G45_LCD_BASE 0x73E00000 + +/* LED */ +#define CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PD31/* this is the Quoted 3 lines
user1 led */
+#defineCONFIG_GREEN_LEDAT91_PIN_PD0/* this is the user2
led */
Would you mind to use the generic gpio led stuff instead?
Quoted 60 lines
Quoted 60 lines
include/configs/corvus.h new file +60
-0+ +#define CONFIG_BOOTDELAY 3 + +/* +* BOOTP options +*/ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NAND +#define CONFIG_CMD_USB + +/* SDRAM */ +#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 +#define CONFIG_SYS_SDRAM_SIZE 0x08000000 + +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE) + +/* No NOR flash */ +#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 ATMEL_BASE_CS3 +#define CONFIG_SYS_NAND_DBW_8 +/* our ALE is AD21 */ +#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) +/* our CLE is AD22 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8 + +#endif + +/* Ethernet */ +#define CONFIG_MACB +#define CONFIG_RMII +#define CONFIG_NET_RETRY_COUNT 20 +#define CONFIG_RESET_PHY_R + +/* USB */ +#define CONFIG_USB_EHCI
Quoted 8 lines
include/configs/corvus.h line 146
Quoted 6 lines
include/configs/corvus.h new file +6
-0+#define CONFIG_USB_EHCI_ATMEL +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 +#define CONFIG_DOS_PARTITION +#define CONFIG_USB_STORAGE + +#define CONFIG_SYS_LOAD_ADDR 0x22000000/* load address */ Does this work on your board?
;) good catch ...
Quoted 7 lines
include/configs/corvus.h line 149
Quoted 4 lines
include/configs/corvus.h new file +3
-0+ +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END 0x23e00000Ditto.
Quoted 8 lines
include/configs/corvus.h line 158
Quoted 8 lines
include/configs/corvus.h new file +8
-0+/* bootstrap + u-boot + env in nandflash */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 +#define CONFIG_ENV_OFFSET_REDUND 0x180000 +#define CONFIG_ENV_SIZE 0x20000 + +#define CONFIG_BOOTCOMMAND \ + "nand read 0x70000000 0x200000 0x300000;" \
nand read ${laodaddr} kernel ?
When using mtdparts in u-boot ... just my 2?
Quoted 20 lines
Quoted 20 lines
include/configs/corvus.h new file +20
-0+ "bootm 0x70000000" +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \ + "root=/dev/mtdblock7 rw rootfstype=jffs2" + +#define CONFIG_BAUDRATE 115200 + +#define CONFIG_SYS_PROMPT "U-Boot> " +#define CONFIG_SYS_CBSIZE 256 +#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 +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_HUSH_PARSER +
Quoted 8 lines
include/configs/corvus.h line 185
Quoted 8 lines
include/configs/corvus.h new file +7
-0+/* +* Size of malloc() pool +*/ +#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + \ + 128*1024, 0x1000) + +#endif
Best regards
Andreas Bie?mann
PATCH 3/3 arm, at91: add siemens corvus board
Hello Andreas,
Am 29.10.2013 11:01, schrieb Andreas Bie?mann:
Quoted 28 lines
Hi Heiko,
some additional comments on top of Bo's.
Quoted 23 lines · Bo Shen
Hi Heiko Schocher,
Please add commit message.Quoted 19 lines · Heiko Schocher
Signed-off-by Boris Schmidt<[email protected]>Reviewed-by Heiko Schocher<[email protected]>Cc Andreas Bie?mann<[email protected]>--- board/siemens/corvus/Makefile | 39 +++++ board/siemens/corvus/board.c | 345 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/corvus.h | 185 ++++++++++++++++++++++ 4 files changed, 570 insertions(+)create mode 100644 board/siemens/corvus/Makefile create mode 100644
board/siemens/corvus/board.ccreate mode 100644include/configs/corvus.hboard/siemens/corvus/board.c new file +0
-0
[...]
Quoted 14 lines
Quoted 14 lines
board/siemens/corvus/board.c line 252
Quoted 4 lines
board/siemens/corvus/board.c new file +4
-0+int board_init (void ) +{ +/* Enable Ctrlc */ +console_init_f ();Remove it.
board/siemens/corvus/board.c line 255
Quoted 2 lines
board/siemens/corvus/board.c new file +2
-0+/* arch number of corvus-Board */ + gd->bd->bi_arch_number =MACH_TYPE_CORVUS ;move to board related configuration file.
Quoted 1 line
+ /* adress of boot parameters */
Quoted 8 lines
Quoted 5 lines
s/adress/address
Quoted 3 lines
board/siemens/corvus/board.c new file +3
-0+ gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ; + + +board_early_init_f ();Why call
board_early_init_f()here? Isn't it called bby generic board code in the init_sequence_f[] whenCONFIG_BOARD_EARLY_INIT_Fis defined?
removed.
Quoted 6 lines
Quoted 4 lines
board/siemens/corvus/board.c line 264
Quoted 4 lines
board/siemens/corvus/board.c new file +4
-0+#ifdef CONFIG_CMD_NAND +corvus_nand_hw_init (); +#endif +#ifdef CONFIG_HAS_DATAFLASH Isn't SPI required for dataflash? Consider rearrange the ifdiffery here.
rearranged.
[...]
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
board/siemens/corvus/board.c new file +5
-0+int board_eth_init (bd_t *bis) +{ +int rc =0 ; +#ifdef CONFIG_MACB + rc =macb_eth_initialize (0 , (void *)ATMEL_BASE_EMAC ,0x00 );
Quoted 8 lines
Quoted 6 lines
board/siemens/corvus/board.c line 312
Quoted 6 lines
board/siemens/corvus/board.c new file +6
-0+#endif +return rc; +} + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI I think this is not required, should be catched by garbage collector.
removed this ifdef
[...]
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
include/configs/corvus.h new file +9
-0@@ -0,0 +1,185 @@ +/* +* Common board functions for siemens AT91SAM9G45 based boards +* (C) Copyright 2013 Siemens AG +* +* Based on: +* U-Boot file: include/configs/at91sam9m10g45ek.h +* (C) Copyright 2007-2008 +* Stelian Pop<[email protected]> +* Lead Tech Design<www.leadtechdesign.com>
Quoted 8 lines
Quoted 6 lines
include/configs/corvus.h line 15
Quoted 6 lines
include/configs/corvus.h new file +6
-0+* +* SPDX-License-Identifier: GPL-2.0+ +*/ + + +remove some of the new lines here.
Done.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
include/configs/corvus.h new file +10
-0+#ifndef __CONFIG_H +#define __CONFIG_H + +#include <asm/hardware.h> + +#define MACH_TYPE_CORVUS 2066 + +/* +* Warning: changing CONFIG_SYS_TEXT_BASE requires +* adapting the initial boot program.
Quoted 8 lines
Quoted 5 lines
include/configs/corvus.h line 30
Quoted 5 lines
include/configs/corvus.h new file +5
-0+* Since the linker has to swallow that define, we must use a pure +* hex number here! +*/ + +#define CONFIG_SYS_TEXT_BASE 0x73f00000Is'nt the RAM placed @0x20000000 for this devices? Ah got it, The sam9m10 has DDR1 @CS0 and DDR0 @CS6
Yep.
Quoted 6 lines
Quoted 3 lines
include/configs/corvus.h line 33
Quoted 3 lines
include/configs/corvus.h new file +3
-0+ +#define CONFIG_AT91_LEGACY +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ The
ATMEL_LEGACYis required for dataflash, please consider using the generic mtd sf stuff instead.
Ok, think about that ...
[...]
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
include/configs/corvus.h new file +3
-0+/* LED */ +#define CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PD31/* this is the user1 led */
+#defineCONFIG_GREEN_LEDAT91_PIN_PD0/* this is the user2
led */Would you mind to use the generic gpio led stuff instead?
You mean ./drivers/misc/gpio_led.c ?
I check this.
[...]
Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
include/configs/corvus.h new file +8
-0+/* Ethernet */ +#define CONFIG_MACB +#define CONFIG_RMII +#define CONFIG_NET_RETRY_COUNT 20 +#define CONFIG_RESET_PHY_R + +/* USB */ +#define CONFIG_USB_EHCI Quoted 8 lines
include/configs/corvus.h line 146
Quoted 6 lines
include/configs/corvus.h new file +6
-0+#define CONFIG_USB_EHCI_ATMEL +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 +#define CONFIG_DOS_PARTITION +#define CONFIG_USB_STORAGE + +#define CONFIG_SYS_LOAD_ADDR 0x22000000/* load address */ Does this work on your board?
Quoted 1 line
;) good catch ...
Fixed.
Quoted 17 lines
Quoted 6 lines
include/configs/corvus.h line 149
Quoted 3 lines
include/configs/corvus.h new file +3
-0+ +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END 0x23e00000Ditto.
Quoted 8 lines
include/configs/corvus.h line 158
Quoted 8 lines
include/configs/corvus.h new file +8
-0+/* bootstrap + u-boot + env in nandflash */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 +#define CONFIG_ENV_OFFSET_REDUND 0x180000 +#define CONFIG_ENV_SIZE 0x20000 + +#define CONFIG_BOOTCOMMAND \ + "nand read 0x70000000 0x200000 0x300000;" \nand read ${laodaddr} kernel ?
Quoted 1 line
When using mtdparts in u-boot ... just my 2?
You mean:
nand read ${loadaddr} kernel
;-)
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 3/3 arm, at91: add siemens corvus board
Hello Heiko,
Quoted 23 lines · Heiko Schocher
Am 29.10.2013 11:01, schrieb Andreas Bie?mann:
Quoted 22 lines · Bo Shen
Quoted 21 lines · Heiko Schocher
Quoted 20 lines
Signed-off-by Boris Schmidt<[email protected]>Reviewed-by Heiko Schocher<[email protected]>Cc Andreas Bie?mann<[email protected]>--- board/siemens/corvus/Makefile | 39 +++++ board/siemens/corvus/board.c | 345 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/corvus.h | 185 ++++++++++++++++++++++ 4 files changed, 570 insertions(+)create mode 100644 board/siemens/corvus/Makefile create mode 100644
board/siemens/corvus/board.ccreate mode 100644include/configs/corvus.hboard/siemens/corvus/board.c new file +0
-0
<snip>
Quoted 9 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
board/siemens/corvus/board.c new file +3
-0+ +#define CONFIG_AT91_LEGACY +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
The
ATMEL_LEGACYis required for dataflash, please consider using the generic mtd sf stuff instead.Ok, think about that ...
This legacy stuff is really a mess ... hopefully I get the gpio thing cleaned up for 2014.01 and completely removed for the follow-up release.
Quoted 11 lines
[...]
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
board/siemens/corvus/board.c new file +3
-0+/* LED */ +#define CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PD31/* this is the user1 led */
+#defineCONFIG_GREEN_LEDAT91_PIN_PD0/* this is the user2
led */Would you mind to use the generic gpio led stuff instead?
You mean
./drivers/misc/gpio_led.c?
I mean the STATUS_LED thing (first part in README.LED). There is the taskit stamp9g20 board which uses it already (in connection with the at91 specific colour_LED thing)
<snip>
Quoted 8 lines
Quoted 4 lines
nand read ${laodaddr} kernel ?
When using mtdparts in u-boot ... just my 2?
You mean:
nand read ${loadaddr} kernel
;-)
I do ;)
By,
Andreas