| Message ID | 20190411204705.5393-1-judge.packham@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [U-Boot,v2,1/2] ARM: mvebu: rename armada-385-amc.dts to armada-385-db-88f6820-amc.dts | expand |
On 11.04.19 22:47, Chris Packham wrote: > This board was added to u-boot first but the Linux maintainers requested > a more descriptive name. Rename the file to match the Linux usage and > update the board defconfig. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Applied to u-boot-marvell/master. Thanks, Stefan
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7704dfb81334..4f661552b0a6 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -140,7 +140,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-388-clearfog.dtb \ armada-388-gp.dtb \ armada-388-helios4.dtb \ - armada-385-amc.dtb \ + armada-385-db-88f6820-amc.dtb \ armada-385-turris-omnia.dtb \ armada-7040-db.dtb \ armada-7040-db-nand.dtb \ diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-db-88f6820-amc.dts similarity index 100% rename from arch/arm/dts/armada-385-amc.dts rename to arch/arm/dts/armada-385-db-88f6820-amc.dts diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index dcf2a25395e2..e8ba5184c4d7 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -41,7 +41,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set -CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc" +CONFIG_DEFAULT_DEVICE_TREE="armada-385-db-88f6820-amc" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USE_ENV_SPI_MAX_HZ=y CONFIG_ENV_SPI_MAX_HZ=50000000
This board was added to u-boot first but the Linux maintainers requested a more descriptive name. Rename the file to match the Linux usage and update the board defconfig. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- Changes in v2: - rebase against u-boot-marvell/master arch/arm/dts/Makefile | 2 +- .../dts/{armada-385-amc.dts => armada-385-db-88f6820-amc.dts} | 0 configs/db-88f6820-amc_defconfig | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/dts/{armada-385-amc.dts => armada-385-db-88f6820-amc.dts} (100%)