diff options
| -rw-r--r-- | arch/arm/configs/tegra12_android_defconfig | 9 | ||||
| -rw-r--r-- | arch/arm64/configs/tegra13_android_defconfig | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/arch/arm/configs/tegra12_android_defconfig b/arch/arm/configs/tegra12_android_defconfig index 5c9f0d6131fa..cfcf707ba605 100644 --- a/arch/arm/configs/tegra12_android_defconfig +++ b/arch/arm/configs/tegra12_android_defconfig @@ -41,7 +41,6 @@ CONFIG_TEGRA_WAKEUP_MONITOR=y CONFIG_TEGRA_PREPOWER_WIFI=y CONFIG_TEGRA_SKIN_THROTTLE=y CONFIG_TEGRA_PLLM_SCALED=y -CONFIG_TEGRA_MC_DOMAINS=y CONFIG_TEGRA_USE_NCT=y CONFIG_ARM_LPAE=y # CONFIG_CACHE_L2X0 is not set @@ -243,11 +242,8 @@ CONFIG_USB_NET_RAW_IP=m CONFIG_WIFI_CONTROL_FUNC=y CONFIG_BCMDHD=m CONFIG_BCM43241=y -CONFIG_BCM43341=y CONFIG_BCMDHD_FW_PATH="/data/misc/wifi/firmware/fw_bcmdhd.bin" CONFIG_BCMDHD_NVRAM_PATH="/data/misc/wifi/firmware/nvram.txt" -CONFIG_BCMDHD_HW_OOB=y -CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y CONFIG_SD8897=m # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_JOYDEV=y @@ -388,8 +384,6 @@ CONFIG_TEGRA_DP=y CONFIG_TEGRA_NVSR=y CONFIG_TEGRA_NVHDCP=y # CONFIG_TEGRA_CAMERA is not set -CONFIG_GK20A_PMU=y -CONFIG_GK20A_DEVFREQ=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set @@ -549,6 +543,7 @@ CONFIG_ION=y CONFIG_ION_DUMMY=y CONFIG_USB_WPAN_HCD=y CONFIG_PASR=y +CONFIG_TEGRA_MC_DOMAINS=y CONFIG_CLK_PALMAS=y CONFIG_CLK_AS3722=y CONFIG_TEGRA_IOMMU_SMMU=y @@ -558,6 +553,8 @@ CONFIG_EXTCON_PALMAS=y CONFIG_IIO=y CONFIG_PWM=y CONFIG_PWM_TEGRA=y +CONFIG_GK20A_PMU=y +CONFIG_GK20A_DEVFREQ=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y diff --git a/arch/arm64/configs/tegra13_android_defconfig b/arch/arm64/configs/tegra13_android_defconfig index e1b4e3e744cd..7d6f0d9c250b 100644 --- a/arch/arm64/configs/tegra13_android_defconfig +++ b/arch/arm64/configs/tegra13_android_defconfig @@ -39,7 +39,6 @@ CONFIG_TEGRA_WAKEUP_MONITOR=y CONFIG_TEGRA_PREPOWER_WIFI=y CONFIG_TEGRA_SKIN_THROTTLE=y CONFIG_TEGRA_PLLM_SCALED=y -CONFIG_TEGRA_MC_DOMAINS=y CONFIG_ARCH_TEGRA_13x_SOC=y CONFIG_MACH_T132REF=y CONFIG_PCI_TEGRA=y @@ -232,11 +231,8 @@ CONFIG_USB_NET_RAW_IP=m CONFIG_WIFI_CONTROL_FUNC=y CONFIG_BCMDHD=m CONFIG_BCM43241=y -CONFIG_BCM43341=y CONFIG_BCMDHD_FW_PATH="/data/misc/wifi/firmware/fw_bcmdhd.bin" CONFIG_BCMDHD_NVRAM_PATH="/data/misc/wifi/firmware/nvram.txt" -CONFIG_BCMDHD_HW_OOB=y -CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y CONFIG_SD8897=m CONFIG_INPUT_JOYDEV=y CONFIG_INPUT_EVDEV=y @@ -363,14 +359,11 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y CONFIG_TEGRA_GRHOST=y CONFIG_TEGRA_DC=y -CONFIG_NVMAP_VPR=y CONFIG_TEGRA_DSI=y CONFIG_TEGRA_DSI2EDP_SN65DSI86=y CONFIG_TEGRA_DP=y CONFIG_TEGRA_NVHDCP=y # CONFIG_TEGRA_CAMERA is not set -CONFIG_GK20A_PMU=y -CONFIG_GK20A_DEVFREQ=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set @@ -523,6 +516,7 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ANDROID_INTF_ALARM_DEV=y CONFIG_USB_WPAN_HCD=y CONFIG_PASR=y +CONFIG_TEGRA_MC_DOMAINS=y CONFIG_CLK_PALMAS=y CONFIG_CLK_AS3722=y CONFIG_TEGRA_IOMMU_SMMU=y @@ -531,6 +525,8 @@ CONFIG_EXTCON_PALMAS=y CONFIG_IIO=y CONFIG_PWM=y CONFIG_PWM_TEGRA=y +CONFIG_GK20A_PMU=y +CONFIG_GK20A_DEVFREQ=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y |