diff --git a/conf/machine/am180x-evm.conf b/conf/machine/omapl138-lcdk.conf
similarity index 66%
rename from conf/machine/am180x-evm.conf
rename to conf/machine/omapl138-lcdk.conf
index ef248a3e..84e71d07 100644
--- a/conf/machine/am180x-evm.conf
+++ b/conf/machine/omapl138-lcdk.conf
@@ -1,11 +1,11 @@
 #@TYPE: Machine
-#@NAME: AM180x CPUs on an AM180x EVM board
-#@DESCRIPTION: Machine configuration for the TI AM180x EVM board
+#@NAME: OMAP-L138 LCDK
+#@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board
 
 require conf/machine/include/davinci.inc
 require conf/machine/include/omapl138.inc
 
-UBOOT_MACHINE = "da850_am18xxevm_config"
+UBOOT_MACHINE = "omapl138_lcdk_config"
 UBOOT_SUFFIX = "ais"
 
 UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig b/recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig
new file mode 100644
index 00000000..b3467853
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_omapl138_release
diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.9/omapl138/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.9/omapl138/defconfig
new file mode 100644
index 00000000..95b61168
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.9/omapl138/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_omapl138_debug