http://downloads.netgear.com/files/GPL/GPL_Source_V361j_DM111PSP_series_consumer_rele...
[bcm963xx.git] / Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 4926873..dd4da93
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ include version.make
 
 BRCM_RELEASETAG=$(BRCM_VERSION).$(BRCM_RELEASE)L.$(BRCM_EXTRAVERSION)
 
+
 ###########################################
 #
 # Define Basic Variables
@@ -39,7 +40,8 @@ TARGETS_DIR = $(BUILD_DIR)/targets
 DEFAULTCFG_DIR = $(TARGETS_DIR)/defaultcfg
 XCHANGE_DIR = $(BUILD_DIR)/xChange
 FSSRC_DIR = $(TARGETS_DIR)/fs.src
-CFE_FILE = $(TARGETS_DIR)/cfe/cfe$(BRCM_CHIP).bin
+BRCM_MODEL_NAME=$(PROFILE)
+CFE_FILE = $(TARGETS_DIR)/cfe/cfe6338_reset_192_168_0_1.bin
 SHARED_DIR = $(BUILD_DIR)/shared
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
           else if [ -x /bin/bash ]; then echo /bin/bash; \
@@ -63,11 +65,15 @@ endif
 ifneq ($(strip $(PROFILE)),)
 include $(TARGETS_DIR)/$(PROFILE)/$(PROFILE)
 export BRCM_CHIP
+export BRCM_SDRAM_SIZE
+export BRCM_FLASH_SIZE
 export BRCM_FLASHPSI_SIZE
+export BRCM_MODEL_NAME
 export BRCM_DRIVER_WIRELESS_PCMCIA_DATASWAP BRCM_DRIVER_WIRELESS_EBI_DMA
 export BRCM_DRIVER_USB BRCM_DRIVER_ETHERNET_CONFIG
 export BRCM_DEFAULTCFG
 export BRCM_KERNEL_NF_FIREWALL BRCM_KERNEL_NF_MANGLE BRCM_KERNEL_NF_NAT
+export ODM_CFG_NO_BLOCK_DEVICE
 endif
 
 ###########################################
@@ -89,6 +95,8 @@ TOOLCHAIN=/usr/crossdev/mips
 CROSS_COMPILE = $(TOOLCHAIN)/bin/mips-linux-
 endif
 
+
+
 AR              = $(CROSS_COMPILE)ar
 AS              = $(CROSS_COMPILE)as
 LD              = $(CROSS_COMPILE)ld
@@ -113,12 +121,13 @@ LIBCDIR         = $(TOOLCHAIN)/mips-linux
 ###########################################
 INSTALL_DIR = $(TARGETS_DIR)/fs.src
 TARGET_FS = $(TARGETS_DIR)/$(PROFILE)/fs
+TARGET_FS2 = $(TARGETS_DIR)/$(PROFILE)/fs2
 PROFILE_DIR = $(TARGETS_DIR)/$(PROFILE)
 PROFILE_PATH = $(TARGETS_DIR)/$(PROFILE)/$(PROFILE)
 VENDOR_NAME = bcm
 FS_KERNEL_IMAGE_NAME = $(VENDOR_NAME)$(PROFILE)_fs_kernel
 CFE_FS_KERNEL_IMAGE_NAME = $(VENDOR_NAME)$(PROFILE)_cfe_fs_kernel
-FLASH_IMAGE_NAME = $(VENDOR_NAME)$(PROFILE)_flash_image_$(BRCM_BOARD_ID)
+FLASH_IMAGE_NAME = $(VENDOR_NAME)$(PROFILE)_flash_image
 INC_BRCMDRIVER_PUB_PATH=$(BRCMDRIVERS_DIR)/opensource/include
 INC_BRCMDRIVER_PRIV_PATH=$(BRCMDRIVERS_DIR)/broadcom/include
 INC_ENDPOINT_PATH=$(BRCMDRIVERS_DIR)/broadcom/char/endpoint/bcm9$(BRCM_CHIP)/inc
@@ -130,25 +139,9 @@ INC_BRCMSHARED_PRIV_PATH=$(SHARED_DIR)/broadcom/include
 INC_BRCMBOARDPARMS_PATH=$(SHARED_DIR)/opensource/boardparms
 INC_FLASH_PATH=$(SHARED_DIR)/opensource/flash
 
-ifeq ($(strip $(BRCM_APP_PHONE)),sip)
-export VOXXXLOAD=1
-export VOIPLOAD=1
-export SIPLOAD=1
+# Michael: this save current config to default config should be enable for every model
+export BRCM_CFG_XFER_TO_FACDEFLT=y
 
-ifeq ($(strip $(BRCM_VODSL_CONFIG_MANAGER)),y)
-       export BRCM_VODSL_CFGMGR=1
-endif
-
-BRCM_RELEASETAG := $(BRCM_RELEASETAG).sip
-endif
-
-ifeq ($(strip $(BRCM_APP_PHONE)),mgcp)
-export VOXXXLOAD=1
-export VOIPLOAD=1
-export MGCPLOAD=1
-export BRCM_VODSL_CFGMGR=0
-BRCM_RELEASETAG := $(BRCM_RELEASETAG).mgcp
-endif
 
 ifeq ($(strip $(BRCM_PROFILER_ENABLED)),y)
 export BRCM_PROFILER_TOOL=1
