From mboxrd@z Thu Jan 1 00:00:00 1970 From: Reinhard Meyer Date: Fri, 05 Nov 2010 11:34:38 +0100 Subject: [U-Boot] [PATCH v2 2/2] avr32: fixup definitions to ATMEL_BASE_xxx In-Reply-To: <1288948531-12187-3-git-send-email-biessmann@corscience.de> References: <1288779654-32567-1-git-send-email-biessmann@corscience.de> <1288948531-12187-3-git-send-email-biessmann@corscience.de> Message-ID: <4CD3DDBE.9050501@emk-elektronik.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Andreas Bie?mann, > Signed-off-by: Andreas Bie?mann *maybe* your mailing system would abstain from escaping the patch if you would use "ss" instead "?" ;) (I am waiting for the first patch to arrive signed off in ???, or even better, farsi (from right to left). My mailer can handle that, but can git-am ?) > --- > changes since v1: > - only rename definitions to ATMEL_BASE_xx schema in this patch > - rename of memeory-map.h -> hardweare.h is required before > > arch/avr32/cpu/at32ap700x/sm.h | 4 +- > arch/avr32/cpu/hsdramc1.h | 4 +- > arch/avr32/cpu/hsmc3.h | 4 +- > arch/avr32/cpu/interrupts.c | 2 +- > arch/avr32/include/asm/arch-at32ap700x/gpio.h | 10 ++-- > arch/avr32/include/asm/arch-at32ap700x/hardware.h | 76 ++++++++++---------- > arch/avr32/include/asm/arch-at32ap700x/portmux.h | 10 ++-- > arch/avr32/include/asm/hmatrix-common.h | 2 +- > board/atmel/atngw100/atngw100.c | 4 +- > board/atmel/atstk1000/atstk1000.c | 4 +- > board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 2 +- > board/mimc/mimc200/mimc200.c | 4 +- > board/miromico/hammerhead/hammerhead.c | 2 +- > drivers/mmc/atmel_mci.h | 4 +- > include/configs/atngw100.h | 4 +- > include/configs/atstk1002.h | 6 +- > include/configs/atstk1003.h | 6 +- > include/configs/atstk1004.h | 6 +- > include/configs/atstk1006.h | 6 +- > include/configs/favr-32-ezkit.h | 6 +- > include/configs/hammerhead.h | 3 +- > include/configs/mimc200.h | 4 +- > 22 files changed, 83 insertions(+), 90 deletions(-) After hand-fixing the escape sequences, applied into u-boot-atmel avr32cleanup branch: > diff --git a/arch/avr32/include/asm/arch-at32ap700x/hardware.h b/arch/avr32/include/asm/arch-at32ap700x/hardware.h > index 6592c03..9172eef 100644 > --- a/arch/avr32/include/asm/arch-at32ap700x/hardware.h > +++ b/arch/avr32/include/asm/arch-at32ap700x/hardware.h > @@ -19,8 +19,8 @@ > * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > * MA 02111-1307 USA > */ > -#ifndef __AT32AP7000_MEMORY_MAP_H__ > -#define __AT32AP7000_MEMORY_MAP_H__ > +#ifndef __AT32AP7000_HARDWARE_H__ > +#define __AT32AP7000_HARDWARE_H__ > > /* Internal and external memories */ > #define EBI_SRAM_CS0_BASE 0x00000000 > @@ -43,44 +43,44 @@ > #define INTERNAL_SRAM_SIZE 0x00008000 > > /* Devices on the High Speed Bus (HSB) */ > -#define LCDC_BASE 0xFF000000 > -#define DMAC_BASE 0xFF200000 > -#define USB_FIFO 0xFF300000 > +#define LCDC_BASE 0xFF000000 > +#define DMAC_BASE 0xFF200000 > +#define USB_FIFO 0xFF300000 ATMEL_BASE_*, ATMEL_SIZE_* for above defines in a later patch, maybe? Otherwise it looks very good. Best Regards, Reinhard