@@ -1,39 +1,36 @@
11{ lib }:
22rec {
3− pcBase = {
4− name = "pc";
5− kernelBaseConfig = "defconfig";
6− # Build whatever possible as a module, if not stated in the extra config.
7− kernelAutoModules = true;
8− kernelTarget = "bzImage";
9− };
10−
11− pc64 = pcBase // { kernelArch = "x86_64"; };
12−
13− pc32 = pcBase // { kernelArch = "i386"; };
14−
15− pc32_simplekernel = pc32 // {
16− kernelAutoModules = false;
3+ pc = {
4+ linux-kernel = {
5+ name = "pc";
6+
7+ baseConfig = "defconfig";
8+ # Build whatever possible as a module, if not stated in the extra config.
9+ autoModules = true;
10+ target = "bzImage";
11+ };
1712 };
1813
19− pc64_simplekernel = pc64 // {
20− kernelAutoModules = false;
14+ pc_simplekernel = lib.recursiveUpdate pc {
15+ linux-kernel.autoModules = false;
2116 };
2217
2318 powernv = {
24− name = "PowerNV";
25− kernelArch = "powerpc";
26− kernelBaseConfig = "powernv_defconfig";
27− kernelTarget = "zImage";
28− kernelInstallTarget = "install";
29− kernelFile = "vmlinux";
30− kernelAutoModules = true;
31− # avoid driver/FS trouble arising from unusual page size
32− kernelExtraConfig = ''
33− PPC_64K_PAGES n
34− PPC_4K_PAGES y
35− IPV6 y
36− '';
19+ linux-kernel = {
20+ name = "PowerNV";
21+
22+ baseConfig = "powernv_defconfig";
23+ target = "zImage";
24+ installTarget = "install";
25+ file = "vmlinux";
26+ autoModules = true;
27+ # avoid driver/FS trouble arising from unusual page size
28+ extraConfig = ''
29+ PPC_64K_PAGES n
30+ PPC_4K_PAGES y
31+ IPV6 y
32+ '';
33+ };
3734 };
3835
3936 ##
@@ -41,17 +38,121 @@ rec {
4138 ##
4239
4340 pogoplug4 = {
44− name = "pogoplug4";
41+ linux-kernel = {
42+ name = "pogoplug4";
4543
44+ baseConfig = "multi_v5_defconfig";
45+ autoModules = false;
46+ extraConfig = ''
47+ # Ubi for the mtd
48+ MTD_UBI y
49+ UBIFS_FS y
50+ UBIFS_FS_XATTR y
51+ UBIFS_FS_ADVANCED_COMPR y
52+ UBIFS_FS_LZO y
53+ UBIFS_FS_ZLIB y
54+ UBIFS_FS_DEBUG n
55+ '';
56+ makeFlags = [ "LOADADDR=0x8000" ];
57+ target = "uImage";
58+ # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working
59+ #DTB = true;
60+ };
4661 gcc = {
4762 arch = "armv5te";
4863 };
64+ };
65+
66+ sheevaplug = {
67+ linux-kernel = {
68+ name = "sheevaplug";
69+
70+ baseConfig = "multi_v5_defconfig";
71+ autoModules = false;
72+ extraConfig = ''
73+ BLK_DEV_RAM y
74+ BLK_DEV_INITRD y
75+ BLK_DEV_CRYPTOLOOP m
76+ BLK_DEV_DM m
77+ DM_CRYPT m
78+ MD y
79+ REISERFS_FS m
80+ BTRFS_FS m
81+ XFS_FS m
82+ JFS_FS m
83+ EXT4_FS m
84+ USB_STORAGE_CYPRESS_ATACB m
85+
86+ # mv cesa requires this sw fallback, for mv-sha1
87+ CRYPTO_SHA1 y
88+ # Fast crypto
89+ CRYPTO_TWOFISH y
90+ CRYPTO_TWOFISH_COMMON y
91+ CRYPTO_BLOWFISH y
92+ CRYPTO_BLOWFISH_COMMON y
93+
94+ IP_PNP y
95+ IP_PNP_DHCP y
96+ NFS_FS y
97+ ROOT_NFS y
98+ TUN m
99+ NFS_V4 y
100+ NFS_V4_1 y
101+ NFS_FSCACHE y
102+ NFSD m
103+ NFSD_V2_ACL y
104+ NFSD_V3 y
105+ NFSD_V3_ACL y
106+ NFSD_V4 y
107+ NETFILTER y
108+ IP_NF_IPTABLES y
109+ IP_NF_FILTER y
110+ IP_NF_MATCH_ADDRTYPE y
111+ IP_NF_TARGET_LOG y
112+ IP_NF_MANGLE y
113+ IPV6 m
114+ VLAN_8021Q m
115+
116+ CIFS y
117+ CIFS_XATTR y
118+ CIFS_POSIX y
119+ CIFS_FSCACHE y
120+ CIFS_ACL y
121+
122+ WATCHDOG y
123+ WATCHDOG_CORE y
124+ ORION_WATCHDOG m
125+
126+ ZRAM m
127+ NETCONSOLE m
128+
129+ # Disable OABI to have seccomp_filter (required for systemd)
130+ # https://github.com/raspberrypi/firmware/issues/651
131+ OABI_COMPAT n
132+
133+ # Fail to build
134+ DRM n
135+ SCSI_ADVANSYS n
136+ USB_ISP1362_HCD n
137+ SND_SOC n
138+ SND_ALI5451 n
139+ FB_SAVAGE n
140+ SCSI_NSP32 n
141+ ATA_SFF n
142+ SUNGEM n
143+ IRDA n
144+ ATM_HE n
145+ SCSI_ACARD n
146+ BLK_DEV_CMD640_ENHANCED n
147+
148+ FUSE_FS m
149+
150+ # systemd uses cgroups
151+ CGROUPS y
152+
153+ # Latencytop
154+ LATENCYTOP y
49155
50− kernelBaseConfig = "multi_v5_defconfig";
51− kernelArch = "arm";
52− kernelAutoModules = false;
53− kernelExtraConfig =
54− ''
55156 # Ubi for the mtd
56157 MTD_UBI y
57158 UBIFS_FS y
@@ -60,137 +161,36 @@ rec {
60161 UBIFS_FS_LZO y
61162 UBIFS_FS_ZLIB y
62163 UBIFS_FS_DEBUG n
63− '';
64− kernelMakeFlags = [ "LOADADDR=0x8000" ];
65− kernelTarget = "uImage";
66− # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working
67− #kernelDTB = true;
68− };
69164
70− sheevaplug = {
71− name = "sheevaplug";
72− kernelBaseConfig = "multi_v5_defconfig";
73− kernelArch = "arm";
74− kernelAutoModules = false;
75− kernelExtraConfig = ''
76− BLK_DEV_RAM y
77− BLK_DEV_INITRD y
78− BLK_DEV_CRYPTOLOOP m
79− BLK_DEV_DM m
80− DM_CRYPT m
81− MD y
82− REISERFS_FS m
83− BTRFS_FS m
84− XFS_FS m
85− JFS_FS m
86− EXT4_FS m
87− USB_STORAGE_CYPRESS_ATACB m
88−
89− # mv cesa requires this sw fallback, for mv-sha1
90− CRYPTO_SHA1 y
91− # Fast crypto
92− CRYPTO_TWOFISH y
93− CRYPTO_TWOFISH_COMMON y
94− CRYPTO_BLOWFISH y
95− CRYPTO_BLOWFISH_COMMON y
96−
97− IP_PNP y
98− IP_PNP_DHCP y
99− NFS_FS y
100− ROOT_NFS y
101− TUN m
102− NFS_V4 y
103− NFS_V4_1 y
104− NFS_FSCACHE y
105− NFSD m
106− NFSD_V2_ACL y
107− NFSD_V3 y
108− NFSD_V3_ACL y
109− NFSD_V4 y
110− NETFILTER y
111− IP_NF_IPTABLES y
112− IP_NF_FILTER y
113− IP_NF_MATCH_ADDRTYPE y
114− IP_NF_TARGET_LOG y
115− IP_NF_MANGLE y
116− IPV6 m
117− VLAN_8021Q m
118−
119− CIFS y
120− CIFS_XATTR y
121− CIFS_POSIX y
122− CIFS_FSCACHE y
123− CIFS_ACL y
124−
125− WATCHDOG y
126− WATCHDOG_CORE y
127− ORION_WATCHDOG m
128−
129− ZRAM m
130− NETCONSOLE m
131−
132− # Disable OABI to have seccomp_filter (required for systemd)
133− # https://github.com/raspberrypi/firmware/issues/651
134− OABI_COMPAT n
135−
136− # Fail to build
137− DRM n
138− SCSI_ADVANSYS n
139− USB_ISP1362_HCD n
140− SND_SOC n
141− SND_ALI5451 n
142− FB_SAVAGE n
143− SCSI_NSP32 n
144− ATA_SFF n
145− SUNGEM n
146− IRDA n
147− ATM_HE n
148− SCSI_ACARD n
149− BLK_DEV_CMD640_ENHANCED n
150−
151− FUSE_FS m
152−
153− # systemd uses cgroups
154− CGROUPS y
155−
156− # Latencytop
157− LATENCYTOP y
158−
159− # Ubi for the mtd
160− MTD_UBI y
161− UBIFS_FS y
162− UBIFS_FS_XATTR y
163− UBIFS_FS_ADVANCED_COMPR y
164− UBIFS_FS_LZO y
165− UBIFS_FS_ZLIB y
166− UBIFS_FS_DEBUG n
167−
168− # Kdb, for kernel troubles
169− KGDB y
170− KGDB_SERIAL_CONSOLE y
171− KGDB_KDB y
172− '';
173− kernelMakeFlags = [ "LOADADDR=0x0200000" ];
174− kernelTarget = "uImage";
175− kernelDTB = true; # Beyond 3.10
165+ # Kdb, for kernel troubles
166+ KGDB y
167+ KGDB_SERIAL_CONSOLE y
168+ KGDB_KDB y
169+ '';
170+ makeFlags = [ "LOADADDR=0x0200000" ];
171+ target = "uImage";
172+ DTB = true; # Beyond 3.10
173+ };
176174 gcc = {
177175 arch = "armv5te";
178176 };
179177 };
180178
181179 raspberrypi = {
182− name = "raspberrypi";
183− kernelBaseConfig = "bcm2835_defconfig";
184− kernelDTB = true;
185− kernelArch = "arm";
186− kernelAutoModules = true;
187− kernelPreferBuiltin = true;
188− kernelExtraConfig = ''
189− # Disable OABI to have seccomp_filter (required for systemd)
190− # https://github.com/raspberrypi/firmware/issues/651
191− OABI_COMPAT n
192− '';
193− kernelTarget = "zImage";
180+ linux-kernel = {
181+ name = "raspberrypi";
182+
183+ baseConfig = "bcm2835_defconfig";
184+ DTB = true;
185+ autoModules = true;
186+ preferBuiltin = true;
187+ extraConfig = ''
188+ # Disable OABI to have seccomp_filter (required for systemd)
189+ # https://github.com/raspberrypi/firmware/issues/651
190+ OABI_COMPAT n
191+ '';
192+ target = "zImage";
193+ };
194194 gcc = {
195195 arch = "armv6";
196196 fpu = "vfp";
@@ -201,13 +201,15 @@ rec {
201201 raspberrypi2 = armv7l-hf-multiplatform;
202202
203203 zero-gravitas = {
204− name = "zero-gravitas";
205− kernelBaseConfig = "zero-gravitas_defconfig";
206− kernelArch = "arm";
207− # kernelTarget verified by checking /boot on reMarkable 1 device
208− kernelTarget = "zImage";
209− kernelAutoModules = false;
210− kernelDTB = true;
204+ linux-kernel = {
205+ name = "zero-gravitas";
206+
207+ baseConfig = "zero-gravitas_defconfig";
208+ # Target verified by checking /boot on reMarkable 1 device
209+ target = "zImage";
210+ autoModules = false;
211+ DTB = true;
212+ };
211213 gcc = {
212214 fpu = "neon";
213215 cpu = "cortex-a9";
@@ -215,13 +217,15 @@ rec {
215217 };
216218
217219 zero-sugar = {
218− name = "zero-sugar";
219− kernelBaseConfig = "zero-sugar_defconfig";
220− kernelArch = "arm";
221− kernelDTB = true;
222− kernelAutoModules = false;
223− kernelPreferBuiltin = true;
224− kernelTarget = "zImage";
220+ linux-kernel = {
221+ name = "zero-sugar";
222+
223+ baseConfig = "zero-sugar_defconfig";
224+ DTB = true;
225+ autoModules = false;
226+ preferBuiltin = true;
227+ target = "zImage";
228+ };
225229 gcc = {
226230 cpu = "cortex-a7";
227231 fpu = "neon-vfpv4";
@@ -229,7 +233,7 @@ rec {
229233 };
230234 };
231235
232− scaleway-c1 = armv7l-hf-multiplatform // {
236+ scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform {
233237 gcc = {
234238 cpu = "cortex-a9";
235239 fpu = "vfpv3";
@@ -237,12 +241,11 @@ rec {
237241 };
238242
239243 utilite = {
240− name = "utilite";
241− kernelBaseConfig = "multi_v7_defconfig";
242− kernelArch = "arm";
243− kernelAutoModules = false;
244− kernelExtraConfig =
245− ''
244+ linux-kernel = {
245+ name = "utilite";
246+ maseConfig = "multi_v7_defconfig";
247+ autoModules = false;
248+ extraConfig = ''
246249 # Ubi for the mtd
247250 MTD_UBI y
248251 UBIFS_FS y
@@ -252,35 +255,37 @@ rec {
252255 UBIFS_FS_ZLIB y
253256 UBIFS_FS_DEBUG n
254257 '';
255− kernelMakeFlags = [ "LOADADDR=0x10800000" ];
256− kernelTarget = "uImage";
257− kernelDTB = true;
258+ makeFlags = [ "LOADADDR=0x10800000" ];
259+ target = "uImage";
260+ DTB = true;
261+ };
258262 gcc = {
259263 cpu = "cortex-a9";
260264 fpu = "neon";
261265 };
262266 };
263267
264− guruplug = sheevaplug // {
268+ guruplug = lib.recursiveUpdate sheevaplug {
265269 # Define `CONFIG_MACH_GURUPLUG' (see
266270 # <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>)
267271 # and other GuruPlug-specific things. Requires the `guruplug-defconfig'
268272 # patch.
269−
270− kernelBaseConfig = "guruplug_defconfig";
273+ linux-kernel.baseConfig = "guruplug_defconfig";
271274 };
272275
273− beaglebone = armv7l-hf-multiplatform // {
274− name = "beaglebone";
275− kernelBaseConfig = "bb.org_defconfig";
276− kernelAutoModules = false;
277− kernelExtraConfig = ""; # TBD kernel config
278− kernelTarget = "zImage";
276+ beaglebone = lib.recursiveUpdate armv7l-hf-multiplatform {
277+ linux-kernel = {
278+ name = "beaglebone";
279+ baseConfig = "bb.org_defconfig";
280+ autoModules = false;
281+ extraConfig = ""; # TBD kernel config
282+ target = "zImage";
283+ };
279284 };
280285
281286 # https://developer.android.com/ndk/guides/abis#v7a
282− armv7a-android = {
283− name = "armeabi-v7a";
287+ armv7a-android = {
288+ linux-kernel.name = "armeabi-v7a";
284289 gcc = {
285290 arch = "armv7-a";
286291 float-abi = "softfp";
@@ -289,29 +294,31 @@ rec {
289294 };
290295
291296 armv7l-hf-multiplatform = {
292− name = "armv7l-hf-multiplatform";
293− kernelBaseConfig = "multi_v7_defconfig";
294− kernelArch = "arm";
295− kernelDTB = true;
296− kernelAutoModules = true;
297− kernelPreferBuiltin = true;
298− kernelTarget = "zImage";
299− kernelExtraConfig = ''
300− # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
301− SERIAL_8250_BCM2835AUX y
302− SERIAL_8250_EXTENDED y
303− SERIAL_8250_SHARE_IRQ y
304−
305− # Fix broken sunxi-sid nvmem driver.
306− TI_CPTS y
307−
308− # Hangs ODROID-XU4
309− ARM_BIG_LITTLE_CPUIDLE n
310−
311− # Disable OABI to have seccomp_filter (required for systemd)
312− # https://github.com/raspberrypi/firmware/issues/651
313− OABI_COMPAT n
314− '';
297+ linux-kernel = {
298+ name = "armv7l-hf-multiplatform";
299+ Major = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.
300+ baseConfig = "multi_v7_defconfig";
301+ DTB = true;
302+ autoModules = true;
303+ PreferBuiltin = true;
304+ target = "zImage";
305+ extraConfig = ''
306+ # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
307+ SERIAL_8250_BCM2835AUX y
308+ SERIAL_8250_EXTENDED y
309+ SERIAL_8250_SHARE_IRQ y
310+
311+ # Fix broken sunxi-sid nvmem driver.
312+ TI_CPTS y
313+
314+ # Hangs ODROID-XU4
315+ ARM_BIG_LITTLE_CPUIDLE n
316+
317+ # Disable OABI to have seccomp_filter (required for systemd)
318+ # https://github.com/raspberrypi/firmware/issues/651
319+ OABI_COMPAT n
320+ '';
321+ };
315322 gcc = {
316323 # Some table about fpu flags:
317324 # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png
@@ -336,34 +343,35 @@ rec {
336343 };
337344
338345 aarch64-multiplatform = {
339− name = "aarch64-multiplatform";
340− kernelBaseConfig = "defconfig";
341− kernelArch = "arm64";
342− kernelDTB = true;
343− kernelAutoModules = true;
344− kernelPreferBuiltin = true;
345− kernelExtraConfig = ''
346− # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10.
347− ARCH_BCM2835 y
348− BCM2835_MBOX y
349− BCM2835_WDT y
350− RASPBERRYPI_FIRMWARE y
351− RASPBERRYPI_POWER y
352− SERIAL_8250_BCM2835AUX y
353− SERIAL_8250_EXTENDED y
354− SERIAL_8250_SHARE_IRQ y
355−
356− # Cavium ThunderX stuff.
357− PCI_HOST_THUNDER_ECAM y
358−
359− # Nvidia Tegra stuff.
360− PCI_TEGRA y
361−
362− # The default (=y) forces us to have the XHCI firmware available in initrd,
363− # which our initrd builder can't currently do easily.
364− USB_XHCI_TEGRA m
365− '';
366− kernelTarget = "Image";
346+ linux-kernel = {
347+ name = "aarch64-multiplatform";
348+ baseConfig = "defconfig";
349+ DTB = true;
350+ autoModules = true;
351+ preferBuiltin = true;
352+ extraConfig = ''
353+ # Raspberry Pi 3 stuff. Not needed for s >= 4.10.
354+ ARCH_BCM2835 y
355+ BCM2835_MBOX y
356+ BCM2835_WDT y
357+ RASPBERRYPI_FIRMWARE y
358+ RASPBERRYPI_POWER y
359+ SERIAL_8250_BCM2835AUX y
360+ SERIAL_8250_EXTENDED y
361+ SERIAL_8250_SHARE_IRQ y
362+
363+ # Cavium ThunderX stuff.
364+ PCI_HOST_THUNDER_ECAM y
365+
366+ # Nvidia Tegra stuff.
367+ PCI_TEGRA y
368+
369+ # The default (=y) forces us to have the XHCI firmware available in initrd,
370+ # which our initrd builder can't currently do easily.
371+ USB_XHCI_TEGRA m
372+ '';
373+ target = "Image";
374+ };
367375 gcc = {
368376 arch = "armv8-a";
369377 };
@@ -374,8 +382,9 @@ rec {
374382 ##
375383
376384 ben_nanonote = {
377− name = "ben_nanonote";
378− kernelArch = "mips";
385+ linux-kernel = {
386+ name = "ben_nanonote";
387+ };
379388 gcc = {
380389 arch = "mips32";
381390 float = "soft";
@@ -383,75 +392,76 @@ rec {
383392 };
384393
385394 fuloong2f_n32 = {
386− name = "fuloong2f_n32";
387− kernelBaseConfig = "lemote2f_defconfig";
388− kernelArch = "mips";
389− kernelAutoModules = false;
390− kernelExtraConfig = ''
391− MIGRATION n
392− COMPACTION n
393−
394− # nixos mounts some cgroup
395− CGROUPS y
396−
397− BLK_DEV_RAM y
398− BLK_DEV_INITRD y
399− BLK_DEV_CRYPTOLOOP m
400− BLK_DEV_DM m
401− DM_CRYPT m
402− MD y
403− REISERFS_FS m
404− EXT4_FS m
405− USB_STORAGE_CYPRESS_ATACB m
406−
407− IP_PNP y
408− IP_PNP_DHCP y
409− IP_PNP_BOOTP y
410− NFS_FS y
411− ROOT_NFS y
412− TUN m
413− NFS_V4 y
414− NFS_V4_1 y
415− NFS_FSCACHE y
416− NFSD m
417− NFSD_V2_ACL y
418− NFSD_V3 y
419− NFSD_V3_ACL y
420− NFSD_V4 y
421−
422− # Fail to build
423− DRM n
424− SCSI_ADVANSYS n
425− USB_ISP1362_HCD n
426− SND_SOC n
427− SND_ALI5451 n
428− FB_SAVAGE n
429− SCSI_NSP32 n
430− ATA_SFF n
431− SUNGEM n
432− IRDA n
433− ATM_HE n
434− SCSI_ACARD n
435− BLK_DEV_CMD640_ENHANCED n
436−
437− FUSE_FS m
438−
439− # Needed for udev >= 150
440− SYSFS_DEPRECATED_V2 n
441−
442− VGA_CONSOLE n
443− VT_HW_CONSOLE_BINDING y
444− SERIAL_8250_CONSOLE y
445− FRAMEBUFFER_CONSOLE y
446− EXT2_FS y
447− EXT3_FS y
448− REISERFS_FS y
449− MAGIC_SYSRQ y
450−
451− # The kernel doesn't boot at all, with FTRACE
452− FTRACE n
453− '';
454− kernelTarget = "vmlinux";
395+ linux-kernel = {
396+ name = "fuloong2f_n32";
397+ baseConfig = "lemote2f_defconfig";
398+ autoModules = false;
399+ extraConfig = ''
400+ MIGRATION n
401+ COMPACTION n
402+
403+ # nixos mounts some cgroup
404+ CGROUPS y
405+
406+ BLK_DEV_RAM y
407+ BLK_DEV_INITRD y
408+ BLK_DEV_CRYPTOLOOP m
409+ BLK_DEV_DM m
410+ DM_CRYPT m
411+ MD y
412+ REISERFS_FS m
413+ EXT4_FS m
414+ USB_STORAGE_CYPRESS_ATACB m
415+
416+ IP_PNP y
417+ IP_PNP_DHCP y
418+ IP_PNP_BOOTP y
419+ NFS_FS y
420+ ROOT_NFS y
421+ TUN m
422+ NFS_V4 y
423+ NFS_V4_1 y
424+ NFS_FSCACHE y
425+ NFSD m
426+ NFSD_V2_ACL y
427+ NFSD_V3 y
428+ NFSD_V3_ACL y
429+ NFSD_V4 y
430+
431+ # Fail to build
432+ DRM n
433+ SCSI_ADVANSYS n
434+ USB_ISP1362_HCD n
435+ SND_SOC n
436+ SND_ALI5451 n
437+ FB_SAVAGE n
438+ SCSI_NSP32 n
439+ ATA_SFF n
440+ SUNGEM n
441+ IRDA n
442+ ATM_HE n
443+ SCSI_ACARD n
444+ BLK_DEV_CMD640_ENHANCED n
445+
446+ FUSE_FS m
447+
448+ # Needed for udev >= 150
449+ SYSFS_DEPRECATED_V2 n
450+
451+ VGA_CONSOLE n
452+ VT_HW_CONSOLE_BINDING y
453+ SERIAL_8250_CONSOLE y
454+ FRAMEBUFFER_CONSOLE y
455+ EXT2_FS y
456+ EXT3_FS y
457+ REISERFS_FS y
458+ MAGIC_SYSRQ y
459+
460+ # The kernel doesn't boot at all, with FTRACE
461+ FTRACE n
462+ '';
463+ target = "vmlinux";
464+ };
455465 gcc = {
456466 arch = "loongson2f";
457467 float = "hard";
@@ -464,34 +474,36 @@ rec {
464474 ##
465475
466476 riscv-multiplatform = {
467− name = "riscv-multiplatform";
468− kernelArch = "riscv";
469− kernelTarget = "vmlinux";
470− kernelAutoModules = true;
471− kernelBaseConfig = "defconfig";
472− kernelExtraConfig = ''
473− FTRACE n
474− SERIAL_OF_PLATFORM y
475− '';
477+ linux-kernel = {
478+ name = "riscv-multiplatform";
479+ target = "vmlinux";
480+ autoModules = true;
481+ baseConfig = "defconfig";
482+ extraConfig = ''
483+ FTRACE n
484+ SERIAL_OF_PLATFORM y
485+ '';
486+ };
476487 };
477488
478489 select = platform:
479490 # x86
480− /**/ if platform.isx86_32 then pc32
481− else if platform.isx86_64 then pc64
491+ /**/ if platform.isx86 then pc
482492
483493 # ARM
484494 else if platform.isAarch32 then let
485495 version = platform.parsed.cpu.version or null;
486− in if version == null then pcBase
496+ in if version == null then pc
487497 else if lib.versionOlder version "6" then sheevaplug
488498 else if lib.versionOlder version "7" then raspberrypi
489499 else armv7l-hf-multiplatform
490500 else if platform.isAarch64 then aarch64-multiplatform
491501
502+ else if platform.isRiscV then riscv-multiplatform
503+
492504 else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then fuloong2f_n32
493505
494506 else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv
495507
496− else pcBase;
508+ else pc;
497509}