@@ -216,6 +209,17 @@ endif
 #  BRCM_DSP_HAL and BRCM_DSP_HAL_EXTENSION for example, in order to pickup
 #  the correct board HAL application.
 #
+
+#swda add,06/27/2005
+ifeq ($(strip $(BRCM_SLIC_LE9502)),y)
+export XCHANGE_BUILD_APP=Bcm$(BRCM_CHIP)_Le9502
+BRCM_RELEASETAG := $(BRCM_RELEASETAG)._LE9502
+BRCM_DSP_HAL := _Le9502
+BRCM_DSP_HAL_EXTENSION :=
+export BRCM_SLIC_LE9502
+endif
+#swda add end
+
 ifeq ($(strip $(BRCM_DSP_FXO)),y)
 ifeq ($(strip $(BRCM_SLIC_LE9502)),y)
 export XCHANGE_BUILD_APP=Bcm$(BRCM_CHIP)_Le9502FXO
@@ -308,6 +312,7 @@ endif
 export BRCM_DSP_CODEC_DEFINES
 export BRCM_DSP_CHAN_DEFINES
 export BRCM_DSP_FXO
+export PSTN_SUPPORT
 export XCHANGE_BUILD_APP=Bcm$(BRCM_CHIP)$(BRCM_DSP_HAL)$(BRCM_DSP_HAL_EXTENSION)
 export XCHANGE_DSP_APP_EXTENSION
 export BRCM_DSP_HAL_EXTENSION
@@ -350,17 +355,6 @@ BRCM_DSP_CHAN_DEFINES = -DNUM_FXO_CHANNELS=1
 export BRCM_6358_G729_FXO_LEGERITY
 export XCHANGE_BUILD_APP=Bcm$(BRCM_CHIP)vw_fxo_legerity
 else
-ifeq ($(strip $(BRCM_6358_G729_ISDN_FXO_LEGERITY)),y)
-BRCM_DSP_HAL := vw_isdn_fxo
-BRCM_DSP_CHAN_DEFINES   = -DNUM_FXO_CHANNELS=1
-BRCM_DSP_CODEC_DEFINES := -DXCFG_G711_SUPPORT=1
-BRCM_DSP_CODEC_DEFINES += -DXCFG_G729_SUPPORT=1
-BRCM_DSP_CODEC_DEFINES += -DXCFG_G726_SUPPORT=1
-BRCM_DSP_CODEC_DEFINES += -DXCFG_FAX_SUPPORT=1
-export BRCM_6358_G729_ISDN_FXO_LEGERITY
-export XCHANGE_BUILD_APP=Bcm$(BRCM_CHIP)vw_isdn_fxo
-export BRCM_DSP_CODEC_DEFINES
-else
 BRCM_DSP_HAL := vw
 export BRCM_6358_G729
 export XCHANGE_BUILD_APP=Bcm$(BRCM_CHIP)vw
@@ -369,7 +363,6 @@ endif
 endif
 endif
 endif
-endif
 
 ifeq ($(strip $(BRCM_VODSL_DUAL_3341)),y)
 BRCM_RELEASETAG := $(BRCM_RELEASETAG).dual3341
@@ -384,6 +377,9 @@ export ADSL_PHY_MODE=file
 #Set up ADSL_SELF_TEST
 export ADSL_SELF_TEST=$(BRCM_ADSL_SELF_TEST)
 
+#Set up ADSL_PLN_TEST
+export ADSL_PLN_TEST=$(BUILD_TR69_XBRCM)
+
 #WLan support
 ifneq ($(strip $(BUILD_MIMO)),)
 WLAN_IMPL=2
@@ -392,6 +388,60 @@ WLAN_IMPL=1
 endif
 export BUILD_MIMO
 
+#export compile option
+#Set up ADSL supporting line modes
+export BRCM_DSL_MODE_GDMT
+export BRCM_DSL_MODE_GLITE
+export BRCM_DSL_MODE_T1413
+export BRCM_DSL_MODE_ADSL2
+export BRCM_DSL_MODE_READSL2
+export BRCM_DSL_MODE_ADSL2PLUS
+export BRCM_DSL_MODE_ANNEXM
+export BRCM_DSL_MODE_BITSWAP
+export BRCM_DSL_MODE_SRA
+
+#Set up ADSL version
+export ADSL_VERSION=$(BRCM_ADSL_VERSION)
+
+export DSL_START_IN_KERNEL
+export WAN_LED_BLINKING
+export CHT_PPP_AS_WAN_LED
+export ODM_PPP_AS_PSTN_LED
+export ODM_PSTN_LED
+export Comtest_Lab_Only
+export Impulse_Test_Telestra_Approval
+export POWER_SAVING_DG
+export CHT_OAM_RES_WAIT_TIME_6
+export CHT_EOC
+
+export DEFAULT_WLAN_SSID=$(BRCM_Default_WLAN_SSID)
+export DEFAULT_WLAN_ESSID
+export BACKUP_WLAN_SPROM=$(BRCM_BACKUP_SPROM_4306)
+export DEFAULT_WLAN_WEP128
+export DEFAULT_WLAN_FRAMEBURST
+export DEFAULT_WLAN_AFTERBURNER
+export WIRELESS_MAIN_ANTENNA
+export WIRELESS_AUX_ANTENNA
+export WIRELESS_AUTO_ANTENNA
+export COUNTRY_ISRAEL
+export WLAN_ENABLE_CTRL_BUTTON
+export WLAN_DISABLE_FEM
+export LLL_TEST_LED
+export WESTELL_GPIO
+export DAA_OFFHOOK_CMD
+export CONFIG_ATM_EOP_MONITORING
+export VOICE_SYS_CLOCK_50MHZ
+export IAD_VDSL_6358
+export IAD_GPON_6358
+export ODM_BOTH_ETH
+export NEWZEALAND_FXO
+export VOICECTL_APP
+#export FXO_GAIN_CMD
+
+#michael add
+#Use chipId to decide what the ADSL config option on html
+export CHIP_ADSL_VERSION=$(BRCM_ADSL_DRIVER)
+
 ###########################################
 #
 # Complete list of applications
