From 230319040a4906eecfde7c0ccc5858770227d26e Mon Sep 17 00:00:00 2001 From: niruiyu Date: Mon, 22 Feb 2010 06:03:08 +0000 Subject: [PATCH] Enable BootTimeOut and ConsoleMode (80x25/100x30) setting save/restore in Duet Setup. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10039 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/DuetPkg.dec | 7 ++++-- DuetPkg/DuetPkg.dsc | 5 ++++ DuetPkg/Include/Guid/ConsoleOutConfig.h | 33 +++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 DuetPkg/Include/Guid/ConsoleOutConfig.h diff --git a/DuetPkg/DuetPkg.dec b/DuetPkg/DuetPkg.dec index 40e72b0474..3339ae3bc8 100644 --- a/DuetPkg/DuetPkg.dec +++ b/DuetPkg/DuetPkg.dec @@ -3,7 +3,7 @@ # This Package provides all definitions(including functions, MACROs, structures and library classes) # and libraries instances, which are only used by Duet platform. # -# Copyright (c) 2007 - 2008, Intel Corporation. +# Copyright (c) 2007 - 2010, Intel Corporation. # # All rights reserved. # This program and the accompanying materials are licensed and made available under @@ -31,4 +31,7 @@ gEfiFlashMapHobGuid = { 0xb091e7d2, 0x5a0, 0x4198, {0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59 }} ## Include/Guid/PciOptionRomTable.h - gEfiPciOptionRomTableGuid = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }} + gEfiPciOptionRomTableGuid = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }} + + ## Include/Guid/ConsoleOutConfig.h + gDuetConsoleOutConfigGuid = { 0xED150714, 0xDF30, 0x407D, { 0xB2, 0x4A, 0x4B, 0x74, 0x2F, 0xD5, 0xCE, 0xA2 }} diff --git a/DuetPkg/DuetPkg.dsc b/DuetPkg/DuetPkg.dsc index 9707dee323..d5e29b8a3a 100644 --- a/DuetPkg/DuetPkg.dsc +++ b/DuetPkg/DuetPkg.dsc @@ -87,6 +87,11 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE +[PcdsDynamicHii.common.DEFAULT] + gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10 # Variable: L"Timeout" + gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"ConOutConfig"|gDuetConsoleOutConfigGuid|0x0|80 + gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"ConOutConfig"|gDuetConsoleOutConfigGuid|0x4|25 + ################################################################################################### # # Components Section - list of the modules and components that will be processed by compilation diff --git a/DuetPkg/Include/Guid/ConsoleOutConfig.h b/DuetPkg/Include/Guid/ConsoleOutConfig.h new file mode 100644 index 0000000000..a9e6380804 --- /dev/null +++ b/DuetPkg/Include/Guid/ConsoleOutConfig.h @@ -0,0 +1,33 @@ +/**@file + Setup Variable data structure for Duet platform. + +Copyright (c) 2010 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. + +**/ + +#ifndef __DUET_CONSOLEOUT_CONFIG_H__ +#define __DUET_CONSOLEOUT_CONFIG_H__ + +#define DUET_CONSOLEOUT_CONFIG_GUID \ + { 0xED150714, 0xDF30, 0x407D, { 0xB2, 0x4A, 0x4B, 0x74, 0x2F, 0xD5, 0xCE, 0xA2 } } + +#pragma pack(1) +typedef struct { + // + // Console output mode + // + UINT32 ConOutColumn; + UINT32 ConOutRow; +} DUET_CONSOLEOUT_CONFIG; +#pragma pack() + +extern EFI_GUID gDuetConsoleOutConfigGuid; + +#endif -- 2.39.2