imx8mp-somdevices: Changed evk/freescale references to somdevices.

Signed-off-by: Josep Orga <jorga@somdevices.com>

diff --git a/board/somdevices/imx8mp_somdevices/Kconfig b/board/somdevices/imx8mp_somdevices/Kconfig
index 072caa3..630d4d8 100644 (file)
--- a/board/somdevices/imx8mp_somdevices/Kconfig
+++ b/board/somdevices/imx8mp_somdevices/Kconfig
@@ -1,14 +1,14 @@
-if TARGET_IMX8MP_EVK || TARGET_IMX8MP_DDR4_EVK
+if TARGET_IMX8MP_SOMDEVICES || TARGET_IMX8MP_DDR4_SOMDEVICES
 
 config SYS_BOARD
-       default "imx8mp_evk"
+       default "imx8mp_somdevices"
 
 config SYS_VENDOR
-       default "freescale"
+       default "somdevices"
 
 config SYS_CONFIG_NAME
-       default "imx8mp_evk"
+       default "imx8mp_somdevices"
 
-source "board/freescale/common/Kconfig"
+source "board/somdevices/common/Kconfig"
 
 endif

diff --git a/board/somdevices/imx8mp_somdevices/MAINTAINERS b/board/somdevices/imx8mp_somdevices/MAINTAINERS
index 2759652..1d5bc14 100644 (file)
--- a/board/somdevices/imx8mp_somdevices/MAINTAINERS
+++ b/board/somdevices/imx8mp_somdevices/MAINTAINERS
@@ -1,6 +1,6 @@
-i.MX8MP EVK BOARD
-M:     Peng Fan <peng.fan@nxp.com>
+i.MX8MP SOMDEVICES BOARD
+M:     Josep Orga <jorga@somdevices.com>
 S:     Maintained
-F:     board/freescale/imx8mp_evk/
-F:     include/configs/imx8mp_evk.h
-F:     configs/imx8mp_evk_defconfig
+F:     board/freescale/imx8mp_somdevices/
+F:     include/configs/imx8mp_somdevices.h
+F:     configs/imx8mp_somdevices_defconfig

diff --git a/board/somdevices/imx8mp_somdevices/Makefile b/board/somdevices/imx8mp_somdevices/Makefile
index 1970dc4..e27fa2c 100644 (file)
--- a/board/somdevices/imx8mp_somdevices/Makefile
+++ b/board/somdevices/imx8mp_somdevices/Makefile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier:      GPL-2.0+
 #
 
-obj-y += imx8mp_evk.o
+obj-y += imx8mp_somdevices.o
 
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o

diff --git a/board/somdevices/imx8mp_somdevices/imx8mp_somdevices.c b/board/somdevices/imx8mp_somdevices/imx8mp_somdevices.c
index c499743..47108f7 100644 (file)
--- a/board/somdevices/imx8mp_somdevices/imx8mp_somdevices.c
+++ b/board/somdevices/imx8mp_somdevices/imx8mp_somdevices.c
@@ -70,7 +70,7 @@ int board_early_init_f(void)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
 #ifdef CONFIG_IMX8M_DRAM_INLINE_ECC
-#ifdef CONFIG_TARGET_IMX8MP_DDR4_EVK
+#ifdef CONFIG_TARGET_IMX8MP_DDR4_SOMDEVICES
        int rc;
        phys_addr_t ecc_start = 0x120000000;
        size_t ecc_size = 0x20000000;
@@ -479,7 +479,7 @@ int board_late_init(void)
        board_late_mmc_env_init();
 #endif
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       env_set("board_name", "EVK");
+       env_set("board_name", "SOMDEVICES");
        env_set("board_rev", "iMX8MP");
 #endif
 

diff --git a/configs/imx8mp_somdevices_defconfig b/configs/imx8mp_somdevices_defconfig
index 8c7ede8..d2add39 100644 (file)
--- a/configs/imx8mp_somdevices_defconfig
+++ b/configs/imx8mp_somdevices_defconfig
@@ -15,13 +15,13 @@ CONFIG_SYS_I2C_MXC_I2C2=y
 CONFIG_SYS_I2C_MXC_I2C3=y
 CONFIG_DM_GPIO=y
 CONFIG_SPL_TEXT_BASE=0x920000
-CONFIG_TARGET_IMX8MP_EVK=y
+CONFIG_TARGET_IMX8MP_SOMDEVICES=y
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
-CONFIG_DEFAULT_DEVICE_TREE="imx8mp-evk"
+CONFIG_DEFAULT_DEVICE_TREE="imx8mp-somdevices"
 CONFIG_CSF_SIZE=0x2000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTCOMMAND="run distro_bootcmd;run bsp_bootcmd"
@@ -31,7 +31,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg"
-CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mp-somdevices.dtb"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y

diff --git a/include/configs/imx8mp_somdevices.h b/include/configs/imx8mp_somdevices.h
index 10e87f3..be4e948 100644 (file)
--- a/include/configs/imx8mp_somdevices.h
+++ b/include/configs/imx8mp_somdevices.h
@@ -3,8 +3,8 @@
  * Copyright 2019 NXP
  */
 
-#ifndef __IMX8MP_EVK_H
-#define __IMX8MP_EVK_H
+#ifndef __IMX8MP_SOMDEVICES_H
+#define __IMX8MP_SOMDEVICES_H
 
 #include <linux/sizes.h>
 #include <linux/stringify.h>
@@ -78,12 +78,12 @@
 
 #define JAILHOUSE_ENV \
        "jh_clk= \0 " \
-       "jh_mmcboot=setenv fdtfile imx8mp-evk-root.dtb;" \
+       "jh_mmcboot=setenv fdtfile imx8mp-somdevices-root.dtb;" \
                "setenv jh_clk clk_ignore_unused mem=2048MB; " \
                           "if run loadimage; then " \
                                   "run mmcboot; " \
                           "else run jh_netboot; fi; \0" \
-       "jh_netboot=setenv fdtfile imx8mp-evk-root.dtb; setenv jh_clk clk_ignore_unused mem=2048MB; run netboot; \0 "
+       "jh_netboot=setenv fdtfile imx8mp-somdevices-root.dtb; setenv jh_clk clk_ignore_unused mem=2048MB; run netboot; \0 "
 
 #define CONFIG_MFG_ENV_SETTINGS \
        CONFIG_MFG_ENV_SETTINGS_DEFAULT \
@@ -214,7 +214,7 @@
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0xC0000000      /* 3 GB */
 #define PHYS_SDRAM_2                   0x100000000
-#ifdef CONFIG_TARGET_IMX8MP_DDR4_EVK
+#ifdef CONFIG_TARGET_IMX8MP_DDR4_SOMDEVICES
 #define PHYS_SDRAM_2_SIZE              0x40000000      /* 1 GB */
 #else
 #define PHYS_SDRAM_2_SIZE              0xC0000000      /* 3 GB */
@@ -232,7 +232,7 @@
 #define CONFIG_IMX_BOOTAUX
 #define CONFIG_FSL_USDHC
 
-#ifdef CONFIG_TARGET_IMX8MP_DDR4_EVK
+#ifdef CONFIG_TARGET_IMX8MP_DDR4_SOMDEVICES
 #define CONFIG_SYS_FSL_USDHC_NUM       1
 #else
 #define CONFIG_SYS_FSL_USDHC_NUM       2
@@ -276,7 +276,7 @@
 #endif
 
 #ifdef CONFIG_ANDROID_SUPPORT
-#include "imx8mp_evk_android.h"
+#include "imx8mp_somdevices_android.h"
 #endif
 
 #endif