x86: Rename include/asm/ic to include/asm/arch-sc520

PATCH New Graeme Russ 2 participants 3 messages Oct 16, 2011 x86

lore

Share & tools

lore

Graeme Russ

author

2011-10-16 03:29 UTC #0 lore raw

PATCH 1/1 x86: Rename include/asm/ic to include/asm/arch-sc520

Also include some trivial related cleanups

Signed-off-by Graeme Russ <[email protected]>

---
 arch/x86/cpu/sc520/sc520.c                      |    2 +-
 arch/x86/cpu/sc520/sc520_car.S                  |    2 +-
 arch/x86/cpu/sc520/sc520_pci.c                  |    4 ++--
 arch/x86/cpu/sc520/sc520_reset.c                |    2 +-
 arch/x86/cpu/sc520/sc520_sdram.c                |    2 +-
 arch/x86/cpu/sc520/sc520_ssi.c                  |    4 ++--
 arch/x86/cpu/sc520/sc520_timer.c                |    2 +-
 arch/x86/include/asm/{ic => arch-sc520}/pci.h   |    0
 arch/x86/include/asm/{ic => arch-sc520}/sc520.h |    0
 arch/x86/include/asm/{ic => arch-sc520}/ssi.h   |    0
 arch/x86/lib/zimage.c                           |    1 -
 board/eNET/eNET.c                               |    2 +-
 board/eNET/eNET_pci.c                           |    2 +-
 board/eNET/eNET_start16.S                       |    4 +---
 14 files changed, 12 insertions(+), 15 deletions(-)
 rename arch/x86/include/asm/{ic => arch-sc520}/pci.h (100%)
 rename arch/x86/include/asm/{ic => arch-sc520}/sc520.h (100%)
 rename arch/x86/include/asm/{ic => arch-sc520}/ssi.h (100%)

arch/x86/cpu/sc520/sc520.c +1 -1

index e37c403..4892c01 100644
@@ -27,7 +27,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/processor-flags.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>
 
 DECLARE_GLOBAL_DATA_PTR;

arch/x86/cpu/sc520/sc520_car.S +1 -1

index a33f94f..7cac4d1 100644
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <asm/processor-flags.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>
 
 .section .text

arch/x86/cpu/sc520/sc520_pci.c +2 -2

