X86: Move the smbios objects into a folder for BIOS objects.
This commit is contained in:
parent
57d663877e
commit
d897aa939f
|
@ -110,13 +110,10 @@ if env['TARGET_ISA'] == 'x86':
|
|||
|
||||
if env['FULL_SYSTEM']:
|
||||
SimObject('X86System.py')
|
||||
SimObject('bios/E820.py')
|
||||
|
||||
# Full-system sources
|
||||
Source('bios/e820.cc')
|
||||
Source('linux/system.cc')
|
||||
Source('pagetable_walker.cc')
|
||||
Source('smbios.cc')
|
||||
Source('system.cc')
|
||||
Source('stacktrace.cc')
|
||||
Source('vtophys.cc')
|
||||
|
|
65
src/arch/x86/bios/SConscript
Normal file
65
src/arch/x86/bios/SConscript
Normal file
|
@ -0,0 +1,65 @@
|
|||
# -*- mode:python -*-
|
||||
|
||||
# Copyright (c) 2007-2008 The Hewlett-Packard Development Company
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this software in source and binary forms,
|
||||
# with or without modification, are permitted provided that the
|
||||
# following conditions are met:
|
||||
#
|
||||
# The software must be used only for Non-Commercial Use which means any
|
||||
# use which is NOT directed to receiving any direct monetary
|
||||
# compensation for, or commercial advantage from such use. Illustrative
|
||||
# examples of non-commercial use are academic research, personal study,
|
||||
# teaching, education and corporate research & development.
|
||||
# Illustrative examples of commercial use are distributing products for
|
||||
# commercial advantage and providing services using the software for
|
||||
# commercial advantage.
|
||||
#
|
||||
# If you wish to use this software or functionality therein that may be
|
||||
# covered by patents for commercial use, please contact:
|
||||
# Director of Intellectual Property Licensing
|
||||
# Office of Strategy and Technology
|
||||
# Hewlett-Packard Company
|
||||
# 1501 Page Mill Road
|
||||
# Palo Alto, California 94304
|
||||
#
|
||||
# Redistributions of source code must retain the above copyright notice,
|
||||
# this list of conditions and the following disclaimer. Redistributions
|
||||
# in binary form must reproduce the above copyright notice, this list of
|
||||
# conditions and the following disclaimer in the documentation and/or
|
||||
# other materials provided with the distribution. Neither the name of
|
||||
# the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission. No right of
|
||||
# sublicense is granted herewith. Derivatives of the software and
|
||||
# output created using the software may be prepared, but only for
|
||||
# Non-Commercial Uses. Derivatives of the software may be shared with
|
||||
# others provided: (i) the others agree to abide by the list of
|
||||
# conditions herein which includes the Non-Commercial Use restrictions;
|
||||
# and (ii) such Derivatives of the software include the above copyright
|
||||
# notice to acknowledge the contribution from this software where
|
||||
# applicable, this list of conditions and the disclaimer below.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
# Authors: Gabe Black
|
||||
|
||||
Import('*')
|
||||
|
||||
if env['TARGET_ISA'] == 'x86':
|
||||
if env['FULL_SYSTEM']:
|
||||
SimObject('E820.py')
|
||||
Source('e820.cc')
|
||||
|
||||
Source('smbios.cc')
|
|
@ -85,7 +85,7 @@
|
|||
* Authors: Gabe Black
|
||||
*/
|
||||
|
||||
#include "arch/x86/smbios.hh"
|
||||
#include "arch/x86/bios/smbios.hh"
|
||||
#include "arch/x86/isa_traits.hh"
|
||||
#include "mem/port.hh"
|
||||
#include "sim/byteswap.hh"
|
|
@ -85,8 +85,8 @@
|
|||
* Authors: Gabe Black
|
||||
*/
|
||||
|
||||
#ifndef __ARCH_X86_SMBIOS_HH__
|
||||
#define __ARCH_X86_SMBIOS_HH__
|
||||
#ifndef __ARCH_X86_BIOS_SMBIOS_HH__
|
||||
#define __ARCH_X86_BIOS_SMBIOS_HH__
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
|
@ -55,9 +55,9 @@
|
|||
* Authors: Gabe Black
|
||||
*/
|
||||
|
||||
#include "arch/x86/bios/smbios.hh"
|
||||
#include "arch/x86/miscregs.hh"
|
||||
#include "arch/x86/system.hh"
|
||||
#include "arch/x86/smbios.hh"
|
||||
#include "arch/vtophys.hh"
|
||||
#include "base/remote_gdb.hh"
|
||||
#include "base/loader/object_file.hh"
|
||||
|
|
Loading…
Reference in a new issue