diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-20 10:16:33 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-20 10:16:33 -0600 |
commit | d4781422d1268aa6deca3e49d2fb227e79c160b4 (patch) | |
tree | 420073c8a29a401a3908803000df6f54673e1731 /arch/x86/include | |
parent | 85854bc3324edd0c81047780ee60033d056fd490 (diff) | |
parent | a7f0154c412859323396111dd0c09dbafbc153cb (diff) | |
download | u-boot-d4781422d1268aa6deca3e49d2fb227e79c160b4.zip u-boot-d4781422d1268aa6deca3e49d2fb227e79c160b4.tar.gz u-boot-d4781422d1268aa6deca3e49d2fb227e79c160b4.tar.bz2 |
Merge tag 'v2024.07-rc3' into next
Prepare v2024.07-rc3
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/arch-quark/mrc.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/arch-quark/msg_port.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/arch-quark/quark.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/cb_sysinfo.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/coreboot_tables.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/early_cmos.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/global_data.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/handoff.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/me_common.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/mp.h | 1 |
10 files changed, 0 insertions, 17 deletions
diff --git a/arch/x86/include/asm/arch-quark/mrc.h b/arch/x86/include/asm/arch-quark/mrc.h index 40c92a5..2353426 100644 --- a/arch/x86/include/asm/arch-quark/mrc.h +++ b/arch/x86/include/asm/arch-quark/mrc.h @@ -10,8 +10,6 @@ #ifndef _MRC_H_ #define _MRC_H_ -#include <linux/types.h> - #define MRC_VERSION 0x0111 /* architectural definitions */ diff --git a/arch/x86/include/asm/arch-quark/msg_port.h b/arch/x86/include/asm/arch-quark/msg_port.h index 98a9360..9527fda 100644 --- a/arch/x86/include/asm/arch-quark/msg_port.h +++ b/arch/x86/include/asm/arch-quark/msg_port.h @@ -34,8 +34,6 @@ #ifndef __ASSEMBLY__ -#include <linux/types.h> - /** * msg_port_setup - set up the message port control register * diff --git a/arch/x86/include/asm/arch-quark/quark.h b/arch/x86/include/asm/arch-quark/quark.h index dec30e2..feca198 100644 --- a/arch/x86/include/asm/arch-quark/quark.h +++ b/arch/x86/include/asm/arch-quark/quark.h @@ -71,8 +71,6 @@ #ifndef __ASSEMBLY__ -#include <linux/types.h> - /* variable range MTRR usage */ enum { MTRR_VAR_ROM, diff --git a/arch/x86/include/asm/cb_sysinfo.h b/arch/x86/include/asm/cb_sysinfo.h index 5864b27..12fa395 100644 --- a/arch/x86/include/asm/cb_sysinfo.h +++ b/arch/x86/include/asm/cb_sysinfo.h @@ -9,7 +9,6 @@ #define _COREBOOT_SYSINFO_H #include <asm/coreboot_tables.h> -#include <linux/types.h> /* Maximum number of memory range definitions */ #define SYSINFO_MAX_MEM_RANGES 32 diff --git a/arch/x86/include/asm/coreboot_tables.h b/arch/x86/include/asm/coreboot_tables.h index 54aeffb..0dfb64b 100644 --- a/arch/x86/include/asm/coreboot_tables.h +++ b/arch/x86/include/asm/coreboot_tables.h @@ -8,9 +8,6 @@ #ifndef _COREBOOT_TABLES_H #define _COREBOOT_TABLES_H -#include <linux/kernel.h> -#include <linux/types.h> - struct timestamp_entry { u32 entry_id; u64 entry_stamp; diff --git a/arch/x86/include/asm/early_cmos.h b/arch/x86/include/asm/early_cmos.h index 007aeb7..543a9e6 100644 --- a/arch/x86/include/asm/early_cmos.h +++ b/arch/x86/include/asm/early_cmos.h @@ -6,8 +6,6 @@ #ifndef __EARLY_CMOS_H #define __EARLY_CMOS_H -#include <linux/types.h> - /* CMOS actually resides in the RTC SRAM */ #define CMOS_IO_PORT 0x70 diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 06bd80c..1ef7f1f 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -12,7 +12,6 @@ #include <linux/types.h> #include <asm/processor.h> #include <asm/mrccache.h> -#include <asm/u-boot.h> enum pei_boot_mode_t { PEI_BOOT_NONE = 0, diff --git a/arch/x86/include/asm/handoff.h b/arch/x86/include/asm/handoff.h index 5f66919..aec49b9 100644 --- a/arch/x86/include/asm/handoff.h +++ b/arch/x86/include/asm/handoff.h @@ -9,8 +9,6 @@ #ifndef __x86_asm_handoff_h #define __x86_asm_handoff_h -#include <linux/types.h> - /** * struct arch_spl_handoff - architecture-specific handoff info * diff --git a/arch/x86/include/asm/me_common.h b/arch/x86/include/asm/me_common.h index aa47859..8570368 100644 --- a/arch/x86/include/asm/me_common.h +++ b/arch/x86/include/asm/me_common.h @@ -13,7 +13,6 @@ #define __ASM_ME_COMMON_H #include <linux/compiler.h> -#include <linux/string.h> #include <linux/types.h> #include <pci.h> diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h index 7c08f7a..f4c4d6c 100644 --- a/arch/x86/include/asm/mp.h +++ b/arch/x86/include/asm/mp.h @@ -11,7 +11,6 @@ #include <asm/atomic.h> #include <asm/cache.h> #include <linux/bitops.h> -#include <linux/errno.h> struct udevice; |