@@ -414,7 +464,28 @@ SUBDIRS_OPENSOURCE = $(OPENSOURCE_DIR)/atm2684/pvc2684ctl \
         $(OPENSOURCE_DIR)/net-snmp  \
         $(OPENSOURCE_DIR)/ftpd \
         $(OPENSOURCE_DIR)/libcreduction \
-        $(OPENSOURCE_DIR)/busybox
+        $(OPENSOURCE_DIR)/busybox \
+        $(OPENSOURCE_DIR)/dproxy \
+        $(OPENSOURCE_DIR)/lpd \
+        $(OPENSOURCE_DIR)/httpc \
+        $(OPENSOURCE_DIR)/mpd
+
+# Start Andy porting from 3.02.02, 2006/05/23
+export BROADCOM_DIR=$(USERAPPS_DIR)/broadcom
+NEED_MOVE = "1"
+NEED_CHG_ACCESSREMOTE = "0"
+ifneq ($(strip $(BRCM_LANG_EN)),)
+       NEED_CHG_ACCESSREMOTE = "1"
+endif
+       HTML_DIR = $(BROADCOM_DIR)/cfm/html
+       NEED_MOVE = "0"
+
+NEED_MOVE_CH = "0"
+
+export HTML_DIR NEED_MOVE NEED_CHG_ACCESSREMOTE NEED_MOVE_CH
+export LOGO_DIR = $(BROADCOM_DIR)/cfm/logo
+export  WEB_LOGO_CHOICE = $(BRCM_WEB_LOGO_CHOICE)
+# End Andy porting from 3.02.02, 2006/05/23
 
 #In future, we need to add soap when it
 #is decoupled from cli
@@ -422,12 +493,15 @@ SUBDIRS_OPENSOURCE = $(OPENSOURCE_DIR)/atm2684/pvc2684ctl \
 export BROADCOM_DIR=$(USERAPPS_DIR)/broadcom
 SUBDIRS_BROADCOM = $(BROADCOM_DIR)/nvram \
        $(BROADCOM_DIR)/cfm \
+       $(BROADCOM_DIR)/cfesetup \
         $(BROADCOM_DIR)/upnp/router/upnp \
         $(BROADCOM_DIR)/nas \
         $(BROADCOM_DIR)/wlctl \
-        $(BROADCOM_DIR)/vodsl \
+       $(BROADCOM_DIR)/wlenablectrl \
+       $(BROADCOM_DIR)/voicectl \
         $(BROADCOM_DIR)/atmctl \
         $(BROADCOM_DIR)/adslctl \
+       $(BROADCOM_DIR)/autoprovisionlan \
         $(BROADCOM_DIR)/netctl \
         $(BROADCOM_DIR)/dnsprobe \
         $(BROADCOM_DIR)/igmp \
@@ -435,8 +509,10 @@ SUBDIRS_BROADCOM = $(BROADCOM_DIR)/nvram \
        $(BROADCOM_DIR)/sntp \
        $(BROADCOM_DIR)/ippd \
        $(BROADCOM_DIR)/ddnsd \
+       $(BROADCOM_DIR)/iappd \
        $(BROADCOM_DIR)/ethctl \
         $(BROADCOM_DIR)/hotplug \
+        $(BROADCOM_DIR)/wav2rtp \
         $(BROADCOM_DIR)/epittcp \
         $(BROADCOM_DIR)/snmp \
         $(BROADCOM_DIR)/tr69c \
@@ -448,18 +524,55 @@ SUBDIRS_BROADCOM = $(BROADCOM_DIR)/nvram \
 SUBDIRS_APP = $(SUBDIRS_BROADCOM) $(SUBDIRS_OPENSOURCE)
 SUBDIRS = $(foreach dir, $(SUBDIRS_APP), $(shell if [ -d "$(dir)" ]; then echo $(dir); fi))
 
-OPENSOURCE_APPS = ipsec-tools pvc2684ctl pvc2684d brctl pppd udhcp iptables ebtables \
-                  reaim tc libosip2 siproxd snmp zebra bftpd busybox 
+OPENSOURCE_APPS = ipsec-tools pvc2684ctl pvc2684d brctl pppd udhcp iptables ebtables mpd \
+                  reaim libosip2 siproxd snmp zebra bftpd busybox dproxy iproute2 httpc lpd
 
-BROADCOM_APPS = nvram cfm upnp nas wlctl vodsl atmctl adslctl netctl dnsprobe \
+BROADCOM_APPS = nvram cfesetup cfm upnp nas wlctl wlenablectrl voicectl atmctl adslctl netctl dnsprobe wav2rtp \
                 igmp dhcpr diagapp sntp ddnsd ilmi ippd hotplug ethctl epittcp snmp ses \
