| Message ID | 20200708033246.2626378-22-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | a308b1fa3901d93fb89e00e2841c8c872a8fe026 |
| Headers | show |
| Series | x86: Programmatic generation of ACPI tables (Part C) | expand |
On Wed, Jul 8, 2020 at 11:34 AM Simon Glass <sjg at chromium.org> wrote: > > This function does not exist anymore. Drop it from the header file. > > Signed-off-by: Simon Glass <sjg at chromium.org> > --- > > Changes in v2: > - Remove the function from zimage.c also > > arch/x86/include/asm/u-boot-x86.h | 2 -- > arch/x86/lib/zimage.c | 10 ---------- > 2 files changed, 12 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index bd3f44014c..d732661f6d 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -83,8 +83,6 @@ int default_print_cpuinfo(void); /* Set up a UART which can be used with printch(), printhex8(), etc. */ int setup_internal_uart(int enable); -void setup_pcat_compatibility(void); - void isa_unmap_rom(u32 addr); u32 isa_map_rom(u32 bus_addr, int size); diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 64d14e8911..d2b6002008 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -304,13 +304,6 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, return 0; } -void setup_pcat_compatibility(void) - __attribute__((weak, alias("__setup_pcat_compatibility"))); - -void __setup_pcat_compatibility(void) -{ -} - int do_zboot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct boot_params *base_ptr; @@ -323,9 +316,6 @@ int do_zboot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) disable_interrupts(); - /* Setup board for maximum PC/AT Compatibility */ - setup_pcat_compatibility(); - if (argc >= 2) { /* argv[1] holds the address of the bzImage */ s = argv[1];
This function does not exist anymore. Drop it from the header file. Signed-off-by: Simon Glass <sjg at chromium.org> --- Changes in v2: - Remove the function from zimage.c also arch/x86/include/asm/u-boot-x86.h | 2 -- arch/x86/lib/zimage.c | 10 ---------- 2 files changed, 12 deletions(-)