From: ryuz Date: Tue, 19 Feb 2008 15:28:50 +0000 (+0000) Subject: (none) X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dd3ccf7ca5a5080ff37e4a8e4f7a19768e54d4dc;p=hos%2Fhos-v4a.git (none) --- diff --git a/aplfw/sample/arm/ez_arm7/gcc/crt0.S b/aplfw/sample/arm/ez_arm7/gcc/crt0.S index e270d74..763a93f 100755 --- a/aplfw/sample/arm/ez_arm7/gcc/crt0.S +++ b/aplfw/sample/arm/ez_arm7/gcc/crt0.S @@ -75,7 +75,6 @@ __main: bx lr - .end diff --git a/aplfw/sample/arm/ez_arm7/gcc/gmake.mak b/aplfw/sample/arm/ez_arm7/gcc/gmake.mak index 772b6f4..4ab80a9 100755 --- a/aplfw/sample/arm/ez_arm7/gcc/gmake.mak +++ b/aplfw/sample/arm/ez_arm7/gcc/gmake.mak @@ -108,17 +108,28 @@ LIBS += $(APLFW_LIB) # -------------------------------------- .PHONY : all -all: make_aplfw makeexe_all $(TARGET_EXE) $(TARGET_MOT) $(TARGET_HEX) +all: make_subprj makeexe_all $(TARGET_EXE) $(TARGET_MOT) $(TARGET_HEX) -.PHONY : make_aplfw -make_aplfw: +.PHONY : make_subprj +make_subprj: $(MAKE) -C $(APLFW_BUILD_DIR) -f gmake.mak - +.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 + $(MAKE) -C $(APLFW_BUILD_DIR) -f gmake.mak clean + +.PHONY : mostlydepend +mostlydepend: depend + $(MAKE) -C $(APLFW_BUILD_DIR) -f gmake.mak depend + ../kernel_cfg.c ../kernel_id.h: ../system.cfg cpp -E ../system.cfg ../system.i diff --git a/aplfw/sample/arm/ez_arm7/gcc/linkext.x b/aplfw/sample/arm/ez_arm7/gcc/linkext.x index 3c3e23c..031f3bb 100755 --- a/aplfw/sample/arm/ez_arm7/gcc/linkext.x +++ b/aplfw/sample/arm/ez_arm7/gcc/linkext.x @@ -5,7 +5,7 @@ MEMORY { vector : o = 0x80000000, l = 0x00000040 rom : o = 0x80000040, l = 0x0000ffc0 - ram : o = 0x80010000, l = 0x000f0000 + ram : o = 0x80020000, l = 0x000e0000 } SECTIONS diff --git a/aplfw/system/file/filefmt.c b/aplfw/system/file/filefmt.c index c88885c..0d30eb9 100755 --- a/aplfw/system/file/filefmt.c +++ b/aplfw/system/file/filefmt.c @@ -24,7 +24,7 @@ int File_PrintFormatV(HANDLE hFile, const char *pszFormat, va_list argptr) pBuf = (char *)Memory_Alloc(128); if ( pBuf != NULL ) { - iRet = vsprintf(pBuf, pszFormat, argptr); /* 肥大化するのでちと保留 */ + /* iRet = vsprintf(pBuf, pszFormat, argptr); */ /* 肥大化するのでちと保留 */ if ( iRet > 0 ) { iRet = File_Write(hFile, pBuf, iRet); diff --git a/aplfw/system/file/stdfile.c b/aplfw/system/file/stdfile.c index 295fc6d..22eb004 100755 --- a/aplfw/system/file/stdfile.c +++ b/aplfw/system/file/stdfile.c @@ -6,7 +6,7 @@ int StdIo_PrintFormat(const char *pszFormat, ...) int iRet; va_start(argptr, pszFormat); - iRet = File_PrintFormatV(Process_GetStdOut(HANDLE_NULL), pszFormat, argptr); + iRet = File_PrintFormatVL(Process_GetStdOut(HANDLE_NULL), pszFormat, argptr); va_end(argptr); return iRet;