ARM: atmel: Rename MA5D4EVK

The board is now manufactured by Aries Embedded GmbH , rename it.

Signed-off-by: Marek Vasut <marex@denx.de>

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 99b88d17852cd40c5530a863773f29628a665199..033c1efd2b83254fa17bc6da7f65aea2ae0994b1 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -124,7 +124,7 @@ config TARGET_SAMA5D4EK
        select BOARD_EARLY_INIT_F
 
 config TARGET_MA5D4EVK
-       bool "DENX MA5D4EVK Evaluation Kit"
+       bool "Aries MA5D4EVK Evaluation Kit"
        select CPU_V7
        select SUPPORT_SPL
 
@@ -169,6 +169,7 @@ endchoice
 config SYS_SOC
        default "at91"
 
+source "board/aries/ma5d4evk/Kconfig"
 source "board/atmel/at91rm9200ek/Kconfig"
 source "board/atmel/at91sam9260ek/Kconfig"
 source "board/atmel/at91sam9261ek/Kconfig"
@@ -186,7 +187,6 @@ source "board/atmel/sama5d4ek/Kconfig"
 source "board/bluewater/gurnard/Kconfig"
 source "board/bluewater/snapper9260/Kconfig"
 source "board/calao/usb_a9263/Kconfig"
-source "board/denx/ma5d4evk/Kconfig"
 source "board/egnite/ethernut5/Kconfig"
 source "board/esd/meesc/Kconfig"
 source "board/l+g/vinco/Kconfig"

diff --git a/board/denx/ma5d4evk/Kconfig b/board/aries/ma5d4evk/Kconfig
similarity index 88%
rename from board/denx/ma5d4evk/Kconfig
rename to board/aries/ma5d4evk/Kconfig
index b4ef10653298a8195c894dceeb027ce773e32b05..56b4f4a1a8c5c086e9b82db3642d2438c87849c1 100644 (file)
--- a/board/denx/ma5d4evk/Kconfig
+++ b/board/aries/ma5d4evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
        default "ma5d4evk"
 
 config SYS_VENDOR
-       default "denx"
+       default "aries"
 
 config SYS_CONFIG_NAME
        default "ma5d4evk"

diff --git a/board/denx/ma5d4evk/MAINTAINERS b/board/aries/ma5d4evk/MAINTAINERS
similarity index 71%
rename from board/denx/ma5d4evk/MAINTAINERS
rename to board/aries/ma5d4evk/MAINTAINERS
index bb25a9ca94b6c68618941a9250e70c50ecc6b89c..664a29a0dfd0cbed9f2c686a0c968ca2cbc66650 100644 (file)
--- a/board/denx/ma5d4evk/MAINTAINERS
+++ b/board/aries/ma5d4evk/MAINTAINERS
@@ -1,6 +1,6 @@
-DENX MA5D4EVK BOARD
+Aries MA5D4EVK BOARD
 M:     Marek Vasut <marek.vasut@gmail.com>
 S:     Maintained
-F:     board/denx/ma5d4evk/
+F:     board/aries/ma5d4evk/
 F:     include/configs/ma5d4evk.h
 F:     configs/ma5d4evk_defconfig

diff --git a/board/denx/ma5d4evk/Makefile b/board/aries/ma5d4evk/Makefile
similarity index 100%
rename from board/denx/ma5d4evk/Makefile
rename to board/aries/ma5d4evk/Makefile

diff --git a/board/denx/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c
similarity index 100%
rename from board/denx/ma5d4evk/ma5d4evk.c
rename to board/aries/ma5d4evk/ma5d4evk.c

diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index bb661400ec4d18d75c9ea0f7981503b9a5debe33..f55d81f5f26590c19c5f2a268da81007a3fce535 100644 (file)
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -1,5 +1,5 @@
 /*
- * DENX MA5D4 configuration
+ * Aries MA5D4 configuration
  * Copyright (C) 2015 Marek Vasut <marex@denx.de>
  *
  * SPDX-License-Identifier:    GPL-2.0+
@@ -102,7 +102,7 @@
 /* USB device */
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_RNDIS
-#define CONFIG_USBNET_MANUFACTURER      "DENX"
+#define CONFIG_USBNET_MANUFACTURER      "AriesEmbedded"
 #endif
 
 /*