Merge branch 'next/misc' into for-next (4a979862) · Commits · 戴 / test

arch/riscv/boot/Makefile

+12 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,18 @@ $(obj)/Image: vmlinux FORCE
		$(obj)/Image.gz: $(obj)/Image FORCE
		$(call if_changed,gzip)

		$(obj)/Image.bz2: $(obj)/Image FORCE
		$(call if_changed,bzip2)

		$(obj)/Image.lz4: $(obj)/Image FORCE
		$(call if_changed,lz4)

		$(obj)/Image.lzma: $(obj)/Image FORCE
		$(call if_changed,lzma)

		$(obj)/Image.lzo: $(obj)/Image FORCE
		$(call if_changed,lzo)

		install:
		$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
		$(obj)/Image System.map "$(INSTALL_PATH)"

+7 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,13 @@
		clocks = <&prci PRCI_CLK_TLCLK>;
		status = "disabled";
		};
		dma: dma@3000000 {
		compatible = "sifive,fu540-c000-pdma";
		reg = <0x0 0x3000000 0x0 0x8000>;
		interrupt-parent = <&plic0>;
		interrupts = <23 24 25 26 27 28 29 30>;
		#dma-cells = <1>;
		};
		uart1: serial@10011000 {
		compatible = "sifive,fu540-c000-uart", "sifive,uart0";
		reg = <0x0 0x10011000 0x0 0x1000>;

+1 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#ifndef _ASM_RISCV_PROTOTYPES_H
		#define _ASM_RISCV_PROTOTYPES_H

		#include <linux/ftrace.h>
		#include <asm-generic/asm-prototypes.h>

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@
		*/


		#ifndef __ASM_CURRENT_H
		#define __ASM_CURRENT_H
		#ifndef _ASM_RISCV_CURRENT_H
		#define _ASM_RISCV_CURRENT_H

		#include <linux/bug.h>
		#include <linux/compiler.h>
		@@ -34,4 +34,4 @@ static __always_inline struct task_struct *get_current(void)

		#endif /* __ASSEMBLY__ */

		#endif /* __ASM_CURRENT_H */
		#endif /* _ASM_RISCV_CURRENT_H */

+5 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		/* Copyright (C) 2017 Andes Technology Corporation */

		#ifndef _ASM_RISCV_FTRACE_H
		#define _ASM_RISCV_FTRACE_H

		/*
		* The graph frame test is not possible if CONFIG_FRAME_POINTER is not enabled.
		* Check arch/riscv/kernel/mcount.S for detail.
		@@ -64,3 +67,5 @@ do { \
		*/
		#define MCOUNT_INSN_SIZE 8
		#endif

		#endif /* _ASM_RISCV_FTRACE_H */