summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Kconfig2
-rw-r--r--src/drivers/Makefile.inc2
-rw-r--r--src/lib/libgcov.c2
-rw-r--r--src/mainboard/amd/inagua/dsdt.asl4
-rw-r--r--src/mainboard/amd/olivehill/dsdt.asl2
-rw-r--r--src/mainboard/amd/persimmon/dsdt.asl2
-rw-r--r--src/mainboard/amd/south_station/dsdt.asl4
-rw-r--r--src/mainboard/amd/union_station/dsdt.asl4
-rw-r--r--src/mainboard/asrock/e350m1/dsdt.asl4
-rw-r--r--src/mainboard/google/snow/memory.c2
-rw-r--r--src/mainboard/lenovo/x60/i915.c2
-rw-r--r--src/mainboard/supermicro/h8qgi/devicetree.cb2
-rw-r--r--src/southbridge/amd/cs5536/smbus.c2
-rw-r--r--util/cbfstool/lzma/C/LzFind.c4
-rw-r--r--util/cbfstool/lzma/C/LzmaDec.c14
-rw-r--r--util/cbfstool/lzma/C/LzmaDec.h4
-rw-r--r--util/cbfstool/lzma/C/LzmaEnc.c40
-rw-r--r--util/i915tool/spatches/fixcalls.cocci12
-rw-r--r--util/i915tool/spatches/fx.cocci2
-rw-r--r--util/i915tool/spatches/intel_display.c.cocci2
20 files changed, 56 insertions, 56 deletions
diff --git a/src/Kconfig b/src/Kconfig
index be2cb249c1..127887ccb6 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -334,7 +334,7 @@ config TIMER_QUEUE
def_bool n
depends on HAVE_MONOTONIC_TIMER
help
- Provide a timer queue for performing time-based callbacks.
+ Provide a timer queue for performing time-based callbacks.
config COOP_MULTITASKING
def_bool n
diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc
index 9a1be720dc..da397d0c8d 100644
--- a/src/drivers/Makefile.inc
+++ b/src/drivers/Makefile.inc
@@ -30,7 +30,7 @@ subdirs-y += sil
subdirs-y += trident
subdirs-y += ics
subdirs-y += spi
-subdirs-y += ti
+subdirs-y += ti
subdirs-y += ipmi
subdirs-y += elog
subdirs-$(CONFIG_ARCH_X86) += pc80
diff --git a/src/lib/libgcov.c b/src/lib/libgcov.c
index f37d0d2cde..dbbd70962a 100644
--- a/src/lib/libgcov.c
+++ b/src/lib/libgcov.c
@@ -334,7 +334,7 @@ gcov_exit (void)
{
crc32 = crc32_unsigned (crc32, gi_ptr->stamp);
crc32 = crc32_unsigned (crc32, gi_ptr->n_functions);
-
+
for (f_ix = 0; (unsigned)f_ix != gi_ptr->n_functions; f_ix++)
{
gfi_ptr = gi_ptr->functions[f_ix];
diff --git a/src/mainboard/amd/inagua/dsdt.asl b/src/mainboard/amd/inagua/dsdt.asl
index f0cfc275fb..f7c7bb2de3 100644
--- a/src/mainboard/amd/inagua/dsdt.asl
+++ b/src/mainboard/amd/inagua/dsdt.asl
@@ -28,13 +28,13 @@ DefinitionBlock (
)
{ /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
-
+
#include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl>
#include "acpi/routing.asl"
-
+
Scope(\_SB) {
/* global utility methods expected within the \_SB scope */
#include <arch/x86/acpi/globutil.asl>
diff --git a/src/mainboard/amd/olivehill/dsdt.asl b/src/mainboard/amd/olivehill/dsdt.asl
index cba800c550..78d9bcacd5 100644
--- a/src/mainboard/amd/olivehill/dsdt.asl
+++ b/src/mainboard/amd/olivehill/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock (
)
{ /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
-
+
/* Globals for the platform */
#include "acpi/mainboard.asl"
diff --git a/src/mainboard/amd/persimmon/dsdt.asl b/src/mainboard/amd/persimmon/dsdt.asl
index 1288929a1b..f7c7bb2de3 100644
--- a/src/mainboard/amd/persimmon/dsdt.asl
+++ b/src/mainboard/amd/persimmon/dsdt.asl
@@ -28,7 +28,7 @@ DefinitionBlock (
)
{ /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
-
+
#include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl>
diff --git a/src/mainboard/amd/south_station/dsdt.asl b/src/mainboard/amd/south_station/dsdt.asl
index f0cfc275fb..f7c7bb2de3 100644
--- a/src/mainboard/amd/south_station/dsdt.asl
+++ b/src/mainboard/amd/south_station/dsdt.asl
@@ -28,13 +28,13 @@ DefinitionBlock (
)
{ /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
-
+
#include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl>
#include "acpi/routing.asl"
-
+
Scope(\_SB) {
/* global utility methods expected within the \_SB scope */
#include <arch/x86/acpi/globutil.asl>
diff --git a/src/mainboard/amd/union_station/dsdt.asl b/src/mainboard/amd/union_station/dsdt.asl
index f0cfc275fb..f7c7bb2de3 100644
--- a/src/mainboard/amd/union_station/dsdt.asl
+++ b/src/mainboard/amd/union_station/dsdt.asl
@@ -28,13 +28,13 @@ DefinitionBlock (
)
{ /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
-
+
#include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl>
#include "acpi/routing.asl"
-
+
Scope(\_SB) {
/* global utility methods expected within the \_SB scope */
#include <arch/x86/acpi/globutil.asl>
diff --git a/src/mainboard/asrock/e350m1/dsdt.asl b/src/mainboard/asrock/e350m1/dsdt.asl
index 0620360edd..626943532a 100644
--- a/src/mainboard/asrock/e350m1/dsdt.asl
+++ b/src/mainboard/asrock/e350m1/dsdt.asl
@@ -28,13 +28,13 @@ DefinitionBlock (
)
{ /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
-
+
#include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl>
#include "acpi/routing.asl"
-
+
Scope(\_SB) {
/* global utility methods expected within the \_SB scope */
#include <arch/x86/acpi/globutil.asl>
diff --git a/src/mainboard/google/snow/memory.c b/src/mainboard/google/snow/memory.c
index af04cbdb77..977dbbc79d 100644
--- a/src/mainboard/google/snow/memory.c
+++ b/src/mainboard/google/snow/memory.c
@@ -509,7 +509,7 @@ struct mem_timings *get_mem_timings(void)
unsigned int frequency_mhz;
enum mem_manuf mem_manuf;
const struct mem_timings *mem;
-
+
config = board_get_config();
switch (config) {
case SNOW_CONFIG_ELPIDA_EVT:
diff --git a/src/mainboard/lenovo/x60/i915.c b/src/mainboard/lenovo/x60/i915.c
index ef266451ae..837c8b490c 100644
--- a/src/mainboard/lenovo/x60/i915.c
+++ b/src/mainboard/lenovo/x60/i915.c
@@ -375,7 +375,7 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
setgtt(0, 800 , physbase, 4096);
- temp = READ32(PGETLB_CTL);
+ temp = READ32(PGETLB_CTL);
printk(BIOS_INFO, "GTT PGETLB_CTL register: 0x%lx\n", temp);
if (temp & 1)
diff --git a/src/mainboard/supermicro/h8qgi/devicetree.cb b/src/mainboard/supermicro/h8qgi/devicetree.cb
index be9e56427e..d99a6ba420 100644
--- a/src/mainboard/supermicro/h8qgi/devicetree.cb
+++ b/src/mainboard/supermicro/h8qgi/devicetree.cb
@@ -111,7 +111,7 @@ chip northbridge/amd/agesa/family15/root_complex
end
end #drivers/i2c/w83795
end # LPC
- device pci 14.4 on
+ device pci 14.4 on
device pci 4.0 on end # onboard VGA
end # PCI 0x4384
device pci 14.5 on end # USB 3
diff --git a/src/southbridge/amd/cs5536/smbus.c b/src/southbridge/amd/cs5536/smbus.c
index 5373824587..bdc089d8e4 100644
--- a/src/southbridge/amd/cs5536/smbus.c
+++ b/src/southbridge/amd/cs5536/smbus.c
@@ -193,4 +193,4 @@ err:
outb(0x0, smbus_io_base + SMB_STS);
return 0xFF;
}
-
+
diff --git a/util/cbfstool/lzma/C/LzFind.c b/util/cbfstool/lzma/C/LzFind.c
index 9103890769..8f204afb13 100644
--- a/util/cbfstool/lzma/C/LzFind.c
+++ b/util/cbfstool/lzma/C/LzFind.c
@@ -512,7 +512,7 @@ static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
delta2 = p->pos - p->hash[hash2Value];
curMatch = p->hash[kFix3HashSize + hashValue];
-
+
p->hash[hash2Value] =
p->hash[kFix3HashSize + hashValue] = p->pos;
@@ -546,7 +546,7 @@ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
delta2 = p->pos - p->hash[ hash2Value];
delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
curMatch = p->hash[kFix4HashSize + hashValue];
-
+
p->hash[ hash2Value] =
p->hash[kFix3HashSize + hash3Value] =
p->hash[kFix4HashSize + hashValue] = p->pos;
diff --git a/util/cbfstool/lzma/C/LzmaDec.c b/util/cbfstool/lzma/C/LzmaDec.c
index 7efb60a43b..fd88cec818 100644
--- a/util/cbfstool/lzma/C/LzmaDec.c
+++ b/util/cbfstool/lzma/C/LzmaDec.c
@@ -141,7 +141,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit_parm, const
Byte *dic = p->dic;
SizeT dicBufSize = p->dicBufSize;
SizeT dicPos = p->dicPos;
-
+
UInt32 processedPos = p->processedPos;
UInt32 checkDicSize = p->checkDicSize;
unsigned len = 0;
@@ -324,7 +324,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit_parm, const
{
NORMALIZE
range >>= 1;
-
+
{
UInt32 t;
code -= range;
@@ -722,7 +722,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
SizeT inSize = *srcLen;
(*srcLen) = 0;
LzmaDec_WriteRem(p, dicLimit);
-
+
*status = LZMA_STATUS_NOT_SPECIFIED;
while (p->remainLen != kMatchSpecLenStart)
@@ -768,7 +768,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
if (p->needInitState)
LzmaDec_InitStateReal(p);
-
+
if (p->tempBufSize == 0)
{
SizeT processed;
@@ -899,12 +899,12 @@ SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
{
UInt32 dicSize;
Byte d;
-
+
if (size < LZMA_PROPS_SIZE)
return SZ_ERROR_UNSUPPORTED;
else
dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
-
+
if (dicSize < LZMA_DIC_MIN)
dicSize = LZMA_DIC_MIN;
p->dicSize = dicSize;
@@ -986,7 +986,7 @@ SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
p.dicBufSize = outSize;
LzmaDec_Init(&p);
-
+
*srcLen = inSize;
res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
diff --git a/util/cbfstool/lzma/C/LzmaDec.h b/util/cbfstool/lzma/C/LzmaDec.h
index bf7f084ba3..7927acd0d4 100644
--- a/util/cbfstool/lzma/C/LzmaDec.h
+++ b/util/cbfstool/lzma/C/LzmaDec.h
@@ -130,7 +130,7 @@ LzmaDec_Allocate* can return:
SZ_ERROR_MEM - Memory allocation error
SZ_ERROR_UNSUPPORTED - Unsupported properties
*/
-
+
SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
@@ -159,7 +159,7 @@ void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
*/
/* LzmaDec_DecodeToDic
-
+
The decoding to internal dictionary buffer (CLzmaDec::dic).
You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
diff --git a/util/cbfstool/lzma/C/LzmaEnc.c b/util/cbfstool/lzma/C/LzmaEnc.c
index aca097dae0..a9a6813961 100644
--- a/util/cbfstool/lzma/C/LzmaEnc.c
+++ b/util/cbfstool/lzma/C/LzmaEnc.c
@@ -109,7 +109,7 @@ static void LzmaEnc_FastPosInit(Byte *g_FastPos)
int c = 2, slotFast;
g_FastPos[0] = 0;
g_FastPos[1] = 1;
-
+
for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
{
UInt32 k = (1 << ((slotFast >> 1) - 1));
@@ -246,7 +246,7 @@ typedef struct
CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-
+
CLenPriceEnc lenEnc;
CLenPriceEnc repLenEnc;
@@ -269,7 +269,7 @@ typedef struct
#ifndef _7ZIP_ST
Byte pad[128];
#endif
-
+
UInt32 optimumEndIndex;
UInt32 optimumCurrentIndex;
@@ -277,7 +277,7 @@ typedef struct
UInt32 numPairs;
UInt32 numAvail;
COptimal opt[kNumOpts];
-
+
#ifndef LZMA_LOG_BSR
Byte g_FastPos[1 << kNumLogBits];
#endif
@@ -311,14 +311,14 @@ typedef struct
CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-
+
CLenPriceEnc lenEnc;
CLenPriceEnc repLenEnc;
unsigned lclp;
Bool fastMode;
-
+
CRangeEnc rc;
Bool writeEndMark;
@@ -909,10 +909,10 @@ static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
{
UInt32 posPrev = posMem;
UInt32 backCur = backMem;
-
+
backMem = p->opt[posPrev].backPrev;
posMem = p->opt[posPrev].posPrev;
-
+
p->opt[posPrev].backPrev = backCur;
p->opt[posPrev].posPrev = cur;
cur = posPrev;
@@ -943,7 +943,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
return lenRes;
}
p->optimumCurrentIndex = p->optimumEndIndex = 0;
-
+
if (p->additionalOffset == 0)
mainLen = ReadMatchDistances(p, &numPairs);
else
@@ -1241,7 +1241,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
-
+
if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
{
UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
@@ -1303,7 +1303,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
}
}
}
-
+
startLen = 2; /* speed optimization */
{
UInt32 repIndex;
@@ -1334,10 +1334,10 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
}
while (--lenTest >= 2);
lenTest = lenTestTemp;
-
+
if (repIndex == 0)
startLen = lenTest + 1;
-
+
/* if (_maxMode) */
{
UInt32 lenTest2 = lenTest + 1;
@@ -1361,7 +1361,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
nextRepMatchPrice = curAndLenCharPrice +
GET_PRICE_1(p->isMatch[state2][posStateNext]) +
GET_PRICE_1(p->isRep[state2]);
-
+
/* for (; lenTest2 >= 2; lenTest2--) */
{
UInt32 curAndLenPrice;
@@ -1416,7 +1416,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
else
curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
-
+
opt = &p->opt[cur + lenTest];
if (curAndLenPrice < opt->price)
{
@@ -1450,7 +1450,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
nextRepMatchPrice = curAndLenCharPrice +
GET_PRICE_1(p->isMatch[state2][posStateNext]) +
GET_PRICE_1(p->isRep[state2]);
-
+
/* for (; lenTest2 >= 2; lenTest2--) */
{
UInt32 offset = cur + lenTest + 1 + lenTest2;
@@ -1562,7 +1562,7 @@ static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
MovePos(p, repLen - 1);
return repLen;
}
-
+
if (mainLen < 2 || numAvail <= 2)
return 1;
@@ -1576,7 +1576,7 @@ static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
(p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
return 1;
}
-
+
data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
for (i = 0; i < LZMA_NUM_REPS; i++)
{
@@ -1837,7 +1837,7 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
pos -= LZMA_NUM_REPS;
GetPosSlot(pos, posSlot);
RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
-
+
if (posSlot >= kStartPosModelIndex)
{
UInt32 footerBits = ((posSlot >> 1) - 1);
@@ -2144,7 +2144,7 @@ static size_t MyWrite(void *pp, const void *data, size_t size)
p->rc.outStream = &outStream.funcTable;
res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
-
+
*unpackSize = (UInt32)(p->nowPos64 - nowPos64);
*destLen -= outStream.rem;
if (outStream.overflow)
diff --git a/util/i915tool/spatches/fixcalls.cocci b/util/i915tool/spatches/fixcalls.cocci
index 50e6458fd3..11cbe4a6ff 100644
--- a/util/i915tool/spatches/fixcalls.cocci
+++ b/util/i915tool/spatches/fixcalls.cocci
@@ -46,7 +46,7 @@ type T;
@@
T f(...){<...
-DRM_DEBUG_KMS(
-+fprintf(stderr,
++fprintf(stderr,
...);
...>}
@@
@@ -55,7 +55,7 @@ type T;
@@
T f(...){<...
-DRM_ERROR(
-+fprintf(stderr,
++fprintf(stderr,
...);
...>}
@@
@@ -64,7 +64,7 @@ type T;
@@
T f(...){<...
-DRM_DEBUG(
-+fprintf(stderr,
++fprintf(stderr,
...);
...>}
@@
@@ -73,7 +73,7 @@ type T;
@@
T f(...){<...
-DRM_DEBUG_DRIVER(
-+fprintf(stderr,
++fprintf(stderr,
...);
...>}
@@
@@ -104,7 +104,7 @@ expression E1, E2;
@@
identifier d;
@@
--static
+-static
const struct pci_device_id d[] = {...};
@@
expression E1;
@@ -113,7 +113,7 @@ expression E1;
+if (
E1
-,
-+) fprintf(stderr,
++) fprintf(stderr,
...);
@@
expression E1;
diff --git a/util/i915tool/spatches/fx.cocci b/util/i915tool/spatches/fx.cocci
index e47ddcab69..576cfcc388 100644
--- a/util/i915tool/spatches/fx.cocci
+++ b/util/i915tool/spatches/fx.cocci
@@ -4,7 +4,7 @@ type T;
@@
T f(...){...
-\(DRM_DEBUG_KMS|DRM_ERRRO\)(
-+fprintf(stderr,
++fprintf(stderr,
...);
...}
diff --git a/util/i915tool/spatches/intel_display.c.cocci b/util/i915tool/spatches/intel_display.c.cocci
index d7d87d3a9f..6e16bbd906 100644
--- a/util/i915tool/spatches/intel_display.c.cocci
+++ b/util/i915tool/spatches/intel_display.c.cocci
@@ -6,7 +6,7 @@ identifier d;
@@
- intel_limit_t d = {...};
@@
-@@
+@@
- intel_connector_attach_encoder(...){...}
@@
@@