summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-08-14 20:38:17 +0000
committerStefan Reinauer <stepan@openbios.org>2010-08-14 20:38:17 +0000
commit30584912579d050c6bb3de3d55ca887e6ae094b5 (patch)
tree5f9aa4fc54cf26b33d756dfe2c693155d71dd143 /src/arch
parentb24d07c3605742095d603f703c7adef39dc09aa6 (diff)
downloadcoreboot-30584912579d050c6bb3de3d55ca887e6ae094b5.tar.xz
My forgotten CAR cleanup patch...
- Drop lots of dead code from the various cache_as_ram.inc files. - Use some descriptive macros instead of magic numbers for MTRR MSRs - drop unused duplicate descriptors from romstage GDT - slightly reformatting code and comments Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5696 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/Makefile.inc20
-rw-r--r--src/arch/i386/include/arch/rom_segs.h3
-rw-r--r--src/arch/i386/init/entry.S7
3 files changed, 20 insertions, 10 deletions
diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index 76b4bbffc3..13ecd2f2f0 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -1,3 +1,23 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009-2010 coresystems GmbH
+## Copyright (C) 2009 Ronald G. Minnich
+##
+## 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; version 2 of the License.
+##
+## 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
+##
+
#######################################################################
# Take care of subdirectories
subdirs-y += boot
diff --git a/src/arch/i386/include/arch/rom_segs.h b/src/arch/i386/include/arch/rom_segs.h
index b51a805948..8c00eb3b7a 100644
--- a/src/arch/i386/include/arch/rom_segs.h
+++ b/src/arch/i386/include/arch/rom_segs.h
@@ -4,7 +4,4 @@
#define ROM_CODE_SEG 0x08
#define ROM_DATA_SEG 0x10
-#define CACHE_RAM_CODE_SEG 0x18
-#define CACHE_RAM_DATA_SEG 0x20
-
#endif /* ROM_SEGS_H */
diff --git a/src/arch/i386/init/entry.S b/src/arch/i386/init/entry.S
index f091c84d1f..af29296403 100644
--- a/src/arch/i386/init/entry.S
+++ b/src/arch/i386/init/entry.S
@@ -113,13 +113,6 @@ gdtptr:
.word 0xffff, 0x0000
.byte 0x00, 0x93, 0xcf, 0x00
- /* selgdt 0x18, flat code segment for CAR */
- .word 0xffff, 0x0000
- .byte 0x00, 0x9b, 0xcf, 0x00
-
- /* selgdt 0x20, flat data segment for CAR */
- .word 0xffff, 0x0000
- .byte 0x00, 0x93, 0xcf, 0x00
gdt_end:
/* Reset vector. */