diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/cyanogenmod_n8000_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/cyanogenmod_n8013_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/mach-exynos/Makefile | 11 |
4 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/configs/cyanogenmod_n8000_defconfig b/arch/arm/configs/cyanogenmod_n8000_defconfig index 674afdf..690c467 100644 --- a/arch/arm/configs/cyanogenmod_n8000_defconfig +++ b/arch/arm/configs/cyanogenmod_n8000_defconfig @@ -459,6 +459,7 @@ CONFIG_MACH_P4NOTE=y # CONFIG_MACH_BAFFIN is not set # CONFIG_MIDAS_COMMON_BD is not set CONFIG_P4NOTE_00_BD=y +CONFIG_GPS_BRCM_475X=y # CONFIG_GC1_00_BD is not set # CONFIG_T0_00_BD is not set # CONFIG_T0_04_BD is not set diff --git a/arch/arm/configs/cyanogenmod_n8013_defconfig b/arch/arm/configs/cyanogenmod_n8013_defconfig index ef92321b..aca3824 100644 --- a/arch/arm/configs/cyanogenmod_n8013_defconfig +++ b/arch/arm/configs/cyanogenmod_n8013_defconfig @@ -459,6 +459,7 @@ CONFIG_MACH_P4NOTE=y # CONFIG_MACH_BAFFIN is not set # CONFIG_MIDAS_COMMON_BD is not set CONFIG_P4NOTE_00_BD=y +CONFIG_GPS_BRCM_475X=y # CONFIG_GC1_00_BD is not set # CONFIG_T0_00_BD is not set # CONFIG_T0_04_BD is not set diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 2c177ec..93bb58c 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -1726,6 +1726,11 @@ endchoice endif +comment "Connectivity Feature" +config GPS_BRCM_475X + bool "BRCM_475X_CHIPSET" + default n + if BT config BT_CSR8811 bool "Enable CSR8811 driver" diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 932ca75..a73a49f 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -159,18 +159,22 @@ obj-$(CONFIG_MIDAS_COMMON) += sec-common.o \ midas-mhl.o midas-lcd.o t0-sound.o obj-$(CONFIG_SEC_MODEM) += board-gps-bcm475x.o else +ifeq ($(CONFIG_MACH_P4NOTE),y) ifeq ($(CONFIG_MACH_P4NOTELTE_USA_VZW),y) obj-$(CONFIG_MIDAS_COMMON) += sec-common.o\ midas-tsp.o board-midas-wlan.o \ midas-camera.o midas-thermistor.o \ midas-mhl.o midas-lcd.o midas-sound.o + +obj-$(CONFIG_GPS_BRCM_475X) += board-gps-bcm475x.o else -ifeq ($(CONFIG_MACH_P4NOTE),y) obj-$(CONFIG_MIDAS_COMMON) += sec-common.o\ midas-tsp.o board-midas-wlan.o \ midas-camera.o midas-thermistor.o \ - midas-mhl.o midas-lcd.o midas-sound.o \ - board-gps-bcm475x.o + midas-mhl.o midas-lcd.o midas-sound.o + +obj-$(CONFIG_GPS_BRCM_475X) += board-gps-bcm475x.o +endif #CONFIG_MACH_P4NOTELTE_USA_VZW else ifeq ($(CONFIG_MACH_SLP_T0_LTE),y) obj-$(CONFIG_MIDAS_COMMON) += sec-common.o \ @@ -195,7 +199,6 @@ endif endif endif endif -endif obj-$(CONFIG_IRON_BD) += board-iron-gpio.o board-grande-power.o obj-$(CONFIG_GRANDE_BD) += board-grande-gpio.o board-grande-power.o obj-$(CONFIG_P4NOTE_00_BD) += p4note-gpio.o p4note-power.o |