ARM: mxs: Rename M28EVK

PATCH New Marek Vasut 2 participants 4 messages Apr 5, 2017

Subsystems (3)

Arm (32-bit) Arm i.MX and Layerscape Framebuffer layer

lore

Share & tools

lore

Marek Vasut

author

2017-04-05 11:31 UTC #0 lore raw

PATCH 1/2 ARM: mxs: Rename M28EVK

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

Signed-off-by Marek Vasut <[email protected]>

---
 arch/arm/Kconfig                         | 2 +-
 board/{denx => aries}/m28evk/Kconfig     | 2 +-
 board/{denx => aries}/m28evk/MAINTAINERS | 2 +-
 board/{denx => aries}/m28evk/Makefile    | 0
 board/{denx => aries}/m28evk/README      | 6 +++---
 board/{denx => aries}/m28evk/m28evk.c    | 6 +++---
 board/{denx => aries}/m28evk/spl_boot.c  | 6 +++---
 doc/README.mxs                           | 2 +-
 drivers/video/mxsfb.c                    | 2 +-
 scripts/config_whitelist.txt             | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)
 rename board/{denx => aries}/m28evk/Kconfig (89%)
 rename board/{denx => aries}/m28evk/MAINTAINERS (84%)
 rename board/{denx => aries}/m28evk/Makefile (100%)
 rename board/{denx => aries}/m28evk/README (82%)
 rename board/{denx => aries}/m28evk/m28evk.c (96%)
 rename board/{denx => aries}/m28evk/spl_boot.c (98%)

arch/arm/Kconfig +1 -1

index e644ee3..acfb95a 100644
@@ -1238,6 +1238,7 @@ source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/imx-common/Kconfig"
 
+source "board/aries/m28evk/Kconfig"
 source "board/bosch/shc/Kconfig"
 source "board/BuR/brxre1/Kconfig"
 source "board/BuR/brppt1/Kconfig"

@@ -1258,7 +1259,6 @@ source "board/cirrus/edb93xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"
 source "board/creative/xfi3/Kconfig"
-source "board/denx/m28evk/Kconfig"
 source "board/denx/m53evk/Kconfig"
 source "board/freescale/ls2080a/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"

board/aries/m28evk/Kconfig renamed from board/denx/m28evk/Kconfig +1 -1

similarity index 89%
rename from board/denx/m28evk/Kconfig
rename to board/aries/m28evk/Kconfig
index dd4dc4d..ab5577c 100644
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "m28evk"
 
 config SYS_VENDOR
-	default "denx"
+	default "aries"
 
 config SYS_SOC
 	default "mxs"

board/aries/m28evk/MAINTAINERS renamed from board/denx/m28evk/MAINTAINERS +1 -1

similarity index 84%
rename from board/denx/m28evk/MAINTAINERS
rename to board/aries/m28evk/MAINTAINERS
index b0535a9..f600e7d 100644
@@ -1,6 +1,6 @@
 M28EVK BOARD
 M:	Marek Vasut <[email protected]>
 S:	Maintained
-F:	board/denx/m28evk/
+F:	board/aries/m28evk/
 F:	include/configs/m28evk.h
 F:	configs/m28evk_defconfig

board/aries/m28evk/Makefile renamed from board/denx/m28evk/Makefile +0 -0

similarity index 100%
rename from board/denx/m28evk/Makefile
rename to board/aries/m28evk/Makefile

board/aries/m28evk/README renamed from board/denx/m28evk/README +3 -3

similarity index 82%
rename from board/denx/m28evk/README
rename to board/aries/m28evk/README
index cb3ae20..9f0d995 100644
@@ -1,12 +1,12 @@
-DENX M28EVK
-===========
+Aries M28EVK
+============
 
 Files of the M28/M28EVK port
 ----------------------------
 
 arch/arm/cpu/arm926ejs/mxs/	- The CPU support code for the Freescale i.MX28
 arch/arm/include/asm/arch-mxs/	- Header files for the Freescale i.MX28
-board/denx/m28evk/		- M28EVK board specific files
+board/aries/m28evk/		- M28EVK board specific files
 include/configs/m28evk.h	- M28EVK configuration file
 
 Follow the instructions from doc/README.mxs to generate a bootable SD card or to

