Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0ab8526 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d987f62c a7a9e2f0

arch/microblaze/Kconfig.debug

+0 −8
Original line number Diff line number Diff line
@@ -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

arch/microblaze/boot/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -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

arch/microblaze/boot/dts/system.dts

+1 −1
Original line number Diff line number Diff line
@@ -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>;

arch/microblaze/include/asm/cpuinfo.h

+1 −1
Original line number Diff line number Diff line
@@ -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 {

arch/microblaze/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -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