Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move qemu-i386 to qemu-x86, as per request from Uwe.

Browse source 
Plus some small trivial reformatting of comments in stage0_i586.S

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



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@146 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Stefan Reinauer 2007-02-27 17:13:40 +00:00
parent 7dea9e43f8
commit 75064d7247
12 changed files with 64 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
arch/x86/stage0_i586.S
View file

@ -54,8 +54,10 @@ _stage0:
movl %eax, %cr3 /* Invalidate TLB */
/* switch to protected mode */
/* NOTE: WIth GNU assembler version 2.15.94.0.2.2 (i386-redhat-linux) using BFD version 2.15.94.0.2.2 20041220
* this works fine without all the ld hackery and other things. So leave it as is with this comment.
/* NOTE: With GNU assembler version 2.15.94.0.2.2 (i386-redhat-linux)
* using BFD version 2.15.94.0.2.2 20041220 this works fine without all
* the ld hackery and other things. So leave it as is with this comment.
*/
# movw %cs, %ax
@ -105,13 +107,17 @@ gdt16xend:
.code32
/* We have two gdts where we could have one. That is ok.
* Let's not worry about this -- optimizing gdt is pointless since we're only in it for a little bit.
* BTW note the trick below: the gdt points to ITSELF, and the first good descriptor is at offset 8.
* so you word-align the table, and then because you chose 8,
* you get a nice 64-bit aligned gdt endtry, which is
* good as this is the size of the entry. Just in case you ever wonder why people do this.
*/
/* We have two gdts where we could have one. That is ok.
*
* Let's not worry about this -- optimizing gdt is pointless since we're
* only in it for a little bit.
*
* BTW note the trick below: The GDT points to ITSELF, and the first good
* descriptor is at offset 8. So you word-align the table, and then because
* you chose 8, you get a nice 64-bit aligned GDT entry, which is good as
* this is the size of the entry.
* Just in case you ever wonder why people do this.
*/
.align 4
.globl gdtptr
gdt:
@ -145,7 +151,7 @@ gdt_end:
* After that, we call the chipset bootstrap routine that
* does what is left of the chipset initialization.
*
* NOTE aligned to 4 so that we are sure that the prefetch
* NOTE: Aligned to 4 so that we are sure that the prefetch
* cache will be reloaded.
*/

2
mainboard/emulation/Kconfig
View file

@ -17,5 +17,5 @@ config BOARD_EMULATION_QEMU_POWERPC
endchoice
source "mainboard/emulation/qemu-i386/Kconfig"
source "mainboard/emulation/qemu-x86/Kconfig"

5
mainboard/emulation/qemu-i386/config.h
View file

@ -1,5 +0,0 @@
extern struct chip_operations mainboard_emulation_qemu_i386_ops;
struct mainboard_emulation_qemu_i386_config {
int nothing;
};

35
mainboard/emulation/qemu-i386/mainboard.c
View file

@ -1,35 +0,0 @@
/*
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <arch/types.h>
// #include "dtc.h"
char *mainboard_vendor = "emulation";
char *mainboard_part_number = "qemu-x86";
static void enable_dev(struct device *dev){
printk(BIOS_INFO, "qemu-i386 enable_dev done\n");
}
struct chip_operations mainboard_emulation_qemu_i386_ops = {
.name = "QEMU Mainboard",
.enable_dev = enable_dev
};

4
mainboard/emulation/qemu-i386/Kconfig → mainboard/emulation/qemu-x86/Kconfig
View file

@ -1,8 +1,8 @@
config MAINBOARD_NAME
string
default emulation/qemu-i386
default emulation/qemu-x86
depends BOARD_EMULATION_QEMU_X86
help
This is the default mainboard name.
source northbridge/intel/i440bxemulation/Kconfig
source northbridge/intel/i440bxemulation/Kconfig

0
mainboard/emulation/qemu-i386/Makefile → mainboard/emulation/qemu-x86/Makefile
View file

0
mainboard/emulation/qemu-i386/cmos.layout → mainboard/emulation/qemu-x86/cmos.layout
View file

5
mainboard/emulation/qemu-x86/config.h Normal file
View file

@ -0,0 +1,5 @@
extern struct chip_operations mainboard_emulation_qemu_x86_ops;
struct mainboard_emulation_qemu_x86_config {
int nothing;
};

10
mainboard/emulation/qemu-i386/dts → mainboard/emulation/qemu-x86/dts
View file

@ -1,12 +1,12 @@
/{
config="mainboard,emulation,qemu-i386";
config="mainboard,emulation,qemu-x86";
cpus {
emulation,qemu-i386@0{
emulation,qemu-x86@0{
enabled;
on_mainboard;
device_type = "cpu";
name = "emulation,qemu-i386";
name = "emulation,qemu-x86";
pcidomain = "0";
ops="i440bxemulation,pcidomainops";
/* the I/O stuff */
@ -26,11 +26,11 @@
extern struct device_operations i440bxemulation_pcidomainops;
struct mainboard_emulation_qemu_i386_config root = {
struct mainboard_emulation_qemu_x86_config root = {
.nothing = 1,
};
struct northbridge_intel_i440bx_config northbridge_intel_440bx = {
.ramsize = CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION_RAMSIZE,
};
};

0
mainboard/emulation/qemu-i386/initram.c → mainboard/emulation/qemu-x86/initram.c
View file

35
mainboard/emulation/qemu-x86/mainboard.c Normal file
View file

@ -0,0 +1,35 @@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <arch/types.h>
// #include "dtc.h"
char *mainboard_vendor = "emulation";
char *mainboard_part_number = "qemu-x86";
static void enable_dev(struct device *dev){
printk(BIOS_INFO, "qemu-x86 enable_dev done\n");
}
struct chip_operations mainboard_emulation_qemu_x86_ops = {
.name = "QEMU Mainboard",
.enable_dev = enable_dev
};

0
mainboard/emulation/qemu-i386/setup_before_car.c → mainboard/emulation/qemu-x86/setup_before_car.c
View file