diff options
author | Chunrong Guo <B40290@freescale.com> | 2014-12-29 17:51:32 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-12-29 11:00:04 -0200 |
commit | 724fafbafba8a6cbe9e4dcaec519366cd226b321 (patch) | |
tree | 2570f9a6cb87f388acdf50e8c88e628ff8f21733 /meta-fsl-arm/conf | |
parent | 640f3d45bd44fcebad1e95cb927abdd63543cbf7 (diff) | |
download | meta-freescale-724fafbafba8a6cbe9e4dcaec519366cd226b321.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 'meta-fsl-arm/conf')
-rw-r--r-- | meta-fsl-arm/conf/machine/ls1021aqds.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/ls1021atwr.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-fsl-arm/conf/machine/ls1021aqds.conf b/meta-fsl-arm/conf/machine/ls1021aqds.conf index d6591967..24ee6df1 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" | |||
15 | UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot_config" | 15 | UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot_config" |
16 | UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config" | 16 | UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config" |
17 | 17 | ||
18 | KERNEL_DEVICETREE = "ls1021aqds.dtb" | 18 | KERNEL_DEVICETREE = "ls1021a-qds.dtb" |
19 | 19 | ||
20 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0" | 20 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0" |
21 | SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" | 21 | SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" |
diff --git a/meta-fsl-arm/conf/machine/ls1021atwr.conf b/meta-fsl-arm/conf/machine/ls1021atwr.conf index e549ac30..1d46f989 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" | |||
15 | UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config" | 15 | UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config" |
16 | 16 | ||
17 | 17 | ||
18 | KERNEL_DEVICETREE ?= "ls1021atwr.dtb" | 18 | KERNEL_DEVICETREE ?= "ls1021a-twr.dtb" |
19 | 19 | ||
20 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0" | 20 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0" |
21 | SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" | 21 | SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" |