commit e064ab4e90be4b9660fbc66c09b290783114825f
author Gabe Black <gabeblack@chromium.org> Fri Mar 15 21:19:42 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon Mar 18 23:14:18 2013 -0700
tree 1df835e7e6a3a7b7d390337d44f1d31da4b1fc28
parent feb2518166b1cd181e607c611cbb610f0c7300da

Don't include biosincludes.h any more.

It's no longer necessary and adds complexity.

BUG=None
TEST=Built vboot_reference (with FEATURES=test), chromeos-u-boot, depthcharge,
chromeos-factory, chromeos-factoryinstall, chromeos-initramfs, and
chromeos-cryptohome for daisy, lumpy, link, alex, and fox_wtm2 where
applicable. Built vboot_reference for the host.
BRANCH=None

Change-Id: Ic2d70b92b25d57fd9ca1d9ad47d9889f6adc85e7
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/45685
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>

firmware/include/sysincludes.h

diff --git a/firmware/include/sysincludes.h b/firmware/include/sysincludes.h
index 777440e..34aebda 100644
--- a/firmware/include/sysincludes.h
+++ b/firmware/include/sysincludes.h
@@ -15,8 +15,6 @@
 #ifndef VBOOT_REFERENCE_SYSINCLUDES_H_
 #define VBOOT_REFERENCE_SYSINCLUDES_H_
 
-#ifdef CHROMEOS_ENVIRONMENT
-
 #include <inttypes.h>  /* For PRIu64 */
 #include <stddef.h>
 #include <stdint.h>
@@ -35,20 +33,12 @@
 #define INLINE inline
 #endif
 
-#else
-#include "biosincludes.h"
-#endif
-
 #ifndef _MSC_VER
 #define __pragma(...)
 #endif
 
-#if defined (CHROMEOS_ENVIRONMENT) || defined (TARGET_TEST_MODE)
-
 /* 64-bit operations, for platforms where they need to be function calls */
 #define UINT64_RSHIFT(v, shiftby) (((uint64_t)(v)) >> (shiftby))
 #define UINT64_MULT32(v, multby)  (((uint64_t)(v)) * ((uint32_t)(multby)))
 
-#endif
-
 #endif  /* VBOOT_REFERENCE_SYSINCLUDES_H_ */