* [U-Boot] [PATCH] x86: Rename include/asm/ic to include/asm/arch-sc520
@ 2011-10-16 3:29 Graeme Russ
2011-10-16 3:33 ` Graeme Russ
0 siblings, 1 reply; 3+ messages in thread
From: Graeme Russ @ 2011-10-16 3:29 UTC (permalink / raw)
To: u-boot
Also include some trivial related cleanups
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
---
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%)
diff --git a/arch/x86/cpu/sc520/sc520.c b/arch/x86/cpu/sc520/sc520.c
index e37c403..4892c01 100644
--- a/arch/x86/cpu/sc520/sc520.c
+++ b/arch/x86/cpu/sc520/sc520.c
@@ -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;
diff --git a/arch/x86/cpu/sc520/sc520_car.S b/arch/x86/cpu/sc520/sc520_car.S
index a33f94f..7cac4d1 100644
--- a/arch/x86/cpu/sc520/sc520_car.S
+++ b/arch/x86/cpu/sc520/sc520_car.S
@@ -23,7 +23,7 @@
#include <config.h>
#include <asm/processor-flags.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>
.section .text
diff --git a/arch/x86/cpu/sc520/sc520_pci.c b/arch/x86/cpu/sc520/sc520_pci.c
index 32d4802..e26793a 100644
--- a/arch/x86/cpu/sc520/sc520_pci.c
+++ b/arch/x86/cpu/sc520/sc520_pci.c
@@ -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;
diff --git a/arch/x86/cpu/sc520/sc520_reset.c b/arch/x86/cpu/sc520/sc520_reset.c
index 18890c3..137af97 100644
--- a/arch/x86/cpu/sc520/sc520_reset.c
+++ b/arch/x86/cpu/sc520/sc520_reset.c
@@ -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;
diff --git a/arch/x86/cpu/sc520/sc520_sdram.c b/arch/x86/cpu/sc520/sc520_sdram.c
index f3623f5..57e4e7d 100644
--- a/arch/x86/cpu/sc520/sc520_sdram.c
+++ b/arch/x86/cpu/sc520/sc520_sdram.c
@@ -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;
diff --git a/arch/x86/cpu/sc520/sc520_ssi.c b/arch/x86/cpu/sc520/sc520_ssi.c
index 47aa80b..3a6a858 100644
--- a/arch/x86/cpu/sc520/sc520_ssi.c
+++ b/arch/x86/cpu/sc520/sc520_ssi.c
@@ -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)
{
diff --git a/arch/x86/cpu/sc520/sc520_timer.c b/arch/x86/cpu/sc520/sc520_timer.c
index 5cccda1..05bc9c1 100644
--- a/arch/x86/cpu/sc520/sc520_timer.c
+++ b/arch/x86/cpu/sc520/sc520_timer.c
@@ -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)
{
diff --git a/arch/x86/include/asm/ic/pci.h b/arch/x86/include/asm/arch-sc520/pci.h
similarity index 100%
rename from arch/x86/include/asm/ic/pci.h
rename to arch/x86/include/asm/arch-sc520/pci.h
diff --git a/arch/x86/include/asm/ic/sc520.h b/arch/x86/include/asm/arch-sc520/sc520.h
similarity index 100%
rename from arch/x86/include/asm/ic/sc520.h
rename to arch/x86/include/asm/arch-sc520/sc520.h
diff --git a/arch/x86/include/asm/ic/ssi.h b/arch/x86/include/asm/arch-sc520/ssi.h
similarity index 100%
rename from arch/x86/include/asm/ic/ssi.h
rename to arch/x86/include/asm/arch-sc520/ssi.h
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 6682e0d..d2dd6fd 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -35,7 +35,6 @@
#include <asm/realmode.h>
#include <asm/byteorder.h>
#include <asm/bootparam.h>
-#include <asm/ic/sc520.h>
/*
* Memory lay-out:
diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c
index 2a5636c..c4ed820 100644
--- a/board/eNET/eNET.c
+++ b/board/eNET/eNET.c
@@ -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>
diff --git a/board/eNET/eNET_pci.c b/board/eNET/eNET_pci.c
index d97387e..29d13d2 100644
--- a/board/eNET/eNET_pci.c
+++ b/board/eNET/eNET_pci.c
@@ -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)
{
diff --git a/board/eNET/eNET_start16.S b/board/eNET/eNET_start16.S
index 77e5519..4241f6e 100644
--- a/board/eNET/eNET_start16.S
+++ b/board/eNET/eNET_start16.S
@@ -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"
--
1.7.5.2.317.g391b14
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] x86: Rename include/asm/ic to include/asm/arch-sc520
2011-10-16 3:29 [U-Boot] [PATCH] x86: Rename include/asm/ic to include/asm/arch-sc520 Graeme Russ
@ 2011-10-16 3:33 ` Graeme Russ
2011-10-16 7:31 ` Wolfgang Denk
0 siblings, 1 reply; 3+ messages in thread
From: Graeme Russ @ 2011-10-16 3:33 UTC (permalink / raw)
To: u-boot
Hi Wolfgang,
On 16/10/11 14:29, Graeme Russ wrote:
> Also include some trivial related cleanups
>
> Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
> ---
> 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%)
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] x86: Rename include/asm/ic to include/asm/arch-sc520
2011-10-16 3:33 ` Graeme Russ
@ 2011-10-16 7:31 ` Wolfgang Denk
0 siblings, 0 replies; 3+ messages in thread
From: Wolfgang Denk @ 2011-10-16 7:31 UTC (permalink / raw)
To: u-boot
Dear Graeme Russ,
In message <4E9A507F.9060409@gmail.com> 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
--
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-16 7:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-16 3:29 [U-Boot] [PATCH] x86: Rename include/asm/ic to include/asm/arch-sc520 Graeme Russ
2011-10-16 3:33 ` Graeme Russ
2011-10-16 7:31 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.