From 6461fc6fcb77134cb454f1af9c08c277dc6b4b2c Mon Sep 17 00:00:00 2001 From: hwg Date: Wed, 4 Mar 2015 10:46:28 +0800 Subject: [PATCH] Revert "support different wifi bt chip auto compatible" This reverts commit 2506d1678c7f5ed228e2a7ed4130a5f9ede641db. --- arch/arm64/boot/dts/rk3368-p9_818.dts | 16 ++-- arch/arm64/boot/dts/rk3368-tb_8846.dts | 14 ++-- scripts/gcc-wrapper.py | 103 +++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 15 deletions(-) create mode 100755 scripts/gcc-wrapper.py diff --git a/arch/arm64/boot/dts/rk3368-p9_818.dts b/arch/arm64/boot/dts/rk3368-p9_818.dts index 2adee7a68e78..a2addcf15800 100755 --- a/arch/arm64/boot/dts/rk3368-p9_818.dts +++ b/arch/arm64/boot/dts/rk3368-p9_818.dts @@ -13,14 +13,14 @@ compatible = "wlan-platdata"; rockchip,grf = <&grf>; - - - /* wifi_chip_type - wifi chip define - * ap6210, ap6330, ap6335 - * rtl8188eu, rtl8723bs, rtl8723bu - * esp8089 - */ - wifi_chip_type = "ap6210"; + + /* wifi_chip_type - wifi chip define + * bcmwifi ==> like ap6xxx, rk90x; + * rtkwifi ==> like rtl8188xx, rtl8723xx; + * esp8089 ==> esp8089; + * other ==> for other wifi; + */ + wifi_chip_type = "bcmwifi"; sdio_vref = <1800>; //1800mv or 3300mv power_pmu_regulator = "rk818_ldo8_reg"; diff --git a/arch/arm64/boot/dts/rk3368-tb_8846.dts b/arch/arm64/boot/dts/rk3368-tb_8846.dts index dbe977849595..665092fc8618 100644 --- a/arch/arm64/boot/dts/rk3368-tb_8846.dts +++ b/arch/arm64/boot/dts/rk3368-tb_8846.dts @@ -16,13 +16,13 @@ compatible = "wlan-platdata"; rockchip,grf = <&grf>; - - /* wifi_chip_type - wifi chip define - * ap6210, ap6330, ap6335 - * rtl8188eu, rtl8723bs, rtl8723bu - * esp8089 - */ - wifi_chip_type = "ap6335"; + /* wifi_chip_type - wifi chip define + * bcmwifi ==> like ap6xxx, rk90x; + * rtkwifi ==> like rtl8188xx, rtl8723xx; + * esp8089 ==> esp8089; + * other ==> for other wifi; + */ + wifi_chip_type = "bcmwifi"; sdio_vref = <1800>; //1800mv or 3300mv diff --git a/scripts/gcc-wrapper.py b/scripts/gcc-wrapper.py new file mode 100755 index 000000000000..1f4ee7b5fc68 --- /dev/null +++ b/scripts/gcc-wrapper.py @@ -0,0 +1,103 @@ +#! /usr/bin/env python +# -*- coding: utf-8 -*- + +# Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of The Linux Foundation nor +# the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Invoke gcc, looking for warnings, and causing a failure if there are +# non-whitelisted warnings. + +import errno +import re +import os +import sys +import subprocess + +# Note that gcc uses unicode, which may depend on the locale. TODO: +# force LANG to be set to en_US.UTF-8 to get consistent warnings. + +allowed_warnings = set([ + "return_address.c:63", + "hid-appleir.c:347", + "hid-magicmouse.c:580", + "hid-ntrig.c:1026", + "core.c:1334", + "menu.c:129", + "bus.c:318", # FIXME + "atags_to_fdt.c:96", + ]) + +# Capture the name of the object file, can find it. +ofile = None + +warning_re = re.compile(r'''(.*/|)([^/]+\.[a-z]+:\d+):(\d+:)? warning:''') +def interpret_warning(line): + """Decode the message from gcc. The messages we care about have a filename, and a warning""" + line = line.rstrip('\n') + m = warning_re.match(line) + if m and m.group(2) not in allowed_warnings: + print "error, forbidden warning:", m.group(2) + + # If there is a warning, remove any object if it exists. + if ofile: + try: + os.remove(ofile) + except OSError: + pass + sys.exit(1) + +def run_gcc(): + args = sys.argv[1:] + # Look for -o + try: + i = args.index('-o') + global ofile + ofile = args[i+1] + except (ValueError, IndexError): + pass + + compiler = sys.argv[0] + + try: + proc = subprocess.Popen(args, stderr=subprocess.PIPE) + for line in proc.stderr: + print line, + interpret_warning(line) + + result = proc.wait() + except OSError as e: + result = e.errno + if result == errno.ENOENT: + print args[0] + ':',e.strerror + print 'Is your PATH set correctly?' + else: + print ' '.join(args), str(e) + + return result + +if __name__ == '__main__': + status = run_gcc() + sys.exit(status) -- 2.34.1