Commit 0ba1c195 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 

Pull nios2 updates from Ley Foon Tan:
 "nios2 fixes/enhancements and adding nios2 R2 support"

* tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: remove custom early console implementation
  nios2: use generic strncpy_from_user() and strnlen_user()
  nios2: Add CDX support
  nios2: Add BMX support
  nios2: Add NIOS2_ARCH_REVISION to select between R1 and R2
  nios2: implement flush_dcache_mmap_lock/unlock
  nios2: enable earlycon support
  nios2: constify irq_domain_ops
  nios2: remove wrapper header for cmpxchg.h
  nios2: add .gitignore entries for auto-generated files
parents 09d79d10 e118c3fe

arch/nios2/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ config NIOS2 
	select GENERIC_CPU_DEVICES

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_KGDB

	select IRQ_DOMAIN

arch/nios2/Kconfig.debug

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ config EARLY_PRINTK 
	bool "Activate early kernel debugging"

	default y

	select SERIAL_CORE_CONSOLE

	depends on SERIAL_ALTERA_JTAGUART_CONSOLE || SERIAL_ALTERA_UART_CONSOLE

	help

	  Enable early printk on console

	  This is useful for kernel debugging when your machine crashes very

arch/nios2/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -22,10 +22,15 @@ export MMU 


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



KBUILD_AFLAGS += -march=r$(CONFIG_NIOS2_ARCH_REVISION)



KBUILD_CFLAGS += -pipe -D__linux__ -D__ELF__

KBUILD_CFLAGS += -march=r$(CONFIG_NIOS2_ARCH_REVISION)

KBUILD_CFLAGS += $(if $(CONFIG_NIOS2_HW_MUL_SUPPORT),-mhw-mul,-mno-hw-mul)

KBUILD_CFLAGS += $(if $(CONFIG_NIOS2_HW_MULX_SUPPORT),-mhw-mulx,-mno-hw-mulx)

KBUILD_CFLAGS += $(if $(CONFIG_NIOS2_HW_DIV_SUPPORT),-mhw-div,-mno-hw-div)

KBUILD_CFLAGS += $(if $(CONFIG_NIOS2_BMX_SUPPORT),-mbmx,-mno-bmx)

KBUILD_CFLAGS += $(if $(CONFIG_NIOS2_CDX_SUPPORT),-mcdx,-mno-cdx)

KBUILD_CFLAGS += $(if $(CONFIG_NIOS2_FPU_SUPPORT),-mcustom-fpu-cfg=60-1,)



KBUILD_CFLAGS += -fno-optimize-sibling-calls

arch/nios2/boot/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
*.dtb

vmImage

arch/nios2/boot/dts/10m50_devboard.dts

+2 −1
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ 
	};



	chosen {

		bootargs = "debug console=ttyS0,115200";

		bootargs = "debug earlycon console=ttyS0,115200";

		stdout-path = &a_16550_uart_0;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE