From: ryuz <ryuz>
Date: Fri, 28 Dec 2007 22:54:16 +0000 (+0000)
Subject: (none)
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0a1c7999b41ca7c42a51c629582b809927970d77;p=hos%2Fhos-v4a.git

(none)
---

diff --git a/aplfw/sample/arm/utb_arm7at91/armcc/gmake.mak b/aplfw/sample/arm/utb_arm7at91/armcc/gmake.mak
index 9a17228..26a2aee 100755
--- a/aplfw/sample/arm/utb_arm7at91/armcc/gmake.mak
+++ b/aplfw/sample/arm/utb_arm7at91/armcc/gmake.mak
@@ -73,7 +73,7 @@ ASRCS += ./vectors.s		\
 # %jp{C言語ファイルの追加}
 CSRCS += ../kernel_cfg.c	\
          ../main.c			\
-         ../boot_task.c		\
+         ../boot.c			\
          ../ostimer.c
 
 # %jp{ライブラリファイルの追加}
diff --git a/aplfw/sample/arm/utb_arm7at91/boot_task.c b/aplfw/sample/arm/utb_arm7at91/boot.c
similarity index 99%
rename from aplfw/sample/arm/utb_arm7at91/boot_task.c
rename to aplfw/sample/arm/utb_arm7at91/boot.c
index 4b259e5..0d8f13e 100755
--- a/aplfw/sample/arm/utb_arm7at91/boot_task.c
+++ b/aplfw/sample/arm/utb_arm7at91/boot.c
@@ -15,7 +15,6 @@
 #include <string.h>
 #include "kernel.h"
 #include "kernel_id.h"
-#include "boot_task.h"
 #include "system/system/system.h"
 #include "system/sysapi/sysapi.h"
 #include "system/file/console.h"
@@ -35,6 +34,7 @@
 #include "application/utility/keytest/keytest.h"
 #include "application/utility/timecmd/timecmd.h"
 #include "application/netcmd/ethersnoop/ethersnoop.h"
+#include "boot.h"
 
 
 long			g_SystemHeap[32 * 1024 / sizeof(long)];
diff --git a/aplfw/sample/arm/utb_arm7at91/boot_task.h b/aplfw/sample/arm/utb_arm7at91/boot.h
similarity index 100%
rename from aplfw/sample/arm/utb_arm7at91/boot_task.h
rename to aplfw/sample/arm/utb_arm7at91/boot.h
diff --git a/aplfw/sample/arm/utb_arm7at91/gcc/gmake.mak b/aplfw/sample/arm/utb_arm7at91/gcc/gmake.mak
index 6cca8ec..663cc79 100755
--- a/aplfw/sample/arm/utb_arm7at91/gcc/gmake.mak
+++ b/aplfw/sample/arm/utb_arm7at91/gcc/gmake.mak
@@ -96,7 +96,7 @@ ASRCS += ./vectors.S		\
 # %jp{C言語ファイルの追加}
 CSRCS += ../kernel_cfg.c	\
          ../main.c			\
-         ../boot_task.c		\
+         ../boot.c			\
          ../ostimer.c
 
 # %jp{ライブラリファイルの追加}
diff --git a/aplfw/sample/arm/utb_arm7at91/system.cfg b/aplfw/sample/arm/utb_arm7at91/system.cfg
index 87792f5..ecd253f 100755
--- a/aplfw/sample/arm/utb_arm7at91/system.cfg
+++ b/aplfw/sample/arm/utb_arm7at91/system.cfg
@@ -26,8 +26,8 @@ KERNEL_MAX_ISRID(32);
 INCLUDE("\"ostimer.h\"");
 ATT_INI({TA_HLNG, 0, OsTimer_Initialize});
 
-/* %jp{ブートタスク}%en{Boot task} */
-INCLUDE("\"boot_task.h\"");
+/* %jp{ブート}%en{Boot} */
+INCLUDE("\"boot.h\"");
 CRE_TSK(TSKID_SAMPLE, {TA_HLNG | TA_ACT, 0, Boot_Task, 2, 2048, NULL});
 
 
