[U-Boot] [PATCH 1/2] ARM: mvebu: rename armada-385-amc.dts to armada-385-db-88f6820-amc.dts

[Stefan Roese]

On 16.03.19 09:21, 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 at gmail.com>

This patch (and 2/2) does not apply any more. Could you please rebase
on top of current u-boot-marvell/master? Or wait for the Marvell pull
request for just now to arrive in Tom's master branch and rebase
on top of that?

Thanks,
Stefan

> ---
> 
>   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%)
> 
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 2a040b20a539..9fa5c98a8240 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -101,7 +101,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-7040-db.dtb			\
>   	armada-7040-db-nand.dtb			\
>   	armada-8040-db.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 319d9dbd9c3f..1f983af1b648 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_SPL_OF_TRANSLATE=y
>   CONFIG_BLK=y
> 

Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de