diff --git a/.gitignore b/.gitignore index e617a5cb8..de076f095 100644 --- a/.gitignore +++ b/.gitignore @@ -35,5 +35,4 @@ /repos/qt4/tool/qmake/qmake /repos/qt4/tool/rcc /repos/qt4/tool/uic -/repos/linux_drivers diff --git a/doc/components.txt b/doc/components.txt index 579c4ff8d..196866345 100644 --- a/doc/components.txt +++ b/doc/components.txt @@ -61,7 +61,7 @@ Device drivers Device drivers usually reside in the 'src/drivers' subdirectory of source-code repositories. The most predominant repositories hosting device drivers are -'os', 'linux_drivers', 'dde_ipxe', 'dde_linux'. +'os', 'dde_ipxe', 'dde_linux'. Platform devices @@ -188,10 +188,6 @@ All audio-output drivers implement the audio session interface defined at Sound drivers for the most common PC sound hardware, ported from the Open Sound System project. -:'linux_drivers/src/drivers/audio_out': - Sound drivers for the most common PC sound hardware, ported from the Linux - kernel. - Block drivers ============= @@ -212,10 +208,10 @@ All block drivers implement the block-session interface defined at :'os/src/drivers/sd_card/exynos5': Driver for SD-cards and eMMC connected to Exynos-5-based platforms. -:'linux_drivers/src/drivers/usb': +:'dde_linux/src/drivers/usb': USB driver that makes USB storage devices available as block sessions. For an example of using this driver, refer to the run script at - 'linux_drivers/run/usb_storage'. + 'dde_linux/run/usb_storage'. :'os/src/drivers/ahci': Driver for SATA disks on x86 PCs. @@ -239,9 +235,6 @@ defined at 'os/include/nic_session'. Device drivers ported from the iPXE project. Supported devices are Intel E1000 and pcnet32. -:'linux_drivers/src/drivers/madwifi': - The MadWifi wireless stack ported from the Linux kernel. - :'dde_linux/src/drivers/usb': For the OMAP4 platform, the USB driver contains the networking driver. @@ -457,9 +450,9 @@ Libraries: :'libports/lib/mk/stdcxx': Standard C++ library -:'libports/lib/mk/gallium' + 'linux_drivers/lib/mk/gpu_i915_drv': +:'libports/lib/mk/gallium': Translates the OpenGL API to a framebuffer session using the MESA OpenGL - stack and the Intel GEM GPU driver. + stack :'libports/lib/mk/pthread': Subset of the POSIX thread and semaphore API. diff --git a/repos/libports/run/http_srv_tracing.run b/repos/libports/run/http_srv_tracing.run index 5588d9bbb..3bfdb73f8 100644 --- a/repos/libports/run/http_srv_tracing.run +++ b/repos/libports/run/http_srv_tracing.run @@ -12,7 +12,7 @@ # environments (i.e., the test won't work with the Linux version of Genode). # # Please make sure to include a nic driver in your build configuration. E.g., -# on the x86 platform, you may enable the 'linux_drivers' repository. +# on the x86 platform, you may enable the 'dde_ipxe' repository. # # diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 7b6721544..47939be0c 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -12,7 +12,7 @@ # environments (i.e., the test won't work with the Linux version of Genode). # # Please make sure to include a nic driver in your build configuration. E.g., -# on the x86 platform, you may enable the 'linux_drivers' repository. +# on the x86 platform, you may enable the 'dde_ipxe' repository. # # diff --git a/tool/builddir/etc/build.conf.drivers_x86 b/tool/builddir/etc/build.conf.drivers_x86 index f65fd08d5..8745b20f1 100644 --- a/tool/builddir/etc/build.conf.drivers_x86 +++ b/tool/builddir/etc/build.conf.drivers_x86 @@ -1,13 +1,4 @@ -# -# Additional drivers ported from the Linux kernel (audio, Intel GEM) -# -# Not supported on the ARM architecture. -# -# This repository is deprecated. -# -#REPOSITORIES += $(GENODE_DIR)/repos/linux_drivers - # # Drivers ported from the Open Sound System #