diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2016-04-19 15:17:50 +0300 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2016-04-21 07:39:13 +0200 |
| commit | defbdcf3e58a7148ecd3c448e4d1e6683d54bd22 (patch) | |
| tree | 6b3f4c44594420b5e88e58045ab810836a3770e0 /src | |
| parent | e0383d2ce8b92b9efaa1e10f7234a7bb607a8a23 (diff) | |
| download | coreboot-defbdcf3e58a7148ecd3c448e4d1e6683d54bd22.tar.xz | |
AGESA vendorcode: Fix type mismatch
Fix is required to compile AGESA ramstage without raminit.
Change-Id: I783883fa7a12e8a647aa432535bb990a47257e9b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/14416
Tested-by: build bot (Jenkins)
Reviewed-by: Kerry Sheh <shekairui@gmail.com>
Diffstat (limited to 'src')
6 files changed, 28 insertions, 28 deletions
diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f10/Include/OptionMemoryInstall.h index 3516fcb8a8..23422a576a 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionMemoryInstall.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionMemoryInstall.h @@ -2563,7 +2563,7 @@ BOOLEAN MemFS3DefConstructorRet ( *--------------------------------------------------------------------------------------------------- */ MEM_FEAT_BLOCK_MAIN MemFeatMain = { - NULL + 0 }; /*--------------------------------------------------------------------------------------------------- @@ -2604,12 +2604,12 @@ BOOLEAN MemFS3DefConstructorRet ( */ #if OPTION_DDR2 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR2 = { - NULL + 0 }; #endif #if OPTION_DDR3 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR3 = { - NULL + 0 }; #endif /*--------------------------------------------------------------------------------------------------- diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f12/Include/OptionMemoryInstall.h index cfb55cc7a5..4fd5354d05 100644 --- a/src/vendorcode/amd/agesa/f12/Include/OptionMemoryInstall.h +++ b/src/vendorcode/amd/agesa/f12/Include/OptionMemoryInstall.h @@ -4033,7 +4033,7 @@ BOOLEAN MemFS3DefConstructorRet ( *--------------------------------------------------------------------------------------------------- */ MEM_FEAT_BLOCK_MAIN MemFeatMain = { - NULL + 0 }; /*--------------------------------------------------------------------------------------------------- @@ -4086,18 +4086,18 @@ BOOLEAN MemFS3DefConstructorRet ( */ #if OPTION_DDR2 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR2 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR2[] = { - NULL + 0 }; #endif #if OPTION_DDR3 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR3 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR3[] = { - NULL + 0 }; #endif /*--------------------------------------------------------------------------------------------------- diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f14/Include/OptionMemoryInstall.h index 97b2d41cb6..f97caa9bb2 100644 --- a/src/vendorcode/amd/agesa/f14/Include/OptionMemoryInstall.h +++ b/src/vendorcode/amd/agesa/f14/Include/OptionMemoryInstall.h @@ -3865,7 +3865,7 @@ BOOLEAN MemFS3DefConstructorRet ( *--------------------------------------------------------------------------------------------------- */ MEM_FEAT_BLOCK_MAIN MemFeatMain = { - NULL + 0 }; /*--------------------------------------------------------------------------------------------------- @@ -3918,18 +3918,18 @@ BOOLEAN MemFS3DefConstructorRet ( */ #if OPTION_DDR2 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR2 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR2[] = { - NULL + 0 }; #endif #if OPTION_DDR3 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR3 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR3[] = { - NULL + 0 }; #endif /*--------------------------------------------------------------------------------------------------- diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f15/Include/OptionMemoryInstall.h index 24c1ae8926..a4d834699e 100644 --- a/src/vendorcode/amd/agesa/f15/Include/OptionMemoryInstall.h +++ b/src/vendorcode/amd/agesa/f15/Include/OptionMemoryInstall.h @@ -3629,7 +3629,7 @@ BOOLEAN MemFS3DefConstructorRet ( *--------------------------------------------------------------------------------------------------- */ MEM_FEAT_BLOCK_MAIN MemFeatMain = { - NULL + 0 }; /*--------------------------------------------------------------------------------------------------- @@ -3674,18 +3674,18 @@ BOOLEAN MemFS3DefConstructorRet ( */ #if OPTION_DDR2 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR2 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR2[] = { - NULL + 0 }; #endif #if OPTION_DDR3 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR3 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR3[] = { - NULL + 0 }; #endif /*--------------------------------------------------------------------------------------------------- diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryInstall.h index 873ed8b2f7..e1c47ee485 100644 --- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryInstall.h +++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryInstall.h @@ -4687,7 +4687,7 @@ BOOLEAN MemFS3DefConstructorRet ( *--------------------------------------------------------------------------------------------------- */ MEM_FEAT_BLOCK_MAIN MemFeatMain = { - NULL + 0 }; /*--------------------------------------------------------------------------------------------------- @@ -4744,18 +4744,18 @@ BOOLEAN MemFS3DefConstructorRet ( */ #if OPTION_DDR2 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR2 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR2[] = { - NULL + 0 }; #endif #if OPTION_DDR3 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR3 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR3[] = { - NULL + 0 }; #endif /*--------------------------------------------------------------------------------------------------- diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionMemoryInstall.h index 1aaa027303..647c3709f1 100644 --- a/src/vendorcode/amd/agesa/f16kb/Include/OptionMemoryInstall.h +++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionMemoryInstall.h @@ -1556,7 +1556,7 @@ BOOLEAN MemFS3DefConstructorRet ( *--------------------------------------------------------------------------------------------------- */ MEM_FEAT_BLOCK_MAIN MemFeatMain = { - NULL + 0 }; /*--------------------------------------------------------------------------------------------------- @@ -1581,18 +1581,18 @@ BOOLEAN MemFS3DefConstructorRet ( */ #if OPTION_DDR2 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR2 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR2[] = { - NULL + 0 }; #endif #if OPTION_DDR3 MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR3 = { - NULL + 0 }; MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR3[] = { - NULL + 0 }; #endif /*--------------------------------------------------------------------------------------------------- |