summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-at91/Kconfig4
-rw-r--r--board/aries/ma5d4evk/Kconfig (renamed from board/denx/ma5d4evk/Kconfig)2
-rw-r--r--board/aries/ma5d4evk/MAINTAINERS (renamed from board/denx/ma5d4evk/MAINTAINERS)4
-rw-r--r--board/aries/ma5d4evk/Makefile (renamed from board/denx/ma5d4evk/Makefile)0
-rw-r--r--board/aries/ma5d4evk/ma5d4evk.c (renamed from board/denx/ma5d4evk/ma5d4evk.c)0
-rw-r--r--include/configs/ma5d4evk.h4
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 99b88d1785..033c1efd2b 100644
--- 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
index b4ef106532..56b4f4a1a8 100644
--- 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
index bb25a9ca94..664a29a0df 100644
--- 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
index b12b5dcbd4..b12b5dcbd4 100644
--- a/board/denx/ma5d4evk/Makefile
+++ b/board/aries/ma5d4evk/Makefile
diff --git a/board/denx/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c
index 81463712fa..81463712fa 100644
--- a/board/denx/ma5d4evk/ma5d4evk.c
+++ b/board/aries/ma5d4evk/ma5d4evk.c
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index bb661400ec..f55d81f5f2 100644
--- 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
/*