Changeset 8a9a41e in mainline for HelenOS.config

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• HelenOS.config (modified) (5 diffs)

HelenOS.config

@@ -68 +68 @@
 % Machine type
 @ "virt" QEMU virt
+@ "hikey960" HiKey 960
 ! [PLATFORM=arm64] MACHINE (choice)
 
@@ -395 +396 @@
 ! CONFIG_DEBUG (y/n)
 
+% Early debugging print
+! [CONFIG_DEBUG=y] CONFIG_DEBUG_EARLY_PRINT (n/y)
+
 % Sanitize undefined behavior (userspace)
 ! CONFIG_UBSAN (n/y)
@@ -509 +513 @@
 
 % Support for PL011 UART
-! [CONFIG_HID_OUT=generic|(PLATFORM=arm64&MACHINE=virt)] CONFIG_PL011_UART (y)
+! [CONFIG_HID_OUT=generic|(PLATFORM=arm64&(MACHINE=virt|MACHINE=hikey960))] CONFIG_PL011_UART (y)
 
 % Support for NS16550 controller (kernel console)
@@ -539 +543 @@
 
 % Support for ARM GICv2
-! [PLATFORM=arm64&MACHINE=virt] CONFIG_GICV2 (y)
+! [PLATFORM=arm64&(MACHINE=virt|MACHINE=hikey960)] CONFIG_GICV2 (y)
 
 % Support for i8042 controller
@@ -612 +616 @@
 
 % Display double buffering
-! [CONFIG_FB=y] CONFIG_DISP_DOUBLE_BUF (y/n)
+! [CONFIG_WINSYS=y] CONFIG_DISP_DOUBLE_BUF (y/n)
 
 % Client-side UI rendering
-! [CONFIG_FB=y] CONFIG_UI_CS_RENDER (y/n)
+! CONFIG_UI_CS_RENDER (y/n)
 
 % Window double buffering