From e480bb9b1a57a95ce85abaf8577574a7b6530d51 Mon Sep 17 00:00:00 2001
From: luroh <lurohh@gmail.com>
Date: Mon, 22 Oct 2012 20:08:23 +0200
Subject: [PATCH 2/2] Replace broken marvell_yukon driver with pre-compiled
binary version from hrev43722.
---
build/jam/HaikuImage | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 67bc299..e5f04bf 100644
a
|
b
|
SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
|
178 | 178 | $(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 |
179 | 179 | $(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x $(X86_ONLY)dec21xxx etherpci |
180 | 180 | $(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0 |
181 | | $(X86_ONLY)marvell_yukon $(X86_ONLY)nforce $(X86_ONLY)pcnet pegasus |
| 181 | $(X86_ONLY)nforce $(X86_ONLY)pcnet pegasus |
182 | 182 | $(X86_ONLY)rtl8139 $(X86_ONLY)rtl81xx $(X86_ONLY)sis19x sis900 |
183 | 183 | $(X86_ONLY)syskonnect usb_davicom usb_asix usb_ecm $(X86_ONLY)via_rhine |
184 | 184 | $(X86_ONLY)vt612x wb840 |
… |
… |
if $(TARGET_ARCH) = x86 {
|
750 | 750 | : [ FDirName $(HAIKU_MESA_HEADERS) GL ] : : -x .svn ; |
751 | 751 | } |
752 | 752 | |
| 753 | # Extract binary marvell_yukon driver to image. |
| 754 | if $(TARGET_ARCH) != x86 { |
| 755 | Echo "No marvell_yukon driver available for $(TARGET_ARCH)" ; |
| 756 | } else { |
| 757 | if $(HAIKU_GCC_VERSION[1]) >= 4 { |
| 758 | ExtractArchiveToHaikuImage |
| 759 | system add-ons kernel drivers bin |
| 760 | : $(HAIKU_TOP)/src/add-ons/kernel/drivers/network/marvell_yukon/marvell_yukon_hrev43722_gcc4.zip ; |
| 761 | } else { |
| 762 | ExtractArchiveToHaikuImage |
| 763 | system add-ons kernel drivers bin |
| 764 | : $(HAIKU_TOP)/src/add-ons/kernel/drivers/network/marvell_yukon/marvell_yukon_hrev43722_gcc2.zip ; |
| 765 | } |
| 766 | AddSymlinkToHaikuImage |
| 767 | system add-ons kernel drivers dev net |
| 768 | : ../../bin/marvell_yukon ; |
| 769 | } |
| 770 | |
753 | 771 | #pragma mark - Optional Packages |
754 | 772 | |
755 | 773 | |