diff --git a/kernel/build/common/gmake/makeexe.inc b/kernel/build/common/gmake/makeexe.inc
index ca53e99..43007bd 100755
--- a/kernel/build/common/gmake/makeexe.inc
+++ b/kernel/build/common/gmake/makeexe.inc
@@ -101,13 +101,7 @@ OBJS = $(addprefix $(OBJS_DIR)/, $(addsuffix .$(EXT_OBJ), $(basename $(notdir $(
 
 # %jp{ライブラリ生成}
 .PHONY : makeexe_all
-makeexe_all: kernel_make mkdir_objs $(CSRCS) $(ASRCS)
-
-
-# %jp{オブジェクト出力ディレクトリ作成}
-.PHONY : mkdir_objs
-mkdir_objs:
-	$(CMD_MKDIR) -p $(OBJS_DIR)
+makeexe_all: kernel_make makeexe_mkobjsdir $(CSRCS) $(ASRCS)
 
 
 # %jp{クリーンナップ}
@@ -116,10 +110,16 @@ makeexe_clean:
 	$(CMD_RM) -f $(TARGET_LIB) $(OBJS)
 
 
+# %jp{オブジェクト出力ディレクトリ作成}
+.PHONY : makeexe_mkobjsdir
+makeexe_mkobjsdir:
+	$(CMD_MKDIR) -p $(OBJS_DIR)
+
+
 # %jp{依存関係の生成}
 DEPFLAGS += -MM $(patsubst %,-I%,$(INC_DIRS))
 .PHONY : makeexe_depend
-makeexe_depend:
+makeexe_depend: makeexe_mkobjsdir
 	$(CMD_DEPEND) $(DEPFLAGS) $(CSRCS) | sed -e 's?^\(.*\):?$(OBJS_DIR)/\1:?g' > $(OBJS_DIR)/depend.inc
 
 -include $(OBJS_DIR)/depend.inc
diff --git a/kernel/build/common/gmake/makelib.inc b/kernel/build/common/gmake/makelib.inc
index 57116c1..d66e7e1 100755
--- a/kernel/build/common/gmake/makelib.inc
+++ b/kernel/build/common/gmake/makelib.inc
@@ -88,7 +88,7 @@ VPATH = $(subst $(space),:,$(SRC_DIRS))
 
 # %jp{ライブラリ生成}%en{library}
 .PHONY : makelib_all
-makelib_all: $(CSRCS) $(ASRCS) mkdir_objs $(TARGET_LIB)
+makelib_all: $(CSRCS) $(ASRCS) makelib_mkobjsdir $(TARGET_LIB)
 
 
 # %jp{クリーンナップ}%en{clean}
@@ -100,15 +100,15 @@ makelib_clean:
 # %jp{依存関係の生成}%en{depend}
 DEPFLAGS += -MM $(patsubst %,-I%,$(INC_DIRS))
 .PHONY : makelib_depend
-makelib_depend:
+makelib_depend: makelib_mkobjsdir
 	$(CMD_DEPEND) $(DEPFLAGS) $(CSRCS) | sed -e 's?^\(.*\):?$(OBJS_DIR)/\1:?g' > $(OBJS_DIR)/depend.inc
 
 -include $(OBJS_DIR)/depend.inc
 
 
 # %jp{オブジェクト出力ディレクトリ作成}%en{objects directory}
-.PHONY : mkdir_objs
-mkdir_objs:
+.PHONY : makelib_mkobjsdir
+makelib_mkobjsdir:
 	$(CMD_MKDIR) -p $(OBJS_DIR)
 
 
diff --git a/kernel/build/ia32/i386/gcc/gmake.mak b/kernel/build/ia32/i386/gcc/gmake.mak
index abe2b93..9027642 100755
--- a/kernel/build/ia32/i386/gcc/gmake.mak
+++ b/kernel/build/ia32/i386/gcc/gmake.mak
@@ -48,8 +48,8 @@ INC_DIRS += $(INC_PROC_DIR) $(INC_IRC_DIR)
 SRC_DIRS += $(SRC_PROC_DIR) $(SRC_PROC_DIR) $(SRC_PROC_CC_DIR) $(SRC_IRC_DIR) $(SRC_IRC_CC_DIR)
 
 # %jp{オプションフラグ}
-AFLAGS  = 
-CFLAGS  = 
+AFLAGS  = -march=i386
+CFLAGS  = -march=i386
 ARFLAGS = 
 
 # %jp{コンフィギュレータ定義}
diff --git a/sample/ia32/pcat/gcc/gmake.mak b/sample/ia32/pcat/gcc/gmake.mak
index c582ecf..e4c6968 100755
--- a/sample/ia32/pcat/gcc/gmake.mak
+++ b/sample/ia32/pcat/gcc/gmake.mak
@@ -39,8 +39,8 @@ LINK_SCRIPT = link_fd.x
 
 
 # %jp{フラグ設定}
-CFLAGS  = 
-AFLAGS  = 
+CFLAGS  = -march=i386
+AFLAGS  = -march=i386
 LNFLAGS = -nostdlib -fno-exceptions -ffreestanding -fno-builtin -nostartfiles -Wl,-Map,$(TARGET).map,-T$(LINK_SCRIPT)
 
 
@@ -88,9 +88,17 @@ LIBS  +=
 .PHONY : all
 all: makeexe_all $(TARGET_BIN) $(TARGET_HEX) $(TARGET_MOT)
 
+.PHONY : clean
 clean: makeexe_clean
 	rm -f $(TARGET_EXE) $(TARGET_EXE) $(OBJS) ../kernel_cfg.c ../kernel_id.h
 
+.PHONY : depend
+depend: makeexe_depend
+
+.PHONY : mostlyclean
+mostlyclean: clean kernel_clean
+
+
 ../kernel_cfg.c ../kernel_id.h: ../system.cfg
 	cpp -E ../system.cfg ../system.i
 	$(KERNEL_CFGRTR) ../system.i -c ../kernel_cfg.c -i ../kernel_id.h