diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 10:20:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 10:20:19 -0700 |
commit | c0ab85267e25e34ce8b7e4429f0ef01fa0795b80 (patch) | |
tree | 26bdf432b4812e67ffd6cf4abe08c4bb9cc2dddc /arch/microblaze/include | |
parent | d987f62cce3289e42b83eb6c110c4745ea781bdf (diff) | |
parent | a7a9e2f0410ddf9ec7491fca0c91fcb4c5c30cbb (diff) | |
download | linux-stable-c0ab85267e25e34ce8b7e4429f0ef01fa0795b80.tar.gz linux-stable-c0ab85267e25e34ce8b7e4429f0ef01fa0795b80.tar.bz2 linux-stable-c0ab85267e25e34ce8b7e4429f0ef01fa0795b80.zip |
Merge tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
- Fix simpleImage format generation
- Remove earlyprintk support and replace it by earlycon
* tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: dts: replace 'linux,stdout-path' with 'stdout-path'
microblaze: remove redundant early_printk support
microblaze: remove unnecessary prom.h includes
microblaze: Fix simpleImage format generation
Diffstat (limited to 'arch/microblaze/include')
-rw-r--r-- | arch/microblaze/include/asm/cpuinfo.h | 2 | ||||
-rw-r--r-- | arch/microblaze/include/asm/pci.h | 1 | ||||
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 27 | ||||
-rw-r--r-- | arch/microblaze/include/asm/setup.h | 5 |
4 files changed, 1 insertions, 34 deletions
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 <asm/prom.h> +#include <linux/of.h> /* 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 00337861472e..66cf3a5a2f83 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -19,7 +19,6 @@ #include <linux/scatterlist.h> #include <asm/io.h> -#include <asm/prom.h> #include <asm/pci-bridge.h> #define PCIBIOS_MIN_IO 0x1000 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 <linux/of.h> - -/* 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); |