rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

ビルドスイッチの整理。

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1210 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yosiokat 2008-04-22 04:52:17 +00:00
parent f8ec16cc07
commit 51f3d75cfe
5 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build/libraries_sysmenu/sysmenu/ARM9/Makefile
View File

@ -18,8 +18,6 @@
SUBDIRS =
MYSUBDIRS = ./
#----------------------------------------------------------------------------
TARGET_FIRM = SYSTEMMENU
TARGET_PLATFORM = TWL
@ -28,7 +26,7 @@ TWL_PROC = ARM9
REVISION_SRC = src/revision.c
SRCDIR = src
SRCDIR = src
SRCS = sysmenu_lib.c \
util.c \
ninLogoFunc.c \
@ -46,22 +44,22 @@ SRCS = sysmenu_lib.c \
TARGET_LIB = libsysmenu$(TWL_LIBSUFFIX).a
ifdef DO_NOT_SHOW_LAUNCHER
MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER
ifeq ($(DO_NOT_SHOW_LAUNCHER),TRUE)
MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER
endif
ifdef LOAD_APP_VIA_WRAM
MACRO_FLAGS += -DLOAD_APP_VIA_WRAM
ifeq ($(LOAD_APP_VIA_WRAM),TRUE)
MACRO_FLAGS += -DLOAD_APP_VIA_WRAM
endif
ifneq ($(DHT_TEST),)
MACRO_FLAGS += -DDHT_TEST
MACRO_FLAGS += -DDHT_TEST
endif
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
INSTALL_TARGETS = $(TARGETS)
INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR)
INSTALL_TARGETS = $(TARGETS)
INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR)
LINCLUDES = $(ROOT)/build/libraries/mb/common/include \
$(ROOT)/build/libraries/spi/ARM9/include \
@ -71,7 +69,7 @@ LDIRT_CLEAN = $(REVISION_SRC)
#----------------------------------------------------------------------------
do-build: $(REVISION_SRC) $(MYSUBDIRS) $(TARGETS)
do-build: $(REVISION_SRC) $(TARGETS)
include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
@ -90,7 +88,4 @@ $(REVISION_SRC) ::
fi
$(MYSUBDIRS)::
# $(MAKE) -C $@ -f MakeCrt0
#===== End of Makefile =====

36
build/systemMenu_RED/Launcher/ARM9/Makefile
View File

@ -16,8 +16,9 @@
# $Author$
#----------------------------------------------------------------------------
# ※コンパイルスイッチの都合上、../../../libraries_sysmenu/sysmenu　は有効にしておく
SUBDIRS = \
# ../../../libraries_sysmenu/sysmenu \
../../../libraries_sysmenu/sysmenu \
# ../../../libraries_sysmenu/boot \
# ../../../components/hyena.TWL
# ../../../libraries_sysmenu/hotsw \
@ -28,9 +29,18 @@ SUBDIRS = \
#----------------------------------------------------------------------------
DISABLE_DEBUG = TRUE
DO_NOT_SHOW_LAUNCHER = FALSE
ENABLE_WDS_SCAN = FALSE
# COMPILE SWITCH　※最終ROM作成時は、全てFALSEにセットする。SUBDIRのビルド時にも影響するようexportで環境変数設定する。
export DO_NOT_SHOW_LAUNCHER = FALSE
export DISABLE_WDS_SCAN = TRUE
export DISABLE_WLFIRM_LOAD = TRUE
export DISABLE_SLEEP = TRUE
# COMPILE SWITCH ※最終ROM作成時は、全てTRUEにセットする
export LOAD_APP_VIA_WRAM = FALSE
# MAKEROM SWITCH ※最終ROM作成時は、全てTRUEにセットする
DISABLE_DEBUG = FALSE
ENABLE_AES = FALSE
TARGET_FIRM = SYSTEMMENU
TARGET_PLATFORM = TWL
@ -88,12 +98,24 @@ MAKEROM_FLAGS += -F \
MAKETAD_FLAGS += -s
ifdef DO_NOT_SHOW_LAUNCHER
ifeq ($(DO_NOT_SHOW_LAUNCHER),TRUE)
MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER
endif
ifdef ENABLE_WDS_SCAN
MACRO_FLAGS += -DENABLE_WDS_SCAN
ifeq ($(DISABLE_WDS_SCAN),TRUE)
MACRO_FLAGS += -DDISABLE_WDS_SCAN
endif
ifeq ($(DISABLE_WLFIRM_LOAD),TRUE)
MACRO_FLAGS += -DDISABLE_WLFIRM_LOAD
endif
ifeq ($(DISABLE_SLEEP),TRUE)
MACRO_FLAGS += -DDISABLE_SLEEP
endif
ifeq ($(ENABLE_AES),TRUE)
MAKEROM_FLAGS += -a
endif
ifneq ($(DHT_TEST),)

