diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-21 17:32:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-21 17:32:17 -0400 |
| commit | 7e6e40c572332b3835c5cb48a08e1d8d404c871c (patch) | |
| tree | cf8ebf03fbe72c1334880f75fe2c9f71c7bb95ff /arch/x86/include | |
| parent | 3881c9fbb7fdd98f6eae5cd33f7e9abe9455a585 (diff) | |
| parent | 976fb2ffa3875a7bed9866bf5cf939a81c423ef8 (diff) | |
| download | u-boot-7e6e40c572332b3835c5cb48a08e1d8d404c871c.zip u-boot-7e6e40c572332b3835c5cb48a08e1d8d404c871c.tar.gz u-boot-7e6e40c572332b3835c5cb48a08e1d8d404c871c.tar.bz2 | |
Merge tag 'v2023.10-rc3' into next
Prepare v2023.10-rc3
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/qemu.h | 14 | ||||
| -rw-r--r-- | arch/x86/include/asm/u-boot-x86.h | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/x86/include/asm/qemu.h b/arch/x86/include/asm/qemu.h new file mode 100644 index 0000000..f1e95ff --- /dev/null +++ b/arch/x86/include/asm/qemu.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Generic QEMU header + * + * Copyright 2023 Google LLC + */ + +#ifndef __QEMU_H +#define __QEMU_H + +/* set up the chipset for QEMU so that video can be used */ +void qemu_chipset_init(void); + +#endif diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 02a8b0f..3acc58a 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -77,7 +77,7 @@ int x86_cleanup_before_linux(void); void x86_enable_caches(void); void x86_disable_caches(void); int x86_init_cache(void); -phys_size_t board_get_usable_ram_top(phys_size_t total_size); +phys_addr_t board_get_usable_ram_top(phys_size_t total_size); int default_print_cpuinfo(void); /* Set up a UART which can be used with printch(), printhex8(), etc. */ |