diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-12 07:26:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-12 07:26:57 -0400 |
| commit | 47e9c70421d75336336097c1425028b40e4f0b54 (patch) | |
| tree | b8ee7f6b2c0e6bfe39511f64dec25fad3b28de0b /board | |
| parent | 726561a9412abe50875b7791feab94f411d76199 (diff) | |
| parent | 555ee3949307648d6c40081b30e212af075ab8a8 (diff) | |
| download | u-boot-47e9c70421d75336336097c1425028b40e4f0b54.tar.gz | |
Merge tag 'ti-v2021.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Minor cleanup on K3 env variables
- Fix OSPI compatible for J721e
- Drop unused property in omap-usb2-phy
- Update Maintainer for am335x-guardian board.
Diffstat (limited to 'board')
| -rw-r--r-- | board/bosch/guardian/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/ti/j721e/evm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/bosch/guardian/MAINTAINERS b/board/bosch/guardian/MAINTAINERS index 2f674d7f83..fd216a96ca 100644 --- a/board/bosch/guardian/MAINTAINERS +++ b/board/bosch/guardian/MAINTAINERS @@ -1,7 +1,7 @@ Guardian BOARD M: Sjoerd Simons <sjoerd.simons@collabora.co.uk> M: Govindaraji Sivanantham <Govindaraji.Sivanantham@in.bosch.com> -M: Moses Christopher Bollavarapu <BollavarapuMoses.Christopher@in.bosch.com> +M: Hiremath Gireesh <Gireesh.Hiremath@in.bosch.com> S: Maintained F: board/bosch/guardian/ F: include/configs/am335x_guardian.h diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index 7925b76ab7..d8711eb900 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -110,7 +110,7 @@ static void __maybe_unused detect_enable_hyperflash(void *blob) do_fixup_by_compat(blob, "ti,am654-hbmc", "status", "okay", sizeof("okay"), 0); offset = fdt_node_offset_by_compatible(blob, -1, - "ti,j721e-ospi"); + "ti,am654-ospi"); fdt_setprop(blob, offset, "status", "disabled", sizeof("disabled")); } |