From: Josep Orga Date: Wed, 1 Sep 2021 17:30:16 +0000 (+0200) Subject: imx8mm-somdevices: Changed evk/freescale references to somdevices. X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~48 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=3f74dc4024dad75e3558ad2d59d6b9e15ba38258;p=u-boot.git imx8mm-somdevices: Changed evk/freescale references to somdevices. Signed-off-by: Josep Orga --- diff --git a/board/somdevices/imx8mm_somdevices/Kconfig b/board/somdevices/imx8mm_somdevices/Kconfig index ae097ee6c5..fa489c0c26 100644 --- a/board/somdevices/imx8mm_somdevices/Kconfig +++ b/board/somdevices/imx8mm_somdevices/Kconfig @@ -1,17 +1,17 @@ -if TARGET_IMX8MM_EVK || TARGET_IMX8MM_DDR4_EVK || TARGET_IMX8MM_EVK_QCA +if TARGET_IMX8MM_SOMDEVICES || TARGET_IMX8MM_DDR4_SOMDEVICES || TARGET_IMX8MM_SOMDEVICES_QCA config SYS_BOARD - default "imx8mm_evk" + default "imx8mm_somdevices" config SYS_VENDOR - default "freescale" + default "somdevices" config SYS_CONFIG_NAME - default "imx8mm_evk" + default "imx8mm_somdevices" config IMX8M_1G_MEMORY bool "imx8m 1GB memory size" -source "board/freescale/common/Kconfig" +source "board/somdevices/common/Kconfig" endif diff --git a/board/somdevices/imx8mm_somdevices/MAINTAINERS b/board/somdevices/imx8mm_somdevices/MAINTAINERS index b031bb0674..bd31163321 100644 --- a/board/somdevices/imx8mm_somdevices/MAINTAINERS +++ b/board/somdevices/imx8mm_somdevices/MAINTAINERS @@ -1,6 +1,6 @@ -i.MX8MM EVK BOARD -M: Peng Fan +i.MX8MM SOMDEVICES BOARD +M: Josep Orga S: Maintained -F: board/freescale/imx8mm_evk/ -F: include/configs/imx8mm_evk.h -F: configs/imx8mm_evk_defconfig +F: board/somdevices/imx8mm_somdevices/ +F: include/configs/imx8mm_somdevices.h +F: configs/imx8mm_somdevices_defconfig diff --git a/board/somdevices/imx8mm_somdevices/Makefile b/board/somdevices/imx8mm_somdevices/Makefile index b3f1c185a3..0308a2576f 100644 --- a/board/somdevices/imx8mm_somdevices/Makefile +++ b/board/somdevices/imx8mm_somdevices/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += imx8mm_evk.o +obj-y += imx8mm_somdevices.o ifdef CONFIG_SPL_BUILD obj-y += spl.o diff --git a/board/somdevices/imx8mm_somdevices/imx8mm_somdevices.c b/board/somdevices/imx8mm_somdevices/imx8mm_somdevices.c index eaa2c6b7f1..1a83d87a4f 100644 --- a/board/somdevices/imx8mm_somdevices/imx8mm_somdevices.c +++ b/board/somdevices/imx8mm_somdevices/imx8mm_somdevices.c @@ -324,7 +324,7 @@ int board_late_init(void) #endif #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - env_set("board_name", "EVK"); + env_set("board_name", "SOMDEVICES"); env_set("board_rev", "iMX8MM"); #endif return 0; diff --git a/configs/imx8mm_somdevices_defconfig b/configs/imx8mm_somdevices_defconfig index 1b78d0ed29..863f987063 100644 --- a/configs/imx8mm_somdevices_defconfig +++ b/configs/imx8mm_somdevices_defconfig @@ -14,13 +14,13 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_SPL_TEXT_BASE=0x7E1000 -CONFIG_TARGET_IMX8MM_EVK=y +CONFIG_TARGET_IMX8MM_SOMDEVICES=y CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y -CONFIG_DEFAULT_DEVICE_TREE="imx8mm-evk" +CONFIG_DEFAULT_DEVICE_TREE="imx8mm-somdevices" CONFIG_CSF_SIZE=0x2000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run distro_bootcmd;run bsp_bootcmd" @@ -75,7 +75,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_USB=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y -CONFIG_DEFAULT_FDT_FILE="imx8mm-evk.dtb" +CONFIG_DEFAULT_FDT_FILE="imx8mm-somdevices.dtb" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=1 diff --git a/include/configs/imx8mm_somdevices.h b/include/configs/imx8mm_somdevices.h index f5bcdd245e..28ba6b8d95 100644 --- a/include/configs/imx8mm_somdevices.h +++ b/include/configs/imx8mm_somdevices.h @@ -3,8 +3,8 @@ * Copyright 2019 NXP */ -#ifndef __IMX8MM_EVK_H -#define __IMX8MM_EVK_H +#ifndef __IMX8MM_SOMDEVICES_H +#define __IMX8MM_SOMDEVICES_H #include #include @@ -33,7 +33,7 @@ #define CONFIG_POWER #define CONFIG_POWER_I2C -#if defined(CONFIG_IMX8M_LPDDR4) && defined(CONFIG_TARGET_IMX8MM_EVK) +#if defined(CONFIG_IMX8M_LPDDR4) && defined(CONFIG_TARGET_IMX8MM_SOMDEVICES) #define CONFIG_POWER_PCA9450 #else #define CONFIG_POWER_BD71837 @@ -94,12 +94,12 @@ */ #define JAILHOUSE_ENV \ "jh_clk= \0 " \ - "jh_mmcboot=mw 0x303d0518 0xff; setenv fdtfile imx8mm-evk-root.dtb;" \ + "jh_mmcboot=mw 0x303d0518 0xff; setenv fdtfile imx8mm-somdevices-root.dtb;" \ "setenv jh_clk clk_ignore_unused mem=1340MB; " \ "if run loadimage; then " \ "run mmcboot; " \ "else run jh_netboot; fi; \0" \ - "jh_netboot=mw 0x303d0518 0xff; setenv fdtfile imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused mem=1340MB; run netboot; \0 " + "jh_netboot=mw 0x303d0518 0xff; setenv fdtfile imx8mm-somdevices-root.dtb; setenv jh_clk clk_ignore_unused mem=1340MB; run netboot; \0 " #define CONFIG_MFG_ENV_SETTINGS \ @@ -240,7 +240,7 @@ /* USDHC */ #define CONFIG_FSL_USDHC -#ifdef CONFIG_TARGET_IMX8MM_DDR4_EVK +#ifdef CONFIG_TARGET_IMX8MM_DDR4_SOMDEVICES #define CONFIG_SYS_FSL_USDHC_NUM 1 #else #define CONFIG_SYS_FSL_USDHC_NUM 2 @@ -298,7 +298,7 @@ #endif #ifdef CONFIG_ANDROID_SUPPORT -#include "imx8mm_evk_android.h" +#include "imx8mm_somdevices_android.h" #endif #endif