X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=Makefile;h=a28d4763087d21687277d76e62bd1ee7f42e3231;hb=a2d96664d0ef34bb8bed0eb7c011b47dff43c340;hp=20f16f52dc28cc2e4f9a7e0c7e7ec28d2fdab065;hpb=f76ebf3bd5a3980496d0305c613d4623a9b41680;p=bcm963xx.git

diff --git a/Makefile b/Makefile
index 20f16f52..a28d4763 100755
--- a/Makefile
+++ b/Makefile
@@ -14,28 +14,9 @@
 
 # Top-level Makefile for all commengine xDSL platforms
 
-# for TECOM standard version, comment it
-# for specific customer, please remove the comment and assign the name
-#
-# note: platform name must be in lower-case
-#       add specific version if necessary
-#       copy html directory to html_xxxxxx for specific customer xxxxxx
-#
-export PLATFORM=t_online_fra
-
-ifeq ($(strip $(PLATFORM)),t_online_fra)
-
-# CUSTOMER is used in "CFM" directory
-export CUSTOMER=T_ONLINE
-# BRCM_VOICE_GLOBAL_CFLAGS is used in "xChange" directory
-BRCM_VOICE_GLOBAL_CFLAGS=$(CUSTOMER)
-
-endif
-
 include version.make
 
-# BRCM_RELEASETAG=$(BRCM_VERSION).$(BRCM_RELEASE)L.$(BRCM_EXTRAVERSION)
-BRCM_RELEASETAG=$(BRCM_VERSION).$(BRCM_RELEASE).$(BRCM_EXTRAVERSION)
+BRCM_RELEASETAG=$(BRCM_VERSION).$(BRCM_RELEASE)L.$(BRCM_EXTRAVERSION)
 
 
 ###########################################
@@ -97,7 +78,6 @@ endif
 ifeq ($(strip $(BRCM_UCLIBC)),y)
 NTC=1
 ifeq ($(strip $(NTC)),1)
-#TOOLCHAIN=/opt/toolchains/uclibc-crosstools
 TOOLCHAIN=/opt/toolchains/uclibc-crosstools
 CROSS_COMPILE = $(TOOLCHAIN)/bin/mips-linux-uclibc-
 else
@@ -135,7 +115,7 @@ INSTALL_DIR = $(TARGETS_DIR)/fs.src
 TARGET_FS = $(TARGETS_DIR)/$(PROFILE)/fs
 PROFILE_DIR = $(TARGETS_DIR)/$(PROFILE)
 PROFILE_PATH = $(TARGETS_DIR)/$(PROFILE)/$(PROFILE)
-VENDOR_NAME = bcm
+VENDOR_NAME = USR
 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)
@@ -147,6 +127,7 @@ INC_ENDPOINT_PATH=$(BRCMDRIVERS_DIR)/broadcom/char/endpoint/bcm9$(BRCM_CHIP)/inc
 INC_ADSLDRV_PATH=$(BRCMDRIVERS_DIR)/broadcom/char/adsl/impl1
 BROADCOM_CFM_DIR=$(BROADCOM_DIR)/cfm
 INC_BRCMCFM_PATH=$(BROADCOM_CFM_DIR)/inc
+VENDOR_COUNTRY = ALL
 
 
 ifeq ($(strip $(BRCM_APP_PHONE)),sip)
@@ -233,26 +214,16 @@ endif
 ifeq ($(strip $(XCHG_LE9502_SLIC)),y)
 ifeq ($(strip $(BRCM_DSP_FXO)),y)
 export XCHANGE_BUILD_APP=Bcm$(BRCM_CHIP)_Le9502FXO
-BRCM_RELEASETAG := $(BRCM_RELEASETAG).LE9502
+BRCM_RELEASETAG := $(BRCM_RELEASETAG)._LE9502
 BRCM_DSP_HAL := LE9502_FXO
 else
 export XCHANGE_BUILD_APP=Bcm$(BRCM_CHIP)_Le9502
-BRCM_RELEASETAG := $(BRCM_RELEASETAG).LE9502
+BRCM_RELEASETAG := $(BRCM_RELEASETAG)._LE9502
 BRCM_DSP_HAL := LE9502
 endif
 export XCHG_LE9502_SLIC
 endif
                                                                                 
-
-ifeq ($(strip $(XCHG_LE9500_SLIC)),y)
-ifeq ($(strip $(BRCM_DSP_FXO)),y)
-export XCHANGE_BUILD_APP=Bcm$(BRCM_CHIP)_Le9500FXO
-BRCM_RELEASETAG := $(BRCM_RELEASETAG).LE9500
-BRCM_DSP_HAL := LE9500_FXO
-endif
-export XCHG_LE9500_SLIC
-endif
-
                                                                                 
 #Set up ADSL standard
 export ADSL=$(BRCM_ADSL_STANDARD)
