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

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

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

* 'next' of git://git.monstr.eu/linux-2.6-microblaze: (42 commits)
  microblaze: Fix build with make 3.82
  fbdev/xilinxfb: Microblaze driver support
  microblaze: Support C optimized lib functions for little-endian
  microblaze: Separate library optimized functions
  microblaze: Support timer on AXI lite
  microblaze: Add support for little-endian Microblaze
  microblaze: KGDB little endian support
  microblaze: Add PVR for endians plus detection
  net: emaclite: Add support for little-endian platforms
  microblaze: trivial: Add comment for AXI pvr
  microblaze: pci-common cleanup
  microblaze: Support early console on uart16550
  microblaze: Do not compile early console support for uartlite if is disabled
  microblaze: Setup early console dynamically
  microblaze: Rename all uartlite early printk functions
  microblaze: remove early printk uarlite console dependency from header
  microblaze: Remove additional compatible properties
  microblaze: Remove hardcoded asm instraction for PVR loading
  microblaze: Use static const char * const where possible
  microblaze: Define VMALLOC_START/END
  ...
parents b20f9e5b b843e4ec

arch/microblaze/Kconfig

+17 −0
Original line number Original line Diff line number Diff line
@@ -121,6 +121,23 @@ config CMDLINE_FORCE 
	  Set this to have arguments from the default kernel command string

	  Set this to have arguments from the default kernel command string

	  override those passed by the boot loader.

	  override those passed by the boot loader.





config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	depends on PROC_FS

	default y

	help

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

	  execution. By using pipes or other transports made available to

	  the process as file descriptors supporting the read/write

	  syscalls, it's possible to isolate those applications in

	  their own address space using seccomp. Once seccomp is

	  enabled via /proc/<pid>/seccomp, it cannot be disabled

	  and the task is only allowed to execute a few safe syscalls

	  defined by each seccomp mode.



	  If unsure, say Y. Only embedded should say N here.



endmenu

endmenu





menu "Advanced setup"

menu "Advanced setup"

arch/microblaze/Kconfig.debug

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ source "lib/Kconfig.debug" 




config EARLY_PRINTK

config EARLY_PRINTK

	bool "Early printk function for kernel"

	bool "Early printk function for kernel"

	depends on SERIAL_UARTLITE_CONSOLE

	depends on SERIAL_UARTLITE_CONSOLE || SERIAL_8250_CONSOLE

	default n

	default n

	help

	help

	  This option turns on/off early printk messages to console.

	  This option turns on/off early printk messages to console.

arch/microblaze/Makefile

+6 −5
Original line number Original line Diff line number Diff line
@@ -42,11 +42,8 @@ KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2) 
LDFLAGS		:=

LDFLAGS		:=

LDFLAGS_vmlinux	:=

LDFLAGS_vmlinux	:=





LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



head-y := arch/microblaze/kernel/head.o

head-y := arch/microblaze/kernel/head.o

libs-y += arch/microblaze/lib/

libs-y += arch/microblaze/lib/

libs-y += $(LIBGCC)

core-y += arch/microblaze/kernel/

core-y += arch/microblaze/kernel/

core-y += arch/microblaze/mm/

core-y += arch/microblaze/mm/

core-y += arch/microblaze/platform/

core-y += arch/microblaze/platform/
@@ -72,12 +69,16 @@ export MMU DTB 




all: linux.bin

all: linux.bin





BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.%

# With make 3.82 we cannot mix normal and wildcard targets

BOOT_TARGETS1 = linux.bin linux.bin.gz

BOOT_TARGETS2 = simpleImage.%





archclean:

archclean:

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

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





$(BOOT_TARGETS): vmlinux

$(BOOT_TARGETS1): vmlinux

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

$(BOOT_TARGETS2): vmlinux

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

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





define archhelp

define archhelp

arch/microblaze/include/asm/byteorder.h

+4 −0
Original line number Original line Diff line number Diff line 
#ifndef _ASM_MICROBLAZE_BYTEORDER_H

#ifndef _ASM_MICROBLAZE_BYTEORDER_H

#define _ASM_MICROBLAZE_BYTEORDER_H

#define _ASM_MICROBLAZE_BYTEORDER_H





#ifdef __MICROBLAZEEL__

#include <linux/byteorder/little_endian.h>

#else

#include <linux/byteorder/big_endian.h>

#include <linux/byteorder/big_endian.h>

#endif





#endif /* _ASM_MICROBLAZE_BYTEORDER_H */
 
#endif /* _ASM_MICROBLAZE_BYTEORDER_H */

arch/microblaze/include/asm/checksum.h

+7 −2
Original line number Original line Diff line number Diff line
@@ -24,8 +24,13 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len, 
		"addc %0, %0, %3\n\t"

		"addc %0, %0, %3\n\t"

		"addc %0, %0, r0\n\t"

		"addc %0, %0, r0\n\t"

		: "+&d" (sum)

		: "+&d" (sum)

		: "d" (saddr), "d" (daddr), "d" (len + proto));

		: "d" (saddr), "d" (daddr),



#ifdef __MICROBLAZEEL__

	"d" ((len + proto) << 8)

#else

	"d" (len + proto)

#endif

);

	return sum;

	return sum;

}

}