-                hmi2proxy relayctl vdslctl
+                hmi2proxy relayctl vdslctl autoprovisionlan iappd
+
+ifneq ($(findstring rvsip,$(BRCM_APP_PHONE)),)
+    SUBDIRS_BROADCOM += $(BROADCOM_DIR)/rvsip
+    BROADCOM_APPS += rvsip
+else
+  ifneq ($(strip $(BUILD_VODSL)),)
+    SUBDIRS_BROADCOM += $(BROADCOM_DIR)/vodsl
+    BROADCOM_APPS += vodsl
+  endif
+endif
+
+ifneq ($(strip $(BUILD_SIGNATURE)),)
+   export BUILD_SIGNATURE
+endif
+
+ifneq ($(strip $(BUILD_SIGNATURE_RSA)),)
+   export BUILD_SIGNATURE_RSA
+endif
+
 LIBC_OPTIMIZATION = libcreduction
 
 ifneq ($(strip $(BUILD_GDBSERVER)),)
 TOOLCHAIN_UTIL_APPS = gdbserver
 endif
 
+ifneq ($(strip $(BUILD_PPP_AUTH_LIMIT)),)
+   export BUILD_PPP_AUTH_LIMIT
+endif
+
+# Start Andy porting from 3.02.02 (2006/05/23)
+ifneq ($(strip $(ODM_MULTI_LANG)),)
+ifneq ($(strip $(MULTI_LANG_EN)),)
+  export MULTI_LANG_EN=y
+endif
+ifneq ($(strip $(MULTI_LANG_DE)),)
+  export MULTI_LANG_DE=y
+endif
+ifneq ($(strip $(MULTI_LANG_TR)),)
+  export MULTI_LANG_TR=y
+endif
+endif
+# End Andy porting from 3.02.02 (2006/05/23)
+
 BUSYBOX_DIR = $(OPENSOURCE_DIR)/busybox
 
 BRCMAPPS = openssl $(BROADCOM_APPS) $(OPENSOURCE_APPS) $(TOOLCHAIN_UTIL_APPS) $(LIBC_OPTIMIZATION)
@@ -571,6 +684,9 @@ export BUILD_CFM_MENU=y
 endif
 
 cfm:
+ifneq ($(strip $(BUILD_SIGNATURE_RSA)),)
+       $(MAKE) -C $(BROADCOM_DIR)/cfm/web/sigmak
+endif
        $(MAKE) -C $(BROADCOM_DIR)/cfm $(BUILD_CFM)
 else
 cfm:
@@ -617,12 +733,29 @@ reaim:
 endif
 
 ifneq ($(strip $(BRCM_KERNEL_NETQOS)),)
-tc:
+iproute2:
        cd $(OPENSOURCE_DIR);   (tar xkfj iproute2.tar.bz2 2> /dev/null || true)
        $(MAKE) -C $(OPENSOURCE_DIR)/iproute2 dynamic
 else
-tc:
-endif
+
+ifneq ($(strip $(BRCM_KERNEL_DN_IPQOS)),)
+iproute2:
+       cd $(OPENSOURCE_DIR);   (tar xkfj iproute2.tar.bz2 2> /dev/null || true)
+       $(MAKE) -C $(OPENSOURCE_DIR)/iproute2 dynamic
+else
+
+ifneq ($(strip $(BUILD_POLICY_ROUTING)),)
+iproute2:
+       cd $(OPENSOURCE_DIR);   (tar xkfj iproute2.tar.bz2 2> /dev/null || true)
+       $(MAKE) -C $(OPENSOURCE_DIR)/iproute2 dynamic
+else
+iproute2:
+endif#BUILD_POLICY_ROUTING
+
+endif#BRCM_KERNEL_DN_IPQOS
+
+endif#BRCM_KERNEL_NETQOS
+
 
 ifneq ($(strip $(BUILD_GDBSERVER)),)
 gdbserver:
@@ -814,11 +947,15 @@ else
 ilmi:
 endif
 
-ifneq ($(strip $(BUILD_VODSL)),)
-vodsl:
-       $(MAKE) -C $(BROADCOM_DIR)/vodsl $(BUILD_VODSL)
+ifneq ($(findstring rvsip,$(BRCM_APP_PHONE)),)
+rvsip:
+       $(MAKE) -C $(BROADCOM_DIR)/rvsip/bos
+       $(MAKE) -C $(BROADCOM_DIR)/rvsip all install
 else
 vodsl:
+  ifneq ($(strip $(BUILD_VODSL)),)
+       $(MAKE) -C $(BROADCOM_DIR)/vodsl $(BUILD_VODSL)
+  endif
 endif
 
 # Leave it for the future when soap server is decoupled from cfm
@@ -874,6 +1011,20 @@ else
 epittcp:
 endif
 
+ifneq ($(strip $(WLAN_ENABLE_CTRL_BUTTON)),)
+wlenablectrl:
+       $(MAKE) -C $(BROADCOM_DIR)/wlenablectrl dynamic
+else
+wlenablectrl:
+endif
+
+ifneq ($(strip $(VOICECTL_APP)),)
+voicectl:
+       $(MAKE) -C $(BROADCOM_DIR)/voicectl dynamic
+else
+voicectl:
+endif
+
 ifneq ($(strip $(BUILD_SES)),)
 ses:
        if [ -e $(BRCMDRIVERS_DIR)/broadcom/net/wl/impl$(WLAN_IMPL)/ses ]; then \