@@ -282,14 +253,14 @@ SUBDIRS_OPENSOURCE = $(OPENSOURCE_DIR)/atm2684/pvc2684ctl \
         $(OPENSOURCE_DIR)/net-snmp  \
         $(OPENSOURCE_DIR)/ftpd \
         $(OPENSOURCE_DIR)/libcreduction \
-        $(OPENSOURCE_DIR)/busybox \
-	$(OPENSOURCE_DIR)/openssl
+        $(OPENSOURCE_DIR)/busybox
 
 #In future, we need to add soap when it
 #is decoupled from cli
 
 export BROADCOM_DIR=$(USERAPPS_DIR)/broadcom
-SUBDIRS_BROADCOM = $(BROADCOM_DIR)/cfm \
+SUBDIRS_BROADCOM = $(BROADCOM_DIR)/nvram \
+	$(BROADCOM_DIR)/cfm \
         $(BROADCOM_DIR)/upnp/router/upnp \
         $(BROADCOM_DIR)/nas \
         $(BROADCOM_DIR)/wlctl \
@@ -306,23 +277,16 @@ SUBDIRS_BROADCOM = $(BROADCOM_DIR)/cfm \
 	$(BROADCOM_DIR)/ethctl \
         $(BROADCOM_DIR)/hotplug \
         $(BROADCOM_DIR)/epittcp \
-        $(BROADCOM_DIR)/urlfilter \
-        $(BROADCOM_DIR)/fwscheduler \
-        $(BROADCOM_DIR)/traffic_ctl \
- 	$(BROADCOM_DIR)/pcscan \
-	$(BROADCOM_DIR)/ntp \
-        $(BROADCOM_DIR)/smdog
-                                                                                                               
+        $(BROADCOM_DIR)/ses 
+
 SUBDIRS_APP = $(SUBDIRS_BROADCOM) $(SUBDIRS_OPENSOURCE)
 SUBDIRS = $(foreach dir, $(SUBDIRS_APP), $(shell if [ -d "$(dir)" ]; then echo $(dir); fi))
 
 OPENSOURCE_APPS = pvc2684ctl pvc2684d brctl pppd udhcp iptables ebtables \
-                  reaim siproxd snmp zebra bftpd busybox gdbserver openssl
-
-BROADCOM_APPS = cfm upnp nas wlctl vodsl atmctl adslctl netctl dnsprobe \
-                igmp dhcpr diagapp sntp ddnsd ilmi ippd hotplug ethctl epittcp\
-                fwscheduler urlfilter traffic_ctl pcscan ntp smdog
+                  reaim siproxd snmp zebra bftpd busybox gdbserver
 
+BROADCOM_APPS = nvram cfm upnp nas wlctl vodsl atmctl adslctl netctl dnsprobe \
+                igmp dhcpr diagapp sntp ddnsd ilmi ippd hotplug ethctl epittcp ses
 LIBC_OPTIMIZATION = libcreduction
 
 BUSYBOX_DIR = $(OPENSOURCE_DIR)/busybox
@@ -480,17 +444,6 @@ else
 reaim:
 endif
 
-######## for smdog #####################################
-ifneq ($(strip $(BUILD_SMDOG)),)
-export SMDOG=1
-smdog:
-	$(MAKE) -C $(BROADCOM_DIR)/smdog $(BUILD_SMDOG)
-else
-export SMDOG=0
-smdog:
-endif
-                                                                                                               
-
 ifneq ($(strip $(BUILD_GDBSERVER)),)
 gdbserver:
 	$(MAKE) -C $(OPENSOURCE_DIR)/gdbserver dynamic
@@ -498,13 +451,6 @@ else
 gdbserver:
 endif
 
-ifneq ($(strip $(BUILD_OPENSSL)),)
-openssl:
-	#$(MAKE) -C $(OPENSOURCE_DIR)/openssl
-else
-openssl:
-endif
-
 ifneq ($(strip $(BUILD_ETHWAN)),)
 export BUILD_ETHWAN=y
 endif
@@ -667,48 +613,6 @@ export WIRELESS=0
 wlctl:
 endif
 
