From f71044c999bf01f2875f26b0df7c0d172d257326 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 27 Mar 2018 21:06:58 -0500 Subject: microblaze: remove unnecessary prom.h includes In preparation to remove prom.h, remove unnecessary prom.h includes. Signed-off-by: Rob Herring Cc: Michal Simek Signed-off-by: Michal Simek --- arch/microblaze/include/asm/cpuinfo.h | 2 +- arch/microblaze/include/asm/pci.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/microblaze/include') diff --git a/arch/microblaze/include/asm/cpuinfo.h b/arch/microblaze/include/asm/cpuinfo.h index 3337417fcdca..8f4996730552 100644 --- a/arch/microblaze/include/asm/cpuinfo.h +++ b/arch/microblaze/include/asm/cpuinfo.h @@ -13,7 +13,7 @@ #ifndef _ASM_MICROBLAZE_CPUINFO_H #define _ASM_MICROBLAZE_CPUINFO_H -#include +#include /* CPU Version and FPGA Family code conversion table type */ struct cpu_ver_key { diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 5de871eb4a59..0f8c07a036ba 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -19,7 +19,6 @@ #include #include -#include #include #define PCIBIOS_MIN_IO 0x1000 -- cgit v1.2.1 From 96f0e6fcc9add1f063984be32073fe8b1d39b664 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 27 Mar 2018 21:06:59 -0500 Subject: microblaze: remove redundant early_printk support With earlycon support now enabled, the arch specific early_printk support can be removed. Signed-off-by: Rob Herring Cc: Michal Simek Signed-off-by: Michal Simek --- arch/microblaze/include/asm/prom.h | 27 --------------------------- arch/microblaze/include/asm/setup.h | 5 ----- 2 files changed, 32 deletions(-) delete mode 100644 arch/microblaze/include/asm/prom.h (limited to 'arch/microblaze/include') diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h deleted file mode 100644 index 2f03ac815851..000000000000 --- a/arch/microblaze/include/asm/prom.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Definitions for talking to the Open Firmware PROM on - * Power Macintosh computers. - * - * Copyright (C) 1996-2005 Paul Mackerras. - * - * Updates for PPC64 by Peter Bergner & David Engebretsen, IBM Corp. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ -#ifndef _ASM_MICROBLAZE_PROM_H -#define _ASM_MICROBLAZE_PROM_H - -#include - -/* Other Prototypes */ -enum early_consoles { - UARTLITE = 1, - UART16550 = 2, -}; - -extern int of_early_console(void *version); - -#endif /* _ASM_MICROBLAZE_PROM_H */ diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h index 7c968c1d1729..d5384f6f36f7 100644 --- a/arch/microblaze/include/asm/setup.h +++ b/arch/microblaze/include/asm/setup.h @@ -19,16 +19,11 @@ extern char cmd_line[COMMAND_LINE_SIZE]; extern char *klimit; -int setup_early_printk(char *opt); -void remap_early_printk(void); -void disable_early_printk(void); - void microblaze_heartbeat(void); void microblaze_setup_heartbeat(void); # ifdef CONFIG_MMU extern void mmu_reset(void); -extern void early_console_reg_tlb_alloc(unsigned int addr); # endif /* CONFIG_MMU */ extern void of_platform_reset_gpio_probe(void); -- cgit v1.2.1