Commit 4f982108 authored by ji.luo's avatar ji.luo Committed by Jason Liu

MA-10334 Rename Aquila board name to spriot board name

Change-Id: Iee122d36d83bc6e1ae007fb2f2053c6e9e7fc2a2
Signed-off-by: default avatarji.luo <ji.luo@nxp.com>
parent 847e79e5
......@@ -355,8 +355,8 @@ config TARGET_PICO_IMX6DL
select DM
select DM_THERMAL
config TARGET_MX6UL_AQUILA
bool "Support mx6ul_aquila"
config TARGET_MX6UL_SPRIOT
bool "Support mx6ul_spriot"
select MX6UL
select DM
select DM_THERMAL
......@@ -515,7 +515,7 @@ source "board/seco/Kconfig"
source "board/solidrun/mx6cuboxi/Kconfig"
source "board/freescale/picosom-imx6ul/Kconfig"
source "board/freescale/pico-imx6dl/Kconfig"
source "board/freescale/mx6ul_aquila/Kconfig"
source "board/freescale/mx6ul_spriot/Kconfig"
source "board/tbs/tbs2910/Kconfig"
source "board/tqc/tqma6/Kconfig"
source "board/toradex/apalis_imx6/Kconfig"
......
......@@ -2643,7 +2643,7 @@
#define MACH_TYPE_HTCPANTHER 2673
#define MACH_TYPE_HTCPANTHER_CDMA 2674
#define MACH_TYPE_REB01 2675
#define MACH_TYPE_AQUILA 2676
#define MACH_TYPE_SPRIOT 2676
#define MACH_TYPE_SPARK_SLS_HW2 2677
#define MACH_TYPE_ESATA_SHEEVAPLUG 2678
#define MACH_TYPE_MSM7X30_SURF 2679
......
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
......@@ -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
......
......@@ -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;
}
......
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_aquila/imximage.cfg,ANDROID_THINGS_SUPPORT"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_spriot/imximage.cfg,ANDROID_THINGS_SUPPORT"
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_MX6UL=y
CONFIG_TARGET_MX6UL_AQUILA=y
CONFIG_TARGET_MX6UL_SPRIOT=y
CONFIG_BOOTDELAY=3
CONFIG_EFI_PARTITION=y
CONFIG_BOARD_EARLY_INIT_F=y
......
......@@ -3,12 +3,12 @@
* Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
*
* Configuration settings for the Murata AQUILA + i.MX6UL-BB board.
* Configuration settings for the Murata SPRIOT + i.MX6UL-BB board.
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX6UL_AQUILA_CONFIG_H
#define __MX6UL_AQUILA_CONFIG_H
#ifndef __MX6UL_SPRIOT_CONFIG_H
#define __MX6UL_SPRIOT_CONFIG_H
#include <asm/arch/imx-regs.h>
......@@ -358,11 +358,11 @@
#define CONFIG_USB_FASTBOOT_BUF_SIZE 0xc800000
#endif
#define PRODUCT_NAME "imx6ul_aquila"
#define VARIANT_NAME "imx6ul_aquila"
#define PRODUCT_NAME "imx6ul_spriot"
#define VARIANT_NAME "imx6ul_spriot"
#if defined(CONFIG_ANDROID_THINGS_SUPPORT)
#include "mx6ul_aquila_android_things.h"
#include "mx6ul_spriot_android_things.h"
#endif
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment