May 2009 - U-Boot

[U-Boot] [Resend PATCH] afeb9260: fix macb device init
by Jean-Christophe PLAGNIOL-VILLARD 24 May '09

24 May '09

missed during the next rebase Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- cpu/arm926ejs/at91/at91sam9260_devices.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cpu/arm926ejs/at91/at91sam9260_devices.c b/cpu/arm926ejs/at91/at91sam9260_devices.c index 6dc0acc..5309ba2 100644 --- a/cpu/arm926ejs/at91/at91sam9260_devices.c +++ b/cpu/arm926ejs/at91/at91sam9260_devices.c @@ -167,7 +167,7 @@ void at91_macb_hw_init(void) at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */ at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */ at91_set_B_periph(AT91_PIN_PA27, 0); /* ERXCK */ -#if defined(CONFIG_AT91SAM9260EK) +#if defined(CONFIG_AT91SAM9260EK) || defined(CONFIG_AFEB9260) /* * use PA10, PA11 for ETX2, ETX3. * PA23 and PA24 are for TWI EEPROM -- 1.6.2.4

2 1

[U-Boot] [PATCH 0/4] omap3: clean up gpmc config strut
by Matthias Ludwig 24 May '09

24 May '09

following patchset cleans up gpmc config for omap3. - chip select configuration is embedded into global gpmc configuration struct to make it available without handling offset-defines. - several instances of gpmc_t (which used always the same base address) are replaced by one global struct which is initialized in gpmc_init. - typedef for gpmc struct is replaced by c struct Compile tested on: omap3_evm, omap3_beagle, omap3_overo, omap3_pandora, omap3_zoom1 Boot tested on new platform (not in mainline), SDRAM, NAND and network (code taken from board/omap3/evm/evm.c) initialization works fine. My EVM broken seems to be broken, so can someone please boot test on at least on platforms? best regards, Matthias Matthias Ludwig (4): omap3: embedd gpmc_cs into gpmc config struct omap3: remove typedef for struct gpmc omap3: replace all instances of gpmc config struct by one global omap3: use only fixed-size types inside ctrl_structs board/omap3/evm/evm.c | 15 +- cpu/arm_cortexa8/omap3/mem.c | 48 ++--- cpu/arm_cortexa8/omap3/sys_info.c | 3 +- drivers/mtd/nand/omap_gpmc.c | 41 ++--- include/asm-arm/arch-omap3/cpu.h | 428 +++++++++++++++++++------------------ include/configs/omap3_beagle.h | 3 +- include/configs/omap3_evm.h | 3 +- include/configs/omap3_overo.h | 3 +- include/configs/omap3_pandora.h | 3 +- include/configs/omap3_zoom1.h | 3 +- 10 files changed, 273 insertions(+), 277 deletions(-)

5 29

[U-Boot] [PATCH] Blackfin: bf518f-ezbrd: setup portmux for async flash
by Mike Frysinger 24 May '09

24 May '09

