Am 18.02.2011 13:50, schrieb Reinhard Meyer: > Signed-off-by: Reinhard Meyer <u-b...@emk-elektronik.de> > --- > arch/arm/include/asm/arch-at91/hardware.h | 96 > +++++++++------------------ > arch/arm/include/asm/arch-at91/memory-map.h | 36 ---------- > 2 files changed, 32 insertions(+), 100 deletions(-) > delete mode 100644 arch/arm/include/asm/arch-at91/memory-map.h > > diff --git a/arch/arm/include/asm/arch-at91/hardware.h > b/arch/arm/include/asm/arch-at91/hardware.h > index 6b44d61..c69c451 100644 > --- a/arch/arm/include/asm/arch-at91/hardware.h > +++ b/arch/arm/include/asm/arch-at91/hardware.h > @@ -1,80 +1,48 @@ > /* > - * [origin: Linux kernel include/asm-arm/arch-at91/hardware.h] > + * (C) Copyright 2007-2008 > + * Stelian Pop <stelian....@leadtechdesign.com> > + * Lead Tech Design <www.leadtechdesign.com> > * > - * Copyright (C) 2003 SAN People > - * Copyright (C) 2003 ATMEL > + * 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 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_HARDWARE_H > -#define __ASM_ARCH_HARDWARE_H > - > -#include <asm/sizes.h> > +#ifndef __ASM_ARM_ARCH_HARDWARE_H__ > +#define __ASM_ARM_ARCH_HARDWARE_H__ > > #if defined(CONFIG_AT91RM9200) > -#include <asm/arch-at91/at91rm9200.h> > -#define AT91_PMC_UHP AT91RM9200_PMC_UHP > -#elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) > -#include <asm/arch/at91sam9260.h> > -#define AT91_BASE_MCI AT91SAM9260_BASE_MCI > -#define AT91_BASE_SPI AT91SAM9260_BASE_SPI0 > -#define AT91_BASE_SPI1 AT91SAM9260_BASE_SPI1 > -#define AT91_ID_UHP AT91SAM9260_ID_UHP > -#define AT91_PMC_UHP AT91SAM926x_PMC_UHP > +# include <asm/arch/at91rm9200.h> > +#elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) || \ > + defined(CONFIG_AT91SAM9XE) > +# include <asm/arch/at91sam9260.h> > #elif defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10) > -#include <asm/arch/at91sam9261.h> > -#define AT91_BASE_SPI AT91SAM9261_BASE_SPI0 > -#define AT91_ID_UHP AT91SAM9261_ID_UHP > -#define AT91_PMC_UHP AT91SAM926x_PMC_UHP > +# include <asm/arch/at91sam9261.h> > #elif defined(CONFIG_AT91SAM9263) > -#include <asm/arch/at91sam9263.h> > -#define AT91_BASE_SPI AT91SAM9263_BASE_SPI0 > -#define AT91_ID_UHP AT91SAM9263_ID_UHP > -#define AT91_PMC_UHP AT91SAM926x_PMC_UHP > +# include <asm/arch/at91sam9263.h> > #elif defined(CONFIG_AT91SAM9RL) > -#include <asm/arch/at91sam9rl.h> > -#define AT91_BASE_SPI AT91SAM9RL_BASE_SPI > -#define AT91_ID_UHP AT91SAM9RL_ID_UHP > +# include <asm/arch/at91sam9rl.h> > #elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) > -#include <asm/arch/at91sam9g45.h> > -#define AT91_BASE_EMAC AT91SAM9G45_BASE_EMAC > -#define AT91_BASE_SPI AT91SAM9G45_BASE_SPI0 > -#define AT91_ID_UHP AT91SAM9G45_ID_UHPHS > -#define AT91_PMC_UHP AT91SAM926x_PMC_UHP > +# include <asm/arch/at91sam9g45.h> > #elif defined(CONFIG_AT91CAP9) > -#include <asm/arch/at91cap9.h> > -#define AT91_BASE_SPI AT91CAP9_BASE_SPI0 > -#define AT91_ID_UHP AT91CAP9_ID_UHP > -#define AT91_PMC_UHP AT91CAP9_PMC_UHP > +# include <asm/arch/at91cap9.h> > #elif defined(CONFIG_AT91X40) > -#include <asm/arch/at91x40.h> > +# include <asm/arch/at91x40.h> > #else > -#error "Unsupported AT91 processor" > +# error "Unsupported AT91 processor" > #endif > > -/* External Memory Map */ > -#define AT91_CHIPSELECT_0 0x10000000 > -#define AT91_CHIPSELECT_1 0x20000000 > -#define AT91_CHIPSELECT_2 0x30000000 > -#define AT91_CHIPSELECT_3 0x40000000 > -#define AT91_CHIPSELECT_4 0x50000000 > -#define AT91_CHIPSELECT_5 0x60000000 > -#define AT91_CHIPSELECT_6 0x70000000 > -#define AT91_CHIPSELECT_7 0x80000000 > - > -/* SDRAM */ > -#ifdef CONFIG_DRAM_BASE > -#define AT91_SDRAM_BASE CONFIG_DRAM_BASE > -#else > -#define AT91_SDRAM_BASE AT91_CHIPSELECT_1 > -#endif > - > -/* Clocks */ > -#define AT91_SLOW_CLOCK 32768 /* slow clock */ > - > -#endif > +#endif /* __ASM_ARM_ARCH_MEMORYMAP_H__ */
hardware.h here! > diff --git a/arch/arm/include/asm/arch-at91/memory-map.h > b/arch/arm/include/asm/arch-at91/memory-map.h > deleted file mode 100644 > index d489fa2..0000000 > --- a/arch/arm/include/asm/arch-at91/memory-map.h > +++ /dev/null > @@ -1,36 +0,0 @@ > -/* > - * (C) Copyright 2007-2008 > - * Stelian Pop <stelian....@leadtechdesign.com> > - * Lead Tech Design <www.leadtechdesign.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 > - */ > -#ifndef __ASM_ARM_ARCH_MEMORYMAP_H__ > -#define __ASM_ARM_ARCH_MEMORYMAP_H__ > - > -#include <asm/arch/hardware.h> > - > -#define USART0_BASE AT91_USART0 > -#define USART1_BASE AT91_USART1 > -#define USART2_BASE AT91_USART2 > -#define USART3_BASE (AT91_BASE_SYS + AT91_DBGU) > -#define SPI0_BASE AT91_BASE_SPI > -#define SPI1_BASE AT91_BASE_SPI1 > - > -#endif /* __ASM_ARM_ARCH_MEMORYMAP_H__ */ _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
