Commit 5872c840 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-3.12-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull Microblaze patches from Michal Simek:
 - PCI fixes
 - Selfmod code removing
 - Intc and timer fixes
 - Adding new MB versions
 - Minor fixes

* tag 'microblaze-3.12-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Show message when reset gpio is not present
  microblaze: Add linux.bin.ub target
  microblaze: Add PVR version string for MB v9.0 and v9.1
  microblaze: timer: Replace microblaze_ prefix by xilinx_
  microblaze: timer: Update header
  microblaze: timer: Remove unused header
  microblaze: timer: Clear driver init function
  microblaze: timer: Use CLKSRC_OF initialization
  microblaze: intc: Remove unused header
  microblaze: intc: Clean driver init function
  microblaze: intc: Using irqchip
  microblaze: intc: Update header
  microblaze: intc: Remove unused headers
  microblaze: Remove selfmodified feature
  of/pci: Use of_pci_range_parser
parents 39eda2ab 54ea21f0

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ config MICROBLAZE 
	select GENERIC_IDLE_POLL_SETUP

	select MODULES_USE_ELF_RELA

	select CLONE_BACKWARDS3

	select CLKSRC_OF



config SWAP

	def_bool n

arch/microblaze/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ all: linux.bin 
archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



linux.bin linux.bin.gz: vmlinux

linux.bin linux.bin.gz linux.bin.ub: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



simpleImage.%: vmlinux
@@ -81,6 +81,7 @@ simpleImage.%: vmlinux 
define archhelp

  echo '* linux.bin    - Create raw binary'

  echo '  linux.bin.gz - Create compressed raw binary'

  echo '  linux.bin.ub - Create U-Boot wrapped raw binary'

  echo '  simpleImage.<dt> - ELF image with $(arch)/boot/dts/<dt>.dts linked in'

  echo '                   - stripped elf with fdt blob'

  echo '  simpleImage.<dt>.unstrip - full ELF image with fdt blob'

arch/microblaze/boot/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -2,12 +2,15 @@ 
# arch/microblaze/boot/Makefile

#



targets := linux.bin linux.bin.gz simpleImage.%

targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.%



OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary



$(obj)/linux.bin: vmlinux FORCE

	$(call if_changed,objcopy)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'



$(obj)/linux.bin.ub: $(obj)/linux.bin FORCE

	$(call if_changed,uimage)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
@@ -22,8 +25,6 @@ quiet_cmd_strip = STRIP $@ 
	cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \

				-K _fdt_start vmlinux -o $@



UIMAGE_IN = $@

UIMAGE_OUT = $@.ub

UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR)



$(obj)/simpleImage.%: vmlinux FORCE

arch/microblaze/include/asm/selfmod.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007-2008 Michal Simek <monstr@monstr.eu>

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_SELFMOD_H

#define _ASM_MICROBLAZE_SELFMOD_H



/*

 * BARRIER_BASE_ADDR is constant address for selfmod function.

 * do not change this value - selfmod function is in

 * arch/microblaze/kernel/selfmod.c: selfmod_function()

 *

 * last 16 bits is used for storing register offset

 */



#define BARRIER_BASE_ADDR	0x1234ff00



void selfmod_function(const int *arr_fce, const unsigned int base);



#endif /* _ASM_MICROBLAZE_SELFMOD_H */

arch/microblaze/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 
CFLAGS_REMOVE_timer.o = -pg

CFLAGS_REMOVE_intc.o = -pg

CFLAGS_REMOVE_early_printk.o = -pg

CFLAGS_REMOVE_selfmod.o = -pg

CFLAGS_REMOVE_heartbeat.o = -pg

CFLAGS_REMOVE_ftrace.o = -pg

CFLAGS_REMOVE_process.o = -pg
@@ -23,7 +22,6 @@ obj-y += dma.o exceptions.o \ 
obj-y += cpu/



obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o

obj-$(CONFIG_SELFMOD)		+= selfmod.o

obj-$(CONFIG_HEART_BEAT)	+= heartbeat.o

obj-$(CONFIG_MODULES)		+= microblaze_ksyms.o module.o

obj-$(CONFIG_MMU)		+= misc.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE