diff mbox

[U-Boot,01/11] arm: pxa: clean-up include file order

Message ID 1439691396-28809-1-git-send-email-marcel@ziswiler.com
State Accepted
Delegated to: Marek Vasut
Headers show

Commit Message

Marcel Ziswiler Aug. 16, 2015, 2:16 a.m. UTC
Cleaning up order of include files by sorting them alphabetically
keeping in mind to leave common.h on top.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---

 arch/arm/cpu/pxa/pxa2xx.c | 4 ++--
 arch/arm/cpu/pxa/timer.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Marek Vasut Aug. 16, 2015, 4:53 p.m. UTC | #1
On Sunday, August 16, 2015 at 04:16:26 AM, Marcel Ziswiler wrote:
> Cleaning up order of include files by sorting them alphabetically
> keeping in mind to leave common.h on top.
> 
> Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>

I cannot find 03/11 , why ?

I applied all but 03/11 and 07/11 to u-boot-pxa/master though :)

Best regards,
Marek Vasut
Marcel Ziswiler Aug. 16, 2015, 5:16 p.m. UTC | #2
On 16 August 2015 18:53:40 CEST, Marek Vasut <marex@denx.de> wrote:

>I cannot find 03/11 , why ?

Ah, I believe that one is actually meant for Tegra rather than PXA and will hopefully be picked up by Tom.

>I applied all but 03/11 and 07/11 to u-boot-pxa/master though :)

Thanks, Marek. I hope we can sort out 07/11 soon as well.

BTW: I just got it booting Linux -next with a preliminary device tree I put together including NFSv4 mounted rootfs. Just wondering why there aren't any PXA device trees mainline yet.
Marek Vasut Aug. 16, 2015, 5:26 p.m. UTC | #3
On Sunday, August 16, 2015 at 07:16:09 PM, Marcel Ziswiler wrote:
> On 16 August 2015 18:53:40 CEST, Marek Vasut <marex@denx.de> wrote:
> >I cannot find 03/11 , why ?
> 
> Ah, I believe that one is actually meant for Tegra rather than PXA and will
> hopefully be picked up by Tom.

Errr, right. What weird sort of battle tactics is this, are you trying to
confuse the enemy with random unrelated patches right in the middle of a
coherent series? :)

> >I applied all but 03/11 and 07/11 to u-boot-pxa/master though :)
> 
> Thanks, Marek. I hope we can sort out 07/11 soon as well.

Well, I'm not so sure. But I'd definitelly be in favor of dropping our odd
dependency on libgcc. It is just a hindrance and I fail to see the benefit.

> BTW: I just got it booting Linux -next with a preliminary device tree I put
> together including NFSv4 mounted rootfs. Just wondering why there aren't
> any PXA device trees mainline yet.

I think Daniel Mack was the last one who worked on PXA DT support.

Best regards,
Marek Vasut
Marcel Ziswiler Aug. 16, 2015, 9:27 p.m. UTC | #4
On Sun, 2015-08-16 at 19:26 +0200, Marek Vasut wrote:

> 
Errr, right. What weird sort of battle tactics is this, are you
> trying to
> confuse the enemy with random unrelated patches right in the middle
> of a
> coherent series? :)

Yes, I agree. But I trusted it all into the hands of patman this time
(;-p).

> I think Daniel Mack was the last one who worked on PXA DT support.

Yes, I met him in Düsseldorf last year and later sent him a bunch of
free hardware but he has been rather quiet since. Oh, well. Probably he
is busy with his day job not touching much embedded stuff any more.
diff mbox

Patch

diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c
index 7e861e2..2f12fb9 100644
--- a/arch/arm/cpu/pxa/pxa2xx.c
+++ b/arch/arm/cpu/pxa/pxa2xx.c
@@ -10,11 +10,11 @@ 
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#include <common.h>
+#include <asm/arch/pxa-regs.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <command.h>
-#include <common.h>
-#include <asm/arch/pxa-regs.h>
 
 /* Flush I/D-cache */
 static void cache_flush(void)
diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c
index 11fefd5..7c25e67 100644
--- a/arch/arm/cpu/pxa/timer.c
+++ b/arch/arm/cpu/pxa/timer.c
@@ -6,8 +6,8 @@ 
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/io.h>
 #include <common.h>
+#include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;