leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imx: kontron-sl-mx8mm: Adjust devicetree names, compatibles and model strings

Browse Source 
This adjusts the names of the boards and SoMs to the official naming
used by Kontron marketing. These changes also affect devicetree
names and compatibles. The same changes have been submitted to the
Linux kernel.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Reviewed-by: Fabio Estevam <festevam@denx.de>
This commit is contained in:
Frieder Schrempf 2022-08-24 15:59:15 +02:00 committed by Stefano Babic
parent 3b846df8ab
commit dfbdc69c5d
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/Makefile
View File

@ -947,7 +947,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
imx8mm-evk.dtb \
imx8mm-icore-mx8mm-ctouch2.dtb \
imx8mm-icore-mx8mm-edimm2.2.dtb \
imx8mm-kontron-n801x-s.dtb \
imx8mm-kontron-bl.dtb \
imx8mm-mx8menlo.dtb \
imx8mm-venice.dtb \
imx8mm-venice-gw71xx-0x.dtb \

0
arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi → arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi
View File

6
arch/arm/dts/imx8mm-kontron-n801x-s.dts → arch/arm/dts/imx8mm-kontron-bl.dts
View File

@ -5,11 +5,11 @@
/dts-v1/;
#include "imx8mm-kontron-n801x-som.dtsi"
#include "imx8mm-kontron-sl.dtsi"
/ {
model = "Kontron i.MX8MM N801X S";
compatible = "kontron,imx8mm-n801x-s", "kontron,imx8mm-n801x-som", "fsl,imx8mm";
model = "Kontron BL i.MX8MM (N801X S)";
compatible = "kontron,imx8mm-bl", "kontron,imx8mm-sl", "fsl,imx8mm";
aliases {
ethernet1 = &usbnet;

4
arch/arm/dts/imx8mm-kontron-n801x-som.dtsi → arch/arm/dts/imx8mm-kontron-sl.dtsi
View File

@ -6,8 +6,8 @@
#include "imx8mm.dtsi"
/ {
model = "Kontron i.MX8MM N801X SoM";
compatible = "kontron,imx8mm-n801x-som", "fsl,imx8mm";
model = "Kontron SL i.MX8MM (N801X SOM)";
compatible = "kontron,imx8mm-sl", "fsl,imx8mm";
memory@40000000 {
device_type = "memory";

2
board/kontron/sl-mx8mm/MAINTAINERS
View File

@ -1,7 +1,7 @@
Kontron SL/BL i.MX8M Mini Boards (N801x)
M: Frieder Schrempf <frieder.schrempf@kontron.de>
S: Maintained
F: arch/arm/dts/imx8mm-kontron-n801x-*
F: arch/arm/dts/imx8mm-kontron*
F: board/kontron/sl-mx8mm
F: configs/kontron-sl-mx8mm_defconfig
F: doc/board/kontron/sl-mx8mm.rst

3
board/kontron/sl-mx8mm/spl.c
View File

@ -150,7 +150,8 @@ int do_board_detect(void)
int board_fit_config_name_match(const char *name)
{
if (gd->board_type == BOARD_TYPE_KTN_N801X && is_imx8mm() &&
!strncmp(name, "imx8mm-kontron-n801x-s", 22))
(!strcmp(name, "imx8mm-kontron-n801x-s") ||
!strcmp(name, "imx8mm-kontron-bl")))
return 0;
return -1;

2
configs/kontron-sl-mx8mm_defconfig
View File

@ -11,7 +11,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_IMX_CONFIG="board/kontron/sl-mx8mm/imximage.cfg"
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s"
CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-bl"
CONFIG_SPL_TEXT_BASE=0x7E1000
CONFIG_TARGET_KONTRON_MX8MM=y
CONFIG_SPL_MMC=y