diff --git a/lib_arm/Makefile b/lib_arm/Makefile
index 037c475f8bbf26f5adf8ecf936b28708350fcddf..aa9bee75cc88b9011cf3c335e55565068a22c550 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 bb2938fe5c2206102477e45282d0d989a6ad4610..ebe237b15745861c39a95aa2020cf2214a487907 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 a7aaef7a3c305e02ff1fc18c549ff6f6646b3516..ac3fb28553a2e49aecb480860640ed54ad42c55f 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 e344da51576cab4acfb044f5c247eb869b5768e5..ef0ba5467387b68ea39445abe4a902a70f63d89c 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 03784fd84e201ec16e55e11be198a1a55efa06e2..d51522325916aff74141b98fbbbd0d0f11d21008 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 82b7beadb0cad627d98f6c4d12e47579ffc9e50e..9b317a2da8bb75d0e566c83f183a166f072dfe5d 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 3163f00e011cbb5561ea323bb63bd56a97bfa34c..93cca7a2395b2b40e620a930ef57af8361362eb2 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 7c9d62cf7c9ca5be9408259e985456cb36591253..d8ae7bd2652c79fd29b8ce392bc68c3af25b8526 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 1ff2f29bcb4a1c72072995c968d56805d64b7c63..5f996d3bf5437613f6521dfee0cb61b8b466aa45 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 2aa015485678516cd5af16472d988b80f63c050c..6845ed0121dfe3207bdf4280d8d54618b53659ee 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 cf127a826c0c616ed8e6a9fec68a24980b10540b..edb03d008294b39a1ca237f4294d46e9f6de27b8 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