update for lineage-15.1

Change-Id: I4d9a0c272d8da1dcfae09cb5d58c745d7e6bc9d9
Exynos7580 · Dec 27, 2017 · f4fa36d · f4fa36d
1 parent ca41732
commit f4fa36d
Show file tree

Hide file tree

Showing 60 changed files with 688 additions and 656 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -21,52 +21,8 @@ TARGET_OTA_ASSERT_DEVICE := s5neo3g,s5neo3gxx,s5neolte,s5neoltexx
 
 DEVICE_PATH := device/samsung/s5neoltexx
 
-# Include path
-TARGET_SPECIFIC_HEADER_PATH += $(DEVICE_PATH)/include
-
-# Bluetooth
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
-
-# Hardware
-BOARD_HARDWARE_CLASS += $(DEVICE_PATH)/cmhw
-
-# Init
-TARGET_INIT_VENDOR_LIB := libinit_s5neolte
-
-# Kernel
-BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x01000000 --tags_offset 0x00000100 --dt $(DEVICE_PATH)/dt.img --board SYSMAGIC000KU
-BOARD_KERNEL_CMDLINE := androidboot.selinux=permissive console=tty0 androidboot.console=tty0 androidboot.hardware=samsungexynos7580 fbcon=font:VGA8x8,rotate:1 mem=471M no_console_suspend=1
-TARGET_KERNEL_CONFIG := lineageos_s5neolte_defconfig
-TARGET_KERNEL_SOURCE := kernel/samsung/exynos7580-common
-BOARD_CUSTOM_BOOTIMG_MK := hardware/samsung/mkbootimg.mk
-
-# Partitions
-BOARD_HAS_NO_MISC_PARTITION:= false
-TARGET_USERIMAGES_USE_F2FS := true
-BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
-BOARD_CACHEIMAGE_PARTITION_SIZE := 209715200
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 39845888
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3145728000
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 12096372736
-BOARD_FLASH_BLOCK_SIZE := 131072
-
-# Properties
-TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
-
-# Recovery
-TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.samsungexynos7580
-
-# Radio
-BOARD_RIL_CLASS := ../../../$(DEVICE_PATH)/ril
-BOARD_MODEM_TYPE := tss310
-
-# NFC
-BOARD_NFC_CHIPSET := pn547
+# Include makefiles from board folder
+-include $(DEVICE_PATH)/board/*.mk
 
 # inherit from the proprietary version
 -include vendor/samsung/s5neoltexx/BoardConfigVendor.mk
-
-# twrp
-ifeq ($(WITH_TWRP),true)
--include device/samsung/s5neoltexx/twrp.mk
-endif
diff --git a/board/audio.mk b/board/audio.mk
@@ -0,0 +1 @@
+TARGET_AUDIOHAL_VARIANT := samsung
diff --git a/board/bluethooth.mk b/board/bluethooth.mk
@@ -0,0 +1,2 @@
+# Bluetooth
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
diff --git a/board/fs.mk b/board/fs.mk
@@ -0,0 +1,9 @@
+# Partitions
+BOARD_HAS_NO_MISC_PARTITION:= false
+TARGET_USERIMAGES_USE_F2FS := true
+BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
+BOARD_CACHEIMAGE_PARTITION_SIZE := 209715200
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 39845888
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3145728000
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 12096372736
+BOARD_FLASH_BLOCK_SIZE := 131072
diff --git a/board/fstab.mk b/board/fstab.mk
@@ -0,0 +1,2 @@
+# Recovery
+TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.samsungexynos7580
diff --git a/board/hw.mk b/board/hw.mk
@@ -0,0 +1,2 @@
+# Hardware
+BOARD_HARDWARE_CLASS += $(DEVICE_PATH)/lineagehw
diff --git a/board/include.mk b/board/include.mk
@@ -0,0 +1,2 @@
+# Include path
+TARGET_SPECIFIC_HEADER_PATH += $(DEVICE_PATH)/include
diff --git a/board/init.mk b/board/init.mk
@@ -0,0 +1,2 @@
+# Init
+TARGET_INIT_VENDOR_LIB := libinit_s5neolte
diff --git a/board/kernel.mk b/board/kernel.mk
@@ -0,0 +1,8 @@
+# Kernel
+BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x01000000 --tags_offset 0x00000100 --board SYSMAGIC000KU
+BOARD_KERNEL_CMDLINE := androidboot.selinux=permissive console=tty0 androidboot.console=tty0 androidboot.hardware=samsungexynos7580 fbcon=font:VGA8x8,rotate:1 mem=471M no_console_suspend=1
+TARGET_KERNEL_CONFIG := lineageos_s5neolte_defconfig
+TARGET_KERNEL_SOURCE := kernel/samsung/exynos7580-common
+BOARD_CUSTOM_BOOTIMG_MK := hardware/samsung/mkbootimg.mk
+BOARD_KERNEL_IMAGE_NAME := Image-dtb
+TARGET_CUSTOM_DTBTOOL := dtbhtoolExynos
diff --git a/board/nfc.mk b/board/nfc.mk
@@ -0,0 +1,2 @@
+# NFC
+BOARD_NFC_CHIPSET := pn547
diff --git a/board/properties.mk b/board/properties.mk
@@ -0,0 +1,2 @@
+# Properties
+TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
diff --git a/board/radio.mk b/board/radio.mk
@@ -0,0 +1,4 @@
+# Radio
+#BOARD_RIL_CLASS := ../../../$(DEVICE_PATH)/ril
+BOARD_PROVIDES_LIBRIL := true
+BOARD_MODEM_TYPE := tss310
diff --git a/configs/audio/mixer_paths.xml b/configs/audio/mixer_paths.xml
@@ -3030,4 +3030,167 @@
 	<path name="gain-fm_radio-fm-recording" >
 		<ctl name="DAC Gain" value="127" />
 	</path>
+
+  <!-- Paths for the audio HAL (we map this to the Samsung paths) -->
+
+  <path name="earpiece">
+    <path name="media-handset" />
+    <path name="gain-media-handset" />
+  </path>
+
+  <path name="speaker">
+    <path name="media-speaker" />
+    <path name="gain-media-speaker" />
+  </path>
+
+  <path name="headphones">
+    <path name="media-headset" />
+    <path name="gain-media-headset" />
+  </path>
+
+  <path name="speaker-and-headphones">
+    <path name="media-speaker-headset" />
+    <path name="gain-media-speaker-headset" />
+  </path>
+
+  <path name="voice-earpiece">
+    <path name="incall_nb-handset" />
+    <path name="gain-incall_nb-handset" />
+  </path>
+
+  <path name="voice-speaker">
+    <path name="incall_nb-speaker" />
+    <path name="gain-incall_nb-speaker" />
+  </path>
+
+  <path name="voice-headphones">
+    <path name="incall_nb-headphone" />
+    <path name="gain-incall_nb-headphone" />
+  </path>
+
+  <path name="voice-earpiece-wb">
+    <path name="incall_wb-handset" />
+    <path name="gain-incall_wb-handset" />
+  </path>
+
+  <path name="voice-speaker-wb">
+    <path name="incall_wb-speaker" />
+    <path name="gain-incall_wb-speaker" />
+  </path>
+
+  <path name="voice-headphones-wb">
+    <path name="incall_wb-headphone" />
+    <path name="gain-incall_wb-headphone" />
+  </path>
+
+  <path name="voice-bt-sco-headset">
+    <path name="incall_nb-bt-sco-headset" />
+    <path name="gain-incall_nb-bt-sco-headset" />
+  </path>
+
+  <path name="voice-bt-sco-headset-wb">
+    <path name="incall_wb-bt-sco-headset" />
+    <path name="gain-incall_wb-bt-sco-headset" />
+  </path>
+
+  <path name="hdmi">
+    <!-- TODO -->
+  </path>
+
+  <path name="speaker-and-hdmi">
+    <!-- TODO -->
+  </path>
+
+  <path name="bt-sco-headset">
+    <path name="media-bt-sco-headset" />
+    <path name="gain-media-bt-sco-headset" />
+  </path>
+
+  <!-- Input stage -->
+
+  <path name="earpiece-mic">
+    <path name="media-mic" />
+    <path name="gain-media-mic" />
+  </path>
+
+  <path name="speaker-mic">
+    <path name="media-mic" />
+    <path name="gain-media-mic" />
+  </path>
+
+  <!-- Samsung uses the same path
+  <path name="headset-mic">
+    <path name="media-headset-mic" />
+    <path name="gain-media-headset-mic" />
+  </path>
+  -->
+
+  <path name="voice-mic">
+    <path name="incall_nb-handset-mic" />
+    <path name="gain-incall_nb-handset-mic" />
+  </path>
+
+  <path name="voice-earpiece-mic">
+    <path name="incall_nb-handset-mic" />
+    <path name="gain-incall_nb-handset-mic" />
+  </path>
+
+  <path name="voice-speaker-mic">
+    <path name="incall_nb-speaker-mic" />
+    <path name="gain-incall_nb-speaker-mic" />
+  </path>
+
+  <path name="voice-headset-mic">
+    <path name="incall_nb-headset-mic" />
+    <path name="gain-incall_nb-headset-mic" />
+  </path>
+
+  <path name="voice-earpiece-mic-wb">
+    <path name="incall_wb-handset-mic" />
+    <path name="gain-incall_wb-handset-mic" />
+  </path>
+
+  <path name="voice-speaker-mic-wb">
+    <path name="incall_wb-speaker-mic" />
+    <path name="gain-incall_wb-speaker-mic" />
+  </path>
+
+  <path name="voice-headset-mic-wb">
+    <path name="incall_wb-headset-mic" />
+    <path name="gain-incall_wb-headset-mic" />
+  </path>
+
+  <path name="voice-bt-sco-mic">
+    <path name="incall_nb-bt-sco-headset-in" />
+    <path name="gain-incall_nb-bt-sco-headset-in" />
+  </path>
+
+  <path name="voice-bt-sco-mic-wb">
+    <path name="incall_wb-bt-sco-headset-in" />
+    <path name="gain-incall_wb-bt-sco-headset-in" />
+  </path>
+
+  <path name="hdmi-mic">
+    <!-- TODO -->
+  </path>
+
+  <path name="bt-sco-mic">
+    <path name="media-bt-sco-headset-in" />
+    <path name="gain-media-bt-sco-headset-in" />
+  </path>
+
+  <!-- samsung uses the same path
+  <path name="camcorder-mic">
+  </path>
+  -->
+
+  <path name="voice-rec-headset-mic">
+    <path name="recording-headset-mic" />
+    <path name="gain-recording-headset-mic" />
+  </path>
+
+  <path name="voice-rec-mic">
+    <path name="recording-mic" />
+    <path name="gain-recording-mic" />
+  </path>
 </mixer>
diff --git a/configs/wifi/filter_ie b/configs/wifi/filter_ie
@@ -0,0 +1,3 @@
+0
+1
+3
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Bluetooth
		BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Recovery
		TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.samsungexynos7580
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Hardware
		BOARD_HARDWARE_CLASS += $(DEVICE_PATH)/lineagehw
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Include path
		TARGET_SPECIFIC_HEADER_PATH += $(DEVICE_PATH)/include
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Init
		TARGET_INIT_VENDOR_LIB := libinit_s5neolte
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Properties
		TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop