Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

since BaS copy copies only .data and .bss, this must happen earlier than before - changed

Browse Source
This commit is contained in:
Markus Fröschle
2013-12-07 21:15:20 +00:00
parent aff7901551
commit 65605594fd
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
BaS_gcc/sources/sysinit.c
View File

@@ -582,8 +582,8 @@ void init_usb(void)
extern struct pci_device_id ohci_usb_pci_table[]; extern struct pci_device_id ohci_usb_pci_table[];
extern struct pci_device_id ehci_usb_pci_table[]; extern struct pci_device_id ehci_usb_pci_table[];
struct pci_device_id *board; struct pci_device_id *board;
int16_t handle; int32_t handle;
uint16_t usb_found; bool usb_found;
int index = 0; int index = 0;
xprintf("USB controller initialization:\r\n"); xprintf("USB controller initialization:\r\n");
@@ -973,10 +973,6 @@ void initialize_hardware(void)
} }
#endif /* MACHINE_FIREBEE */ #endif /* MACHINE_FIREBEE */
if (BAS_LMA != BAS_IN_RAM)
{
clear_data_segment();
}
clear_bss_segment(); clear_bss_segment();
init_gpio(); init_gpio();
@@ -1093,21 +1089,6 @@ void initialize_hardware(void)
0 /* leave core clock enabled */ 0 /* leave core clock enabled */
); );
init_slt();
init_fbcs();
init_ddram();
#if MACHINE_FIREBEE
init_fpga();
init_pll();
init_video_ddr();
dvi_on();
#endif /* MACHINE_FIREBEE */
init_pci();
/* moved the following line (temporarily) to BaS (after MMU init) to be able to catch adressing errors on USB init */
//init_usb();
#if MACHINE_FIREBEE
init_ac97();
#endif /* MACHINE_FIREBEE */
if (BAS_LMA != BAS_IN_RAM) if (BAS_LMA != BAS_IN_RAM)
{ {
@@ -1124,6 +1105,20 @@ void initialize_hardware(void)
xprintf("no BaS copy necessary - running from RAM already\r\n"); xprintf("no BaS copy necessary - running from RAM already\r\n");
} }
init_slt();
init_fbcs();
init_ddram();
#if MACHINE_FIREBEE
init_fpga();
init_pll();
init_video_ddr();
dvi_on();
#endif /* MACHINE_FIREBEE */
init_pci();
init_usb();
#if MACHINE_FIREBEE
init_ac97();
#endif /* MACHINE_FIREBEE */
/* jump into the BaS */ /* jump into the BaS */
extern void BaS(void); extern void BaS(void);
BaS(); BaS();