Skip to content

Commit

Permalink
Merge tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-mic…
Browse files Browse the repository at this point in the history
…roblaze

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
  • Loading branch information
Linus Torvalds committed Jun 7, 2018
2 parents d987f62 + a7a9e2f commit c0ab852
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 364 deletions.
8 changes: 0 additions & 8 deletions arch/microblaze/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ config TRACE_IRQFLAGS_SUPPORT

source "lib/Kconfig.debug"

config EARLY_PRINTK
bool "Early printk function for kernel"
depends on SERIAL_UARTLITE_CONSOLE || SERIAL_8250_CONSOLE
default n
help
This option turns on/off early printk messages to console.
First Uartlite node is taken.

config HEART_BEAT
bool "Heart beat function for kernel"
default n
Expand Down
10 changes: 6 additions & 4 deletions arch/microblaze/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,19 @@ $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE
quiet_cmd_cp = CP $< $@$2
cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)

quiet_cmd_strip = STRIP $@
quiet_cmd_strip = STRIP $< $@$2
cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \
-K _fdt_start vmlinux -o $@
-K _fdt_start $< -o $@$2

UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR)
UIMAGE_IN = $@
UIMAGE_OUT = $@.ub

$(obj)/simpleImage.%: vmlinux FORCE
$(call if_changed,cp,.unstrip)
$(call if_changed,objcopy)
$(call if_changed,uimage)
$(call if_changed,strip)
@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
$(call if_changed,strip,.strip)
@echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')'

clean-files += simpleImage.*.unstrip linux.bin.ub
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/system.dts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
} ;
chosen {
bootargs = "console=ttyUL0,115200 highres=on";
linux,stdout-path = "/plb@0/serial@84000000";
stdout-path = "/plb@0/serial@84000000";
} ;
cpus {
#address-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/include/asm/cpuinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion arch/microblaze/include/asm/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 0 additions & 27 deletions arch/microblaze/include/asm/prom.h

This file was deleted.

5 changes: 0 additions & 5 deletions arch/microblaze/include/asm/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion arch/microblaze/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ obj-y += dma.o exceptions.o \

obj-y += cpu/

obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_HEART_BEAT) += heartbeat.o
obj-$(CONFIG_MODULES) += microblaze_ksyms.o module.o
obj-$(CONFIG_MMU) += misc.o
Expand Down
184 changes: 0 additions & 184 deletions arch/microblaze/kernel/early_printk.c

This file was deleted.

35 changes: 0 additions & 35 deletions arch/microblaze/kernel/misc.S
Original file line number Diff line number Diff line change
Expand Up @@ -63,38 +63,3 @@ _tlbie_1:
nop

.size _tlbie, . - _tlbie

/*
* Allocate TLB entry for early console
*/
.globl early_console_reg_tlb_alloc;
.type early_console_reg_tlb_alloc, @function
.align 4;
early_console_reg_tlb_alloc:
/*
* Load a TLB entry for the UART, so that microblaze_progress() can use
* the UARTs nice and early. We use a 4k real==virtual mapping.
*/
lwi r4, r0, tlb_skip
mts rtlbx, r4 /* TLB slot 63 */

or r4,r5,r0
andi r4,r4,0xfffff000
ori r4,r4,(TLB_WR|TLB_I|TLB_M|TLB_G)

andi r5,r5,0xfffff000
ori r5,r5,(TLB_VALID | TLB_PAGESZ(PAGESZ_4K))

mts rtlblo,r4 /* Load the data portion of the entry */
nop
mts rtlbhi,r5 /* Load the tag portion of the entry */
nop

lwi r5, r0, tlb_skip
addik r5, r5, 1
swi r5, r0, tlb_skip

rtsd r15, 8
nop

.size early_console_reg_tlb_alloc, . - early_console_reg_tlb_alloc
1 change: 0 additions & 1 deletion arch/microblaze/kernel/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

#include <linux/init.h>
#include <linux/of_platform.h>
#include <asm/prom.h>
#include <asm/setup.h>

static struct of_device_id xilinx_of_bus_ids[] __initdata = {
Expand Down
Loading

0 comments on commit c0ab852

Please sign in to comment.