diff options
| author | Eric Miao <eric.miao@nvidia.com> | 2013-10-03 18:01:10 -0700 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-10-10 19:28:37 -0700 |
| commit | dd95ea1e1644214f9953611628bb97f433aaf1ac (patch) | |
| tree | 60669d58a0d1bd873172618aab31c8fcf73ee736 | |
| parent | 9cdf6b4fdb5cf30267a62f8b795eb83ea06d5637 (diff) | |
ARM: tegra: disable IKCONFIG and make modules built-in
Bug 1343930
To be conform with CTS, we need to disable IKCONFIG and MODULES,
and make existing modules all built-in.
CONFIG_MODULES and relevant options are left untouched, these will
be turned OFF if it's a user build. This option is still necessary
for engineering build for out-of-tree modules and many test cases.
Change-Id: Icd858d5d707e66d4d9499de8ad358d06bc4e35d2
Signed-off-by: Eric Miao <eric.miao@nvidia.com>
Reviewed-on: http://git-master/r/281984
Reviewed-by: Eric Miao <emiao@nvidia.com>
Tested-by: Eric Miao <emiao@nvidia.com>
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
| -rw-r--r-- | arch/arm/configs/tegra11_android_defconfig | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/configs/tegra11_android_defconfig b/arch/arm/configs/tegra11_android_defconfig index 3888670072bc..20bbf1c23b8f 100644 --- a/arch/arm/configs/tegra11_android_defconfig +++ b/arch/arm/configs/tegra11_android_defconfig @@ -1,7 +1,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_AUDIT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG is not set +# CONFIG_IKCONFIG_PROC is not set CONFIG_CGROUPS=y CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y @@ -41,7 +41,7 @@ CONFIG_TEGRA_DYNAMIC_PWRDET=y CONFIG_TEGRA_WAKEUP_MONITOR=y CONFIG_TEGRA_USB_MODEM_POWER=y CONFIG_TEGRA_BB_XMM_POWER=y -CONFIG_TEGRA_BB_XMM_POWER2=m +CONFIG_TEGRA_BB_XMM_POWER2=y CONFIG_TEGRA_PREPOWER_WIFI=y CONFIG_TEGRA_SKIN_THROTTLE=y CONFIG_TEGRA_PLLM_SCALED=y @@ -181,10 +181,10 @@ CONFIG_NET_ACT_GACT=y CONFIG_NET_ACT_MIRRED=y CONFIG_BT=y CONFIG_BT_HIDP=y -CONFIG_CFG80211=m +CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y -CONFIG_LIB80211=m -CONFIG_MAC80211=m +CONFIG_LIB80211=y +CONFIG_MAC80211=y CONFIG_RFKILL=y CONFIG_RFKILL_GPIO=y CONFIG_CAIF=y @@ -204,7 +204,7 @@ CONFIG_FAN_THERM_EST=y CONFIG_BLUEDROID_PM=y CONFIG_EEPROM_AT24=y CONFIG_TI_ST=y -CONFIG_ST_GPS=m +CONFIG_ST_GPS=y CONFIG_ST_HCI=y CONFIG_ST_HOST_WAKE=y CONFIG_TEGRA_BB_SUPPORT=y @@ -241,8 +241,8 @@ CONFIG_USB_NET_SMSC95XX=y # CONFIG_USB_BELKIN is not set # CONFIG_USB_ARMLINUX is not set # CONFIG_USB_NET_ZAURUS is not set -CONFIG_USB_NET_RAW_IP=m -CONFIG_BCMDHD=m +CONFIG_USB_NET_RAW_IP=y +CONFIG_BCMDHD=y CONFIG_BCMDHD_FW_PATH="/system/vendor/firmware/bcm43241/fw_bcmdhd.bin" CONFIG_BCMDHD_NVRAM_PATH="/system/etc/nvram_43241.txt" CONFIG_BCMDHD_CFG80211=y @@ -270,9 +270,9 @@ CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y CONFIG_INPUT_CAPELLA_CM3217=y CONFIG_INPUT_CAPELLA_CM3218=y -CONFIG_INV_AK8975=m -CONFIG_INV_MPU=m -CONFIG_INV_BMP180=m +CONFIG_INV_AK8975=y +CONFIG_INV_MPU=y +CONFIG_INV_BMP180=y CONFIG_SERIO_LIBPS2=y # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set @@ -473,7 +473,7 @@ CONFIG_USB_LIBUSUAL=y CONFIG_USB_SERIAL=y CONFIG_USB_SERIAL_PL2303=y CONFIG_USB_SERIAL_OPTION=y -CONFIG_USB_SERIAL_BASEBAND=m +CONFIG_USB_SERIAL_BASEBAND=y CONFIG_USB_RENESAS_MODEM=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_VBUS_DRAW=500 @@ -563,7 +563,7 @@ CONFIG_DYNAMIC_DEBUG=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_SELINUX=y -CONFIG_CRYPTO_TEST=m +# CONFIG_CRYPTO_TEST is not set CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_ANSI_CPRNG is not set |