X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=hostTools%2Fscripts%2Fgendefconfig;h=af931decbfc25cd183dcf49ff8e9689285f2c952;hp=b11d7baf0d7cc3845d4e565195aa8002ca1b955c;hb=57a096f051259ceaefd5977f30d269884e1dd248;hpb=a69849c98808437716b821267cd97529c56f45b0

diff --git a/hostTools/scripts/gendefconfig b/hostTools/scripts/gendefconfig
index b11d7baf..af931dec 100755
--- a/hostTools/scripts/gendefconfig
+++ b/hostTools/scripts/gendefconfig
@@ -25,7 +25,7 @@ driver_setup ()
   if [ "$BRCM_DRIVER_VAL" != "" ]; then
      SEDCMD="$SEDCMD -e 's/# $LINUX_CONFIG_NAME is not set/$LINUX_CONFIG_NAME="$BRCM_DRIVER_VAL"/'"
   fi
-  SEDCMD="$SEDCMD -e 's/"$LINUX_IMPL_NAME"/"$LINUX_CONFIG_NAME"_IMPL/'"
+  SEDCMD="$SEDCMD -e 's/# "$LINUX_IMPL_NAME"/"$LINUX_CONFIG_NAME"_IMPL/'"
 }
 
 
@@ -54,7 +54,7 @@ TEMPLATE=$HOSTTOOLS_DIR/scripts/defconfig-bcm.template
 
 SEDCMD="$SEDCMD -e 's/# CONFIG_BCM9"$BRCM_CHIP" is not set/CONFIG_BCM9"$BRCM_CHIP"=y/'"
 SEDCMD="$SEDCMD -e 's/# CONFIG_BCM_BOARD is not set/CONFIG_BCM_BOARD=y/'"
-SEDCMD="$SEDCMD -e 's/CONFIG_BCM9"$BRCM_CHIP"_BOARD_IMPL/CONFIG_BCM_BOARD_IMPL/'"
+SEDCMD="$SEDCMD -e 's/# CONFIG_BCM9"$BRCM_CHIP"_BOARD_IMPL/CONFIG_BCM_BOARD_IMPL/'"
 
 driver_setup "ATM" "ATMAPI"
 
@@ -64,7 +64,7 @@ driver_setup "ATM" "BLAA"
 if [ "$BUILD_DIAGAPP" != "" ]; then
    general_setup CONFIG_BCM_ATMTEST $BRCM_DRIVER_ATM
 fi
-SEDCMD="$SEDCMD -e 's/CONFIG_BCM9"$BRCM_CHIP"_ATMTEST_IMPL/CONFIG_BCM_ATMTEST_IMPL/'"
+SEDCMD="$SEDCMD -e 's/# CONFIG_BCM9"$BRCM_CHIP"_ATMTEST_IMPL/CONFIG_BCM_ATMTEST_IMPL/'"
 
 driver_setup "ADSL" "ADSL"
 
@@ -104,6 +104,8 @@ driver_setup "VDSL" "VDSL"
 
 driver_setup "PHONE" "ENDPOINT"
 
+driver_setup "BCMPROF" "BCMPROF"
+
 driver_setup "HPNA" "HPNA"
 
 driver_setup "SECURITY" "SECURITY"
@@ -194,6 +196,16 @@ SEDCMD="$SEDCMD -e 's/# CONFIG_KALLSYMS is not set/CONFIG_KALLSYMS=y/'"
 SEDCMD="$SEDCMD -e 's/# CONFIG_KALLSYMS_EXTRA_PASS is not set/CONFIG_KALLSYMS_EXTRA_PASS=y/'"
 fi
 
+
+############################################################
+# 	Kernel preemption
+############################################################
+
+if [ "$BRCM_KERNEL_PREEMPT" = "y" ]; then
+SEDCMD="$SEDCMD -e 's/# CONFIG_PREEMPT is not set/CONFIG_PREEMPT=y/'"
+fi
+
+
 ############################################################
 # 	Netfilter config generation
 ############################################################
@@ -239,16 +251,6 @@ if [ "$BRCM_KERNEL_NETFILTER" != "" ]; then
       done
    fi
 
-   #Tecom set up netfilter queue
-   if [ "$BRCM_KERNEL_NF_QUEUE" != "" ]; then
-      netfilter_setup "QUEUE" $BRCM_KERNEL_NF_QUEUE
-   fi
-
-   #Tecom set up netfilter traffic
-   if [ "$BRCM_KERNEL_NF_TECOM_TRAFFIC" != "" ]; then
-      netfilter_setup "TECOM_TRAFFIC" $BRCM_KERNEL_NF_TECOM_TRAFFIC
-   fi
-
    # set up packet mangling related modules
    if [ "$BRCM_KERNEL_NF_MANGLE" != "" ]; then
       for mod in $NF_MANGLE_MODULES; do
@@ -292,12 +294,46 @@ if [ "$BRCM_KERNEL_NETFILTER" != "" ]; then
 
 fi
 
