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()

3 files changed, 115 insertions, 3 deletions

diff --git a/arch/nios2/include/asm/kgdb.h b/arch/nios2/include/asm/kgdb.h
new file mode 100644
index 000000000000..8fd5e3b66c57
--- /dev/null
+++ b/arch/nios2/include/asm/kgdb.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2015 Altera Corporation
+ * Copyright (C) 2011 Tobias Klauser <tklauser@distanz.ch>
+ *
+ * Based on the code posted by Kazuyasu on the Altera Forum at:
+ * http://www.alteraforum.com/forum/showpost.php?p=77003&postcount=20
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef _ASM_NIOS2_KGDB_H
+#define _ASM_NIOS2_KGDB_H
+
+#define CACHE_FLUSH_IS_SAFE     1
+#define BUFMAX                  2048
+
+enum regnames {
+        GDB_R0 = 0,
+        GDB_AT,
+        GDB_R2,
+        GDB_R3,
+        GDB_R4,
+        GDB_R5,
+        GDB_R6,
+        GDB_R7,
+        GDB_R8,
+        GDB_R9,
+        GDB_R10,
+        GDB_R11,
+        GDB_R12,
+        GDB_R13,
+        GDB_R14,
+        GDB_R15,
+        GDB_R16,
+        GDB_R17,
+        GDB_R18,
+        GDB_R19,
+        GDB_R20,
+        GDB_R21,
+        GDB_R22,
+        GDB_R23,
+        GDB_ET,
+        GDB_BT,
+        GDB_GP,
+        GDB_SP,
+        GDB_FP,
+        GDB_EA,
+        GDB_BA,
+        GDB_RA,
+        GDB_PC,
+        GDB_STATUS,
+        GDB_ESTATUS,
+        GDB_BSTATUS,
+        GDB_IENABLE,
+        GDB_IPENDING,
+        GDB_CPUID,
+        GDB_CTL6,
+        GDB_EXCEPTION,
+        GDB_PTEADDR,
+        GDB_TLBACC,
+        GDB_TLBMISC,
+        GDB_ECCINJ,
+        GDB_BADADDR,
+        GDB_CONFIG,
+        GDB_MPUBASE,
+        GDB_MPUACC,
+        /* do not change the last entry or anything below! */
+        GDB_NUMREGBYTES         /* number of registers */
+};
+
+#define GDB_SIZEOF_REG          sizeof(u32)
+#define DBG_MAX_REG_NUM (49)
+#define NUMREGBYTES             (DBG_MAX_REG_NUM * sizeof(GDB_SIZEOF_REG))
+
+#define BREAK_INSTR_SIZE        4
+static inline void arch_kgdb_breakpoint(void)
+{
+        __asm__ __volatile__("trap 30\n");
+}
+
+#endif /* _ASM_NIOS2_KGDB_H */
diff --git a/arch/nios2/include/asm/processor.h b/arch/nios2/include/asm/processor.h
index 3bd349473b06..c2ba45c159c7 100644
--- a/arch/nios2/include/asm/processor.h
+++ b/arch/nios2/include/asm/processor.h
@@ -85,9 +85,6 @@ static inline void exit_thread(void)
 
 extern unsigned long get_wchan(struct task_struct *p);
 
-/* Prepare to copy thread state - unlazy all lazy status */
-#define prepare_to_copy(tsk)    do { } while (0)
-
 #define task_pt_regs(p) \
         ((struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1)
 
diff --git a/arch/nios2/include/asm/prom.h b/arch/nios2/include/asm/prom.h
new file mode 100644
index 000000000000..75fffb42cfa5
--- /dev/null
+++ b/arch/nios2/include/asm/prom.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright Altera Corporation (C) <2015>. All rights reserved
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ASM_NIOS2_PROM_H__
+#define __ASM_NIOS2_PROM_H__
+
+extern unsigned long __init of_early_console(void);
+
+#endif