@@ -925,6 +1076,13 @@ else
 zebra:
 endif
 
+ifneq ($(strip $(ODM_AUTO_PROVISION_LAN)),)
+autoprovisionlan:
+       $(MAKE) -C $(BROADCOM_DIR)/autoprovisionlan dynamic
+else
+autoprovisionlan:
+endif
+
 ifneq ($(strip $(BUILD_ATMCTL)),)
 atmctl:
        $(MAKE) -C $(BROADCOM_DIR)/atmctl $(BUILD_ATMCTL)
@@ -967,6 +1125,18 @@ else
 libcreduction:
 endif
 
+###########################################
+#
+# VOIP Call Waitting Function
+#
+###########################################
+ifneq ($(strip $(BUILD_WAV2RTP)),)
+wav2rtp:
+       $(MAKE) -C $(BROADCOM_DIR)/wav2rtp dynamic
+else
+wav2rtp:
+endif
+
 ifneq ($(strip $(BUILD_DIAGAPP)),)
 diagapp:
        $(MAKE) -C $(BROADCOM_DIR)/diagapp $(BUILD_DIAGAPP)
@@ -982,6 +1152,20 @@ else
 bftpd:
 endif
 
+ifneq ($(strip $(BUILD_HTTPC)),)
+httpc:
+       $(MAKE) -C $(OPENSOURCE_DIR)/httpc $(BUILD_HTTPC)
+else
+httpc:
+endif
+
+ifneq ($(strip $(BUILD_MPD)),)
+mpd:
+       $(MAKE) -C $(OPENSOURCE_DIR)/mpd $(BUILD_MPD)
+else
+mpd:
+endif
+
 ifneq ($(strip $(BUILD_DDNSD)),)
 ddnsd:
        $(MAKE) -C $(BROADCOM_DIR)/ddnsd $(BUILD_DDNSD)
@@ -996,6 +1180,14 @@ else
 sntp:
 endif
 
+ifneq ($(strip $(ODM_CFESETUP)),)
+cfesetup:
+       $(MAKE) -C $(BROADCOM_DIR)/cfesetup all
+else
+cfesetup:
+endif
+
+
 ifneq ($(strip $(BUILD_IPPD)),)
 ippd:
        $(MAKE) -C $(BROADCOM_DIR)/ippd $(BUILD_IPPD)
@@ -1003,11 +1195,32 @@ else
 ippd:
 endif
 
-ifneq ($(strip $(BUILD_PORT_MIRRORING)),)
-export BUILD_PORT_MIRRORING=1
+# Start: Andy porting from 2.21.5, 2005/04/14
+ifneq ($(strip $(BUILD_DPROXY)),)
+dproxy:
+       $(MAKE) -C $(OPENSOURCE_DIR)/dproxy $(BUILD_DPROXY)
+else
+dproxy:
+endif
+# End: Andy porting from 2.21.5, 2005/04/14
+
+#Paul porting from 2.21.5, 7/24/2006
+ifneq ($(strip $(BUILD_PRINTSERVER)),)
+iappd:
+       $(MAKE) -C $(BROADCOM_DIR)/iappd dynamic
+lpd:
+       $(MAKE) -C $(OPENSOURCE_DIR)/lpd dynamic
 else
-export BUILD_PORT_MIRRORING=0
+iappd:
+lpd:
 endif
+#Paul porting end
+
+#ifneq ($(strip $(BUILD_PORT_MIRRORING)),)
+#export BUILD_PORT_MIRRORING=1
+#else
+#export BUILD_PORT_MIRRORING=0
+#endif
 
 ifneq ($(strip $(BUILD_HOSTMGR)),)
 hmi2proxy: vdsl_processing
@@ -1031,6 +1244,9 @@ vdslctl:
 endif
 
 hosttools:
+ifneq ($(strip $(BUILD_SIGNATURE_RSA)),)
+       $(MAKE) -C $(HOSTTOOLS_DIR)/sigmak
+endif
        $(MAKE) -C $(HOSTTOOLS_DIR)
 
 vdsl_processing: add_6510_support vdsl_modem vdsl_modem_file
@@ -1040,7 +1256,7 @@ vdsl_modem_file:
        @echo   "VCOPE_BOARD=$(VCOPE_BOARD) HMI_VERSION=$(HMI_VERSION)"
        @echo "VCOPE_TYPE=$(VCOPE_TYPE) VCOPE_LINE_NUMBER=$(VCOPE_LINE_NUMBER)"
        @echo "**********************************************************************"
-  
+
 vdsl_modem:
        - cmp -s $(FSSRC_DIR)/images/modem.bin $(6510_REF_CODE)/images/$(VMODEM_BIN); \
        if [ ! $$? -eq 0 ]; then \
@@ -1052,12 +1268,13 @@ vdsl_modem:
                find userapps/broadcom/vdslctl/  -name *.[oa]   | xargs rm; \
                find userapps/broadcom/vdslctl/  -name *.depend | xargs rm; \
        fi
