diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-06-17 01:09:07 +0300 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-06-17 21:49:33 +0200 |
| commit | d715105d30c2b37a63d783eda45166505b483e7d (patch) | |
| tree | dd65b638e04d4b99634515aff4c52d42720ab472 /src | |
| parent | 397ca6176c70f5d8c1db7cdcb0b3dedaa74c3cbd (diff) | |
| download | coreboot-d715105d30c2b37a63d783eda45166505b483e7d.tar.xz | |
AMD: Use same sourcecode for reset in romstage as ramstage
Confusingly, romstage compiled in different copy of soft_reset()
than ramstage. Use source in reset.c for both.
Change-Id: I2e4b6d1b89c859c7cf5d9e9c8f7748b43d369775
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3487
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/advansus/a785e-i/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/mainboard/advansus/a785e-i/romstage.c | 7 | ||||
| -rw-r--r-- | src/mainboard/asus/m5a88-v/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/asus/m5a88-v/romstage.c | 7 | ||||
| -rw-r--r-- | src/mainboard/avalue/eax-785e/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/mainboard/avalue/eax-785e/romstage.c | 8 |
6 files changed, 3 insertions, 26 deletions
diff --git a/src/mainboard/advansus/a785e-i/Makefile.inc b/src/mainboard/advansus/a785e-i/Makefile.inc index d69a9bf869..d7290afedd 100644 --- a/src/mainboard/advansus/a785e-i/Makefile.inc +++ b/src/mainboard/advansus/a785e-i/Makefile.inc @@ -1,5 +1,4 @@ -#romstage-y += reset.c #FIXME romstage have include test_rest.c - +romstage-y += reset.c ramstage-y += reset.c #SB800 CIMx share AGESA V5 lib code diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c index ae283a4a3d..1a4a27635b 100644 --- a/src/mainboard/advansus/a785e-i/romstage.c +++ b/src/mainboard/advansus/a785e-i/romstage.c @@ -72,14 +72,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/model_10xxx/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include "spd.h" - #include <reset.h> -void soft_reset(void) -{ - set_bios_reset(); - /* link reset */ - outb(0x06, 0x0cf9); -} void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) { diff --git a/src/mainboard/asus/m5a88-v/Makefile.inc b/src/mainboard/asus/m5a88-v/Makefile.inc index 35b20430c6..d7290afedd 100644 --- a/src/mainboard/asus/m5a88-v/Makefile.inc +++ b/src/mainboard/asus/m5a88-v/Makefile.inc @@ -1,3 +1,4 @@ +romstage-y += reset.c ramstage-y += reset.c #SB800 CIMx share AGESA V5 lib code diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c index dbae2d35f1..ddb0e6fe85 100644 --- a/src/mainboard/asus/m5a88-v/romstage.c +++ b/src/mainboard/asus/m5a88-v/romstage.c @@ -72,14 +72,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/model_10xxx/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include "spd.h" - #include <reset.h> -void soft_reset(void) -{ - set_bios_reset(); - /* link reset */ - outb(0x06, 0x0cf9); -} #define SERIAL_DEV PNP_DEV(0x4e, IT8721F_SP1) void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) diff --git a/src/mainboard/avalue/eax-785e/Makefile.inc b/src/mainboard/avalue/eax-785e/Makefile.inc index d69a9bf869..d7290afedd 100644 --- a/src/mainboard/avalue/eax-785e/Makefile.inc +++ b/src/mainboard/avalue/eax-785e/Makefile.inc @@ -1,5 +1,4 @@ -#romstage-y += reset.c #FIXME romstage have include test_rest.c - +romstage-y += reset.c ramstage-y += reset.c #SB800 CIMx share AGESA V5 lib code diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c index d4704e8029..5af67f706f 100644 --- a/src/mainboard/avalue/eax-785e/romstage.c +++ b/src/mainboard/avalue/eax-785e/romstage.c @@ -72,15 +72,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/model_10xxx/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include "spd.h" - #include <reset.h> -void soft_reset(void) -{ - set_bios_reset(); - /* link reset */ - outb(0x06, 0x0cf9); -} - void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) { |