| Message ID | 1452742746-31746-9-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 8b67761437099c81c18f825f195c70a25fed0097 |
| Delegated to: | Simon Glass |
| Headers | show |
On 13 January 2016 at 20:39, Bin Meng <bmeng.cn@gmail.com> wrote: > Move /chosen node out of the board device tree. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > --- > > Changes in v2: > - New patch to split off board device tree > > arch/arm/dts/Makefile | 2 +- > arch/arm/dts/ls1021a-twr-duart.dts | 16 ++++++++++++++++ > arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} | 3 +-- > configs/ls1021atwr_nor_defconfig | 2 +- > configs/ls1021atwr_qspi_defconfig | 2 +- > configs/ls1021atwr_sdcard_qspi_defconfig | 2 +- > 6 files changed, 21 insertions(+), 6 deletions(-) > create mode 100644 arch/arm/dts/ls1021a-twr-duart.dts > rename arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} (96%) Acked-by: Simon Glass <sjg@chromium.org>
On 20 January 2016 at 13:27, Simon Glass <sjg@chromium.org> wrote: > On 13 January 2016 at 20:39, Bin Meng <bmeng.cn@gmail.com> wrote: >> Move /chosen node out of the board device tree. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> >> --- >> >> Changes in v2: >> - New patch to split off board device tree >> >> arch/arm/dts/Makefile | 2 +- >> arch/arm/dts/ls1021a-twr-duart.dts | 16 ++++++++++++++++ >> arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} | 3 +-- >> configs/ls1021atwr_nor_defconfig | 2 +- >> configs/ls1021atwr_qspi_defconfig | 2 +- >> configs/ls1021atwr_sdcard_qspi_defconfig | 2 +- >> 6 files changed, 21 insertions(+), 6 deletions(-) >> create mode 100644 arch/arm/dts/ls1021a-twr-duart.dts >> rename arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} (96%) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm, thanks!
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0bcd316..02b031e 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -89,7 +89,7 @@ dtb-$(CONFIG_TARGET_BEAGLE_X15) += am57xx-beagle-x15.dtb dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb dtb-$(CONFIG_LS102XA) += ls1021a-qds.dtb \ - ls1021a-twr.dtb + ls1021a-twr-duart.dtb dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ fsl-ls2080a-rdb.dtb dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds.dtb \ diff --git a/arch/arm/dts/ls1021a-twr-duart.dts b/arch/arm/dts/ls1021a-twr-duart.dts new file mode 100644 index 0000000..aaf7296 --- /dev/null +++ b/arch/arm/dts/ls1021a-twr-duart.dts @@ -0,0 +1,16 @@ +/* + * Freescale ls1021a TWR board device tree source + * + * Copyright 2013-2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/dts-v1/; +#include "ls1021a-twr.dtsi" + +/ { + chosen { + stdout-path = &uart0; + }; +}; diff --git a/arch/arm/dts/ls1021a-twr.dts b/arch/arm/dts/ls1021a-twr.dtsi similarity index 96% rename from arch/arm/dts/ls1021a-twr.dts rename to arch/arm/dts/ls1021a-twr.dtsi index aead13f..d1be9ae 100644 --- a/arch/arm/dts/ls1021a-twr.dts +++ b/arch/arm/dts/ls1021a-twr.dtsi @@ -1,12 +1,11 @@ /* - * Freescale ls1021a TWR board device tree source + * Freescale ls1021a TWR board common device tree source * * Copyright 2013-2015 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ -/dts-v1/; #include "ls1021a.dtsi" / { diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig index 2b79443..b7b3a8d 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021ATWR=y CONFIG_DM_SERIAL=y -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr" +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart" # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y CONFIG_DM=y diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig index 0c71df6..d7c7e4c 100644 --- a/configs/ls1021atwr_qspi_defconfig +++ b/configs/ls1021atwr_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021ATWR=y CONFIG_DM_SPI=y -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr" +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart" CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig index 2b4ebd9..453a3bb 100644 --- a/configs/ls1021atwr_sdcard_qspi_defconfig +++ b/configs/ls1021atwr_sdcard_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021ATWR=y CONFIG_DM_SPI=y -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr" +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart" CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI" CONFIG_OF_CONTROL=y
Move /chosen node out of the board device tree. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- Changes in v2: - New patch to split off board device tree arch/arm/dts/Makefile | 2 +- arch/arm/dts/ls1021a-twr-duart.dts | 16 ++++++++++++++++ arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} | 3 +-- configs/ls1021atwr_nor_defconfig | 2 +- configs/ls1021atwr_qspi_defconfig | 2 +- configs/ls1021atwr_sdcard_qspi_defconfig | 2 +- 6 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 arch/arm/dts/ls1021a-twr-duart.dts rename arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} (96%)