From: Graf Yang <graf.yang(a)analog.com> The pins for async memory where parallel flash lives are not enabled by default, so make sure we mux them as needed. Signed-off-by: Graf Yang <graf.yang(a)analog.com> Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- board/bf518f-ezbrd/bf518f-ezbrd.c | 16 ++++++++++++++++ include/configs/bf518f-ezbrd.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/board/bf518f-ezbrd/bf518f-ezbrd.c b/board/bf518f-ezbrd/bf518f-ezbrd.c index ec5a7ed..63be7cf 100644 --- a/board/bf518f-ezbrd/bf518f-ezbrd.c +++ b/board/bf518f-ezbrd/bf518f-ezbrd.c @@ -146,3 +146,19 @@ int misc_init_r(void) return 0; } + +int board_early_init_f(void) +{ +#if !defined(CONFIG_SYS_NO_FLASH) + /* setup BF518-EZBRD GPIO pin PG11 to AMS2. */ + bfin_write_PORTG_MUX((bfin_read_PORTG_MUX() & ~PORT_x_MUX_6_MASK) | PORT_x_MUX_6_FUNC_2); + bfin_write_PORTG_FER(bfin_read_PORTG_FER() | PG11); + +# if !defined(CONFIG_BFIN_SPI) + /* setup BF518-EZBRD GPIO pin PG15 to AMS3. */ + bfin_write_PORTG_MUX((bfin_read_PORTG_MUX() & ~PORT_x_MUX_7_MASK) | PORT_x_MUX_7_FUNC_3); + bfin_write_PORTG_FER(bfin_read_PORTG_FER() | PG15); +# endif +#endif + return 0; +} diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index 77b94a8..06f2765 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -132,6 +132,7 @@ /* * Misc Settings */ +#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 -- 1.6.3.1

1 0

[U-Boot] LDS Consolidation
by Jean-Christophe PLAGNIOL-VILLARD 23 May '09

23 May '09

Hi all, Currently we have 10s of lds copy arround When you want to update them it's really a pain in the ass As you may see I've send patches to clean it up It will be nice if each Maintainer could help to continue this specially the powerpc devs Currently I've send patch for the following area ARM AVR32 MIPS SH Thanks by Advance Best Regards, J.

2 1

[U-Boot] [PATCH 2/3] arm: add initcalls_init
by Jean-Christophe PLAGNIOL-VILLARD 23 May '09

23 May '09

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- lib_arm/board.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib_arm/board.c b/lib_arm/board.c index e081fbc..f40e227 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -42,6 +42,7 @@ #include <command.h> #include <malloc.h> #include <devices.h> +#include <init.h> #include <timestamp.h> #include <version.h> #include <net.h> @@ -284,6 +285,7 @@ init_fnc_t *init_sequence[] = { #if defined(CONFIG_DISPLAY_BOARDINFO) checkboard, /* display board info */ #endif + initcalls_init, #if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) init_func_i2c, #endif -- 1.6.3.1

3 5

[U-Boot] [PATCH] ARM DaVinci Minor Change to header file
by s-paulraj＠ti.com 23 May '09

23 May '09

WE want to use MACROS in the config files for various DaVinci boards. At the moment this is not possible because we get compilation error when we include the hardware.h header file in the config file for various SOC's and then try to compile. This patch addresses comments received while submitting patches for the Leopard board. Signed-off-by: Sandeep Paulraj <s-paulraj(a)ti.com> --- include/asm-arm/arch-davinci/hardware.h | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/include/asm-arm/arch-davinci/hardware.h b/include/asm-arm/arch-davinci/hardware.h index 313b3f3..2e941e2 100644 --- a/include/asm-arm/arch-davinci/hardware.h +++ b/include/asm-arm/arch-davinci/hardware.h @@ -34,6 +34,9 @@ #define __ASM_ARCH_HARDWARE_H #include <config.h> + +#ifndef __ASSEMBLY__ + #include <asm/sizes.h> #define REG(addr) (*(volatile unsigned int *)(addr)) @@ -42,6 +45,16 @@ typedef volatile unsigned int dv_reg; typedef volatile unsigned int * dv_reg_p; +void lpsc_on(unsigned int id); +void dsp_on(void); + +void davinci_enable_uart0(void); +void davinci_enable_emac(void); +void davinci_enable_i2c(void); +void davinci_errata_workarounds(void); + +#endif + /* * Base register addresses * @@ -153,14 +166,6 @@ typedef volatile unsigned int * dv_reg_p; #define DAVINCI_LPSC_GEM 39 #define DAVINCI_LPSC_IMCOP 40 -void lpsc_on(unsigned int id); -void dsp_on(void); - -void davinci_enable_uart0(void); -void davinci_enable_emac(void); -void davinci_enable_i2c(void); -void davinci_errata_workarounds(void); - /* Some PSC defines */ #define PSC_CHP_SHRTSW (0x01c40038) #define PSC_GBLCTL (0x01c41010) -- 1.6.0.4

2 1

[U-Boot] [PATCH 1/3] ppc4xx: Move definition for PPC4xx NAND FLASH controller to header
by Stefan Roese 23 May '09

23 May '09

This patch moves the definition for the PPC4xx NAND FLASH controller (NDFC) CONFIG_NAND_NDFC into include/ppc4xx.h. This is needed for the upcoming fix for the ECC byte ordering of the NDFC driver. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Scott Wood <scottwood(a)freescale.com> --- Scott, please review this patchset. It fixes a problem with the 4xx NDFC and it's compatibility with the Linux driver. I would really like to get this into this 2009-06 release. Since this patchset also touches a file in drivers/mtd/nand, how should we handle those patches? Should I push those patches (after your ACK) via my ppc4xx repository? BTW: My plan is to move this 4xx NAND driver to drivers/mtd/nand after the next release. Thanks, Stefan cpu/ppc4xx/ndfc.c | 9 +++------ include/ppc4xx.h | 7 +++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cpu/ppc4xx/ndfc.c b/cpu/ppc4xx/ndfc.c index 3a5af12..ba481ad 100644 --- a/cpu/ppc4xx/ndfc.c +++ b/cpu/ppc4xx/ndfc.c @@ -1,9 +1,9 @@ /* * Overview: * Platform independend driver for NDFC (NanD Flash Controller) - * integrated into EP440 cores + * integrated into IBM/AMCC PPC4xx cores * - * (C) Copyright 2006-2007 + * (C) Copyright 2006-2009 * Stefan Roese, DENX Software Engineering, sr(a)denx.de. * * Based on original work by @@ -32,10 +32,7 @@ #include <common.h> #if defined(CONFIG_CMD_NAND) && !defined(CONFIG_NAND_LEGACY) && \ - (defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ - defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ - defined(CONFIG_405EZ) || defined(CONFIG_405EX) || \ - defined(CONFIG_460EX) || defined(CONFIG_460GT)) + defined(CONFIG_NAND_NDFC) #include <nand.h> #include <linux/mtd/ndfc.h> diff --git a/include/ppc4xx.h b/include/ppc4xx.h index f147885..55ff323 100644 --- a/include/ppc4xx.h +++ b/include/ppc4xx.h @@ -46,6 +46,13 @@ #define CONFIG_SDRAM_PPC4xx_IBM_DDR2 /* IBM DDR(2) controller */ #endif +#if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ + defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ + defined(CONFIG_405EZ) || defined(CONFIG_405EX) || \ + defined(CONFIG_460EX) || defined(CONFIG_460GT) +#define CONFIG_NAND_NDFC +#endif + /* PLB4 CrossBar Arbiter Core supported across PPC4xx families */ #if defined(CONFIG_405EX) || \ defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \ -- 1.6.2.5

2 4

[U-Boot] [PATCH] at91: Add command to control GPIO LEDs from the console
by Daniel Gorsulowski 23 May '09

23 May '09

This patch allows any at91 board implementing the GPIO LED API to control vendor specific LEDs from the console. Adding configuration items CONFIG_AT91_LED and CONFIG_CMD_LED enables the command. Moreover the GPIO Pins have to be defined by CONFIG_GPIO_LEDS See doc/README.LED for detailed information. Usage: led [LED_number] [on|off] Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski(a)esd.eu> --- cpu/arm926ejs/at91/Makefile | 1 + cpu/arm926ejs/at91/cmd_led.c | 60 +++++++++++++++++++++++++++++++++++++++ cpu/arm926ejs/at91/led.c | 29 +++++++++++++++++++ doc/README.LED | 40 ++++++++++++++++++++++++++ include/asm-arm/arch-at91/led.h | 42 +++++++++++++++++++++++++++ 5 files changed, 172 insertions(+), 0 deletions(-) create mode 100644 cpu/arm926ejs/at91/cmd_led.c create mode 100644 include/asm-arm/arch-at91/led.h diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile index e300d97..adfd192 100644 --- a/cpu/arm926ejs/at91/Makefile +++ b/cpu/arm926ejs/at91/Makefile @@ -54,6 +54,7 @@ ifdef CONFIG_AT91SAM9RL COBJS-y += at91sam9rl_serial.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9rl_spi.o endif +COBJS-$(CONFIG_CMD_LED) += cmd_led.o COBJS-$(CONFIG_AT91_LED) += led.o COBJS-y += clock.o COBJS-y += cpu.o diff --git a/cpu/arm926ejs/at91/cmd_led.c b/cpu/arm926ejs/at91/cmd_led.c new file mode 100644 index 0000000..45d634b --- /dev/null +++ b/cpu/arm926ejs/at91/cmd_led.c @@ -0,0 +1,60 @@ +/* + * (C) Copyright 2009 + * Daniel Gorsulowski <daniel.gorsulowski(a)esd.eu> + * esd electronic system design gmbh <www.esd.eu> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <config.h> +#include <command.h> +#include <asm/arch/led.h> + +int do_led(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + ulong led_nr; + unsigned on; + + /* Validate arguments */ + led_nr = simple_strtoul(argv[1], NULL, 10); + if (led_nr > CONFIG_LED_MAX) { + printf("Usage:\n%s\n", cmdtp->usage); + return 1; + } + + if (strcmp(argv[2], "off") == 0) { + on = 1; + } else if (strcmp(argv[2], "on") == 0) { + on = 0; + } else { + printf("Usage:\n%s\n", cmdtp->usage); + return 1; + } + + user_led(led_nr - 1, on); + + return 0; +} + +U_BOOT_CMD( + led, 3, 1, do_led, + "[LED_number] [on|off]", + "[LED_number] [on|off] turns LED on/off" +); diff --git a/cpu/arm926ejs/at91/led.c b/cpu/arm926ejs/at91/led.c index be68f59..b41a7c4 100644 --- a/cpu/arm926ejs/at91/led.c +++ b/cpu/arm926ejs/at91/led.c @@ -3,6 +3,10 @@ * Stelian Pop <stelian.pop(a)leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com> * + * (C) Copyright 2009 + * Daniel Gorsulowski <daniel.gorsulowski(a)esd.eu> + * esd electronic system design gmbh <www.esd.eu> + * * See file CREDITS for list of people who contributed to this * project. * @@ -27,6 +31,31 @@ #include <asm/arch/gpio.h> #include <asm/arch/io.h> +#ifdef CONFIG_AT91_LED + +#if defined(CONFIG_AT91RM9200) +#include <asm/arch/at91rm9200.h> +#elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) +#include <asm/arch/at91sam9260.h> +#elif defined(CONFIG_AT91SAM9261) +#include <asm/arch/at91sam9261.h> +#elif defined(CONFIG_AT91SAM9263) +#include <asm/arch/at91sam9263.h> +#elif defined(CONFIG_AT91SAM9RL) +#include <asm/arch/at91sam9rl.h> +#elif defined(CONFIG_AT91CAP9) +#include <asm/arch/at91cap9.h> +#endif + +#include <asm/arch/led.h> + +void user_led(ulong led_nr, unsigned on) +{ + at91_set_gpio_value(leds[led_nr], on); +} + +#endif /* CONFIG_AT91_LED */ + #ifdef CONFIG_RED_LED void red_LED_on(void) { diff --git a/doc/README.LED b/doc/README.LED index 1221177..06a741e 100644 --- a/doc/README.LED +++ b/doc/README.LED @@ -76,3 +76,43 @@ TBD : Describe older board dependent macros similar to what is done for CONFIG_TQM8xxL. TBD : Describe general support via asm/status_led.h + + +GPIO LEDs +======================================== + +GPIO LEDs are presently only supported by at91. +this README describes the usage of the GPIO LED API. + +The API is defined by the include file include/asm-arm/arch-at91/led.h + +The first step is to define CONFIG_AT91_LED, CONFIG_LED_MAX and CONFIG_GPIO_LEDS +in the board config file. +I.e.: + /* LED */ + #define CONFIG_AT91_LED + #define CONFIG_LED_MAX ARRAY_SIZE(leds) + #define CONFIG_GPIO_LEDS { \ + AT91_PIN_PB8, \ + AT91_PIN_PB7 \ + } + +The second step is to initialize the Peripheral Clock Controller and the GPIO +pins in the vendor specific board code. +I.e.: + #ifdef CONFIG_AT91_LED + /* Enable clock */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_PIOB | + 1 << AT91SAM9263_ID_PIOCDE); + + /* Initialize GPIO pins */ + int i; + for(i = 0; i < CONFIG_LED_MAX; i++) { + at91_set_gpio_output(leds[i], 1); + at91_set_gpio_value(leds[i], 1); + } + #endif + +Now a new command "led" will be available in the U-Boot console. +Usage: +led [LED_number] [on|off] diff --git a/include/asm-arm/arch-at91/led.h b/include/asm-arm/arch-at91/led.h new file mode 100644 index 0000000..f55cb56 --- /dev/null +++ b/include/asm-arm/arch-at91/led.h @@ -0,0 +1,42 @@ +/* + * (C) Copyright 2009 + * Daniel Gorsulowski <daniel.gorsulowski(a)esd.eu> + * esd electronic system design gmbh <www.esd.eu> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __ASM_ARCH_LED_H +#define __ASM_ARCH_LED_H + +/* + * GPIO LEDs API + */ + +#include <asm/arch/gpio.h> + +static long leds[] = CONFIG_GPIO_LEDS; + +#ifndef __ASSEMBLY__ +extern void user_led(ulong led_nr, unsigned on); +#else + .extern user_led +#endif + +#endif /* __ASM_ARCH_LED_H */ -- 1.6.1

