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

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

Merge tag 'nios2-v3.20-rc1' of git://git.rocketboards.org/linux-socfpga-next 

Pull arch/nios2 update from Ley Foon Tan:
 "Here is the nios2 update for 3.20:

   - add early printk support
   - add kgdb support
   - add compressed kernel support
   - bugfixes"

* tag 'nios2-v3.20-rc1' of git://git.rocketboards.org/linux-socfpga-next:
  nios2: add kgdb support
  MAINTAINERS: update arch/nios2 git tree
  nios2: default CONFIG_NIOS2_BOOT_LINK_OFFSET to 8MB
  nios2: Add support for compressed kernel
  nios2: add early printk support
  nios2: Port OOM changes to do_page_fault()
  nios2: Remove unused prepare_to_copy()
parents 99fa0ad9 d16d2be1

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -6876,7 +6876,7 @@ F: drivers/scsi/nsp32* 
NIOS2 ARCHITECTURE

NIOS2 ARCHITECTURE

M:	Ley Foon Tan <lftan@altera.com>

M:	Ley Foon Tan <lftan@altera.com>

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)

T:	git git://git.rocketboards.org/linux-socfpga.git

T:	git git://git.rocketboards.org/linux-socfpga-next.git

S:	Maintained

S:	Maintained

F:	arch/nios2/

F:	arch/nios2/

arch/nios2/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ config NIOS2 
	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_KGDB

	select IRQ_DOMAIN

	select IRQ_DOMAIN

	select MODULES_USE_ELF_RELA

	select MODULES_USE_ELF_RELA

	select OF

	select OF
@@ -134,6 +135,14 @@ config NIOS2_PASS_CMDLINE 
	  will override "Default kernel command string".

	  will override "Default kernel command string".

	  Say N if you are unsure.

	  Say N if you are unsure.





config NIOS2_BOOT_LINK_OFFSET

	hex "Link address offset for booting"

	default "0x00500000"

	help

	  This option allows you to set the link address offset of the zImage.

	  This can be useful if you are on a board which has a small amount of

	  memory.



endmenu

endmenu





menu "Advanced setup"

menu "Advanced setup"

arch/nios2/Kconfig.debug

+11 −0
Original line number Original line Diff line number Diff line
@@ -14,4 +14,15 @@ config DEBUG_STACK_USAGE 




	  This option will slow down process creation somewhat.

	  This option will slow down process creation somewhat.





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

	  early before the console code is initialized.

	  You should normally say N here, unless you want to debug such a crash.



endmenu
 
endmenu

arch/nios2/boot/Makefile

+7 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,13 @@ $(obj)/vmImage: $(obj)/vmlinux.gz 
	$(call if_changed,uimage)

	$(call if_changed,uimage)

	@$(kecho) 'Kernel: $@ is ready'

	@$(kecho) 'Kernel: $@ is ready'





$(obj)/zImage: $(obj)/compressed/vmlinux FORCE

	$(call if_changed,objcopy)

	@$(kecho) 'Kernel: $@ is ready'



$(obj)/compressed/vmlinux: $(obj)/vmlinux.gz FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@



# Rule to build device tree blobs

# Rule to build device tree blobs

DTB_SRC := $(patsubst "%",%,$(CONFIG_NIOS2_DTB_SOURCE))

DTB_SRC := $(patsubst "%",%,$(CONFIG_NIOS2_DTB_SOURCE))

arch/nios2/boot/compressed/Makefile

0 → 100644
+19 −0
Original line number Original line Diff line number Diff line 
#

# create a compressed vmlinux image from the original vmlinux

#



targets		:= vmlinux head.o misc.o piggy.o vmlinux.lds

asflags-y	:=



OBJECTS = $(obj)/head.o $(obj)/misc.o



LDFLAGS_vmlinux := -T



$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS) $(obj)/piggy.o FORCE

	$(call if_changed,ld)

	@:



LDFLAGS_piggy.o := -r --format binary --oformat elf32-littlenios2 -T



$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/../vmlinux.gz FORCE

	$(call if_changed,ld)