Undo the other patches that sneaked in in my last commit.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://coreboot.org/repository/coreboot-v3@650 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Stefan Reinauer 2008-04-04 03:33:08 +00:00
commit a8b10df926
5 changed files with 11 additions and 2649 deletions

View file

@ -297,20 +297,20 @@ clear_fixed_var_mtrr_out:
* register we want to use for CAR.
* reg is the register where the IO type should be stored.
*/
.macro extractmask size_segs, reg
.if \size_segs <= 0
.macro extractmask segs, reg
.if \segs <= 0
/* The xorl here is superfluous because at the point of first execution
* of this macro, %eax and %edx are cleared. Later invocations of this
* macro will have a monotonically increasing size_segs parameter.
* macro will have a monotonically increasing segs parameter.
*/
xorl \reg, \reg
.elseif \size_segs == 0x1000
.elseif \segs == 1
movl $0x06000000, \reg
.elseif \size_segs == 0x2000
.elseif \segs == 2
movl $0x06060000, \reg
.elseif \size_segs == 0x3000
.elseif \segs == 3
movl $0x06060600, \reg
.elseif \size_segs >= 0x4000
.elseif \segs >= 4
movl $0x06060606, \reg
.endif
.endm
@ -319,8 +319,8 @@ clear_fixed_var_mtrr_out:
* windowoffset is the 32k-aligned window into CAR size
*/
.macro simplemask carsize, windowoffset
extractmask ((( \carsize - \windowoffset ) ) - 0x4000 ), %eax
extractmask ((( \carsize - \windowoffset ) ) ), %edx
extractmask (((\carsize - \windowoffset) / 0x1000) - 4), %eax
extractmask (((\carsize - \windowoffset) / 0x1000)), %edx
.endm
#if CacheSize > 0x10000

View file

@ -130,7 +130,6 @@ struct device_operations *find_device_operations(struct device_id *id)
printk(BIOS_SPEW, "%s: match\n", __func__);
return c;
}
printk(BIOS_SPEW, "no more constructors\n");
}
return NULL;

View file

@ -231,7 +231,7 @@ struct device {
/* number of buses attached to the device */
unsigned int links;
const struct device_operations *ops;
struct device_operations *ops;
void *device_configuration;
};

File diff suppressed because it is too large Load diff

View file

@ -32,8 +32,8 @@
#include <sys/mman.h>
#include <netinet/in.h>
#include <libgen.h>
#include <elf.h>
#include "elf.h"
#include "lar.h"
#include "lib.h"