From dc06fd90ff9358c109609086dac1e43da83a6db8 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 5 Jul 2012 14:29:48 +0300 Subject: [PATCH] tizen packaging: update TI wifi driver build script Update the wl12xx driver build script to MCG WW26 release. Also, update the related tizen patch. Signed-off-by: Markus Lehtonen --- packaging/tizen-wl12xx-compat-build.patch | 43 +++++++++++++++++-------------- packaging/wl12xx-compat-build.sh | 20 +++++++++----- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/packaging/tizen-wl12xx-compat-build.patch b/packaging/tizen-wl12xx-compat-build.patch index 4eb0da5..d5cca29 100644 --- a/packaging/tizen-wl12xx-compat-build.patch +++ b/packaging/tizen-wl12xx-compat-build.patch @@ -1,11 +1,11 @@ -diff --git packaging/wl12xx-compat-build.sh packaging/wl12xx-compat-build.sh -index 4b81ff1..bd49107 100755 ---- packaging/wl12xx-compat-build.sh -+++ packaging/wl12xx-compat-build.sh -@@ -38,19 +38,20 @@ _logfile="" - _preserve_kernel_config="" +diff --git a/packaging/wl12xx-compat-build.sh b/packaging/wl12xx-compat-build.sh +index dd33741..22ee7dd 100755 +--- a/packaging/wl12xx-compat-build.sh ++++ b/packaging/wl12xx-compat-build.sh +@@ -39,19 +39,20 @@ _preserve_kernel_config="" _menuconfig="false" _config_file_type=android + _regdom="00" +_install=false init_variables() { @@ -28,7 +28,7 @@ index 4b81ff1..bd49107 100755 if [ -z "$CROSS_COMPILE" ];then export CROSS_COMPILE="`basename ${TARGET_TOOLS_PREFIX}`" fi -@@ -59,7 +60,7 @@ init_variables() { +@@ -60,7 +61,7 @@ init_variables() { export CROSS_COMPILE="ccache $CROSS_COMPILE" fi export ARCH=i386 @@ -37,7 +37,7 @@ index 4b81ff1..bd49107 100755 echo >&3 "ARCH: $ARCH" echo >&3 "CROSS_COMPILE: $CROSS_COMPILE" echo >&3 "PATH: $PATH" -@@ -85,29 +86,28 @@ init_variables() { +@@ -86,32 +87,33 @@ init_variables() { esac PRODUCT_OUT=${TOP}/out/target/product/${BOARD} @@ -52,13 +52,18 @@ index 4b81ff1..bd49107 100755 + local COMPAT_SRC_DIR=$TOP/ti-wlan/wl12xx-compat/ + local MODULE_DEST_TMP=${INSTALL_MOD_PATH} local MODULE_DEST=${PRODUCT_OUT}/root/lib/modules + local MODULE_REGDOM=$2 cd ${COMPAT_SRC_DIR} ++ # Fix script permissions ++ chmod 755 ./scripts/* + + echo "$MODULE_REGDOM" > compat_regdom - make ARCH=${ARCH} KLIB=${MODULE_DEST_TMP} KLIB_BUILD=${KERNEL_BUILD_DIR} clean - exit_on_error $? quiet - - make ARCH=${ARCH} KLIB=${MODULE_DEST_TMP} KLIB_BUILD=${KERNEL_BUILD_DIR} + make ARCH=${ARCH} KLIB=${MODULE_DEST_TMP} KLIB_BUILD=${KERNEL_BUILD_DIR} exit_on_error $? quiet - rm -rf ${MODULE_DEST_TMP} @@ -77,18 +82,18 @@ index 4b81ff1..bd49107 100755 exit_on_error $? quiet cd ${TOP} -@@ -129,7 +129,7 @@ usage() { +@@ -134,7 +136,7 @@ usage() { main() { - local custom_board_list="vbox mfld_cdk mfld_pr2 mfld_gi mfld_dv10 ctp_pr0 ctp_pr1 mrfl_vp mrfl_hvp mrfl_sle" + local custom_board_list="vbox mfld_cdk mfld_pr2 mfld_gi mfld_dv10 mfld_tablet_evx ctp_pr0 ctp_pr1 mrfl_vp mrfl_hvp mrfl_sle" -- while getopts Kc:j:kthCm opt -+ while getopts Kc:j:kthCmi opt +- while getopts Kc:j:kthCmr: opt ++ while getopts Kc:j:kthCmr:i opt do case "${opt}" in K) -@@ -172,6 +172,9 @@ main() { - m) - _menuconfig=true +@@ -180,6 +182,9 @@ main() { + r) + _regdom=$OPTARG ;; + i) + _install=true @@ -96,7 +101,7 @@ index 4b81ff1..bd49107 100755 ?) echo "Unknown option" usage -@@ -182,11 +185,18 @@ main() { +@@ -190,11 +195,18 @@ main() { for custom_board in $custom_board_list do @@ -104,12 +109,12 @@ index 4b81ff1..bd49107 100755 - echo >&3 "Building kernel for $custom_board" - echo >&3 "---------------------------------" init_variables "$custom_board" -- make_compat ${custom_board} +- make_compat ${custom_board} $_regdom + if [ $_install != true ]; then + echo >&3 + echo >&3 "Building TI WLAN modules for $custom_board" + echo >&3 "---------------------------------" -+ make_compat ${custom_board} ++ make_compat ${custom_board} $_regdom + else + echo >&3 + echo >&3 "Installing TI WLAN modules for $custom_board" diff --git a/packaging/wl12xx-compat-build.sh b/packaging/wl12xx-compat-build.sh index 4b81ff1..dd33741 100755 --- a/packaging/wl12xx-compat-build.sh +++ b/packaging/wl12xx-compat-build.sh @@ -38,6 +38,7 @@ _logfile="" _preserve_kernel_config="" _menuconfig="false" _config_file_type=android +_regdom="00" init_variables() { local custom_board=$1 @@ -74,7 +75,7 @@ init_variables() { VENDOR="" BOARD=generic_x86 ;; - mfld_cdk | mfld_pr2 | mfld_gi | mfld_dv10 | ctp_pr0 | ctp_pr1 | mrfl_vp | mrfl_hvp | mrfl_sle) + mfld_cdk | mfld_pr2 | mfld_gi | mfld_dv10 | mfld_tablet_evx | ctp_pr0 | ctp_pr1 | mrfl_vp | mrfl_hvp | mrfl_sle) VENDOR=intel BOARD=${custom_board} ;; @@ -93,13 +94,16 @@ make_compat() { local COMPAT_SRC_DIR=$TOP/hardware/ti/wlan/wl12xx-compat/ local MODULE_DEST_TMP=${PRODUCT_OUT}/compat_modules local MODULE_DEST=${PRODUCT_OUT}/root/lib/modules + local MODULE_REGDOM=$2 cd ${COMPAT_SRC_DIR} + echo "$MODULE_REGDOM" > compat_regdom + make ARCH=${ARCH} KLIB=${MODULE_DEST_TMP} KLIB_BUILD=${KERNEL_BUILD_DIR} clean exit_on_error $? quiet - make ARCH=${ARCH} KLIB=${MODULE_DEST_TMP} KLIB_BUILD=${KERNEL_BUILD_DIR} + make ARCH=${ARCH} KLIB=${MODULE_DEST_TMP} KLIB_BUILD=${KERNEL_BUILD_DIR} exit_on_error $? quiet rm -rf ${MODULE_DEST_TMP} @@ -117,19 +121,20 @@ usage() { echo "Usage: $0 [-c custom_board] [-j jobs]" echo "" - echo " -c [generic_x86|vbox|mfld_cdk|mfld_pr2|mfld_gi|mfld_dv10|ctp_pr0|ctp_pr1|mrfl_vp|mrfl_hvp|mrfl_sle]" + echo " -c [generic_x86|vbox|mfld_cdk|mfld_pr2|mfld_gi|mfld_dv10|mfld_tablet_evx|ctp_pr0|ctp_pr1|mrfl_vp|mrfl_hvp|mrfl_sle]" echo " custom board (target platform)" echo " -j [jobs] # of jobs to run simultaneously. 0=automatic" echo " -K Build a kboot kernel" echo " -k build kernel only" echo " -t testtool build" echo " -C clean first" + echo " -r default regulatory domain" } main() { - local custom_board_list="vbox mfld_cdk mfld_pr2 mfld_gi mfld_dv10 ctp_pr0 ctp_pr1 mrfl_vp mrfl_hvp mrfl_sle" + local custom_board_list="vbox mfld_cdk mfld_pr2 mfld_gi mfld_dv10 mfld_tablet_evx ctp_pr0 ctp_pr1 mrfl_vp mrfl_hvp mrfl_sle" - while getopts Kc:j:kthCm opt + while getopts Kc:j:kthCmr: opt do case "${opt}" in K) @@ -172,6 +177,9 @@ main() { m) _menuconfig=true ;; + r) + _regdom=$OPTARG + ;; ?) echo "Unknown option" usage @@ -186,7 +194,7 @@ main() { echo >&3 "Building kernel for $custom_board" echo >&3 "---------------------------------" init_variables "$custom_board" - make_compat ${custom_board} + make_compat ${custom_board} $_regdom exit_on_error $? done exit 0 -- 2.7.4