From db94fcd9ee07ec896bf49b7e30e91a9d78a5bcfb Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Mon, 29 Dec 2014 17:51:32 +0800 Subject: 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 Signed-off-by: Otavio Salvador --- conf/machine/ls1021aqds.conf | 2 +- conf/machine/ls1021atwr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') 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" 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/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" 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}" -- cgit v1.2.3-54-g00ecf