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.
Signed-off-by: Marian Balakowicz m8@semihalf.com --- lib_arm/Makefile | 2 +- lib_arm/{armlinux.c => bootm.c} | 0 lib_avr32/Makefile | 2 +- lib_avr32/{avr32_linux.c => bootm.c} | 0 lib_blackfin/Makefile | 2 +- lib_blackfin/{bf533_linux.c => bootm.c} | 0 lib_i386/Makefile | 2 +- lib_i386/{i386_linux.c => bootm.c} | 0 lib_m68k/Makefile | 2 +- lib_m68k/{m68k_linux.c => bootm.c} | 0 lib_microblaze/Makefile | 2 +- lib_microblaze/{microblaze_linux.c => bootm.c} | 0 lib_mips/Makefile | 2 +- lib_mips/{mips_linux.c => bootm.c} | 0 lib_nios/Makefile | 2 +- lib_nios/{nios_linux.c => bootm.c} | 0 lib_nios2/Makefile | 2 +- lib_nios2/{nios_linux.c => bootm.c} | 0 lib_ppc/Makefile | 2 +- lib_ppc/{ppc_linux.c => bootm.c} | 0 lib_sh/Makefile | 2 +- lib_sh/{sh_linux.c => bootm.c} | 0 22 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib_arm/Makefile b/lib_arm/Makefile index 037c475..aa9bee7 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 similarity index 100% rename from lib_arm/armlinux.c rename to lib_arm/bootm.c diff --git a/lib_avr32/Makefile b/lib_avr32/Makefile index bb2938f..ebe237b 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 similarity index 100% rename from lib_avr32/avr32_linux.c rename to lib_avr32/bootm.c diff --git a/lib_blackfin/Makefile b/lib_blackfin/Makefile index a7aaef7..ac3fb28 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 similarity index 100% rename from lib_blackfin/bf533_linux.c rename to lib_blackfin/bootm.c diff --git a/lib_i386/Makefile b/lib_i386/Makefile index e344da5..ef0ba54 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 similarity index 100% rename from lib_i386/i386_linux.c rename to lib_i386/bootm.c diff --git a/lib_m68k/Makefile b/lib_m68k/Makefile index 03784fd..d515223 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 similarity index 100% rename from lib_m68k/m68k_linux.c rename to lib_m68k/bootm.c diff --git a/lib_microblaze/Makefile b/lib_microblaze/Makefile index 82b7bea..9b317a2 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 similarity index 100% rename from lib_microblaze/microblaze_linux.c rename to lib_microblaze/bootm.c diff --git a/lib_mips/Makefile b/lib_mips/Makefile index 3163f00..93cca7a 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 similarity index 100% rename from lib_mips/mips_linux.c rename to lib_mips/bootm.c diff --git a/lib_nios/Makefile b/lib_nios/Makefile index 7c9d62c..d8ae7bd 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 similarity index 100% rename from lib_nios/nios_linux.c rename to lib_nios/bootm.c diff --git a/lib_nios2/Makefile b/lib_nios2/Makefile index 1ff2f29..5f996d3 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 similarity index 100% rename from lib_nios2/nios_linux.c rename to lib_nios2/bootm.c diff --git a/lib_ppc/Makefile b/lib_ppc/Makefile index 2aa0154..6845ed0 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 similarity index 100% rename from lib_ppc/ppc_linux.c rename to lib_ppc/bootm.c diff --git a/lib_sh/Makefile b/lib_sh/Makefile index cf127a8..edb03d0 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 similarity index 100% rename from lib_sh/sh_linux.c rename to lib_sh/bootm.c