2 1

[U-Boot] [PATCH] at91/cpu.c: add missing Copyright & GPL header
by Jean-Christophe PLAGNIOL-VILLARD 22 May '09

22 May '09

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- cpu/arm926ejs/at91/cpu.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/cpu/arm926ejs/at91/cpu.c b/cpu/arm926ejs/at91/cpu.c index 677fa51..6bb88cf 100644 --- a/cpu/arm926ejs/at91/cpu.c +++ b/cpu/arm926ejs/at91/cpu.c @@ -1,3 +1,26 @@ +/* + * (C) Copyright 2009 + * Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + #include <common.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_pmc.h> -- 1.6.2.4

1 0

[U-Boot] [PATCH] at91: move cpu name define to arm/arch/ cpu header
by Jean-Christophe PLAGNIOL-VILLARD 22 May '09

22 May '09

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- include/asm-arm/arch-at91/at91cap9.h | 5 +++++ include/asm-arm/arch-at91/at91sam9260.h | 9 +++++++++ include/asm-arm/arch-at91/at91sam9261.h | 4 ++++ include/asm-arm/arch-at91/at91sam9263.h | 4 ++++ include/asm-arm/arch-at91/at91sam9rl.h | 5 +++++ include/configs/at91cap9adk.h | 1 - include/configs/at91sam9260ek.h | 2 -- include/configs/at91sam9261ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/pm9263.h | 2 -- 11 files changed, 27 insertions(+), 8 deletions(-) diff --git a/include/asm-arm/arch-at91/at91cap9.h b/include/asm-arm/arch-at91/at91cap9.h index 0b52228..b128ac5 100644 --- a/include/asm-arm/arch-at91/at91cap9.h +++ b/include/asm-arm/arch-at91/at91cap9.h @@ -134,4 +134,9 @@ #define CONFIG_DRAM_BASE AT91_CHIPSELECT_6 +/* + * Cpu Name + */ +#define AT91_CPU_NAME "AT91CAP9" + #endif diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/include/asm-arm/arch-at91/at91sam9260.h index 920a7f3..707d7bc 100644 --- a/include/asm-arm/arch-at91/at91sam9260.h +++ b/include/asm-arm/arch-at91/at91sam9260.h @@ -121,4 +121,13 @@ #define AT91SAM9XE_FLASH_BASE 0x00200000 /* Internal FLASH base address */ #define AT91SAM9XE_SRAM_BASE 0x00300000 /* Internal SRAM base address */ +/* + * Cpu Name + */ +#if defined(CONFIG_AT91SAM9260) +#define AT91_CPU_NAME "AT91SAM9260" +#if defined(CONFIG_AT91SAM9G20) +#define AT91_CPU_NAME "AT91SAM9G20" +#endif + #endif diff --git a/include/asm-arm/arch-at91/at91sam9261.h b/include/asm-arm/arch-at91/at91sam9261.h index 752d81d..b303e07 100644 --- a/include/asm-arm/arch-at91/at91sam9261.h +++ b/include/asm-arm/arch-at91/at91sam9261.h @@ -101,5 +101,9 @@ #define AT91SAM9261_UHP_BASE 0x00500000 /* USB Host controller */ #define AT91SAM9261_LCDC_BASE 0x00600000 /* LDC controller */ +/* + * Cpu Name + */ +#define AT91_CPU_NAME "AT91SAM9261" #endif diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/include/asm-arm/arch-at91/at91sam9263.h index 07b265f..966a683 100644 --- a/include/asm-arm/arch-at91/at91sam9263.h +++ b/include/asm-arm/arch-at91/at91sam9263.h @@ -124,5 +124,9 @@ #define AT91SAM9263_DMAC_BASE 0x00800000 /* DMA Controller */ #define AT91SAM9263_UHP_BASE 0x00a00000 /* USB Host controller */ +/* + * Cpu Name + */ +#define AT91_CPU_NAME "AT91SAM9263" #endif diff --git a/include/asm-arm/arch-at91/at91sam9rl.h b/include/asm-arm/arch-at91/at91sam9rl.h index 215bbc8..4dd8037 100644 --- a/include/asm-arm/arch-at91/at91sam9rl.h +++ b/include/asm-arm/arch-at91/at91sam9rl.h @@ -112,4 +112,9 @@ #define AT91SAM9RL_LCDC_BASE 0x00500000 /* LCD Controller */ #define AT91SAM9RL_UDPHS_BASE 0x00600000 /* USB Device HS controller */ +/* + * Cpu Name + */ +#define AT91_CPU_NAME "AT91SAM9RL" + #endif diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index b2e6d7d..526cd60 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -28,7 +28,6 @@ #define __CONFIG_H /* ARM asynchronous clock */ -#define AT91_CPU_NAME "AT91CAP9" #define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */ #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index e46c9d6..1828c63 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -34,10 +34,8 @@ #define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ #ifdef CONFIG_AT91SAM9G20EK -#define AT91_CPU_NAME "AT91SAM9G20" #define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/ #else -#define AT91_CPU_NAME "AT91SAM9260" #define CONFIG_AT91SAM9260 1 /* It's an Atmel AT91SAM9260 SoC*/ #endif diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index fdaa71c..b84e361 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -28,7 +28,6 @@ #define __CONFIG_H /* ARM asynchronous clock */ -#define AT91_CPU_NAME "AT91SAM9261" #define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */ #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index d03ecee..c212d11 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -28,7 +28,6 @@ #define __CONFIG_H /* ARM asynchronous clock */ -#define AT91_CPU_NAME "AT91SAM9263" #define AT91_MAIN_CLOCK 16367660 /* 16.367 MHz crystal */ #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 846d165..c466823 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -28,7 +28,6 @@ #define __CONFIG_H /* ARM asynchronous clock */ -#define AT91_CPU_NAME "AT91SAM9RL" #define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */ #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 0db17b3..d60c417 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -29,8 +29,6 @@ #define __CONFIG_H /* ARM asynchronous clock */ -#define AT91_CPU_NAME "AT91SAM9263" - #define CONFIG_DISPLAY_BOARDINFO #define MASTER_PLL_DIV 15 -- 1.6.2.4

1 1