Skip to content

Commit

Permalink
Merge tag 'u-boot-imx-master-20240219' of https://gitlab.denx.de/u-bo…
Browse files Browse the repository at this point in the history
…ot/custodians/u-boot-imx

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/19683

- Convert msc_sm2s_imx8mp to DM_SERIAL.
- Make Ethernel functional on msc_sm2s_imx8mp.
- General improvements for msc_sm2s_imx8mp.
- Add suport for the Sielaff i.MX6 Solo board.
- Update GE HealthCare maitainers' e-mail addresses.
  • Loading branch information
trini committed Feb 19, 2024
2 parents e4013bc + 0cfc2e9 commit 3e6f2a9
Show file tree
Hide file tree
Showing 24 changed files with 1,323 additions and 19 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ F: drivers/timer/mchp-pit64b-timer.c

ARM MSC SM2S IMX8MP SOM
M: Martyn Welch <martyn.welch@collabora.com>
M: Ian Ray <ian.ray@ge.com>
M: Ian Ray <ian.ray@gehealthcare.com>
S: Maintained
F: arch/arm/dts/imx8mp-msc-sm2s*
F: board/msc/sm2s_imx8mp/
Expand Down
1 change: 1 addition & 0 deletions arch/arm/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,7 @@ dtb-y += \
imx6dl-riotboard.dtb \
imx6dl-sabreauto.dtb \
imx6dl-sabresd.dtb \
imx6dl-sielaff.dtb \
imx6dl-wandboard-revd1.dtb \
imx6s-dhcom-drc02.dtb

Expand Down
38 changes: 38 additions & 0 deletions arch/arm/dts/imx6dl-sielaff-u-boot.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* Copyright (C) 2022 Kontron Electronics GmbH
*/

#include "imx6qdl-u-boot.dtsi"

/ {
binman: binman {
filename = "flash.bin";
pad-byte = <0x00>;

spl: blob-ext@1 {
offset = <0x0>;
filename = "SPL";
};

uboot: blob-ext@2 {
offset = <0x11000>;
filename = "u-boot.img";
};
};

wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
};
};

&fec {
phy-mode = "rmii";
phy-reset-gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
phy-reset-duration = <100>;
};

&gpmi {
fsl,legacy-bch-geometry;
};
Loading

0 comments on commit 3e6f2a9

Please sign in to comment.