From db830fa39e5a20761c928b3367c75a72cdfa8e4f Mon Sep 17 00:00:00 2001
From: Tomoki Shirasawa <sira@popeye.cc.u-tokyo.ac.jp>
Date: Mon, 4 Feb 2013 11:39:09 +0900
Subject: [PATCH] support to load kernel to any phys addr

---
 kernel/script/mkimage.builtin-mic | 37 ++++++++++++++++++-------------
 kernel/script/mkimage.builtin-x86 | 36 +++++++++++++++++-------------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/kernel/script/mkimage.builtin-mic b/kernel/script/mkimage.builtin-mic
index 92925749..90b6aade 100644
--- a/kernel/script/mkimage.builtin-mic
+++ b/kernel/script/mkimage.builtin-mic
@@ -1,20 +1,25 @@
 #!/bin/sh
 
-set -e
+set -x
+cp $1 $2
 
-O=`pwd`
+exit 0
 
-make -C $3/../arch/x86/kboot O=$O clean
-#make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x3a001000
-make -C $3/../arch/x86/kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x21001000
-#make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x901001000
-
-make -C $3/../arch/x86/elfboot O=$O clean
-make -C $3/../arch/x86/elfboot O=$O
-
-cat elfboot/elfboot kboot/kboot.elf > $2
-
-make -C $3/../arch/x86/kboot O=$O clean
-#make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x3a001000
-make -C $3/../arch/x86/kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x31001000
-cat elfboot/elfboot kboot/kboot.elf > $2.768M
+#set -e
+#
+#O=`pwd`
+#
+#make -C $3/../arch/x86/kboot O=$O clean
+##make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x3a001000
+#make -C $3/../arch/x86/kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x21001000
+##make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x901001000
+#
+#make -C $3/../arch/x86/elfboot O=$O clean
+#make -C $3/../arch/x86/elfboot O=$O
+#
+#cat elfboot/elfboot kboot/kboot.elf > $2
+#
+#make -C $3/../arch/x86/kboot O=$O clean
+##make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x3a001000
+#make -C $3/../arch/x86/kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x31001000
+#cat elfboot/elfboot kboot/kboot.elf > $2.768M
diff --git a/kernel/script/mkimage.builtin-x86 b/kernel/script/mkimage.builtin-x86
index 809992d2..aee0cc17 100644
--- a/kernel/script/mkimage.builtin-x86
+++ b/kernel/script/mkimage.builtin-x86
@@ -1,20 +1,24 @@
 #!/bin/sh
 
-set -e
+cp $1 $2
 
-O=`pwd`
+exit 0
 
-make -C $3/../arch/x86/kboot O=$O clean
-#make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x3a001000
-make -C $3/../arch/x86/kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x101001000
-#make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x901001000
-
-make -C $3/../arch/x86/elfboot O=$O clean
-make -C $3/../arch/x86/elfboot O=$O
-
-cat elfboot/elfboot kboot/kboot.elf > $2
-
-make -C $3/../arch/x86/kboot O=$O clean
-#make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x3a001000
-make -C $3/../arch/x86/kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x201001000
-cat elfboot/elfboot kboot/kboot.elf > $2.8G
+#set -e
+#
+#O=`pwd`
+#
+#make -C $3/../arch/x86/kboot O=$O clean
+##make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x3a001000
+#make -C $3/../arch/x86/kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x101001000
+##make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x901001000
+#
+#make -C $3/../arch/x86/elfboot O=$O clean
+#make -C $3/../arch/x86/elfboot O=$O
+#
+#cat elfboot/elfboot kboot/kboot.elf > $2
+#
+#make -C $3/../arch/x86/kboot O=$O clean
+##make -C $3/../kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x3a001000
+#make -C $3/../arch/x86/kboot O=$O KIMAGE="$O/$1" LOAD_PA=0x201001000
+#cat elfboot/elfboot kboot/kboot.elf > $2.8G