Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-22

Creator:  Ronald G. Minnich <rminnich@lanl.gov>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1938 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
arch import user (historical)
2005-07-06 17:03:01 +00:00
parent d8b8655647
commit 4a39e0b67c
3 changed files with 14 additions and 8 deletions

View File

@@ -44,7 +44,7 @@ arch i386 end
driver mainboard.o driver mainboard.o
if HAVE_PIRQ_TABLE object irq_tables.o end if HAVE_PIRQ_TABLE object irq_tables.o end
#object reset.o object reset.o
## ##
## Romcc output ## Romcc output

View File

@@ -14,6 +14,9 @@
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "cpu/amd/sc520/raminit.c" #include "cpu/amd/sc520/raminit.c"
struct mem_controller {
int i;
};
static void hard_reset(void) static void hard_reset(void)
{ {
@@ -36,19 +39,21 @@ static inline void activate_spd_rom(const struct mem_controller *ctrl)
static inline int spd_read_byte(unsigned device, unsigned address) static inline int spd_read_byte(unsigned device, unsigned address)
{ {
return smbus_read_byte(device, address); // return smbus_read_byte(device, address);
} }
#include "sdram/generic_sdram.c" //#include "sdram/generic_sdram.c"
static void main(unsigned long bist) static void main(unsigned long bist)
{ {
/*
static const struct mem_controller memctrl[] = { static const struct mem_controller memctrl[] = {
{ {
.d0 = PCI_DEV(0, 0, 0), .d0 = PCI_DEV(0, 0, 0),
.channel0 = { (0xa<<3)|0, 0 }, .channel0 = { (0xa<<3)|0, 0 },
}, },
}; };
*/
if (bist == 0) { if (bist == 0) {
early_mtrr_init(); early_mtrr_init();
@@ -65,7 +70,7 @@ static void main(unsigned long bist)
#if 0 #if 0
print_pci_devices(); print_pci_devices();
#endif #endif
#if 0
if(!bios_reset_detected()) { if(!bios_reset_detected()) {
enable_smbus(); enable_smbus();
#if 0 #if 0
@@ -73,12 +78,13 @@ static void main(unsigned long bist)
// dump_smbus_registers(); // dump_smbus_registers();
#endif #endif
memreset_setup(); memreset_setup();
sdram_initialize(sizeof(memctrl)/sizeof(memctrl[0]), memctrl); sdram_initialize(sizeof(memctrl)/sizeof(memctrl[0]), memctrl);
} }
#endif
#if 0 #if 0
else { else {
/* clear memory 1meg */ /* clear memory 1meg */

View File

@@ -32,10 +32,10 @@ static unsigned pci_read_config32(device_t dev, unsigned where)
outl(0x80000000 | (addr & ~3), 0xCF8); outl(0x80000000 | (addr & ~3), 0xCF8);
return inl(0xCFC); return inl(0xCFC);
} }
#endif
void hard_reset(void) void hard_reset(void)
{ {
set_bios_reset(); //set_bios_reset();
// pci_write_config8(PCI_DEV(1, 0x04, 0), 0x47, 1); // pci_write_config8(PCI_DEV(1, 0x04, 0), 0x47, 1);
} }
#endif