7
build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
View File

@ -541,18 +541,21 @@ BOOL GetWlanFirmwareInstallResult(WLANFirmResult *pResult)
// 無線ファームロード完了？
BOOL PollingInstallWlanFirmware( BOOL isStartScanWDS )
{
#ifndef ENABLE_WDS_SCAN
#pragma unused(isStartScanWDS)
#endif
if ( !s_isFinished ) {
WLANFirmResult result;
if( GetWlanFirmwareInstallResult( &result ) ) {
if( result == WLANFIRM_RESULT_SUCCESS ) {
OS_TPrintf( "WLFIRM load finished.\n" );
#ifdef ENABLE_WDS_SCAN
#ifndef DISABLE_WDS_SCAN
// WDSスキャンがTRUE かつ 無線フラグがONならば、引き続きWDSビーコン受信開始
if( isStartScanWDS &&
!LCFG_THW_IsForceDisableWireless() && LCFG_TSD_IsAvailableWireless() ) {
StartScanWDS();
}
#endif // ENABLE_WDS_SCAN
#endif // DISABLE_WDS_SCAN
}else {
// ロード失敗
if( !s_isHotStartWLFirm ) {

13
build/systemMenu_RED/Launcher/ARM9/src/main.c
View File

@ -20,17 +20,12 @@
#include "misc.h"
#include "logoDemo.h"
#include "sound.h"
//#define DISABLE_SLEEP
#include "loadWlanFirm.h"
// extern data-----------------------------------------------------------------
// define data-----------------------------------------------------------------
#define WIRELESS_FIRM_LOADING 1
#if( WIRELESS_FIRM_LOADING == 1 )
#include "loadWlanFirm.h"
#endif
// function's prototype-------------------------------------------------------
static void INTR_VBlank( void );
@ -214,11 +209,11 @@ void TwlMain( void )
// 無線ファームウェアを無線モジュールにダウンロードする。
#if( WIRELESS_FIRM_LOADING == 1 )
#ifndef DISABLE_WLFIRM_LOAD
if( FALSE == InstallWlanFirmware( SYSM_IsHotStart() ) ) {
OS_TPrintf( "ERROR: Wireless firmware download failed!\n" );
}
#endif
#endif // DISABLE_WLFIRM_LOAD
if( SYSM_IsFatalError() ) {
// FATALエラー処理
@ -289,7 +284,9 @@ void TwlMain( void )
break;
case AUTHENTICATE:
if( ( direct_boot || ( !direct_boot && LauncherFadeout( s_titleList ) ) ) &&
#ifndef DISABLE_WLFIRM_LOAD
PollingInstallWlanFirmware( FALSE ) && // アプリブート前に無線ファームのロードは完了しておく必要がある
#endif // DISABLE_WLFIRM_LOAD
SYSM_IsAuthenticateTitleFinished() )
{
if( SYSM_IsFatalError() ) {

3
build/systemMenu_RED/MachineSettings/ARM9/Makefile
View File

@ -22,7 +22,8 @@ SUBDIRS = \
#----------------------------------------------------------------------------
DISABLE_DEBUG = TRUE
// MAKEROM SWITCH ※最終ROM作成時は、TRUEにする
DISABLE_DEBUG = FALSE
TARGET_FIRM = SYSTEMMENU
TARGET_PLATFORM = TWL