aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarian Balakowicz2008-01-31 13:20:06 +0100
committerWolfgang Denk2008-02-07 01:12:57 +0100
commit4a995edec1ac163d9326d143ffe2b47e7543407f (patch)
treef69ac1a596c3eadb1e9db93c5b5c678d26b804f7
parent7582438c285bf0cef82909d0f232de64ec567a8a (diff)
[new uImage] Rename architecture specific bootm code files
Implementation of the do_bootm_linux() and other bootm helper routines is architecture specific code. As such it resides in lib_<arch> directories in files named <arch>_linux.c This patch renames those files to a more clear and accurate lib_<arch>/bootm.c form. List of the renamed files: lib_arm/armlinux.c -> lib_arm/bootm.c lib_avr32/avr32_linux.c -> lib_avr32/bootm.c lib_blackfin/bf533_linux.c -> lib_blackfin/bootm.c lib_i386/i386_linux.c -> lib_i386/bootm.c lib_m68k/m68k_linux.c -> lib_m68k/bootm.c lib_microblaze/microblaze_linux.c -> lib_microblaze/bootm.c lib_mips/mips_linux.c -> lib_mips/bootm.c lib_nios/nios_linux.c -> lib_nios/bootm.c lib_nios2/nios_linux.c -> lib_nios2/bootm.c lib_ppc/ppc_linux.c -> lib_ppc/bootm.c lib_sh/sh_linux.c -> lib_sh/bootm.c Signed-off-by: Marian Balakowicz <m8@semihalf.com>
-rw-r--r--lib_arm/Makefile2
-rw-r--r--lib_arm/bootm.c (renamed from lib_arm/armlinux.c)0
-rw-r--r--lib_avr32/Makefile2
-rw-r--r--lib_avr32/bootm.c (renamed from lib_avr32/avr32_linux.c)0
-rw-r--r--lib_blackfin/Makefile2
-rw-r--r--lib_blackfin/bootm.c (renamed from lib_blackfin/bf533_linux.c)0
-rw-r--r--lib_i386/Makefile2
-rw-r--r--lib_i386/bootm.c (renamed from lib_i386/i386_linux.c)0
-rw-r--r--lib_m68k/Makefile2
-rw-r--r--lib_m68k/bootm.c (renamed from lib_m68k/m68k_linux.c)0
-rw-r--r--lib_microblaze/Makefile2
-rw-r--r--lib_microblaze/bootm.c (renamed from lib_microblaze/microblaze_linux.c)0
-rw-r--r--lib_mips/Makefile2
-rw-r--r--lib_mips/bootm.c (renamed from lib_mips/mips_linux.c)0
-rw-r--r--lib_nios/Makefile2
-rw-r--r--lib_nios/bootm.c (renamed from lib_nios/nios_linux.c)0
-rw-r--r--lib_nios2/Makefile2
-rw-r--r--lib_nios2/bootm.c (renamed from lib_nios2/nios_linux.c)0
-rw-r--r--lib_ppc/Makefile2
-rw-r--r--lib_ppc/bootm.c (renamed from lib_ppc/ppc_linux.c)0
-rw-r--r--lib_sh/Makefile2
-rw-r--r--lib_sh/bootm.c (renamed from lib_sh/sh_linux.c)0
22 files changed, 11 insertions, 11 deletions
diff --git a/lib_arm/Makefile b/lib_arm/Makefile
index 037c475f8bb..aa9bee75cc8 100644
--- a/lib_arm/Makefile
+++ b/lib_arm/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = _ashldi3.o _ashrdi3.o _divsi3.o _modsi3.o _udivsi3.o _umodsi3.o
-COBJS = armlinux.o board.o \
+COBJS = bootm.o board.o \
cache.o div0.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/lib_arm/armlinux.c b/lib_arm/bootm.c
index 4f9aae613e8..4f9aae613e8 100644
--- a/lib_arm/armlinux.c
+++ b/lib_arm/bootm.c
diff --git a/lib_avr32/Makefile b/lib_avr32/Makefile
index bb2938fe5c2..ebe237b1574 100644
--- a/lib_avr32/Makefile
+++ b/lib_avr32/Makefile
@@ -29,7 +29,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = memset.o
-COBJS = board.o interrupts.o avr32_linux.o
+COBJS = board.o interrupts.o bootm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_avr32/avr32_linux.c b/lib_avr32/bootm.c
index 455590e37dd..455590e37dd 100644
--- a/lib_avr32/avr32_linux.c
+++ b/lib_avr32/bootm.c
diff --git a/lib_blackfin/Makefile b/lib_blackfin/Makefile
index a7aaef7a3c3..ac3fb28553a 100644
--- a/lib_blackfin/Makefile
+++ b/lib_blackfin/Makefile
@@ -31,7 +31,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = memcpy.o memcmp.o memset.o memmove.o
-COBJS = post.o tests.o board.o bf533_linux.o bf533_string.o cache.o muldi3.o
+COBJS = post.o tests.o board.o bootm.o bf533_string.o cache.o muldi3.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_blackfin/bf533_linux.c b/lib_blackfin/bootm.c
index 6299415b11e..6299415b11e 100644
--- a/lib_blackfin/bf533_linux.c
+++ b/lib_blackfin/bootm.c
diff --git a/lib_i386/Makefile b/lib_i386/Makefile
index e344da51576..ef0ba546738 100644
--- a/lib_i386/Makefile
+++ b/lib_i386/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = bios.o bios_pci.o realmode_switch.o
-COBJS = board.o bios_setup.o i386_linux.o zimage.o realmode.o \
+COBJS = board.o bios_setup.o bootm.o zimage.o realmode.o \
pci_type1.o pci.o video_bios.o video.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/lib_i386/i386_linux.c b/lib_i386/bootm.c
index 27a2b0d9ab3..27a2b0d9ab3 100644
--- a/lib_i386/i386_linux.c
+++ b/lib_i386/bootm.c
diff --git a/lib_m68k/Makefile b/lib_m68k/Makefile
index 03784fd84e2..d5152232591 100644
--- a/lib_m68k/Makefile
+++ b/lib_m68k/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = cache.o traps.o time.o interrupts.o board.o m68k_linux.o
+COBJS = cache.o traps.o time.o interrupts.o board.o bootm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_m68k/m68k_linux.c b/lib_m68k/bootm.c
index b135556a99d..b135556a99d 100644
--- a/lib_m68k/m68k_linux.c
+++ b/lib_m68k/bootm.c
diff --git a/lib_microblaze/Makefile b/lib_microblaze/Makefile
index 82b7beadb0c..9b317a2da8b 100644
--- a/lib_microblaze/Makefile
+++ b/lib_microblaze/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = board.o microblaze_linux.o time.o cache.o
+COBJS = board.o bootm.o time.o cache.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_microblaze/microblaze_linux.c b/lib_microblaze/bootm.c
index a4fce5a73c9..a4fce5a73c9 100644
--- a/lib_microblaze/microblaze_linux.c
+++ b/lib_microblaze/bootm.c
diff --git a/lib_mips/Makefile b/lib_mips/Makefile
index 3163f00e011..93cca7a2395 100644
--- a/lib_mips/Makefile
+++ b/lib_mips/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = board.o time.o mips_linux.o
+COBJS = board.o time.o bootm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_mips/mips_linux.c b/lib_mips/bootm.c
index 7ea7571a816..7ea7571a816 100644
--- a/lib_mips/mips_linux.c
+++ b/lib_mips/bootm.c
diff --git a/lib_nios/Makefile b/lib_nios/Makefile
index 7c9d62cf7c9..d8ae7bd2652 100644
--- a/lib_nios/Makefile
+++ b/lib_nios/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = board.o cache.o divmod.o nios_linux.o mult.o time.o
+COBJS = board.o cache.o divmod.o bootm.o mult.o time.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_nios/nios_linux.c b/lib_nios/bootm.c
index 55f7e3adc14..55f7e3adc14 100644
--- a/lib_nios/nios_linux.c
+++ b/lib_nios/bootm.c
diff --git a/lib_nios2/Makefile b/lib_nios2/Makefile
index 1ff2f29bcb4..5f996d3bf54 100644
--- a/lib_nios2/Makefile
+++ b/lib_nios2/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = cache.o
-COBJS = board.o divmod.o nios_linux.o mult.o time.o
+COBJS = board.o divmod.o bootm.o mult.o time.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_nios2/nios_linux.c b/lib_nios2/bootm.c
index cb843246b87..cb843246b87 100644
--- a/lib_nios2/nios_linux.c
+++ b/lib_nios2/bootm.c
diff --git a/lib_ppc/Makefile b/lib_ppc/Makefile
index 2aa01548567..6845ed0121d 100644
--- a/lib_ppc/Makefile
+++ b/lib_ppc/Makefile
@@ -29,7 +29,7 @@ SOBJS = ppcstring.o ticks.o
COBJS = board.o \
bat_rw.o cache.o extable.o kgdb.o time.o interrupts.o \
- ppc_linux.o
+ bootm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_ppc/ppc_linux.c b/lib_ppc/bootm.c
index 391168787a9..391168787a9 100644
--- a/lib_ppc/ppc_linux.c
+++ b/lib_ppc/bootm.c
diff --git a/lib_sh/Makefile b/lib_sh/Makefile
index cf127a826c0..edb03d00829 100644
--- a/lib_sh/Makefile
+++ b/lib_sh/Makefile
@@ -24,7 +24,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = board.o sh_linux.o # time.o
+COBJS = board.o bootm.o # time.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_sh/sh_linux.c b/lib_sh/bootm.c
index 14b6815cd40..14b6815cd40 100644
--- a/lib_sh/sh_linux.c
+++ b/lib_sh/bootm.c