index 32d4802..e26793a 100644
@@ -28,8 +28,8 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/pci.h>
-#include <asm/ic/pci.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/pci.h>
+#include <asm/arch/sc520.h>
 
 static struct {
 	u8 priority;

arch/x86/cpu/sc520/sc520_reset.c +1 -1

index 18890c3..137af97 100644
@@ -26,7 +26,7 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>
 
 DECLARE_GLOBAL_DATA_PTR;

arch/x86/cpu/sc520/sc520_sdram.c +1 -1

index f3623f5..57e4e7d 100644
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/processor-flags.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>
 
 DECLARE_GLOBAL_DATA_PTR;

arch/x86/cpu/sc520/sc520_ssi.c +2 -2

index 47aa80b..3a6a858 100644
@@ -23,8 +23,8 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/ic/ssi.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/ssi.h>
+#include <asm/arch/sc520.h>
 
 int ssi_set_interface(int freq, int lsb_first, int inv_clock, int inv_phase)
 {

arch/x86/cpu/sc520/sc520_timer.c +1 -1

index 5cccda1..05bc9c1 100644
@@ -27,7 +27,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/interrupt.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>
 
 void sc520_timer_isr(void)
 {

arch/x86/include/asm/arch-sc520/pci.h renamed from arch/x86/include/asm/ic/pci.h +0 -0

similarity index 100%
rename from arch/x86/include/asm/ic/pci.h
rename to arch/x86/include/asm/arch-sc520/pci.h

arch/x86/include/asm/arch-sc520/sc520.h renamed from arch/x86/include/asm/ic/sc520.h +0 -0

similarity index 100%
rename from arch/x86/include/asm/ic/sc520.h
rename to arch/x86/include/asm/arch-sc520/sc520.h

arch/x86/include/asm/arch-sc520/ssi.h renamed from arch/x86/include/asm/ic/ssi.h +0 -0

similarity index 100%
rename from arch/x86/include/asm/ic/ssi.h
rename to arch/x86/include/asm/arch-sc520/ssi.h

arch/x86/lib/zimage.c +0 -1

index 6682e0d..d2dd6fd 100644
@@ -35,7 +35,6 @@
 #include <asm/realmode.h>
 #include <asm/byteorder.h>
 #include <asm/bootparam.h>
-#include <asm/ic/sc520.h>
 
 /*
  * Memory lay-out:

board/eNET/eNET.c +1 -1

index 2a5636c..c4ed820 100644
@@ -23,7 +23,7 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>
 #include <net.h>
 #include <netdev.h>

board/eNET/eNET_pci.c +1 -1

index d97387e..29d13d2 100644
@@ -27,7 +27,7 @@
 #include <common.h>
 #include <pci.h>
 #include <asm/pci.h>
-#include <asm/ic/pci.h>
+#include <asm/arch/pci.h>
 
 static void pci_enet_fixup_irq(struct pci_controller *hose, pci_dev_t dev)
 {

board/eNET/eNET_start16.S +1 -3

index 77e5519..4241f6e 100644
@@ -27,11 +27,9 @@
  * that is used by U-boot to its final destination.
  */
 
-/* #include <asm/ic/sc520_defs.h> */
-
 #include "config.h"
 #include "hardware.h"
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>
 
 .text
 .section .start16, "ax"

Signature · 1 line

1.7.5.2.317.g391b14

Graeme Russ

author

2011-10-16 03:33 UTC #1 lore raw

PATCH 1/1 x86: Rename include/asm/ic to include/asm/arch-sc520

Hi Wolfgang,

Quoted 14 lines · Graeme Russ

Also include some trivial related cleanups

Signed-off-by Graeme Russ <[email protected]>

---
 arch/x86/cpu/sc520/sc520.c                      |    2 +-
 arch/x86/cpu/sc520/sc520_car.S                  |    2 +-
 arch/x86/cpu/sc520/sc520_pci.c                  |    4 ++--
 arch/x86/cpu/sc520/sc520_reset.c                |    2 +-
 arch/x86/cpu/sc520/sc520_sdram.c                |    2 +-
 arch/x86/cpu/sc520/sc520_ssi.c                  |    4 ++--
 arch/x86/cpu/sc520/sc520_timer.c                |    2 +-
 arch/x86/include/asm/{ic => arch-sc520}/pci.h   |    0
 arch/x86/include/asm/{ic => arch-sc520}/sc520.h |    0
 arch/x86/include/asm/{ic => arch-sc520}/ssi.h   |    0

Quoted 8 lines

 arch/x86/lib/zimage.c                           |    1 -
 board/eNET/eNET.c                               |    2 +-
 board/eNET/eNET_pci.c                           |    2 +-
 board/eNET/eNET_start16.S                       |    4 +---
 14 files changed, 12 insertions(+), 15 deletions(-)
 rename arch/x86/include/asm/{ic => arch-sc520}/pci.h (100%)
 rename arch/x86/include/asm/{ic => arch-sc520}/sc520.h (100%)
 rename arch/x86/include/asm/{ic => arch-sc520}/ssi.h (100%)

I missed the merge window by a day, but since this is a tidy-up that touches only x86, do you mind if I apply it to the x86 repo anyway before I send through a pull request?

It is checkpatch clean in case your wondering

Regards,

Graeme

Wolfgang Denk

2011-10-16 07:31 UTC #2 lore raw

PATCH 1/1 x86: Rename include/asm/ic to include/asm/arch-sc520

Dear Graeme Russ,

Quoted 4 lines · In message <[email protected]> you wrote:

I missed the merge window by a day, but since this is a tidy-up that touches only x86, do you mind if I apply it to the x86 repo anyway before I send through a pull request?

No problem with that - see
http://www.denx.de/wiki/U-Boot/DevelopmentProcess#CornerCases

Best regards,

Wolfgang Denk

Signature · 6 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"The whole problem with the world is  that  fools  and  fanatics  are
always so certain of themselves, but wiser people so full of doubts."
- Bertrand Russell