board/aries/m28evk/m28evk.c renamed from board/denx/m28evk/m28evk.c +3 -3

similarity index 96%
rename from board/denx/m28evk/m28evk.c
rename to board/aries/m28evk/m28evk.c
index 33d38cf..c990ea9 100644
@@ -1,5 +1,5 @@
 /*
- * DENX M28 module
+ * Aries M28 module
  *
  * Copyright (C) 2011 Marek Vasut <[email protected]>
  * on behalf of DENX Software Engineering GmbH

@@ -93,7 +93,7 @@ int board_mmc_init(bd_t *bis)
 
 int fecmxc_mii_postcall(int phy)
 {
-#if	defined(CONFIG_DENX_M28_V11) || defined(CONFIG_DENX_M28_V10)
+#if	defined(CONFIG_ARIES_M28_V11) || defined(CONFIG_ARIES_M28_V10)
 	/* KZ8031 PHY on old boards. */
 	const uint32_t freq = 0x0080;
 #else

@@ -123,7 +123,7 @@ int board_eth_init(bd_t *bis)
 		CLKCTRL_ENET_TIME_SEL_MASK | CLKCTRL_ENET_CLK_OUT_EN,
 		CLKCTRL_ENET_TIME_SEL_RMII_CLK);
 
-#if !defined(CONFIG_DENX_M28_V11) && !defined(CONFIG_DENX_M28_V10)
+#if !defined(CONFIG_ARIES_M28_V11) && !defined(CONFIG_ARIES_M28_V10)
 	/* Reset the new PHY */
 	gpio_direction_output(MX28_PAD_AUART2_RTS__GPIO_3_11, 0);
 	udelay(10000);

board/aries/m28evk/spl_boot.c renamed from board/denx/m28evk/spl_boot.c +3 -3

similarity index 98%
rename from board/denx/m28evk/spl_boot.c
rename to board/aries/m28evk/spl_boot.c
index 5a1010e..e27a74e 100644
@@ -1,5 +1,5 @@
 /*
- * DENX M28 Boot setup
+ * ARIES M28 Boot setup
  *
  * Copyright (C) 2011 Marek Vasut <[email protected]>
  * on behalf of DENX Software Engineering GmbH

@@ -56,7 +56,7 @@ const iomux_cfg_t iomux_setup[] = {
 	MX28_PAD_LCD_ENABLE__LCD_ENABLE | MUX_CONFIG_LCD,
 
 	/* UART1 */
-#ifdef	CONFIG_DENX_M28_V10
+#ifdef	CONFIG_ARIES_M28_V10
 	MX28_PAD_AUART0_CTS__DUART_RX,
 	MX28_PAD_AUART0_RTS__DUART_TX,
 #else

