4 files changed, 6 insertions, 6 deletions

diff --git a/meta-fsl-arm/conf/machine/ls1021aqds.conf b/meta-fsl-arm/conf/machine/ls1021aqds.conf
index d65919670..24ee6df1c 100644
--- a/meta-fsl-arm/conf/machine/ls1021aqds.conf
+++ b/meta-fsl-arm/conf/machine/ls1021aqds.conf
@@ -15,7 +15,7 @@ UBOOT_CONFIG[qspi] = "ls1021aqds_qspi_config"
 UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot_config"
 UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config"
 
-KERNEL_DEVICETREE = "ls1021aqds.dtb"
+KERNEL_DEVICETREE = "ls1021a-qds.dtb"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-arm/conf/machine/ls1021atwr.conf b/meta-fsl-arm/conf/machine/ls1021atwr.conf
index e549ac30b..1d46f989a 100644
--- a/meta-fsl-arm/conf/machine/ls1021atwr.conf
+++ b/meta-fsl-arm/conf/machine/ls1021atwr.conf
@@ -15,7 +15,7 @@ UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard"
 UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config"
 
 
-KERNEL_DEVICETREE ?= "ls1021atwr.dtb"
+KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-ls1.inc b/meta-fsl-arm/recipes-kernel/linux/linux-ls1.inc
index 72be73814..cd8398e38 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-ls1.inc
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-ls1.inc
@@ -2,9 +2,9 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 inherit kernel fsl-kernel-localversion
-LOCALVERSION ?= "-${SRCBRANCH}"
+LOCALVERSION ?= "+ls1"
 
-SRC_URI = "git://git.freescale.com/layerscape/ls1021a/linux.git;branch=${SRCBRANCH} \
+SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=${SRCBRANCH} \
     file://defconfig \
 "
 
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-ls1_3.12.bb b/meta-fsl-arm/recipes-kernel/linux/linux-ls1_3.12.bb
index 4e1e85b78..c33485c4d 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-ls1_3.12.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-ls1_3.12.bb
@@ -5,7 +5,7 @@ Layerscape1 Family Boards. "
 require recipes-kernel/linux/linux-ls1.inc
 require recipes-kernel/linux/linux-dtb.inc
 
-SRCBRANCH = "ls1-dev"
-SRCREV = "3ced9e82f9f3f7b232bea0bd18c9a62572c06b44"
+SRCBRANCH = "sdk-v1.7.x"
+SRCREV = "6619b8b55796cdf0cec04b66a71288edd3057229"
 
 COMPATIBLE_MACHINE = "(ls102xa)"