From 80601126c0ad785c68352d9af2672a3af9603ea7 Mon Sep 17 00:00:00 2001
From: Jose V Beneyto <sepen@crux.nu>
Date: Thu, 3 Nov 2011 11:30:12 +0100
Subject: [PATCH] Added uImage's stuff, moved from kernel's Makefile.

---
 devices/efikamx/Makefile | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/devices/efikamx/Makefile b/devices/efikamx/Makefile
index 9657996..97c7d2a 100644
--- a/devices/efikamx/Makefile
+++ b/devices/efikamx/Makefile
@@ -3,7 +3,9 @@
 #
 
 PWD = $(shell pwd)
+WORK = $(PWD)/work
 MKIMAGE = $(PWD)/../../work/mkimage
+ZIMAGE = $(PWD)/../../../kernel/efikamx/work/zImage
 INITRDGZ = $(PWD)/../../../initrd/work/initrd.gz
 
 .PHONY: all clean distclean uImage boot.scr uInitrd
@@ -14,24 +16,34 @@ clean: uImage-clean boot.scr-clean uInitrd-clean
 
 distclean: clean
 
-uImage: # TODO
-uImage-clean: # TODO
+$(WORK)/zImage: $(ZIMAGE)
+	cp $(ZIMAGE) $(WORK)
+
+uImage: $(MKIMAGE) $(WORK)/zImage
+	$(MKIMAGE) -A arm -O linux -a 0x90008000 -e 0x90008000 \
+	-T kernel -C none -n "Linux-2.6.31.14.22-efikamx" \
+	-d $(WORK)/zImage $(WORK)/uImage
+
+uImage-clean:
+	rm -f $(WORK)/uImage $(WORK)/zImage
 
 boot.scr: $(MKIMAGE) boot.script
-	$(MKIMAGE) -A arm -O linux -a 0 -e 0 -T script -C none \
-	-n "EfikaMX Boot Script" -d boot.script boot.scr
+	$(MKIMAGE) -A arm -O linux -a 0 -e 0 \
+	-T script -C none -n "EfikaMX Boot Script" \
+	-d boot.script $(WORK)/boot.scr
 
 boot.scr-clean:
-	rm -f boot.scr
+	rm -f $(WORK)/boot.scr
 
-initrd.gz: $(INITRDGZ)
-	cp $(INITRDGZ) .
+$(WORK)/initrd.gz: $(INITRDGZ)
+	cp $(INITRDGZ) $(WORK)
 
-uInitrd: $(MKIMAGE) initrd.gz
-	$(MKIMAGE) -A arm -O linux -a 0 -e 0 -T ramdisk -C none \
-	-n "initrd" -d initrd.gz uInitrd
+uInitrd: $(MKIMAGE) $(WORK)/initrd.gz
+	$(MKIMAGE) -A arm -O linux -a 0 -e 0 \
+	-T ramdisk -C none -n "EfikaMX Initrd Image" \
+	-d $(WORK)/initrd.gz $(WORK)/uInitrd
 
 uInitrd-clean:
-	rm -f uInitrd initrd.gz
+	rm -f $(WORK)/uInitrd $(WORK)/initrd.gz
 
 # End of file
-- 
2.26.2