summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorChunrong Guo <B40290@freescale.com>2014-12-29 17:51:32 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2014-12-29 11:00:04 -0200
commitdb94fcd9ee07ec896bf49b7e30e91a9d78a5bcfb (patch)
treed3ab07012006f6382845a4589dc09f38bbb1f9de /conf
parente42c9752dd08f30aba280116894537d1f555fc73 (diff)
downloadmeta-fsl-arm-db94fcd9ee07ec896bf49b7e30e91a9d78a5bcfb.tar.gz
linux-ls1: update to sdk v1.7 release
This includes following changes: bdb722f arm: dts: ls1021a-twr: remove dspi1 node for cannot be verified fb3f709 arm: ls1: only call ls1_pm_iomap() when doing deep sleep c15b78f ls1021a/dts: Add eTSEC1 as wake-up event source 5f94f9f qspi: ls102xa: Adjust the size of QSPI AMBA Bus memory map Signed-off-by: Chunrong Guo <B40290@freescale.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/ls1021aqds.conf2
-rw-r--r--conf/machine/ls1021atwr.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/ls1021aqds.conf b/conf/machine/ls1021aqds.conf
index d659196..24ee6df 100644
--- a/conf/machine/ls1021aqds.conf
+++ b/conf/machine/ls1021aqds.conf
@@ -15,7 +15,7 @@ UBOOT_CONFIG[qspi] = "ls1021aqds_qspi_config"
15UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot_config" 15UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot_config"
16UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config" 16UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config"
17 17
18KERNEL_DEVICETREE = "ls1021aqds.dtb" 18KERNEL_DEVICETREE = "ls1021a-qds.dtb"
19 19
20SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0" 20SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
21SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" 21SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index e549ac3..1d46f98 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -15,7 +15,7 @@ UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard"
15UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config" 15UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config"
16 16
17 17
18KERNEL_DEVICETREE ?= "ls1021atwr.dtb" 18KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
19 19
20SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0" 20SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
21SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" 21SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"