diff --git a/libsensors_iio/.config b/libsensors_iio/.config
new file mode 100644
index 0000000..bca3f77
--- /dev/null
+++ b/libsensors_iio/.config
@@ -0,0 +1,48 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# SensorHAL IIO Configuration
+#
+CONFIG_ST_HAL_ANDROID_VERSION=1
+# CONFIG_ST_HAL_HAS_6AX_FUSION is not set
+# CONFIG_ST_HAL_HAS_9AX_FUSION is not set
+# CONFIG_ST_HAL_HAS_GEOMAG_FUSION is not set
+# CONFIG_ST_HAL_HAS_MAGN_CALIB is not set
+# CONFIG_ST_HAL_HAS_GYRO_GBIAS_ESTIMATION is not set
+# CONFIG_ST_HAL_HAS_TILT_FU_FD is not set
+
+#
+# Enable/disable sensors
+#
+CONFIG_ST_HAL_ACCEL_ENABLED=y
+CONFIG_ST_HAL_MAGN_ENABLED=y
+CONFIG_ST_HAL_GYRO_ENABLED=y
+CONFIG_ST_HAL_MAGN_UNCALIB_DISABLED=y
+CONFIG_ST_HAL_GYRO_UNCALIB_DISABLED=y
+CONFIG_ST_HAL_SIGN_MOTION_ENABLED=y
+CONFIG_ST_HAL_STEP_DETECTOR_ENABLED=y
+CONFIG_ST_HAL_STEP_COUNTER_ENABLED=y
+# CONFIG_ST_HAL_TILT_ENABLED is not set
+CONFIG_ST_HAL_PRESSURE_ENABLED=y
+CONFIG_ST_HAL_ORIENTATION_DISABLED=y
+CONFIG_ST_HAL_GRAVITY_DISABLED=y
+CONFIG_ST_HAL_LINEAR_DISABLED=y
+CONFIG_ST_HAL_ROT_VECTOR_DISABLED=y
+CONFIG_ST_HAL_GAME_ROT_VECTOR_DISABLED=y
+CONFIG_ST_HAL_GEOMAG_ROT_VECTOR_DISABLED=y
+
+#
+# Common configuration
+#
+CONFIG_ST_HAL_MAX_SAMPLING_FREQUENCY=200
+CONFIG_ST_HAL_DEBUG_LEVEL=0
+CONFIG_ST_HAL_ACCEL_ROT_MATRIX="1,0,0,0,1,0,0,0,1"
+CONFIG_ST_HAL_ACCEL_RANGE=17
+CONFIG_ST_HAL_MAGN_ROT_MATRIX="1,0,0,0,1,0,0,0,1"
+CONFIG_ST_HAL_MAGN_RANGE=1000
+CONFIG_ST_HAL_GYRO_ROT_MATRIX="1,0,0,0,1,0,0,0,1"
+CONFIG_ST_HAL_GYRO_RANGE=35
+
+#
+# IIO supported sensors
+#
+CONFIG_ST_HAL_LSM6DS3_ENABLED=y
diff --git a/libsensors_iio/Android.mk b/libsensors_iio/Android.mk
index 1a206c3..48d97bf 100644
--- a/libsensors_iio/Android.mk
+++ b/libsensors_iio/Android.mk
@@ -66,7 +66,6 @@
 export ST_HAL_HAS_COMPASS_LIB=n
 endif
 
-export KCONFIG_CONFIG=$(CURRENT_DIRECTORY)/.config
 export ST_HAL_PATH=$(CURRENT_DIRECTORY)
 
 all_modules:
diff --git a/libsensors_iio/README b/libsensors_iio/README
index 3b981fc..4fdfd2d 100644
--- a/libsensors_iio/README
+++ b/libsensors_iio/README
@@ -20,7 +20,8 @@
 
    "mm defconfig=y"	Generated default .config.
 
-   "mm menuconfig=y"	Text based color menus, radiolists & dialogs.
+   "mm menuconfig=y  KCONFIG_CONFIG=hardware/intel/sensors/libsensors_iio/.config"
+			Text based color menus, radiolists & dialogs.
 
    "mm clean=y"		Delete .config and configuration.h files.
 
diff --git a/libsensors_iio/configuration.h b/libsensors_iio/configuration.h
new file mode 100644
index 0000000..03ee9b0
--- /dev/null
+++ b/libsensors_iio/configuration.h
@@ -0,0 +1,40 @@
+/* configuration.h -- Autogenerated file! Do not edit. */
+
+#ifndef __ST_SENSOR_HAL_CONFIG_H
+#define __ST_SENSOR_HAL_CONFIG_H
+
+
+
+#define CONFIG_ST_HAL_ANDROID_VERSION 1
+
+
+#define CONFIG_ST_HAL_ACCEL_ENABLED 1
+#define CONFIG_ST_HAL_MAGN_ENABLED 1
+#define CONFIG_ST_HAL_GYRO_ENABLED 1
+#define CONFIG_ST_HAL_MAGN_UNCALIB_DISABLED 1
+#define CONFIG_ST_HAL_GYRO_UNCALIB_DISABLED 1
+#define CONFIG_ST_HAL_SIGN_MOTION_ENABLED 1
+#define CONFIG_ST_HAL_STEP_DETECTOR_ENABLED 1
+#define CONFIG_ST_HAL_STEP_COUNTER_ENABLED 1
+#define CONFIG_ST_HAL_PRESSURE_ENABLED 1
+#define CONFIG_ST_HAL_ORIENTATION_DISABLED 1
+#define CONFIG_ST_HAL_GRAVITY_DISABLED 1
+#define CONFIG_ST_HAL_LINEAR_DISABLED 1
+#define CONFIG_ST_HAL_ROT_VECTOR_DISABLED 1
+#define CONFIG_ST_HAL_GAME_ROT_VECTOR_DISABLED 1
+#define CONFIG_ST_HAL_GEOMAG_ROT_VECTOR_DISABLED 1
+
+
+#define CONFIG_ST_HAL_MAX_SAMPLING_FREQUENCY 200
+#define CONFIG_ST_HAL_DEBUG_LEVEL 0
+#define CONFIG_ST_HAL_ACCEL_ROT_MATRIX 1,0,0,0,1,0,0,0,1
+#define CONFIG_ST_HAL_ACCEL_RANGE 17
+#define CONFIG_ST_HAL_MAGN_ROT_MATRIX 1,0,0,0,1,0,0,0,1
+#define CONFIG_ST_HAL_MAGN_RANGE 1000
+#define CONFIG_ST_HAL_GYRO_ROT_MATRIX 1,0,0,0,1,0,0,0,1
+#define CONFIG_ST_HAL_GYRO_RANGE 35
+
+
+#define CONFIG_ST_HAL_LSM6DS3_ENABLED 1
+
+#endif /* __ST_SENSOR_HAL_CONFIG_H */
diff --git a/libsensors_iio/src/Android.mk b/libsensors_iio/src/Android.mk
index 10b40dc..f9fe484 100644
--- a/libsensors_iio/src/Android.mk
+++ b/libsensors_iio/src/Android.mk
@@ -25,10 +25,10 @@
 
 LOCAL_PRELINK_MODULE := false
 
-ifdef TARGET_BOARD_PLATFORM
-LOCAL_MODULE := sensors.$(TARGET_BOARD_PLATFORM)
+ifdef TARGET_DEVICE
+LOCAL_MODULE := libsensors_iio.$(TARGET_DEVICE)
 else
-LOCAL_MODULE := sensors.default
+LOCAL_MODULE := libsensors_iio.default
 endif
 
 LOCAL_MODULE_RELATIVE_PATH := hw