sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove fallback/normal handling in mainboards'

Browse Source 
romstage.c like r5255 did for failover/fallback/normal
mainboards.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5257 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi
2010-03-18 16:18:58 +00:00
parent a41b939294
commit 776b85ba45
46 changed files with 256 additions and 2181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cpu/intel/model_106cx/cache_as_ram_disable.c
View File

@@ -25,30 +25,6 @@ void stage1_main(unsigned long bist)
{
unsigned int cpu_reset = 0;
#if !defined(CONFIG_TINY_BOOTBLOCK) || !CONFIG_TINY_BOOTBLOCK
#if CONFIG_USE_FALLBACK_IMAGE == 1
/* Is this a deliberate reset by the bios */
if (bios_reset_detected() && last_boot_normal()) {
goto normal_image;
} else {
/* This is the primary cpu how should I boot? */
check_cmos_failed();
if (do_normal_boot()) {
goto normal_image;
}
else {
goto fallback_image;
}
}
normal_image:
__asm__ volatile ("jmp __normal_image"
: /* outputs */
: "a" (bist) /* inputs */
);
fallback_image:
#endif
#endif
real_main(bist);
/* No servicable parts below this line .. */

24
src/cpu/intel/model_6ex/cache_as_ram_disable.c
View File

@@ -27,30 +27,6 @@ void stage1_main(unsigned long bist)
{
unsigned int cpu_reset = 0;
#if !defined(CONFIG_TINY_BOOTBLOCK) || !CONFIG_TINY_BOOTBLOCK
#if CONFIG_USE_FALLBACK_IMAGE == 1
/* Is this a deliberate reset by the bios */
if (bios_reset_detected() && last_boot_normal()) {
goto normal_image;
} else {
/* This is the primary cpu how should I boot? */
check_cmos_failed();
if (do_normal_boot()) {
goto normal_image;
}
else {
goto fallback_image;
}
}
normal_image:
__asm__ volatile ("jmp __normal_image"
: /* outputs */
: "a" (bist) /* inputs */
);
fallback_image:
#endif
#endif
real_main(bist);
/* No servicable parts below this line .. */

24
src/cpu/intel/model_6fx/cache_as_ram_disable.c
View File

@@ -27,30 +27,6 @@ void stage1_main(unsigned long bist)
{
unsigned int cpu_reset = 0;
#if !defined(CONFIG_TINY_BOOTBLOCK) || !CONFIG_TINY_BOOTBLOCK
#if CONFIG_USE_FALLBACK_IMAGE == 1
/* Is this a deliberate reset by the bios */
if (bios_reset_detected() && last_boot_normal()) {
goto normal_image;
} else {
/* This is the primary cpu how should I boot? */
check_cmos_failed();
if (do_normal_boot()) {
goto normal_image;
}
else {
goto fallback_image;
}
}
normal_image:
__asm__ volatile ("jmp __normal_image"
: /* outputs */
: "a" (bist) /* inputs */
);
fallback_image:
#endif
#endif
real_main(bist);
/* No servicable parts below this line .. */