diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /board/congatec | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
| download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.bz2 u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.zip | |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/congatec')
| -rw-r--r-- | board/congatec/cgtqmx8/cgtqmx8.c | 2 | ||||
| -rw-r--r-- | board/congatec/cgtqmx8/spl.c | 1 | ||||
| -rw-r--r-- | board/congatec/common/mmc.c | 3 | ||||
| -rw-r--r-- | board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/board/congatec/cgtqmx8/cgtqmx8.c b/board/congatec/cgtqmx8/cgtqmx8.c index 99c33a1943..d8e5b1d696 100644 --- a/board/congatec/cgtqmx8/cgtqmx8.c +++ b/board/congatec/cgtqmx8/cgtqmx8.c @@ -3,7 +3,7 @@ * Copyright 2018 congatec AG * Copyright (C) 2019 Oliver Graute <oliver.graute@kococonnector.com> */ -#include <config.h> +#include <common.h> #include <errno.h> #include <linux/libfdt.h> #include <fsl_esdhc.h> diff --git a/board/congatec/cgtqmx8/spl.c b/board/congatec/cgtqmx8/spl.c index 242e794981..b432ce2745 100644 --- a/board/congatec/cgtqmx8/spl.c +++ b/board/congatec/cgtqmx8/spl.c @@ -4,6 +4,7 @@ * */ +#include <common.h> #include <dm.h> #include <fdt_support.h> #include <init.h> diff --git a/board/congatec/common/mmc.c b/board/congatec/common/mmc.c index 74a189ab4d..bb7a3d4a9a 100644 --- a/board/congatec/common/mmc.c +++ b/board/congatec/common/mmc.c @@ -4,8 +4,7 @@ * Copyright 2018 NXP * */ - -#include <vsprintf.h> +#include <common.h> #include <linux/errno.h> #include <asm/io.h> #include <env.h> diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c index 4197e88fb6..315b6dc542 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c +++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c @@ -3,6 +3,7 @@ * Copyright (C) 2016 Stefan Roese <sr@denx.de> */ +#include <common.h> #include <i2c.h> #include <init.h> #include <winbond_w83627.h> |