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 /arch/x86/cpu/qemu | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
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 'arch/x86/cpu/qemu')
| -rw-r--r-- | arch/x86/cpu/qemu/cpu.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/dram.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/e820.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/qemu.c | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c index 0708a380626..735b6560843 100644 --- a/arch/x86/cpu/qemu/cpu.c +++ b/arch/x86/cpu/qemu/cpu.c @@ -3,6 +3,7 @@ * Copyright (C) 2015, Miao Yan <yanmiaobest@gmail.com> */ +#include <common.h> #include <cpu.h> #include <dm.h> #include <errno.h> diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index 62a301c0fd3..d83abf00527 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -3,6 +3,7 @@ * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> */ +#include <common.h> #include <init.h> #include <asm/global_data.h> #include <asm/post.h> diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c index 17a04f86479..ebfe5956442 100644 --- a/arch/x86/cpu/qemu/e820.c +++ b/arch/x86/cpu/qemu/e820.c @@ -6,6 +6,7 @@ * (C) Copyright 2019 Bin Meng <bmeng.cn@gmail.com> */ +#include <common.h> #include <env_internal.h> #include <malloc.h> #include <asm/e820.h> diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 262584d01f0..70414556086 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -3,6 +3,7 @@ * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> */ +#include <common.h> #include <cpu_func.h> #include <init.h> #include <pci.h> @@ -13,7 +14,6 @@ #include <asm/processor.h> #include <asm/arch/device.h> #include <asm/arch/qemu.h> -#include <asm/u-boot-x86.h> static bool i440fx; |