mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/9] initial Intel/Marvell PXA support
Date: Thu, 24 Nov 2011 10:29:31 +0100	[thread overview]
Message-ID: <20111124092931.GZ27267@pengutronix.de> (raw)
In-Reply-To: <1322103764-6265-2-git-send-email-robert.jarzmik@free.fr>

On Thu, Nov 24, 2011 at 04:02:36AM +0100, Robert Jarzmik wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> Conflicts:
> 
> 	arch/arm/cpu/Makefile
> 	drivers/serial/Makefile
> ---
>  arch/arm/Kconfig                             |    4 +
>  arch/arm/Makefile                            |    2 +
>  arch/arm/cpu/Kconfig                         |    5 +
>  arch/arm/cpu/Makefile                        |    1 +
>  arch/arm/mach-pxa/Kconfig                    |   37 ++
>  arch/arm/mach-pxa/Makefile                   |    6 +
>  arch/arm/mach-pxa/clocksource.c              |   50 +++
>  arch/arm/mach-pxa/common.c                   |   42 +++
>  arch/arm/mach-pxa/gpio.c                     |   70 ++++
>  arch/arm/mach-pxa/include/mach/clock.h       |   16 +
>  arch/arm/mach-pxa/include/mach/gpio.h        |  137 ++++++++
>  arch/arm/mach-pxa/include/mach/hardware.h    |   31 ++
>  arch/arm/mach-pxa/include/mach/mfp-pxa27x.h  |  438 ++++++++++++++++++++++++
>  arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h  |  133 ++++++++
>  arch/arm/mach-pxa/include/mach/mfp.h         |   21 ++
>  arch/arm/mach-pxa/include/mach/pxa-regs.h    |   33 ++
>  arch/arm/mach-pxa/include/mach/pxa27x-regs.h |    6 +
>  arch/arm/mach-pxa/include/mach/pxa2xx-regs.h |  267 +++++++++++++++
>  arch/arm/mach-pxa/include/mach/regs-intc.h   |   34 ++
>  arch/arm/mach-pxa/include/mach/regs-ost.h    |   34 ++
>  arch/arm/mach-pxa/include/plat/gpio.h        |   55 +++
>  arch/arm/mach-pxa/include/plat/mfp.h         |  468 ++++++++++++++++++++++++++
>  arch/arm/mach-pxa/mfp-pxa2xx.c               |  189 +++++++++++
>  arch/arm/mach-pxa/speed-pxa27x.c             |   20 ++
>  drivers/serial/Kconfig                       |    4 +
>  drivers/serial/Makefile                      |    1 +
>  drivers/serial/serial_pxa.c                  |  203 +++++++++++

Please remove or update the serial driver here. It still uses map_base
and won't compile currently.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2011-11-24  9:29 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-24  3:02 [PATCH 0/9] Initial PXA support and Mitac MIOA701 board Robert Jarzmik
2011-11-24  3:02 ` [PATCH 1/9] initial Intel/Marvell PXA support Robert Jarzmik
2011-11-24  9:29   ` Sascha Hauer [this message]
2011-11-25 21:26     ` Robert Jarzmik
2011-11-24  3:02 ` [PATCH 2/9] fix association of cache handling code for PXA Robert Jarzmik
2011-11-24  3:02 ` [PATCH 3/9] fix core version selection Robert Jarzmik
2011-11-24  3:02 ` [PATCH 4/9] add PXA framebuffer support Robert Jarzmik
2011-11-24  3:02 ` [PATCH 5/9] drivers: pxafb: Fix IOMEM API evolution Robert Jarzmik
2011-11-24  3:02 ` [PATCH 6/9] drivers: pxafb: add include ifdefery Robert Jarzmik
2011-11-24  3:02 ` [PATCH 7/9] arm/mach-pxa: add gpio direction functions Robert Jarzmik
2011-11-24  3:02 ` [PATCH 8/9] arm/mach-pxa: add basic devices hooks Robert Jarzmik
2011-11-24  3:02 ` [PATCH 9/9] arm/mach-pxa: add mioa701 board Robert Jarzmik
2011-11-24  9:13   ` Marc Kleine-Budde
2011-11-24 21:15     ` Robert Jarzmik
2011-11-24  9:45   ` Sascha Hauer
2011-11-24 21:22     ` Robert Jarzmik
2011-11-24 23:08       ` Sascha Hauer
2011-11-25 21:50         ` Robert Jarzmik
2011-11-24  9:10 ` [PATCH 0/9] Initial PXA support and Mitac MIOA701 board Marc Kleine-Budde
2011-11-24  9:28   ` Sascha Hauer
2011-11-24 21:32   ` Robert Jarzmik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111124092931.GZ27267@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=robert.jarzmik@free.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox