MA-10334 Rename Aquila board name to spriot board name

Change-Id: Iee122d36d83bc6e1ae007fb2f2053c6e9e7fc2a2
Signed-off-by: ji.luo <ji.luo@nxp.com>

5 files changed, 15 insertions, 15 deletions

diff --git a/board/freescale/mx6ul_aquila/Kconfig b/board/freescale/mx6ul_spriot/Kconfig
index e4e0a39738..7feb2fe479 100644
--- a/board/freescale/mx6ul_aquila/Kconfig
+++ b/board/freescale/mx6ul_spriot/Kconfig
@@ -1,7 +1,7 @@
-if TARGET_MX6UL_AQUILA
+if TARGET_MX6UL_SPRIOT
 
 config SYS_BOARD
-	default "mx6ul_aquila"
+	default "mx6ul_spriot"
 
 config SYS_VENDOR
 	default "freescale"
@@ -10,6 +10,6 @@ config SYS_SOC
 	default "mx6"
 
 config SYS_CONFIG_NAME
-	default "mx6ul_aquila"
+	default "mx6ul_spriot"
 
 endif
diff --git a/board/freescale/mx6ul_aquila/Makefile b/board/freescale/mx6ul_spriot/Makefile
index 4b95075fec..cd19da0e3a 100644
--- a/board/freescale/mx6ul_aquila/Makefile
+++ b/board/freescale/mx6ul_spriot/Makefile
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y  := mx6ul_aquila.o
+obj-y  := mx6ul_spriot.o
 
 extra-$(CONFIG_USE_PLUGIN) :=  plugin.bin
 $(obj)/plugin.bin: $(obj)/plugin.o
diff --git a/board/freescale/mx6ul_aquila/imximage.cfg b/board/freescale/mx6ul_spriot/imximage.cfg
index 12f91b05c3..12f91b05c3 100644
--- a/board/freescale/mx6ul_aquila/imximage.cfg
+++ b/board/freescale/mx6ul_spriot/imximage.cfg
diff --git a/board/freescale/mx6ul_aquila/mx6ul_aquila.c b/board/freescale/mx6ul_spriot/mx6ul_spriot.c
index 205f0ee9c3..963a88a622 100644
--- a/board/freescale/mx6ul_aquila/mx6ul_aquila.c
+++ b/board/freescale/mx6ul_spriot/mx6ul_spriot.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
  * Copyright 2017 NXP
  *
- * Specified for EVK consisting of Murata Aquila (iMX6UL + PMIC + eMMC + WiFi/BT) + iMX6UL-Base board
+ * Specified for EVK consisting of Murata spriot (iMX6UL + PMIC + eMMC + WiFi/BT) + iMX6UL-Base board
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -252,7 +252,7 @@ struct i2c_pads_info i2c_pad_info1 = {
 	},
 };
 #else
-/* Murata Aquila uses PMIC */
+/* Murata spriot uses PMIC */
 	#error "Need to define CONFIG_SYS_I2C_MXC"
 #endif
 
@@ -276,10 +276,10 @@ static iomux_v3_cfg_t const usdhc1_pads[] = {
 	MX6_PAD_SD1_DATA2__USDHC1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
 	MX6_PAD_SD1_DATA3__USDHC1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
 
-/* Murata Aquila does not use VSELECT, CD and RST_B for WiFi control */
+/* Murata spriot does not use VSELECT, CD and RST_B for WiFi control */
 };
 
-/* Murata Aquila uses 8-bit eMMC at uSDHC2 */
+/* Murata spriot uses 8-bit eMMC at uSDHC2 */
 static iomux_v3_cfg_t const usdhc2_emmc_pads[] = {
 	MX6_PAD_NAND_RE_B__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
 	MX6_PAD_NAND_WE_B__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
@@ -299,7 +299,7 @@ static iomux_v3_cfg_t const usdhc2_emmc_pads[] = {
 };
 
 #ifdef CONFIG_SYS_USE_NAND
-/* Murata Aquila uses NAND pads for eMMC at uSDHC2 */
+/* Murata spriot uses NAND pads for eMMC at uSDHC2 */
 #error "Cannot define CONFIG_SYS_USE_NAND"
 #endif
 
@@ -383,7 +383,7 @@ static struct fsl_esdhc_cfg usdhc_cfg[2] = {
 	{USDHC2_BASE_ADDR, 0, 8},
 };
 
-/* Murata Aquila eMMC reset */
+/* Murata spriot eMMC reset */
 #define USDHC2_PWR_GPIO	IMX_GPIO_NR(4, 10)
 
 int mmc_get_env_devno(void)
@@ -401,7 +401,7 @@ int mmc_get_env_devno(void)
 	/* BOOT_CFG2[3] and BOOT_CFG2[4] */
 	dev_no = (soc_sbmr & 0x00001800) >> 11;
 
-	/* Murata Aquila always use uSDHC2 for eMMC.  Note the 1 difference in mapping. */
+	/* Murata spriot always use uSDHC2 for eMMC.  Note the 1 difference in mapping. */
 	if (dev_no == 2 && mx6_esdhc_fused(USDHC2_BASE_ADDR))
 	{
 		dev_no = 1;
@@ -412,7 +412,7 @@ int mmc_get_env_devno(void)
 
 int mmc_map_to_kernel_blk(int dev_no)
 {
-	/* Murata Aquila always use uSDHC2 for eMMC and uSDHC1 for WiFi.  Note the 1 difference in mapping. */
+	/* Murata spriot always use uSDHC2 for eMMC and uSDHC1 for WiFi.  Note the 1 difference in mapping. */
 	if (dev_no == 1 && mx6_esdhc_fused(USDHC2_BASE_ADDR))
 	{
 		dev_no = 2;
@@ -428,11 +428,11 @@ int board_mmc_getcd(struct mmc *mmc)
 
 	switch (cfg->esdhc_base) {
 	case USDHC1_BASE_ADDR:
-		/* Murata Aquila always has WiFi connected to uSDHC1 which is not available for storage*/
+		/* Murata spriot always has WiFi connected to uSDHC1 which is not available for storage*/
 		ret = 0;
 		break;
 	case USDHC2_BASE_ADDR:
-		/* Murata Aquila always has eMMC connected to uSDHC2 */
+		/* Murata spriot always has eMMC connected to uSDHC2 */
 		ret = 1;
 		break;
 	}
@@ -879,7 +879,7 @@ u32 get_board_rev(void)
 
 int checkboard(void)
 {
-    puts("Board: Murata MX6UL-Aquila\n");
+    puts("Board: Murata MX6UL-spriot\n");
 
 	return 0;
 }
diff --git a/board/freescale/mx6ul_aquila/plugin.S b/board/freescale/mx6ul_spriot/plugin.S
index 802a510b27..802a510b27 100644
--- a/board/freescale/mx6ul_aquila/plugin.S
+++ b/board/freescale/mx6ul_spriot/plugin.S