AGESA boards: Clean up definition of BIOS_SIZE in platform_cfg

Clean up vendor code from hard coded #define if-def chain with a
pre-processor shift and subtract.

Change-Id: Ibce34ab576d7db8586a6ec8f9b2460268e0e1878
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/4811
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Edward O'Callaghan 2014-01-26 11:45:30 +11:00 committed by Alexandru Gagniuc
parent 9ad52fe56e
commit 5760e197b3
12 changed files with 66 additions and 252 deletions

View File

@ -22,29 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #ifndef BIOS_SIZE
#define BIOS_SIZE BIOS_SIZE_1M #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1 #endif /* BIOS_SIZE */
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM

View File

@ -22,31 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#ifndef BIOS_SIZE #ifndef BIOS_SIZE
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE BIOS_SIZE_1M #endif /* BIOS_SIZE */
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM

View File

@ -22,31 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#ifndef BIOS_SIZE #ifndef BIOS_SIZE
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE BIOS_SIZE_1M #endif /* BIOS_SIZE */
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM
@ -270,4 +254,4 @@ static const CODECTBLLIST codec_tablelist[] =
*/ */
#define FADT_PM_PROFILE 1 #define FADT_PM_PROFILE 1
#endif #endif /* _PLATFORM_CFG_H_ */

View File

@ -22,31 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#ifndef BIOS_SIZE #ifndef BIOS_SIZE
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE BIOS_SIZE_1M #endif /* BIOS_SIZE */
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM

View File

@ -25,29 +25,15 @@
/** /**
* @section BIOSSize BIOSSize * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @li <b>0</b> - 1M *
* @li <b>1</b> - 2M * In Hudson-2, default ROM size is 1M Bytes, if your platform ROM
* @li <b>3</b> - 4M * bigger than 1M you have to set the ROM size outside CIMx module and
* @li <b>7</b> - 8M * before AGESA module get call.
* In Hudson-2, default ROM size is 1M Bytes, if your platform
* ROM bigger then 1M you have to set the ROM size outside CIMx
* module and before AGESA module get call.
*/ */
#define BIOS_SIZE_1M 0 #ifndef BIOS_SIZE
#define BIOS_SIZE_2M 1 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE_4M 3 #endif /* BIOS_SIZE */
#define BIOS_SIZE_8M 7
#if CONFIG_COREBOOT_ROMSIZE_KB_1024
#define BIOS_SIZE BIOS_SIZE_1M
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
/** /**
* @section SBCIMx_LEGACY_FREE SBCIMx_LEGACY_FREE * @section SBCIMx_LEGACY_FREE SBCIMx_LEGACY_FREE

View File

@ -22,31 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#ifndef BIOS_SIZE #ifndef BIOS_SIZE
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE BIOS_SIZE_1M #endif /* BIOS_SIZE */
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM

View File

@ -22,31 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#ifndef BIOS_SIZE #ifndef BIOS_SIZE
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE BIOS_SIZE_1M #endif /* BIOS_SIZE */
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM

View File

@ -22,29 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #ifndef BIOS_SIZE
#define BIOS_SIZE BIOS_SIZE_1M #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1 #endif /* BIOS_SIZE */
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM

View File

@ -22,31 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#ifndef BIOS_SIZE #ifndef BIOS_SIZE
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE BIOS_SIZE_1M #endif /* BIOS_SIZE */
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM

View File

@ -26,31 +26,15 @@
#define LEGACY_FREE 1 #define LEGACY_FREE 1
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#ifndef BIOS_SIZE #ifndef BIOS_SIZE
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE BIOS_SIZE_1M #endif /* BIOS_SIZE */
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM

View File

@ -22,31 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#ifndef BIOS_SIZE #ifndef BIOS_SIZE
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE BIOS_SIZE_1M #endif /* BIOS_SIZE */
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM

View File

@ -22,31 +22,15 @@
#define _PLATFORM_CFG_H_ #define _PLATFORM_CFG_H_
/** /**
* @def BIOS_SIZE_1M * @def BIOS_SIZE -> BIOS_SIZE_{1,2,4,8,16}M
* @def BIOS_SIZE_2M *
* @def BIOS_SIZE_4M * In SB800, default ROM size is 1M Bytes, if your platform ROM
* @def BIOS_SIZE_8M
*/
#define BIOS_SIZE_1M 0
#define BIOS_SIZE_2M 1
#define BIOS_SIZE_4M 3
#define BIOS_SIZE_8M 7
/* In SB800, default ROM size is 1M Bytes, if your platform ROM
* bigger than 1M you have to set the ROM size outside CIMx module and * bigger than 1M you have to set the ROM size outside CIMx module and
* before AGESA module get call. * before AGESA module get call.
*/ */
#ifndef BIOS_SIZE #ifndef BIOS_SIZE
#if CONFIG_COREBOOT_ROMSIZE_KB_1024 #define BIOS_SIZE ((CONFIG_COREBOOT_ROMSIZE_KB >> 10) - 1)
#define BIOS_SIZE BIOS_SIZE_1M #endif /* BIOS_SIZE */
#elif CONFIG_COREBOOT_ROMSIZE_KB_2048 == 1
#define BIOS_SIZE BIOS_SIZE_2M
#elif CONFIG_COREBOOT_ROMSIZE_KB_4096 == 1
#define BIOS_SIZE BIOS_SIZE_4M
#elif CONFIG_COREBOOT_ROMSIZE_KB_8192 == 1
#define BIOS_SIZE BIOS_SIZE_8M
#endif
#endif
/** /**
* @def SPREAD_SPECTRUM * @def SPREAD_SPECTRUM