diff --git a/core/meson.build b/core/meson.build index a16d01c..853f9e3 100644 --- a/core/meson.build +++ b/core/meson.build @@ -1,7 +1,6 @@ kernel_sources += files( 'clock.c', 'console.c', - 'fbcon.c', 'initgraph.c', 'irq.c', 'ksyms.c', diff --git a/dev/Kconfig b/dev/Kconfig index 20ccd65..26076c6 100644 --- a/dev/Kconfig +++ b/dev/Kconfig @@ -14,5 +14,6 @@ config ACPI source "dev/block/Kconfig" source "dev/pci/Kconfig" +source "dev/video/Kconfig" endmenu diff --git a/dev/meson.build b/dev/meson.build index 924a755..fde44ab 100644 --- a/dev/meson.build +++ b/dev/meson.build @@ -1,6 +1,7 @@ subdir('common') subdir('block') subdir('dt') +subdir('video') if kconfig.get('CONFIG_PCI', 'n') == 'y' subdir('pci') diff --git a/dev/video/Kconfig b/dev/video/Kconfig new file mode 100644 index 0000000..900a305 --- /dev/null +++ b/dev/video/Kconfig @@ -0,0 +1,9 @@ +menu "Video Drivers" + +config FBCON + bool "Framebuffer console" + default y + help + Adds a basic console that can draw on a framebuffer passed by firmware. + +endmenu diff --git a/core/fbcon.c b/dev/video/fbcon/fbcon.c similarity index 100% rename from core/fbcon.c rename to dev/video/fbcon/fbcon.c diff --git a/core/fbcon_font.bin b/dev/video/fbcon/fbcon_font.bin similarity index 100% rename from core/fbcon_font.bin rename to dev/video/fbcon/fbcon_font.bin diff --git a/dev/video/fbcon/meson.build b/dev/video/fbcon/meson.build new file mode 100644 index 0000000..2ba1cf0 --- /dev/null +++ b/dev/video/fbcon/meson.build @@ -0,0 +1 @@ +kernel_sources += files('fbcon.c') \ No newline at end of file diff --git a/dev/video/meson.build b/dev/video/meson.build new file mode 100644 index 0000000..83c6772 --- /dev/null +++ b/dev/video/meson.build @@ -0,0 +1,3 @@ +if kconfig.get('CONFIG_FBCON', 'n') == 'y' + subdir('fbcon') +endif