Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'riscv-for-linus-5.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt:
- Two kexec-related build fixes
- A DTS update to make the GPIO nodes match the upcoming dtschema
- A fix that passes -mno-relax directly to the assembler when building
modules, to work around compilers that fail to do so
* tag 'riscv-for-linus-5.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
riscv: add as-options for modules with assembly compontents
riscv: dts: align gpio-key node names with dtschema
RISC-V: kexec: Fix build error without CONFIG_KEXEC
RISCV: kexec: Fix build error without CONFIG_MODULES
+10
-9
+1
arch/riscv/Makefile
+1
arch/riscv/Makefile
···
73
73
endif
74
74
75
75
KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax)
76
+
KBUILD_AFLAGS_MODULE += $(call as-option,-Wa$(comma)-mno-relax)
76
77
77
78
# GCC versions that support the "-mstrict-align" option default to allowing
78
79
# unaligned accesses. While unaligned accesses are explicitly allowed in the
+1
-1
arch/riscv/boot/dts/canaan/canaan_kd233.dts
+1
-1
arch/riscv/boot/dts/canaan/canaan_kd233.dts
+1
-1
arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
+1
-1
arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
+1
-1
arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
+1
-1
arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
+3
-3
arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
+3
-3
arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
···
46
46
gpio-keys {
47
47
compatible = "gpio-keys";
48
48
49
-
up {
49
+
key-up {
50
50
label = "UP";
51
51
linux,code = <BTN_1>;
52
52
gpios = <&gpio1_0 7 GPIO_ACTIVE_LOW>;
53
53
};
54
54
55
-
press {
55
+
key-press {
56
56
label = "PRESS";
57
57
linux,code = <BTN_0>;
58
58
gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
59
59
};
60
60
61
-
down {
61
+
key-down {
62
62
label = "DOWN";
63
63
linux,code = <BTN_2>;
64
64
gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+1
-1
arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
+1
-1
arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
+1
-1
arch/riscv/kernel/Makefile
+1
-1
arch/riscv/kernel/Makefile
···
78
78
endif
79
79
obj-$(CONFIG_HOTPLUG_CPU) += cpu-hotplug.o
80
80
obj-$(CONFIG_KGDB) += kgdb.o
81
-
obj-$(CONFIG_KEXEC) += kexec_relocate.o crash_save_regs.o machine_kexec.o
81
+
obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.o crash_save_regs.o machine_kexec.o
82
82
obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o
83
83
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
84
84