+############################################################
+# 	Cryptographic config generation
+############################################################
+if [ "$BRCM_KERNEL_CRYPTO" != "" ]; then
+
+   # set up networking options
+   SEDCMD="$SEDCMD -e 's/# CONFIG_NET_KEY is not set/CONFIG_NET_KEY=y/'"
+   SEDCMD="$SEDCMD -e 's/# CONFIG_INET_AH is not set/CONFIG_INET_AH=y/'"
+   SEDCMD="$SEDCMD -e 's/# CONFIG_INET_ESP is not set/CONFIG_INET_ESP=y/'"
+   SEDCMD="$SEDCMD -e 's/# CONFIG_XFRM_USER is not set/CONFIG_XFRM_USER=y/'"
+   
+   # set up cryptographic options
+   SEDCMD="$SEDCMD -e 's/# CONFIG_CRYPTO is not set/CONFIG_CRYPTO=y/'"
+   if [ "$BRCM_KERNEL_CRYPTO_HMAC" != "" ]; then
+	  SEDCMD="$SEDCMD -e 's/# CONFIG_CRYPTO_HMAC is not set/CONFIG_CRYPTO_HMAC=y/'"
+   fi
+   if [ "$BRCM_KERNEL_CRYPTO_NULL" != "" ]; then
+	  SEDCMD="$SEDCMD -e 's/# CONFIG_CRYPTO_NULL is not set/CONFIG_CRYPTO_NULL=y/'"
+   fi
+   if [ "$BRCM_KERNEL_CRYPTO_MD5" != "" ]; then
+	  SEDCMD="$SEDCMD -e 's/# CONFIG_CRYPTO_MD5 is not set/CONFIG_CRYPTO_MD5=y/'"
+   fi
+   if [ "$BRCM_KERNEL_CRYPTO_SHA1" != "" ]; then
+	  SEDCMD="$SEDCMD -e 's/# CONFIG_CRYPTO_SHA1 is not set/CONFIG_CRYPTO_SHA1=y/'"
+   fi
+   if [ "$BRCM_KERNEL_CRYPTO_DES" != "" ]; then
+	  SEDCMD="$SEDCMD -e 's/# CONFIG_CRYPTO_DES is not set/CONFIG_CRYPTO_DES=y/'"
+   fi
+   if [ "$BRCM_KERNEL_CRYPTO_AES" != "" ]; then
+	  SEDCMD="$SEDCMD -e 's/# CONFIG_CRYPTO_AES is not set/CONFIG_CRYPTO_AES=y/'"
+   fi
+fi
+
 ############################################################
 # 	Bridge Layer filter config generation
 ############################################################
 if [ "$BUILD_EBTABLES" != "" ]; then
 SEDCMD="$SEDCMD -e 's/# CONFIG_BRIDGE_NF_EBTABLES is not set/CONFIG_BRIDGE_NF_EBTABLES=y/'"
 SEDCMD="$SEDCMD -e 's/# CONFIG_BRIDGE_EBT_T_FILTER is not set/CONFIG_BRIDGE_EBT_T_FILTER=y/'"
+SEDCMD="$SEDCMD -e 's/# CONFIG_BRIDGE_EBT_BROUTE is not set/CONFIG_BRIDGE_EBT_BROUTE=y/'"
 SEDCMD="$SEDCMD -e 's/# CONFIG_BRIDGE_EBT_IP is not set/CONFIG_BRIDGE_EBT_IP=y/'"
 SEDCMD="$SEDCMD -e 's/# CONFIG_BRIDGE_EBT_VLAN is not set/CONFIG_BRIDGE_EBT_VLAN=y/'"
 SEDCMD="$SEDCMD -e 's/# CONFIG_BRIDGE_EBT_TIME is not set/CONFIG_BRIDGE_EBT_TIME=y/'"
@@ -318,19 +354,16 @@ fi
 ############################################################
 if [ "$BRCM_KERNEL_NETQOS" != "" ]; then
    SEDCMD="$SEDCMD -e 's/# CONFIG_NET_SCHED is not set/CONFIG_NET_SCHED=y/'"
-   SEDCMD="$SEDCMD -e 's/# CONFIG_NET_QOS is not set/CONFIG_NET_QOS=y/'"
-   SEDCMD="$SEDCMD -e 's/# CONFIG_NET_ESTIMATOR is not set/CONFIG_NET_ESTIMATOR=y/'"
+   SEDCMD="$SEDCMD -e 's/# CONFIG_NET_SCH_CLK_JIFFIES is not set/CONFIG_NET_SCH_CLK_JIFFIES=y/'"
    SEDCMD="$SEDCMD -e 's/# CONFIG_NET_CLS is not set/CONFIG_NET_CLS=y/'"
    SEDCMD="$SEDCMD -e 's/# CONFIG_NET_CLS_POLICE is not set/CONFIG_NET_CLS_POLICE=y/'"
    general_setup CONFIG_NET_SCH_CBQ  $BRCM_KERNEL_NETQOS
    general_setup CONFIG_NET_SCH_HTB  $BRCM_KERNEL_NETQOS
-   general_setup CONFIG_NET_SCH_HFSC $BRCM_KERNEL_NETQOS
    general_setup CONFIG_NET_SCH_PRIO $BRCM_KERNEL_NETQOS
    general_setup CONFIG_NET_SCH_SFQ $BRCM_KERNEL_NETQOS
-   general_setup CONFIG_NET_SCH_DSMARK $BRCM_KERNEL_NETQOS
-   general_setup CONFIG_NET_CLS_TCINDEX $BRCM_KERNEL_NETQOS
    general_setup CONFIG_NET_CLS_FW $BRCM_KERNEL_NETQOS
    general_setup CONFIG_NET_CLS_U32 $BRCM_KERNEL_NETQOS
+   general_setup CONFIG_NET_CLS_POLICE $BRCM_KERNEL_NETQOS
 fi
 
 ############################################################