-       @echo "$(FSSRC_DIR)/images/: Creating \"modem.bin\" out of $(VMODEM_BIN)" 
+       @echo "$(FSSRC_DIR)/images/: Creating \"modem.bin\" out of $(VMODEM_BIN)"
        cp -f $(6510_REF_CODE)/images/$(VMODEM_BIN) $(FSSRC_DIR)/images/modem.bin;
        cp -f $(6510_REF_CODE)/images/$(VBOOT_BIN) $(FSSRC_DIR)/images/boot.bin;
 
 buildimage: $(KERNEL_DIR)/vmlinux
        su --command="cd $(TARGETS_DIR); ./buildFS"
+#      find $(TARGET_FS) -name CVS | xargs rm -rf
 ifeq ($(strip $(BRCM_KERNEL_ROOTFS)),squashfs)
        #$(HOSTTOOLS_DIR)/mksquashfs $(TARGET_FS) $(PROFILE_DIR)/rootfs.img -noappend -be -always-use-fragments -gzip
        $(HOSTTOOLS_DIR)/mksquashfs $(TARGET_FS) $(PROFILE_DIR)/rootfs.img -noappend -be -lzma -no-fragments -noI
@@ -1078,14 +1295,11 @@ ifneq ($(strip $(BRCM_KERNEL_ROOTFS)),nfs)
        $(STRIP) --remove-section=.note --remove-section=.comment vmlinux; \
        $(OBJCOPY) -O binary vmlinux vmlinux.bin; \
        $(HOSTTOOLS_DIR)/cmplzma -k -2 vmlinux vmlinux.bin vmlinux.lz;\
-       $(HOSTTOOLS_DIR)/bcmImageBuilder --output $(FS_KERNEL_IMAGE_NAME) --chip $(BRCM_CHIP) --board $(BRCM_BOARD_ID) --blocksize $(BRCM_FLASHBLK_SIZE) --cfefile $(CFE_FILE) --rootfsfile rootfs.img --kernelfile vmlinux.lz; \
-       $(HOSTTOOLS_DIR)/bcmImageBuilder --output $(CFE_FS_KERNEL_IMAGE_NAME) --chip $(BRCM_CHIP) --board $(BRCM_BOARD_ID) --blocksize $(BRCM_FLASHBLK_SIZE) --cfefile $(CFE_FILE) --rootfsfile rootfs.img --kernelfile vmlinux.lz --include-cfe; \
-       $(HOSTTOOLS_DIR)/createimg -b $(BRCM_BOARD_ID) -n $(BRCM_NUM_MAC_ADDRESSES) -m $(BRCM_BASE_MAC_ADDRESS) -i $(CFE_FS_KERNEL_IMAGE_NAME) -o $(FLASH_IMAGE_NAME); \
-       $(HOSTTOOLS_DIR)/addvtoken $(FLASH_IMAGE_NAME) $(FLASH_IMAGE_NAME).w
-       @mkdir -p $(IMAGES_DIR)
-       @cp $(PROFILE_DIR)/$(FS_KERNEL_IMAGE_NAME) $(IMAGES_DIR)/$(FS_KERNEL_IMAGE_NAME)_$(BRCM_RELEASETAG)-$(shell date '+%y%m%d_%H%M')
-       @echo
-       @echo -e "Done! Image $(PROFILE) has been built in $(IMAGES_DIR)."
+       $(HOSTTOOLS_DIR)/bcmImageBuilder --output $(FS_KERNEL_IMAGE_NAME) --board $(BRCM_BOARD_ID) --blocksize $(BRCM_FLASHBLK_SIZE) --cfefile $(CFE_FILE) --rootfsfile rootfs.img --kernelfile vmlinux.lz; \
+       mkdir -p $(IMAGES_DIR)
+       cp $(PROFILE_DIR)/$(FS_KERNEL_IMAGE_NAME) $(IMAGES_DIR)/$(FS_KERNEL_IMAGE_NAME)_$(BRCM_RELEASETAG)-$(shell date '+%y%m%d_%H%M')
+       echo
+       echo -e "Done! Image $(PROFILE) has been built in $(IMAGES_DIR)."
 else
        cd $(PROFILE_DIR); \
        cp $(KERNEL_DIR)/vmlinux . ; \
@@ -1118,7 +1332,6 @@ fssrc_clean:
        rm -fr $(INSTALL_DIR)/sbin
        rm -fr $(INSTALL_DIR)/lib
        rm -fr $(INSTALL_DIR)/upnp
-       rm -fr $(INSTALL_DIR)/docs
        rm -fr $(INSTALL_DIR)/webs
        rm -fr $(INSTALL_DIR)/usr
        rm -fr $(INSTALL_DIR)/linuxrc
