From: Josep Orga Date: Wed, 6 Oct 2021 14:43:01 +0000 (+0200) Subject: imx8mn-somdevices: Changed evk/freescale references to somdevices. X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~24 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=1b1a0713e2e114ac8f4767b143482ae833485bb6;p=u-boot.git imx8mn-somdevices: Changed evk/freescale references to somdevices. Signed-off-by: Josep Orga --- diff --git a/board/somdevices/imx8mn_somdevices/Kconfig b/board/somdevices/imx8mn_somdevices/Kconfig index 135d543335..762aa9bc2f 100644 --- a/board/somdevices/imx8mn_somdevices/Kconfig +++ b/board/somdevices/imx8mn_somdevices/Kconfig @@ -1,18 +1,18 @@ -if TARGET_IMX8MN_EVK || TARGET_IMX8MN_DDR4_EVK || TARGET_IMX8MN_DDR3_EVK +if TARGET_IMX8MN_SOMDEVICES || TARGET_IMX8MN_DDR4_SOMDEVICES || TARGET_IMX8MN_DDR3_SOMDEVICES config SYS_BOARD - default "imx8mn_evk" + default "imx8mn_somdevices" config SYS_VENDOR - default "freescale" + default "somdevices" config SYS_CONFIG_NAME - default "imx8mn_evk" + default "imx8mn_somdevices" config IMX8MN_LOW_DRIVE_MODE - bool "Enable the low drive mode of iMX8MN on EVK board" + bool "Enable the low drive mode of iMX8MN on SOMDEVICES board" default n -source "board/freescale/common/Kconfig" +source "board/somdevices/common/Kconfig" endif diff --git a/board/somdevices/imx8mn_somdevices/MAINTAINERS b/board/somdevices/imx8mn_somdevices/MAINTAINERS index 3b0653d3c8..ff4d8d922a 100644 --- a/board/somdevices/imx8mn_somdevices/MAINTAINERS +++ b/board/somdevices/imx8mn_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/imx8mn_evk/ -F: include/configs/imx8mn_evk.h -F: configs/imx8mn_ddr4_evk_defconfig +F: board/freescale/imx8mn_somdevices/ +F: include/configs/imx8mn_somdevices.h +F: configs/imx8mn_somdevices_defconfig diff --git a/board/somdevices/imx8mn_somdevices/Makefile b/board/somdevices/imx8mn_somdevices/Makefile index ad3ef8edd6..1c283270c9 100644 --- a/board/somdevices/imx8mn_somdevices/Makefile +++ b/board/somdevices/imx8mn_somdevices/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += imx8mn_evk.o +obj-y += imx8mn_somdevices.o ifdef CONFIG_SPL_BUILD obj-y += spl.o diff --git a/board/somdevices/imx8mn_somdevices/imx8mn_somdevices.c b/board/somdevices/imx8mn_somdevices/imx8mn_somdevices.c index 7593761275..77325a23ee 100644 --- a/board/somdevices/imx8mn_somdevices/imx8mn_somdevices.c +++ b/board/somdevices/imx8mn_somdevices/imx8mn_somdevices.c @@ -324,7 +324,7 @@ int board_late_init(void) #endif #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - env_set("board_name", "DDR4 EVK"); + env_set("board_name", "SOMDEVICES"); env_set("board_rev", "iMX8MN"); #endif return 0; diff --git a/configs/imx8mn_somdevices_defconfig b/configs/imx8mn_somdevices_defconfig index ef5647eadb..27be8f8957 100644 --- a/configs/imx8mn_somdevices_defconfig +++ b/configs/imx8mn_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=0x912000 -CONFIG_TARGET_IMX8MN_EVK=y +CONFIG_TARGET_IMX8MN_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="imx8mn-evk" +CONFIG_DEFAULT_DEVICE_TREE="imx8mn-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-8mn-lpddr4.cfg" -CONFIG_DEFAULT_FDT_FILE="imx8mn-evk.dtb" +CONFIG_DEFAULT_FDT_FILE="imx8mn-somdevices.dtb" CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y diff --git a/include/configs/imx8mn_somdevices.h b/include/configs/imx8mn_somdevices.h index ff65b80999..2916169b26 100644 --- a/include/configs/imx8mn_somdevices.h +++ b/include/configs/imx8mn_somdevices.h @@ -3,8 +3,8 @@ * Copyright 2018 NXP */ -#ifndef __IMX8MN_EVK_H -#define __IMX8MN_EVK_H +#ifndef __IMX8MN_SOMDEVICES_H +#define __IMX8MN_SOMDEVICES_H #include #include @@ -77,10 +77,10 @@ * Another approach is add the clocks for inmates into clks_init_on * in clk-imx8mm.c, then clk_ingore_unused could be removed. */ -#ifdef CONFIG_TARGET_IMX8MN_DDR4_EVK -#define JH_ROOT_DTB "imx8mn-ddr4-evk-root.dtb" +#ifdef CONFIG_TARGET_IMX8MN_DDR4_SOMDEVICES +#define JH_ROOT_DTB "imx8mn-ddr4-somdevices-root.dtb" #else -#define JH_ROOT_DTB "imx8mn-evk-root.dtb" +#define JH_ROOT_DTB "imx8mn-somdevices-root.dtb" #endif #define JAILHOUSE_ENV \ @@ -197,7 +197,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 -#ifdef CONFIG_TARGET_IMX8MN_DDR3_EVK +#ifdef CONFIG_TARGET_IMX8MN_DDR3_SOMDEVICES #define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */ #else #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ @@ -261,7 +261,7 @@ #endif #ifdef CONFIG_ANDROID_SUPPORT -#include "imx8mn_evk_android.h" +#include "imx8mn_somdevices_android.h" #endif #endif