[linux-yocto] [PATCH 25/87] arm/boot: change target name

[Paul Butler]

From: John Jacques <john.jacques at lsi.com>

Naming cleanup. linux.img (instead of linux.fm) is now the target.

Signed-off-by: John Jacques <john.jacques at lsi.com>
Signed-off-by: Wang Hui <Hui.Wang at windriver.com>
---
 arch/arm/boot/fmboot/Makefile | 14 +++++++-------
 arch/arm/boot/fmboot/fmboot.S |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/fmboot/Makefile b/arch/arm/boot/fmboot/Makefile
index 9b2b42e..14db83f 100644
--- a/arch/arm/boot/fmboot/Makefile
+++ b/arch/arm/boot/fmboot/Makefile
@@ -4,21 +4,21 @@ AS		= $(CROSS_COMPILE)gcc -c
 LD		= $(CROSS_COMPILE)ld
 
 DTC = ../../../../scripts/dtc/dtc
-DTS = ../dts/axm-sim.dts
+DTS = ../dts/axm55xxsim.dts
 ZIMAGE = ../zImage
 
-all: clean linux.fm
+all: clean linux.img
 
 clean:
-	rm -f linux.fm fmboot.o zImage.fm axm-sim.dtb
+	rm -f linux.img fmboot.o zImage.fm axm55xxsim.dtb
 
-linux.fm: fmboot.o fmboot.lds zImage.fm
+linux.img: fmboot.o fmboot.lds zImage.fm
 	$(LD) -o $@ --script=fmboot.lds
 
-zImage.fm: $(ZIMAGE) axm-sim.dtb
-	python pack.py $(ZIMAGE) axm-sim.dtb > $@
+zImage.fm: $(ZIMAGE) axm55xxsim.dtb
+	python pack.py $(ZIMAGE) axm55xxsim.dtb > $@
 
-axm-sim.dtb: $(DTS)
+axm55xxsim.dtb: $(DTS)
 	$(DTC) -O dtb -o $@ $<
 
 fmboot.o: fmboot.S
diff --git a/arch/arm/boot/fmboot/fmboot.S b/arch/arm/boot/fmboot/fmboot.S
index 576d1df..e4a4cd0 100644
--- a/arch/arm/boot/fmboot/fmboot.S
+++ b/arch/arm/boot/fmboot/fmboot.S
@@ -1,5 +1,5 @@
 /*
- * boot.S - simple register setup code for stand-alone Linux booting
+ * fmboot.S - simple register setup code for stand-alone Linux booting
  *
  * Copyright (C) 2011 ARM Limited. All rights reserved.
  *
-- 
1.8.3