-######### for fwscheduler ##############################
-ifneq ($(strip $(BUILD_FWSCHEDULER)),)
-export FWSCHEDULER=1
-fwscheduler:
-	$(MAKE) -C $(BROADCOM_DIR)/fwscheduler $(BUILD_FWSCHEDULER)
-else
-export FWSCHEDULER=0
-fwscheduler:
-endif
-
-######### for urlfilter ################################
-ifneq ($(strip $(BUILD_URLFILTER)),)
-export URLFILTER=1
-urlfilter:
-	$(MAKE) -C $(BROADCOM_DIR)/urlfilter $(BUILD_URLFILTER)
-else
-export URLFILTER=0
-urlfilter:
-endif
-
-################for traffic_ctl########################
-ifneq ($(strip $(BUILD_BUDGET)),)	
-traffic_ctl:
-	$(MAKE) -C $(BROADCOM_DIR)/traffic_ctl $(BUILD_BUDGET)
-else
-traffic_ctl:
-endif
-ifneq ($(strip $(BUILD_PCSCAN)),)
-pcscan:
-	$(MAKE) -C $(BROADCOM_DIR)/pcscan $(BUILD_PCSCAN);
-else
-pcscan:
-endif	
-
-ifneq ($(strip $(BUILD_NTP)),)
-ntp:
-	$(MAKE) -C $(BROADCOM_DIR)/ntp $(BUILD_NTP);
-else
-ntp:
-endif	
-
-
 #Always compile Ethernet control utility
 ethctl:
 	$(MAKE) -C $(BROADCOM_DIR)/ethctl dynamic
@@ -779,6 +683,7 @@ endif
 
 ifneq ($(strip $(BUILD_LIBCREDUCTION)),)
 libcreduction:
+	mkdir -p $(OPENSOURCE_DIR)/libcreduction/uclibc
 	$(MAKE) -C $(OPENSOURCE_DIR)/libcreduction install
 else
 libcreduction:
@@ -820,6 +725,20 @@ else
 epittcp:
 endif
 
+ifneq ($(strip $(BUILD_SES)),)
+ses:
+	$(MAKE) -C $(BROADCOM_DIR)/ses $(BUILD_SES)
+else
+ses:
+endif
+
+ifneq ($(strip $(BUILD_NVRAM)),)
+nvram:
+	$(MAKE) -C $(BROADCOM_DIR)/nvram $(BUILD_NVRAM)
+else
+nvram:
+endif
+
 ifneq ($(strip $(BUILD_IPPD)),)
 ippd:
 	$(MAKE) -C $(BROADCOM_DIR)/ippd $(BUILD_IPPD)
@@ -855,7 +774,7 @@ ifneq ($(strip $(BRCM_KERNEL_ROOTFS)),nfs)
 	$(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)/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) -l $(VENDOR_COUNTRY); \
 	$(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')
@@ -940,8 +859,8 @@ export  BRCM_VERSION BRCM_RELEASE BRCM_EXTRAVERSION BRCM_RELEASETAG BRCM_BOARD R
 	BRCM_APP_PHONE BUILD_SOAP BUILD_SOAP_VER BRCM_DSP_CODEC_G711 BRCM_DSP_CODEC_G723 BRCM_DSP_CODEC_G726 BRCM_DSP_CODEC_G729 \
    BRCM_DSP_CODEC_G7xx BRCM_DSP_PCM BRCM_DSP_HYBRID BRCM_DSP_HYBRID_EXT BRCM_DSP_APM_FXO BRCM_DSP_APM_FXO_EXT BRCM_DSP_HYBRID_FXO \
    BRCM_DSP_HYBRID_FXO_EXT BRCM_DSP_CODEC_T38_EXT BRCM_DSP_CODEC_T38_INT BRCM_DSP_HAL BRCM_DSP_HAL_EXTENSION  XCHANGE_DSP_APP_EXTENSION BRCM_VOICE_COUNTRY_JAPAN BRCM_VOICE_GLOBAL_CFLAGS \
-	BUILD_PPPD BUILD_REAIM BUILD_GDBSERVER BUILD_UDHCP BUILD_DHCPR BUILD_UPNP BUILD_SNMP BUILD_NAS BUILD_WLCTL BUILD_BUSYBOX BUILD_DNSPROBE BUILD_SLACTEST BUILD_VCONFIG BUILD_ETHWAN  BUILD_NTP BUILD_OPENSSL \
+	BUILD_PPPD BUILD_REAIM BUILD_GDBSERVER BUILD_UDHCP BUILD_DHCPR BUILD_UPNP BUILD_SNMP BUILD_NAS BUILD_WLCTL BUILD_BUSYBOX BUILD_DNSPROBE BUILD_SLACTEST BUILD_VCONFIG BUILD_ETHWAN \
 	BUILD_ZEBRA BUILD_ATMCTL BUILD_ADSLCTL BUILD_NETCTL BUILD_IGMP BRCM_PTHREADS BUILD_DIAGAPP \
 	BUILD_CFM_TELNETD BUILD_CFM_SSHD BUILD_SSHD_MIPS_GENKEY BUILD_FTPD BRCM_DRIVER_PCI \
 	BRCM_PSI_VERSION WEB_POPUP BUILD_DIR BUILD_DDNSD BUILD_SNTP BUILD_TOD BUILD_IPPD BUILD_VCONFIG JTAG_KERNEL_DEBUG \
-	BUILD_EPITTCP
+	BUILD_EPITTCP BUILD_NVRAM BUILD_SES