X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=Makefile;h=492687341819859c6a1e8497fd3112758fceb194;hp=efe594858b9de727a6e3325119977f95f55704b4;hb=172f01faf449acfc67d24d7f10b29f66f9760147;hpb=6adeba4d92a546ebbadde2562283ee6b984b22c1

diff --git a/Makefile b/Makefile
index efe59485..49268734 100755
--- a/Makefile
+++ b/Makefile
@@ -115,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 = USR
+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)
@@ -129,7 +129,6 @@ INC_BRCMSHARED_PUB_PATH=$(SHARED_DIR)/opensource/include
 INC_BRCMSHARED_PRIV_PATH=$(SHARED_DIR)/broadcom/include
 INC_BRCMBOARDPARMS_PATH=$(SHARED_DIR)/opensource/boardparms
 INC_FLASH_PATH=$(SHARED_DIR)/opensource/flash
-VENDOR_COUNTRY = IT
 
 ifeq ($(strip $(BRCM_APP_PHONE)),sip)
 export VOXXXLOAD=1
@@ -444,7 +443,6 @@ SUBDIRS_BROADCOM = $(BROADCOM_DIR)/nvram \
         $(BROADCOM_DIR)/ses \
         $(BROADCOM_DIR)/relayCtl \
         $(BROADCOM_DIR)/vdslctl \
-        $(BROADCOM_DIR)/ledctrl \
         $(BROADCOM_DIR)/hostCode
 
 SUBDIRS_APP = $(SUBDIRS_BROADCOM) $(SUBDIRS_OPENSOURCE)
@@ -455,7 +453,7 @@ OPENSOURCE_APPS = ipsec-tools pvc2684ctl pvc2684d brctl pppd udhcp iptables ebta
 
 BROADCOM_APPS = nvram cfm upnp nas wlctl vodsl atmctl adslctl netctl dnsprobe \
                 igmp dhcpr diagapp sntp ddnsd ilmi ippd hotplug ethctl epittcp snmp ses \
-                hmi2proxy relayctl vdslctl ledctrl
+                hmi2proxy relayctl vdslctl
 LIBC_OPTIMIZATION = libcreduction
 
 ifneq ($(strip $(BUILD_GDBSERVER)),)
@@ -526,15 +524,11 @@ endif
 
 modules: profile_check modbuild hosttools buildimage
 
-app: profile_check prebuild $(BRCMAPPS) hosttools rm_cvs buildimage 
+app: profile_check prebuild $(BRCMAPPS) hosttools buildimage
 
 prebuild:
 	mkdir -p $(INSTALL_DIR)/bin $(INSTALL_DIR)/lib
 
-rm_cvs:
-#	@echo "Removing CVS info"
-#	find $(INSTALL_DIR) -name 'CVS' -print -exec rm -rf "{}" ";"
-
 # touch_voice_files doesn't clean up voice, just enables incremental build of voice code
 touch_voice_files:
 	find bcmdrivers/broadcom/char/endpoint/ \( -name '*.o' -o -name '*.a' -o -name '*.lib' -o -name '*.ko' -o -name '*.cmd' -o -name '.*.cmd' -o -name '*.c' -o -name '*.mod' \) -print -exec rm -f "{}" ";"
@@ -968,7 +962,6 @@ endif
 
 ifneq ($(strip $(BUILD_LIBCREDUCTION)),)
 libcreduction:
-	mkdir -p $(OPENSOURCE_DIR)/libcreduction/uclibc
 	$(MAKE) -C $(OPENSOURCE_DIR)/libcreduction install
 else
 libcreduction:
@@ -1036,9 +1029,6 @@ vdslctl:
 else
 vdslctl:
 endif
-# USR9109/9113 BUILD_LEDCTRL
-ledctrl:
-	$(MAKE) -C $(BROADCOM_DIR)/ledctrl $(BUILD_SNTP)
 
 hosttools:
 	$(MAKE) -C $(HOSTTOOLS_DIR)
@@ -1090,7 +1080,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) -l $(VENDOR_COUNTRY); \
+	$(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')