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/cobra5272 | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
| download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz | |
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/cobra5272')
| -rw-r--r-- | board/cobra5272/cobra5272.c | 2 | ||||
| -rw-r--r-- | board/cobra5272/flash.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/board/cobra5272/cobra5272.c b/board/cobra5272/cobra5272.c index 774aa82b57f..69a9df94231 100644 --- a/board/cobra5272/cobra5272.c +++ b/board/cobra5272/cobra5272.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <config.h> +#include <common.h> #include <init.h> #include <asm/global_data.h> #include <asm/immap.h> diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 157b71da85e..8416af163ad 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -4,17 +4,13 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <config.h> +#include <common.h> #include <console.h> #include <cpu_func.h> #include <flash.h> #include <irq_func.h> -#include <stdio.h> -#include <time.h> #include <uuid.h> -#include <vsprintf.h> #include <linux/delay.h> -#include <linux/string.h> #define PHYS_FLASH_1 CFG_SYS_FLASH_BASE #define FLASH_BANK_SIZE 0x200000 |