From 9328c78a90620ffe78970a2513d8df584f4bcbe0 Mon Sep 17 00:00:00 2001 From: Yogev Ezra Date: Tue, 26 Nov 2013 19:35:00 +0000 Subject: [PATCH] Move Vortex86 SoC handling before usb_init and CPU speed detection, since otherwise the CPU speed is not detected correctly. git-svn-id: svn://kolibrios.org@4297 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/kernel.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index 52b9b8f001..7e3c0585c3 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -882,6 +882,8 @@ end if mov [pci_access_enabled], 1 call pci_enum +include "detect/vortex86.inc" ; Vortex86 SoC detection code + stdcall load_driver, szVidintel call usb_init @@ -1109,8 +1111,6 @@ end if @@: DEBUGF 1, "K : %d CPU detected\n", eax -include "detect/vortex86.inc" ; Vortex86 SoC detection code - DEBUGF 1, "K : BAR0 %x \n", [IDE_BAR0_val]:4 DEBUGF 1, "K : BAR1 %x \n", [IDE_BAR1_val]:4 DEBUGF 1, "K : BAR2 %x \n", [IDE_BAR2_val]:4