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

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

Pull OpenRISC updates from Stafford Horne:

 - Update for Litex SoC controller to support wider width registers as
   well as reset.

 - Refactor SMP code to use device tree to define possible cpus.

 - Update build including generating vmlinux.bin

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc: Use devicetree to determine present cpus
  drivers/soc/litex: Add restart handler
  openrisc: add arch/openrisc/Kbuild
  drivers/soc/litex: make 'litex_[set|get]_reg()' methods private
  drivers/soc/litex: support 32-bit subregisters, 64-bit CPUs
  drivers/soc/litex: s/LITEX_REG_SIZE/LITEX_SUBREG_ALIGN/g
  drivers/soc/litex: separate MMIO from subregister offset calculation
  drivers/soc/litex: move generic accessors to litex.h
  openrisc: restart: Call common handlers before hanging
  openrisc: Add vmlinux.bin target
parents e7270e47 8f722f67

arch/openrisc/Kbuild

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y += lib/ kernel/ mm/

obj-y += boot/dts/

arch/openrisc/Makefile

+12 −9
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) 


KBUILD_CFLAGS	+= -pipe -ffixed-r10 -D__linux__



all: vmlinux.bin



boot := arch/$(ARCH)/boot



ifeq ($(CONFIG_OPENRISC_HAVE_INST_MUL),y)

	KBUILD_CFLAGS += $(call cc-option,-mhard-mul)

else
@@ -38,14 +42,13 @@ endif 


head-y 		:= arch/openrisc/kernel/head.o



core-y		+= arch/openrisc/lib/ \

		   arch/openrisc/kernel/ \

		   arch/openrisc/mm/

core-y		+= arch/openrisc/

libs-y		+= $(LIBGCC)



ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""'

BUILTIN_DTB := y

else

BUILTIN_DTB := n

endif

core-$(BUILTIN_DTB) += arch/openrisc/boot/dts/
 
PHONY += vmlinux.bin



vmlinux.bin: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/openrisc/boot/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

vmlinux.bin

arch/openrisc/boot/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Makefile for bootable kernel images

#



targets += vmlinux.bin



OBJCOPYFLAGS_vmlinux.bin := -O binary

$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)

arch/openrisc/kernel/process.c

+10 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/init_task.h>

#include <linux/mqueue.h>

#include <linux/fs.h>

#include <linux/reboot.h>



#include <linux/uaccess.h>

#include <asm/io.h>
@@ -49,10 +50,16 @@ 
 */

struct thread_info *current_thread_info_set[NR_CPUS] = { &init_thread_info, };



void machine_restart(void)

void machine_restart(char *cmd)

{

	printk(KERN_INFO "*** MACHINE RESTART ***\n");

	__asm__("l.nop 1");

	do_kernel_restart(cmd);



	/* Give a grace period for failure to restart of 1s */

	mdelay(1000);



	/* Whoops - the platform was unable to reboot. Tell the user! */

	pr_emerg("Reboot failed -- System halted\n");

	while (1);

}



/*