Merge tag 'for-linus' of git://github.com/openrisc/linux

Pull OpenRISC updates from Stafford Horne:
 "A few cleanups and compiler warning fixes for OpenRISC.

  Also, this includes dts and defconfig updates to enable Ethernet on
  OpenRISC/Litex FPGA SoC's now that the LiteEth driver has gone
  upstream"

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc/litex: Update defconfig
  openrisc/litex: Add ethernet device
  openrisc/litex: Update uart address
  openrisc: Fix compiler warnings in setup
  openrisc: rename or32 code & comments to or1k
  openrisc: don't printk() unconditionally

diff --combined arch/openrisc/kernel/entry.S
index 947613f,8c8ac34..edaa775
--- 1/arch/openrisc/kernel/entry.S
--- 2/arch/openrisc/kernel/entry.S
+++ b/arch/openrisc/kernel/entry.S
@@@ -326,7 -326,7 +326,7 @@@ EXCEPTION_ENTRY(_data_page_fault_handle
  1:    l.ori   r6,r0,0x0                  // !write access
  2:
  
-       /* call fault.c handler in or32/mm/fault.c */
+       /* call fault.c handler in openrisc/mm/fault.c */
        l.jal   do_page_fault
         l.nop
        l.j     _ret_from_exception
@@@ -348,7 -348,7 +348,7 @@@ EXCEPTION_ENTRY(_insn_page_fault_handle
        /* r4 set be EXCEPTION_HANDLE */   // effective address of fault
        l.ori   r6,r0,0x0                  // !write access
  
-       /* call fault.c handler in or32/mm/fault.c */
+       /* call fault.c handler in openrisc/mm/fault.c */
        l.jal   do_page_fault
         l.nop
        l.j     _ret_from_exception
@@@ -547,11 -547,12 +547,12 @@@ EXCEPTION_ENTRY(_external_irq_handler
        l.bnf   1f                      // ext irq enabled, all ok.
        l.nop
  
+ #ifdef CONFIG_PRINTK
        l.addi  r1,r1,-0x8
        l.movhi r3,hi(42f)
        l.ori   r3,r3,lo(42f)
        l.sw    0x0(r1),r3
 -      l.jal   printk
 +      l.jal   _printk
        l.sw    0x4(r1),r4
        l.addi  r1,r1,0x8
  
@@@ -560,6 -561,7 +561,7 @@@
                .string "\n\rESR interrupt bug: in _external_irq_handler (ESR %x)\n\r"
                .align 4
        .previous
+ #endif
  
        l.ori   r4,r4,SPR_SR_IEE        // fix the bug
  //    l.sw    PT_SR(r1),r4
@@@ -681,8 -683,8 +683,8 @@@ _syscall_debug
        l.sw    -4(r1),r27
        l.sw    -8(r1),r11
        l.addi  r1,r1,-8
 -      l.movhi r27,hi(printk)
 -      l.ori   r27,r27,lo(printk)
 +      l.movhi r27,hi(_printk)
 +      l.ori   r27,r27,lo(_printk)
        l.jalr  r27
         l.nop
        l.addi  r1,r1,8