Merge tag 'v4.4.76' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / arch / nios2 / Kconfig

diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index 2361acf6d2b1abb195c3f2daff5c64df88400a94..437555424bda6765c0939be4606c70c2dc7d3c84 100644 (file)
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -8,6 +8,7 @@ config NIOS2
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select HAVE_ARCH_TRACEHOOK
+       select HAVE_ARCH_KGDB
        select IRQ_DOMAIN
        select MODULES_USE_ELF_RELA
        select OF
@@ -134,6 +135,14 @@ config NIOS2_PASS_CMDLINE
          will override "Default kernel command string".
          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
 
 menu "Advanced setup"