@@ -132,7 +132,7 @@ const iomux_cfg_t iomux_setup[] = {
 	MX28_PAD_ENET0_RXD3__ENET1_RXD1 | MUX_CONFIG_ENET,
 	MX28_PAD_ENET0_TXD2__ENET1_TXD0 | MUX_CONFIG_ENET,
 	MX28_PAD_ENET0_TXD3__ENET1_TXD1 | MUX_CONFIG_ENET,
-#if !defined(CONFIG_DENX_M28_V11) && !defined(CONFIG_DENX_M28_V10)
+#if !defined(CONFIG_ARIES_M28_V11) && !defined(CONFIG_ARIES_M28_V10)
 	MX28_PAD_AUART2_RTS__GPIO_3_11,	/* PHY reset */
 #endif

doc/README.mxs +1 -1

index 4edf19f..e23ab9c 100644
@@ -95,7 +95,7 @@ Next, configure U-Boot for a MXS based board
 
 Examples:
 
-1. For building U-Boot for Denx M28EVK board:
+1. For building U-Boot for Aries M28EVK board:
 
 	$ make m28evk_config

drivers/video/mxsfb.c +1 -1

index 32ecbe2..20455ff 100644
@@ -36,7 +36,7 @@ __weak void mxsfb_system_setup(void)
 }
 
 /*
- * DENX M28EVK:
+ * ARIES M28EVK:
  * setenv videomode
  * video=ctfb:x:800,y:480,depth:18,mode:0,pclk:30066,
  *       le:0,ri:256,up:0,lo:45,hs:1,vs:1,sync:100663296,vmode:0

scripts/config_whitelist.txt +1 -1

index 668f238..9f32cb2 100644
@@ -127,6 +127,7 @@ CONFIG_ARC_SERIAL
 CONFIG_ARC_UART_BASE
 CONFIG_ARIA
 CONFIG_ARIA_FPGA
+CONFIG_ARIES_M28_V10
 CONFIG_ARM926EJS
 CONFIG_ARMADA100
 CONFIG_ARMADA100_FEC

@@ -727,7 +728,6 @@ CONFIG_DEFAULT_SPI_CS
 CONFIG_DEFAULT_SPI_MODE
 CONFIG_DEF_HWCONFIG
 CONFIG_DELAY_ENVIRONMENT
-CONFIG_DENX_M28_V10
 CONFIG_DESIGNWARE_ETH
 CONFIG_DESIGNWARE_WATCHDOG
 CONFIG_DEVCONCENTER

Signature · 1 line

2.10.2

Marek Vasut

author

2017-04-05 11:31 UTC #1 lore raw

PATCH 2/2 ARM: mx5: Rename M53EVK

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

Signed-off-by Marek Vasut <[email protected]>

---
 arch/arm/Kconfig                          | 2 +-
 board/{denx => aries}/m53evk/Kconfig      | 2 +-
 board/{denx => aries}/m53evk/MAINTAINERS  | 2 +-
 board/{denx => aries}/m53evk/Makefile     | 2 +-
 board/{denx => aries}/m53evk/imximage.cfg | 2 +-
 board/{denx => aries}/m53evk/m53evk.c     | 4 ++--
 configs/m53evk_defconfig                  | 2 +-
 include/configs/m53evk.h                  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename board/{denx => aries}/m53evk/Kconfig (89%)
 rename board/{denx => aries}/m53evk/MAINTAINERS (84%)
 rename board/{denx => aries}/m53evk/Makefile (88%)
 rename board/{denx => aries}/m53evk/imximage.cfg (98%)
 rename board/{denx => aries}/m53evk/m53evk.c (99%)

arch/arm/Kconfig +1 -1

index acfb95a..9febc1e 100644
@@ -1239,6 +1239,7 @@ source "arch/arm/cpu/armv8/Kconfig"
 source "arch/arm/imx-common/Kconfig"
 
 source "board/aries/m28evk/Kconfig"
+source "board/aries/m53evk/Kconfig"
 source "board/bosch/shc/Kconfig"
 source "board/BuR/brxre1/Kconfig"
 source "board/BuR/brppt1/Kconfig"

@@ -1259,7 +1260,6 @@ source "board/cirrus/edb93xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"
 source "board/creative/xfi3/Kconfig"
-source "board/denx/m53evk/Kconfig"
 source "board/freescale/ls2080a/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"
 source "board/freescale/ls2080ardb/Kconfig"

board/aries/m53evk/Kconfig renamed from board/denx/m53evk/Kconfig +1 -1

similarity index 89%
rename from board/denx/m53evk/Kconfig
rename to board/aries/m53evk/Kconfig
index 0696ad7..2d49b40 100644
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "m53evk"
 
 config SYS_VENDOR
-	default "denx"
+	default "aries"
 
 config SYS_SOC
 	default "mx5"

board/aries/m53evk/MAINTAINERS renamed from board/denx/m53evk/MAINTAINERS +1 -1

similarity index 84%
rename from board/denx/m53evk/MAINTAINERS
rename to board/aries/m53evk/MAINTAINERS
index 5d8c764..71137f0 100644
@@ -1,6 +1,6 @@
 M53EVK BOARD
 M:	Marek Vasut <[email protected]>
 S:	Maintained
-F:	board/denx/m53evk/
+F:	board/aries/m53evk/
 F:	include/configs/m53evk.h
 F:	configs/m53evk_defconfig

board/aries/m53evk/Makefile renamed from board/denx/m53evk/Makefile +1 -1

similarity index 88%
rename from board/denx/m53evk/Makefile
rename to board/aries/m53evk/Makefile
index 19b8977..daa0fe4 100644
@@ -1,5 +1,5 @@
 #
-# DENX M53EVK
+# Aries M53EVK
 # Copyright (C) 2012-2013 Marek Vasut <[email protected]>
 #
 # SPDX-License-Identifier:	GPL-2.0+

board/aries/m53evk/imximage.cfg renamed from board/denx/m53evk/imximage.cfg +1 -1

similarity index 98%
rename from board/denx/m53evk/imximage.cfg
rename to board/aries/m53evk/imximage.cfg
index c0e2602..ec855c8 100644
@@ -1,5 +1,5 @@
 /*
- * DENX M53 DRAM init values
+ * Aries M53 DRAM init values
  * Copyright (C) 2012-2013 Marek Vasut <[email protected]>
  *
  * SPDX-License-Identifier:	GPL-2.0+

board/aries/m53evk/m53evk.c renamed from board/denx/m53evk/m53evk.c +2 -2

similarity index 99%
rename from board/denx/m53evk/m53evk.c
rename to board/aries/m53evk/m53evk.c
index ef63bbd..cbfc2a2 100644
@@ -1,5 +1,5 @@
 /*
- * DENX M53 module
+ * Aries M53 module
  *
  * Copyright (C) 2012-2013 Marek Vasut <[email protected]>
  *

@@ -379,7 +379,7 @@ int board_init(void)
 
 int checkboard(void)
 {
-	puts("Board: DENX M53EVK\n");
+	puts("Board: Aries M53EVK\n");
 
 	return 0;
 }

configs/m53evk_defconfig +1 -1

index 9e3b8af..4dff335 100644
@@ -7,7 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_VIDEO=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aries/m53evk/imximage.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y

include/configs/m53evk.h +1 -1

index a70f041..275ecf3 100644
@@ -1,5 +1,5 @@
 /*
- * DENX M53 configuration
+ * Aries M53 configuration
  * Copyright (C) 2012-2013 Marek Vasut <[email protected]>
  *
  * SPDX-License-Identifier:	GPL-2.0+

Signature · 1 line

2.10.2

Stefano Babic

2017-04-05 16:13 UTC #2 lore raw

PATCH 2/2 ARM: mx5: Rename M53EVK

Quoted 140 lines · Marek Vasut

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

Signed-off-by Marek Vasut <[email protected]>

---
 arch/arm/Kconfig                          | 2 +-
 board/{denx => aries}/m53evk/Kconfig      | 2 +-
 board/{denx => aries}/m53evk/MAINTAINERS  | 2 +-
 board/{denx => aries}/m53evk/Makefile     | 2 +-
 board/{denx => aries}/m53evk/imximage.cfg | 2 +-
 board/{denx => aries}/m53evk/m53evk.c     | 4 ++--
 configs/m53evk_defconfig                  | 2 +-
 include/configs/m53evk.h                  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename board/{denx => aries}/m53evk/Kconfig (89%)
 rename board/{denx => aries}/m53evk/MAINTAINERS (84%)
 rename board/{denx => aries}/m53evk/Makefile (88%)
 rename board/{denx => aries}/m53evk/imximage.cfg (98%)
 rename board/{denx => aries}/m53evk/m53evk.c (99%)

arch/arm/Kconfig +1 -1

index acfb95a..9febc1e 100644
@@ -1239,6 +1239,7 @@ source "arch/arm/cpu/armv8/Kconfig"
 source "arch/arm/imx-common/Kconfig"
 
 source "board/aries/m28evk/Kconfig"
+source "board/aries/m53evk/Kconfig"
 source "board/bosch/shc/Kconfig"
 source "board/BuR/brxre1/Kconfig"
 source "board/BuR/brppt1/Kconfig"

@@ -1259,7 +1260,6 @@ source "board/cirrus/edb93xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"
 source "board/creative/xfi3/Kconfig"
-source "board/denx/m53evk/Kconfig"
 source "board/freescale/ls2080a/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"
 source "board/freescale/ls2080ardb/Kconfig"

board/aries/m53evk/Kconfig renamed from board/denx/m53evk/Kconfig +1 -1

similarity index 89%
rename from board/denx/m53evk/Kconfig
rename to board/aries/m53evk/Kconfig
index 0696ad7..2d49b40 100644
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "m53evk"
 
 config SYS_VENDOR
-	default "denx"
+	default "aries"
 
 config SYS_SOC
 	default "mx5"

board/aries/m53evk/MAINTAINERS renamed from board/denx/m53evk/MAINTAINERS +1 -1

similarity index 84%
rename from board/denx/m53evk/MAINTAINERS
rename to board/aries/m53evk/MAINTAINERS
index 5d8c764..71137f0 100644
@@ -1,6 +1,6 @@
 M53EVK BOARD
 M:	Marek Vasut <[email protected]>
 S:	Maintained
-F:	board/denx/m53evk/
+F:	board/aries/m53evk/
 F:	include/configs/m53evk.h
 F:	configs/m53evk_defconfig

board/aries/m53evk/Makefile renamed from board/denx/m53evk/Makefile +1 -1

similarity index 88%
rename from board/denx/m53evk/Makefile
rename to board/aries/m53evk/Makefile
index 19b8977..daa0fe4 100644
@@ -1,5 +1,5 @@
 #
-# DENX M53EVK
+# Aries M53EVK
 # Copyright (C) 2012-2013 Marek Vasut <[email protected]>
 #
 # SPDX-License-Identifier:	GPL-2.0+

board/aries/m53evk/imximage.cfg renamed from board/denx/m53evk/imximage.cfg +1 -1

similarity index 98%
rename from board/denx/m53evk/imximage.cfg
rename to board/aries/m53evk/imximage.cfg
index c0e2602..ec855c8 100644
@@ -1,5 +1,5 @@
 /*
- * DENX M53 DRAM init values
+ * Aries M53 DRAM init values
  * Copyright (C) 2012-2013 Marek Vasut <[email protected]>
  *
  * SPDX-License-Identifier:	GPL-2.0+

board/aries/m53evk/m53evk.c renamed from board/denx/m53evk/m53evk.c +2 -2

similarity index 99%
rename from board/denx/m53evk/m53evk.c
rename to board/aries/m53evk/m53evk.c
index ef63bbd..cbfc2a2 100644
@@ -1,5 +1,5 @@
 /*
- * DENX M53 module
+ * Aries M53 module
  *
  * Copyright (C) 2012-2013 Marek Vasut <[email protected]>
  *

@@ -379,7 +379,7 @@ int board_init(void)
 
 int checkboard(void)
 {
-	puts("Board: DENX M53EVK\n");
+	puts("Board: Aries M53EVK\n");
 
 	return 0;
 }

configs/m53evk_defconfig +1 -1

index 9e3b8af..4dff335 100644
@@ -7,7 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_VIDEO=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aries/m53evk/imximage.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y

include/configs/m53evk.h +0 -0

index a70f041..275ecf3 100644

include/configs/m53evk.h line 5

Quoted 6 lines

include/configs/m53evk.h +1 -1

@@ -1,5 +1,5 @@
 /*
- * DENX M53 configuration
+ * Aries M53 configuration
  * Copyright (C) 2012-2013 Marek Vasut <[email protected]>
  *
  * SPDX-License-Identifier:	GPL-2.0+

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines

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

Stefano Babic

2017-04-05 16:13 UTC #3 lore raw

PATCH 1/2 ARM: mxs: Rename M28EVK

In reply to Marek Vasut

Quoted 204 lines · Marek Vasut

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

Signed-off-by Marek Vasut <[email protected]>

---
 arch/arm/Kconfig                         | 2 +-
 board/{denx => aries}/m28evk/Kconfig     | 2 +-
 board/{denx => aries}/m28evk/MAINTAINERS | 2 +-
 board/{denx => aries}/m28evk/Makefile    | 0
 board/{denx => aries}/m28evk/README      | 6 +++---
 board/{denx => aries}/m28evk/m28evk.c    | 6 +++---
 board/{denx => aries}/m28evk/spl_boot.c  | 6 +++---
 doc/README.mxs                           | 2 +-
 drivers/video/mxsfb.c                    | 2 +-
 scripts/config_whitelist.txt             | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)
 rename board/{denx => aries}/m28evk/Kconfig (89%)
 rename board/{denx => aries}/m28evk/MAINTAINERS (84%)
 rename board/{denx => aries}/m28evk/Makefile (100%)
 rename board/{denx => aries}/m28evk/README (82%)
 rename board/{denx => aries}/m28evk/m28evk.c (96%)
 rename board/{denx => aries}/m28evk/spl_boot.c (98%)

arch/arm/Kconfig +1 -1

index e644ee3..acfb95a 100644
@@ -1238,6 +1238,7 @@ source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/imx-common/Kconfig"
 
+source "board/aries/m28evk/Kconfig"
 source "board/bosch/shc/Kconfig"
 source "board/BuR/brxre1/Kconfig"
 source "board/BuR/brppt1/Kconfig"

@@ -1258,7 +1259,6 @@ source "board/cirrus/edb93xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"
 source "board/creative/xfi3/Kconfig"
-source "board/denx/m28evk/Kconfig"
 source "board/denx/m53evk/Kconfig"
 source "board/freescale/ls2080a/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"

board/aries/m28evk/Kconfig renamed from board/denx/m28evk/Kconfig +1 -1

similarity index 89%
rename from board/denx/m28evk/Kconfig
rename to board/aries/m28evk/Kconfig
index dd4dc4d..ab5577c 100644
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "m28evk"
 
 config SYS_VENDOR
-	default "denx"
+	default "aries"
 
 config SYS_SOC
 	default "mxs"

board/aries/m28evk/MAINTAINERS renamed from board/denx/m28evk/MAINTAINERS +1 -1

similarity index 84%
rename from board/denx/m28evk/MAINTAINERS
rename to board/aries/m28evk/MAINTAINERS
index b0535a9..f600e7d 100644
@@ -1,6 +1,6 @@
 M28EVK BOARD
 M:	Marek Vasut <[email protected]>
 S:	Maintained
-F:	board/denx/m28evk/
+F:	board/aries/m28evk/
 F:	include/configs/m28evk.h
 F:	configs/m28evk_defconfig

board/aries/m28evk/Makefile renamed from board/denx/m28evk/Makefile +0 -0

similarity index 100%
rename from board/denx/m28evk/Makefile
rename to board/aries/m28evk/Makefile

board/aries/m28evk/README renamed from board/denx/m28evk/README +3 -3

similarity index 82%
rename from board/denx/m28evk/README
rename to board/aries/m28evk/README
index cb3ae20..9f0d995 100644
@@ -1,12 +1,12 @@
-DENX M28EVK
-===========
+Aries M28EVK
+============
 
 Files of the M28/M28EVK port
 ----------------------------
 
 arch/arm/cpu/arm926ejs/mxs/	- The CPU support code for the Freescale i.MX28
 arch/arm/include/asm/arch-mxs/	- Header files for the Freescale i.MX28
-board/denx/m28evk/		- M28EVK board specific files
+board/aries/m28evk/		- M28EVK board specific files
 include/configs/m28evk.h	- M28EVK configuration file
 
 Follow the instructions from doc/README.mxs to generate a bootable SD card or to

board/aries/m28evk/m28evk.c renamed from board/denx/m28evk/m28evk.c +3 -3

similarity index 96%
rename from board/denx/m28evk/m28evk.c
rename to board/aries/m28evk/m28evk.c
index 33d38cf..c990ea9 100644
@@ -1,5 +1,5 @@
 /*
- * DENX M28 module
+ * Aries M28 module
  *
  * Copyright (C) 2011 Marek Vasut <[email protected]>
  * on behalf of DENX Software Engineering GmbH

@@ -93,7 +93,7 @@ int board_mmc_init(bd_t *bis)
 
 int fecmxc_mii_postcall(int phy)
 {
-#if	defined(CONFIG_DENX_M28_V11) || defined(CONFIG_DENX_M28_V10)
+#if	defined(CONFIG_ARIES_M28_V11) || defined(CONFIG_ARIES_M28_V10)
 	/* KZ8031 PHY on old boards. */
 	const uint32_t freq = 0x0080;
 #else

@@ -123,7 +123,7 @@ int board_eth_init(bd_t *bis)
 		CLKCTRL_ENET_TIME_SEL_MASK | CLKCTRL_ENET_CLK_OUT_EN,
 		CLKCTRL_ENET_TIME_SEL_RMII_CLK);
 
-#if !defined(CONFIG_DENX_M28_V11) && !defined(CONFIG_DENX_M28_V10)
+#if !defined(CONFIG_ARIES_M28_V11) && !defined(CONFIG_ARIES_M28_V10)
 	/* Reset the new PHY */
 	gpio_direction_output(MX28_PAD_AUART2_RTS__GPIO_3_11, 0);
 	udelay(10000);

board/aries/m28evk/spl_boot.c renamed from board/denx/m28evk/spl_boot.c +3 -3

similarity index 98%
rename from board/denx/m28evk/spl_boot.c
rename to board/aries/m28evk/spl_boot.c
index 5a1010e..e27a74e 100644
@@ -1,5 +1,5 @@
 /*
- * DENX M28 Boot setup
+ * ARIES M28 Boot setup
  *
  * Copyright (C) 2011 Marek Vasut <[email protected]>
  * on behalf of DENX Software Engineering GmbH

@@ -56,7 +56,7 @@ const iomux_cfg_t iomux_setup[] = {
 	MX28_PAD_LCD_ENABLE__LCD_ENABLE | MUX_CONFIG_LCD,
 
 	/* UART1 */
