The function of imagetool-uncompress.py is now built into "make"

technion · May 13, 2013 · 9281de1 · 9281de1
1 parent 2a8d810
commit 9281de1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 #
 # Normal rules
 #
+kernel.img
 .*
 *.o
 *.o.*

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
@@ -25,7 +25,7 @@ INITRD_PHYS := $(initrd_phys-y)
 
 export ZRELADDR INITRD_PHYS PARAMS_PHYS
 
-targets := Image zImage xipImage bootpImage uImage
+targets := Image zImage xipImage bootpImage uImage kernel.img
 
 ifeq ($(CONFIG_XIP_KERNEL),y)
 
@@ -54,6 +54,8 @@ $(obj)/compressed/vmlinux: $(obj)/Image FORCE
 $(obj)/zImage:	$(obj)/compressed/vmlinux FORCE
 	$(call if_changed,objcopy)
 	@echo '  Kernel: $@ is ready'
+	@echo '  IMGTOOL:	Creating arch/arm/boot/kernel.img'
+	@cat $(obj)/first32k $(obj)/zImage > $(obj)/kernel.img
 
 endif
 

diff --git a/arch/arm/boot/first32k b/arch/arm/boot/first32k
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     #
     # Normal rules
     #
+    kernel.img
     .*
     *.o
     *.o.*
@@ Expand Down @@