diff options
| author | Tom Rini | 2024-02-12 09:26:20 -0500 |
|---|---|---|
| committer | Tom Rini | 2024-02-12 09:26:20 -0500 |
| commit | 91c37c4a20db24a4fc1d565c70035072d355cce0 (patch) | |
| tree | 49e2b12cf091e87bad45b8768d5d7894523a4caa /arch | |
| parent | e8f2404e093daf6cc3ac2b3233e3c6770d13e371 (diff) | |
| parent | fcd377ed6480643b1f79188c7a8fb9280a211b4f (diff) | |
Merge tag 'u-boot-imx-master-20240212' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/19583
- Fix the i.MX8MP SPI compatible string.
- Let the SPL clock code do the configuration on Data Modul i.MX8M Plus
eDM SBC.
- Enable secure boot on the imx93_var_som board.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-imx9/mu.h | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi b/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi index cb6ea356fd7..805b5f57955 100644 --- a/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi @@ -45,6 +45,9 @@ }; &ecspi1 { + /delete-property/ assigned-clocks; + /delete-property/ assigned-clock-rates; + /delete-property/ assigned-clock-parents; bootph-pre-ram; flash@0 { bootph-pre-ram; diff --git a/arch/arm/include/asm/arch-imx9/mu.h b/arch/arm/include/asm/arch-imx9/mu.h new file mode 100644 index 00000000000..b8604992914 --- /dev/null +++ b/arch/arm/include/asm/arch-imx9/mu.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2024 Mathieu Othacehe <m.othacehe@gmail.com> + */ + +#ifndef __ARCH_IMX9_MU_H +#define __ARCH_IMX9_MU_H + +#include <event.h> + +int imx9_probe_mu(void *ctx, struct event *event); + +#endif |