@@ -1127,6 +1340,7 @@ kernel_clean: sanity_check
        $(MAKE) -C $(KERNEL_DIR) mrproper
        rm -f $(KERNEL_DIR)/arch/mips/defconfig
        rm -f $(HOSTTOOLS_DIR)/lzma/decompress/*.o
+       rm -f $(TARGETS_DIR)/*.o $(TARGETS_DIR)/.*.flags $(TARGETS_DIR)/.depend
        rm -rf $(XCHANGE_DIR)/dslx/lib/LinuxKernel
        rm -rf $(XCHANGE_DIR)/dslx/obj/LinuxKernel
 
@@ -1135,7 +1349,7 @@ app_clean: sanity_check fssrc_clean
        rm -rf $(XCHANGE_DIR)/dslx/lib/LinuxUser
        rm -rf $(XCHANGE_DIR)/dslx/obj/LinuxUser
 
-target_clean: sanity_check
+target_clean: sanity_check fssrc_clean
        rm -f $(PROFILE_DIR)/rootfs.img
        rm -f $(PROFILE_DIR)/vmlinux
        rm -f $(PROFILE_DIR)/vmlinux.bin
@@ -1144,6 +1358,8 @@ target_clean: sanity_check
        rm -f $(PROFILE_DIR)/$(CFE_FS_KERNEL_IMAGE_NAME)
        rm -f $(PROFILE_DIR)/$(FLASH_IMAGE_NAME)
        rm -f $(PROFILE_DIR)/$(FLASH_IMAGE_NAME).w
+       rm -f $(PROFILE_DIR)/$(FLASH_IMAGE_NAME).bin
+       rm -f $(PROFILE_DIR)/$(FLASH_IMAGE_NAME).ice
        rm -fr $(PROFILE_DIR)/modules
        find targets -name vmlinux -print -exec rm -f "{}" ";"
        su --command="rm -fr $(TARGET_FS)"
@@ -1151,23 +1367,21 @@ target_clean: sanity_check
 hosttools_clean:
        $(MAKE) -C $(HOSTTOOLS_DIR) clean
 
-add_6510_support: 
+add_6510_support:
        $(6510_REF_CODE)/add6510support DYMMY_HMI_VERSON $(6510_REF_CODE)
-       
+
 remove_6510_support:
        rm -fr $(BROADCOM_DIR)/hostCode
        rm -fr $(BROADCOM_DIR)/relayCtl
        rm -fr $(BROADCOM_DIR)/vdslctl
 
 clean_6510:
-       rm -f `find userapps/broadcom/hostCode/ -name *.[oa]`
-       rm -f `find userapps/broadcom/hostCode/ -name *.depend`
-       rm -f `find userapps/broadcom/relayCtl/ -name *.[oa]`
-       rm -f `find userapps/broadcom/relayCtl/ -name *.depend`
-       rm -f `find userapps/broadcom/vdslctl/  -name *.[oa]`
-       rm -f `find userapps/broadcom/vdslctl/  -name *.depend`
-       rm -f `find userapps/broadcom/cfm/      -name *.[oa]`
-       rm -f `find userapps/broadcom/cfm/      -name *.depend`
+       find userapps/broadcom/hostCode/ -name *.[oa]   | xargs rm
+       find userapps/broadcom/hostCode/ -name *.depend | xargs rm
+       find userapps/broadcom/relayCtl/ -name *.[oa]   | xargs rm
+       find userapps/broadcom/relayCtl/ -name *.depend | xargs rm
+       find userapps/broadcom/vdslctl/  -name *.[oa]   | xargs rm
+       find userapps/broadcom/vdslctl/  -name *.depend | xargs rm
 
 voice_clean:
        find bcmdrivers/broadcom/char/endpoint -name '*.o' -exec rm -f "{}" ";"
@@ -1186,11 +1400,15 @@ voice_clean:
 export \
 AR                         \
 AS                         \
+ODM_AUTO_PROVISION_LAN   \
+ODM_LANG_NETGEAR         \
 BRCM_APP_PHONE             \
 BRCMAPPS                   \
 BRCM_BOARD                 \
 BRCM_DRIVER_PCI            \
 BRCMDRIVERS_DIR            \
+BRCM_DRIVER_WIRELESS       \
+BRCM_DRIVER_PHONE          \
 BRCM_DSP_APM_FXO           \
 BRCM_DSP_APM_FXO_EXT       \
 BRCM_DSP_CODEC_G711        \
@@ -1224,6 +1442,7 @@ BRCM_VOICE_GLOBAL_CFLAGS   \
 BROADCOM_CFM_DIR           \
 BUILD_ADSLCTL              \
 BUILD_ATMCTL               \
+BUILD_AUTO_PROVISION_ON_WAN\
 BUILD_BR2684CTL            \
 BUILD_BRCM_VLAN            \
 BUILD_BRCTL                \
@@ -1243,6 +1462,7 @@ BUILD_EPITTCP              \
 BUILD_ETHWAN               \
 BUILD_FTPD                 \
 BUILD_GDBSERVER            \
+BUILD_HTTPC                \
 BUILD_IGMP                 \
 BUILD_IPPD                 \
 BUILD_IPSEC_TOOLS          \
@@ -1250,10 +1470,12 @@ BUILD_IPTABLES             \
 BUILD_NAS                  \
 BUILD_NETCTL               \
 BUILD_NVRAM                \
-BUILD_PORT_MIRRORING                    \
+BUILD_PORT_MIRRORING      \
+BUILD_PPP_DOMAIN_SUFFIX    \
 BUILD_PPPD                 \
 BUILD_PVC2684CTL           \
 BUILD_REAIM                \
+BUILD_REMOVE_PPPOE_PASS_THROUGH \
 BUILD_RT2684D              \
 BUILD_SES                  \
 BUILD_SIPROXD              \
@@ -1263,9 +1485,13 @@ BUILD_SNTP                 \
 BUILD_SOAP                 \
 BUILD_SOAP_VER             \
 BUILD_SSHD_MIPS_GENKEY     \
+BUILD_SYS_ALG              \
+BUILD_SYS_SIP_ALG          \
+BUILD_SYS_VPN_ALG          \
 BUILD_TOD                  \
 BUILD_TR69C                \
 BUILD_TR69C_SSL            \
+BUILD_TR69_XBRCM           \
 BUILD_UDHCP                \
 BUILD_UPNP                 \
 BUILD_VCONFIG              \
@@ -1315,4 +1541,54 @@ XCHANGE_DSP_APP_EXTENSION  \
 VCOPE_TYPE                 \
 VCOPE_BOARD                \
 VCOPE_LINE_NUMBER          \
-
+DEFAULT_USB_PID            \
+BUILD_DPROXY            \
+
+#Start Andy porting from 3.02.02 (2006/05/23)
+export ODM_MULTI_LANG BUILD_STATIC_DNS BUILD_MTU_LAN_PPP BUILD_PPP_IPEXTENSION SUPPORT_XML_API SUPPORT_XML_API_FOR_NETGEAR
+export BUILD_DOMAIN_LOCK ODM_LANG_LLL BUILD_PPP_ALWAYS_RETRY BUILD_MERDEFAULT_GW BUILD_PPPDEFAULT_GW BRCM_DEFAULT_HOST_NAME
+export BRCM_KERNEL_DN_IPQOS BRCM_KERNEL_ATMQOS ODM_VOICE_QOS BUILD_MPD BUILD_PARTCONF BRCM_KERNEL_NF_NAT_ALG_SIP
+export STRIP_USERNAME_PASSWORD SIP_SUPPORT_VMWI SIP_SUPPORT_CFW SIP_SUPPORT_DNS_SRV_RR
+export SIP_SUPPORT_KEYPAD_EU SIP_SUPPORT_FLASHKEY_EU
+#End Andy porting from 3.02.02 (2006/05/23)
+export DISABLE_IGMP_SNOOPING_OPTION
+export BUILD_PRINTSERVER
+export BUILD_USER_ACCOUNT BUILD_USER_ACCOUNT_QSWV BUILD_USER_ACCOUNT_Q BUILD_USER_ACCOUNT_S BUILD_USER_ACCOUNT_W BUILD_USER_ACCOUNT_V \
+       BUILD_USER_ACCOUNT_QSW BUILD_USER_ACCOUNT_QSV BUILD_USER_ACCOUNT_SWV BUILD_USER_ACCOUNT_QWV BUILD_USER_ACCOUNT_QS \
+       BUILD_USER_ACCOUNT_QW BUILD_USER_ACCOUNT_QV BUILD_USER_ACCOUNT_SW BUILD_USER_ACCOUNT_SV BUILD_USER_ACCOUNT_WV
+
+export CONFIG_NET_SCH_CBQ CONFIG_NET_SCH_CSZ CONFIG_NET_SCH_HPFQ CONFIG_NET_SCH_HFCS CONFIG_NET_SCH_ATM \
+       CONFIG_NET_SCH_PRIO CONFIG_NET_SCH_RED CONFIG_NET_SCH_SFQ CONFIG_NET_SCH_TEQL CONFIG_NET_SCH_TBF \
+       CONFIG_NET_SCH_GRED CONFIG_NET_SCH_DSMARK CONFIG_NET_SCH_INGRESS CONFIG_NET_QOS CONFIG_NET_ESTIMATOR \
+       CONFIG_NET_CLS CONFIG_NET_CLS_TCINDEX CONFIG_NET_CLS_ROUTE4 CONFIG_NET_CLS_ROUTE CONFIG_NET_CLS_FW \
+       CONFIG_NET_CLS_U32 CONFIG_NET_CLS_RSVP CONFIG_NET_CLS_RSVP6 CONFIG_NET_CLS_POLICE ODM_LANG_NETGEAR \
+       IPTV_SUPPORT_FOR_TI BUILD_BLOCK_MULTICAST_FLOOD
+
+export BUILD_NSASOFT_TRAFFIC_EMULATOR
+export BUILD_AUTO_DETECT_DEFAULT_PVC SUPPORT_SERVICE_MODE
+export BUILD_POLICY_ROUTING BUILD_SUPPORT_PPPDBG_SYSLOG
+
+################################################################################################
+#
+# VOIP releated exported variables
+# 
+################################################################################################
+export \
+ODM_VOIP_NO_RELAY                 \
+ODM_ONLY_G729_G711A               \
+ODM_SIP_HASH2NUMBER               \
+ODM_IGNORE_FMTP_MAP               \
+ODM_TELSTRA_APPROVAL              \
+ODM_RESERVE_OFF_HOOK              \
+ODM_SWITCH_PORT1_PORT2            \
+ODM_PSTN_ONLY_PORT1_NO_FXO        \
+BRCM_RETURN_ONE_CODEC               \
+BUILD_WAV2RTP                       \
+BUILD_SIP_REALM                     \
+FIND_TRANSACTION_WITHOUT_VIA_BRANCH \
+SIP_PROXY_FAIL_RECOVER              \
+SIP_RTP_MONITOR                     \
+SIP_MIN_SE_ENABLE                   \
+SIP_SESSION_TIMER_ENABLE            \
+VOIP_DIAL_MAP_TIMER                 \
+VOIP_INTER_DIGIT_TIMER