diff options
| author | arch import user (historical) <svn@openbios.org> | 2005-07-06 17:03:01 +0000 |
|---|---|---|
| committer | arch import user (historical) <svn@openbios.org> | 2005-07-06 17:03:01 +0000 |
| commit | 4a39e0b67ce13f63ebf23282f7b8f1ae1e803d01 (patch) | |
| tree | db72c3c2266861c12af4e0a30adf620c9ece7c12 | |
| parent | d8b8655647a6b9bf23944cb8efe09719cf132339 (diff) | |
| download | coreboot-4a39e0b67ce13f63ebf23282f7b8f1ae1e803d01.tar.xz | |
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
| -rw-r--r-- | src/mainboard/digitallogic/msm586seg/Config.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/digitallogic/msm586seg/auto.c | 14 | ||||
| -rw-r--r-- | src/mainboard/digitallogic/msm586seg/reset.c | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/src/mainboard/digitallogic/msm586seg/Config.lb b/src/mainboard/digitallogic/msm586seg/Config.lb index effb4c2813..20977e0ac2 100644 --- a/src/mainboard/digitallogic/msm586seg/Config.lb +++ b/src/mainboard/digitallogic/msm586seg/Config.lb @@ -44,7 +44,7 @@ arch i386 end driver mainboard.o if HAVE_PIRQ_TABLE object irq_tables.o end -#object reset.o +object reset.o ## ## Romcc output diff --git a/src/mainboard/digitallogic/msm586seg/auto.c b/src/mainboard/digitallogic/msm586seg/auto.c index 961f5481ee..b165657c1d 100644 --- a/src/mainboard/digitallogic/msm586seg/auto.c +++ b/src/mainboard/digitallogic/msm586seg/auto.c @@ -14,6 +14,9 @@ #include "cpu/x86/bist.h" #include "cpu/amd/sc520/raminit.c" +struct mem_controller { + int i; +}; 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) { - 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 const struct mem_controller memctrl[] = { { .d0 = PCI_DEV(0, 0, 0), .channel0 = { (0xa<<3)|0, 0 }, }, }; +*/ if (bist == 0) { early_mtrr_init(); @@ -65,7 +70,7 @@ static void main(unsigned long bist) #if 0 print_pci_devices(); #endif - +#if 0 if(!bios_reset_detected()) { enable_smbus(); #if 0 @@ -73,12 +78,13 @@ static void main(unsigned long bist) // dump_smbus_registers(); #endif - memreset_setup(); sdram_initialize(sizeof(memctrl)/sizeof(memctrl[0]), memctrl); + } +#endif #if 0 else { /* clear memory 1meg */ diff --git a/src/mainboard/digitallogic/msm586seg/reset.c b/src/mainboard/digitallogic/msm586seg/reset.c index f332b3f6a3..e0e6d2aa89 100644 --- a/src/mainboard/digitallogic/msm586seg/reset.c +++ b/src/mainboard/digitallogic/msm586seg/reset.c @@ -32,10 +32,10 @@ static unsigned pci_read_config32(device_t dev, unsigned where) outl(0x80000000 | (addr & ~3), 0xCF8); return inl(0xCFC); } - +#endif void hard_reset(void) { - set_bios_reset(); + //set_bios_reset(); // pci_write_config8(PCI_DEV(1, 0x04, 0), 0x47, 1); } -#endif + |