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

Commit 464480f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze 

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (46 commits)
  microblaze: Remove rt_sigsuspend wrapper
  microblaze: nommu: Don't clobber R11 on syscalls
  microblaze: Remove show_tmem function
  microblaze: Support for WB cache
  microblaze: Add PVR for Microblaze v7.30.a
  microblaze: Remove ancient and fake microblaze version from cpu_ver table
  microblaze: Remove panic_timeout init value
  microblaze: Do not count system calls in default
  microblaze: Enable DTC compilation
  microblaze: Core oprofile configs and hooks
  microblaze: Fix level interrupt ACKing
  microblaze: Enable futimesat syscall
  microblaze: Checking DTS against PVR for write-back cache
  microblaze: Remove duplicity from pgalloc.h
  microblaze: Futex support
  microblaze: Adding dev_arch_data functions
  microblaze: Fix the heartbeat gpio to be more robust
  microblaze: Simple __copy_tofrom_user for noMMU
  microblaze: Export memory_start for modules
  microblaze: Use lowest-common-denominator default CPU settings
  ...
parents 37222e1c 571202f5

arch/microblaze/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -6,8 +6,15 @@ mainmenu "Linux/Microblaze Kernel Configuration" 
config MICROBLAZE

	def_bool y

	select HAVE_LMB

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select USB_ARCH_HAS_EHCI

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select HAVE_OPROFILE

	select TRACING_SUPPORT



config SWAP

	def_bool n
@@ -57,12 +64,24 @@ config GENERIC_GPIO 
config GENERIC_CSUM

	def_bool y



config STACKTRACE_SUPPORT

	def_bool y



config LOCKDEP_SUPPORT

	def_bool y



config HAVE_LATENCYTOP_SUPPORT

	def_bool y



config PCI

	def_bool n



config NO_DMA

	def_bool y



config DTC

	def_bool y



source "init/Kconfig"



source "kernel/Kconfig.freezer"

arch/microblaze/Kconfig.debug

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 


menu "Kernel hacking"



config TRACE_IRQFLAGS_SUPPORT

	def_bool y



source "lib/Kconfig.debug"



config EARLY_PRINTK

arch/microblaze/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ core-y += arch/microblaze/kernel/ 
core-y += arch/microblaze/mm/

core-y += arch/microblaze/platform/



drivers-$(CONFIG_OPROFILE) += arch/microblaze/oprofile/



boot := arch/microblaze/boot



# Are we making a simpleImage.<boardname> target? If so, crack out the boardname

arch/microblaze/boot/Makefile

+13 −2
Original line number Diff line number Diff line
@@ -2,11 +2,13 @@ 
# arch/microblaze/boot/Makefile

#



MKIMAGE := $(srctree)/scripts/mkuboot.sh



obj-y += linked_dtb.o



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



OBJCOPYFLAGS_linux.bin  := -O binary

OBJCOPYFLAGS := -O binary



# Where the DTS files live

dtstree         := $(srctree)/$(src)/dts
@@ -24,6 +26,7 @@ $(obj)/linux.bin: vmlinux FORCE 
	[ -n $(CONFIG_INITRAMFS_SOURCE) ] && [ ! -e $(CONFIG_INITRAMFS_SOURCE) ] && \

	touch $(CONFIG_INITRAMFS_SOURCE) || echo "No CPIO image"

	$(call if_changed,objcopy)

	$(call if_changed,uimage)

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



$(obj)/linux.bin.gz: $(obj)/linux.bin FORCE
@@ -36,8 +39,16 @@ quiet_cmd_cp = CP $< $@$2 
quiet_cmd_strip = STRIP   $@

      cmd_strip = $(STRIP) -K _start -K _end -K __log_buf -K _fdt_start vmlinux -o $@



quiet_cmd_uimage = UIMAGE  $@.ub

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A microblaze -O linux -T kernel \

                   -C none -n 'Linux-$(KERNELRELEASE)' \

                   -a $(CONFIG_KERNEL_BASE_ADDR) -e $(CONFIG_KERNEL_BASE_ADDR) \

                   -d $@ $@.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`')'
@@ -53,4 +64,4 @@ $(obj)/%.dtb: $(dtstree)/%.dts FORCE 


clean-kernel += linux.bin linux.bin.gz simpleImage.*



clean-files += *.dtb
 
clean-files += *.dtb simpleImage.*.unstrip

arch/microblaze/include/asm/cache.h

+0 −16
Original line number Diff line number Diff line
@@ -21,20 +21,4 @@ 


#define SMP_CACHE_BYTES	L1_CACHE_BYTES



void _enable_icache(void);

void _disable_icache(void);

void _invalidate_icache(unsigned int addr);



#define __enable_icache()		_enable_icache()

#define __disable_icache()		_disable_icache()

#define __invalidate_icache(addr)	_invalidate_icache(addr)



void _enable_dcache(void);

void _disable_dcache(void);

void _invalidate_dcache(unsigned int addr);



#define __enable_dcache()		_enable_dcache()

#define __disable_dcache()		_disable_dcache()

#define __invalidate_dcache(addr)	_invalidate_dcache(addr)



#endif /* _ASM_MICROBLAZE_CACHE_H */