-#ifdef	CONFIG_DENX_M28_V10
+#ifdef	CONFIG_ARIES_M28_V10
 	MX28_PAD_AUART0_CTS__DUART_RX,
 	MX28_PAD_AUART0_RTS__DUART_TX,
 #else

@@ -132,7 +132,7 @@ const iomux_cfg_t iomux_setup[] = {
 	MX28_PAD_ENET0_RXD3__ENET1_RXD1 | MUX_CONFIG_ENET,
 	MX28_PAD_ENET0_TXD2__ENET1_TXD0 | MUX_CONFIG_ENET,
 	MX28_PAD_ENET0_TXD3__ENET1_TXD1 | MUX_CONFIG_ENET,
-#if !defined(CONFIG_DENX_M28_V11) && !defined(CONFIG_DENX_M28_V10)
+#if !defined(CONFIG_ARIES_M28_V11) && !defined(CONFIG_ARIES_M28_V10)
 	MX28_PAD_AUART2_RTS__GPIO_3_11,	/* PHY reset */
 #endif

doc/README.mxs +1 -1

index 4edf19f..e23ab9c 100644
@@ -95,7 +95,7 @@ Next, configure U-Boot for a MXS based board
 
 Examples:
 
-1. For building U-Boot for Denx M28EVK board:
+1. For building U-Boot for Aries M28EVK board:
 
 	$ make m28evk_config

drivers/video/mxsfb.c +1 -1

index 32ecbe2..20455ff 100644
@@ -36,7 +36,7 @@ __weak void mxsfb_system_setup(void)
 }
 
 /*
- * DENX M28EVK:
+ * ARIES M28EVK:
  * setenv videomode
  * video=ctfb:x:800,y:480,depth:18,mode:0,pclk:30066,
  *       le:0,ri:256,up:0,lo:45,hs:1,vs:1,sync:100663296,vmode:0

scripts/config_whitelist.txt +1 -0

index 668f238..9f32cb2 100644
@@ -127,6 +127,7 @@ CONFIG_ARC_SERIAL
 CONFIG_ARC_UART_BASE
 CONFIG_ARIA
 CONFIG_ARIA_FPGA
+CONFIG_ARIES_M28_V10
 CONFIG_ARM926EJS
 CONFIG_ARMADA100
 CONFIG_ARMADA100_FEC

scripts/config_whitelist.txt CONFIG_DEFAULT_SPI_CS · line 733

Quoted 7 lines

scripts/config_whitelist.txt +0 -1

@@ -727,7 +728,6 @@ CONFIG_DEFAULT_SPI_CS
 CONFIG_DEFAULT_SPI_MODE
 CONFIG_DEF_HWCONFIG
 CONFIG_DELAY_ENVIRONMENT
-CONFIG_DENX_M28_V10
 CONFIG_DESIGNWARE_ETH
 CONFIG_DESIGNWARE_WATCHDOG
 CONFIG_DEVCONCENTER

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines

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