ARM: mxs: Rename M28EVK

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

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b758745f4a6962f7f3c12c9c32b5857ad30a4e02..1709410d8e043412414b5d2c51a90634a06a1f03 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1223,6 +1223,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"
@@ -1242,7 +1243,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"

diff --git a/board/denx/m28evk/Kconfig b/board/aries/m28evk/Kconfig
similarity index 89%
rename from board/denx/m28evk/Kconfig
rename to board/aries/m28evk/Kconfig
index dd4dc4d096d8de9959cd25fec121d03eedd8c056..ab5577cf742aa24d983ba6184d3c78ea2ed7156f 100644 (file)
--- a/board/denx/m28evk/Kconfig
+++ b/board/aries/m28evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
        default "m28evk"
 
 config SYS_VENDOR
-       default "denx"
+       default "aries"
 
 config SYS_SOC
        default "mxs"

diff --git a/board/denx/m28evk/MAINTAINERS b/board/aries/m28evk/MAINTAINERS
similarity index 84%
rename from board/denx/m28evk/MAINTAINERS
rename to board/aries/m28evk/MAINTAINERS
index b0535a91864ccce4a0d67578b9e345c1b064072c..f600e7d884706b763e85ba13502f9938888643c3 100644 (file)
--- a/board/denx/m28evk/MAINTAINERS
+++ b/board/aries/m28evk/MAINTAINERS
@@ -1,6 +1,6 @@
 M28EVK BOARD
 M:     Marek Vasut <marek.vasut@gmail.com>
 S:     Maintained
-F:     board/denx/m28evk/
+F:     board/aries/m28evk/
 F:     include/configs/m28evk.h
 F:     configs/m28evk_defconfig

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

diff --git a/board/denx/m28evk/README b/board/aries/m28evk/README
similarity index 82%
rename from board/denx/m28evk/README
rename to board/aries/m28evk/README
index cb3ae20f862d77c4c0a2548b48af5fdf6f0eb229..9f0d9954521ce70382e3b6dd13e3ecc87b48e0ad 100644 (file)
--- a/board/denx/m28evk/README
+++ b/board/aries/m28evk/README
@@ -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

diff --git a/board/denx/m28evk/m28evk.c b/board/aries/m28evk/m28evk.c
similarity index 96%
rename from board/denx/m28evk/m28evk.c
rename to board/aries/m28evk/m28evk.c
index 33d38cfc5493ff683e482dce2af41cc1e2e7bf26..c990ea9fec14232ab4a5b8b8f2d2d068c6d33b08 100644 (file)
--- a/board/denx/m28evk/m28evk.c
+++ b/board/aries/m28evk/m28evk.c
@@ -1,5 +1,5 @@
 /*
- * DENX M28 module
+ * Aries M28 module
  *
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * 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);

diff --git a/board/denx/m28evk/spl_boot.c b/board/aries/m28evk/spl_boot.c
similarity index 98%
rename from board/denx/m28evk/spl_boot.c
rename to board/aries/m28evk/spl_boot.c
index 5a1010e59550a4c65d9e2fc2ad3922ae0e5f9660..e27a74e07a6982a0208e3ea189076cf22a90a139 100644 (file)
--- a/board/denx/m28evk/spl_boot.c
+++ b/board/aries/m28evk/spl_boot.c
@@ -1,5 +1,5 @@
 /*
- * DENX M28 Boot setup
+ * ARIES M28 Boot setup
  *
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * 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
 

diff --git a/doc/README.mxs b/doc/README.mxs
index 4edf19faab8d70170126aa3db5cb01d82eb2f139..e23ab9cc6d9a173756e80d3f4482b6f38ab5e61f 100644 (file)
--- a/doc/README.mxs
+++ b/doc/README.mxs
@@ -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
 

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 32ecbe2b0991c34b93cbecf7ba5f785f33286ad0..20455ffb54219e9965bbd989c0e601d1392d50ae 100644 (file)
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -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

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 668f238459cf27b5c32265fedf9838d1274919ed..9f32cb2448c7df7211b410757f88230844823da3 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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