compiler.h: add __weak macro

Instead of writing out '__attribute__((weak))' use a shorter form.

Change-Id: If418a1d55052780077febd2d8f2089021f414b91
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/25767
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
This commit is contained in:
Aaron Durbin 2018-04-21 14:45:32 -06:00
commit 6403167d29
137 changed files with 408 additions and 277 deletions

View file

@ -14,6 +14,7 @@
*/
#include <arch/early_variables.h>
#include <compiler.h>
#include <console/console.h>
#include <fsp/car.h>
#include <fsp/util.h>
@ -100,18 +101,18 @@ asmlinkage void after_cache_as_ram(void *chipset_context)
after_cache_as_ram_stage();
}
void __attribute__((weak)) car_mainboard_pre_console_init(void)
void __weak car_mainboard_pre_console_init(void)
{
}
void __attribute__((weak)) car_soc_pre_console_init(void)
void __weak car_soc_pre_console_init(void)
{
}
void __attribute__((weak)) car_mainboard_post_console_init(void)
void __weak car_mainboard_post_console_init(void)
{
}
void __attribute__((weak)) car_soc_post_console_init(void)
void __weak car_soc_post_console_init(void)
{
}

View file

@ -15,6 +15,7 @@
#include <arch/acpi.h>
#include <cbmem.h>
#include <compiler.h>
#include <console/console.h>
#include <fsp/memmap.h>
#include <fsp/romstage.h>
@ -296,7 +297,7 @@ void raminit(struct romstage_params *params)
}
/* Initialize the UPD parameters for MemoryInit */
__attribute__((weak)) void mainboard_memory_init_params(
__weak void mainboard_memory_init_params(
struct romstage_params *params,
MEMORY_INIT_UPD *upd_ptr)
{
@ -304,7 +305,7 @@ __attribute__((weak)) void mainboard_memory_init_params(
}
/* Display the UPD parameters for MemoryInit */
__attribute__((weak)) void soc_display_memory_init_params(
__weak void soc_display_memory_init_params(
const MEMORY_INIT_UPD *old, MEMORY_INIT_UPD *new)
{
printk(BIOS_SPEW, "UPD values for MemoryInit:\n");
@ -312,7 +313,7 @@ __attribute__((weak)) void soc_display_memory_init_params(
}
/* Initialize the UPD parameters for MemoryInit */
__attribute__((weak)) void soc_memory_init_params(
__weak void soc_memory_init_params(
struct romstage_params *params,
MEMORY_INIT_UPD *upd)
{

View file

@ -18,6 +18,7 @@
#include <arch/acpi.h>
#include <cbmem.h>
#include <cbfs.h>
#include <compiler.h>
#include <console/console.h>
#include <fsp/memmap.h>
#include <fsp/ramstage.h>
@ -28,7 +29,7 @@
#include <timestamp.h>
/* SOC initialization after FSP silicon init */
__attribute__((weak)) void soc_after_silicon_init(void)
__weak void soc_after_silicon_init(void)
{
}
@ -215,13 +216,13 @@ void intel_silicon_init(void)
}
/* Initialize the UPD parameters for SiliconInit */
__attribute__((weak)) void mainboard_silicon_init_params(
__weak void mainboard_silicon_init_params(
SILICON_INIT_UPD *params)
{
};
/* Display the UPD parameters for SiliconInit */
__attribute__((weak)) void soc_display_silicon_init_params(
__weak void soc_display_silicon_init_params(
const SILICON_INIT_UPD *old, SILICON_INIT_UPD *new)
{
printk(BIOS_SPEW, "UPD values for SiliconInit:\n");
@ -229,6 +230,6 @@ __attribute__((weak)) void soc_display_silicon_init_params(
}
/* Initialize the UPD parameters for SiliconInit */
__attribute__((weak)) void soc_silicon_init_params(SILICON_INIT_UPD *params)
__weak void soc_silicon_init_params(SILICON_INIT_UPD *params)
{
}

View file

@ -20,6 +20,7 @@
#include <arch/cbfs.h>
#include <arch/early_variables.h>
#include <assert.h>
#include <compiler.h>
#include <console/console.h>
#include <cbmem.h>
#include <cpu/intel/microcode.h>
@ -185,13 +186,13 @@ void after_cache_as_ram_stage(void)
}
/* Initialize the power state */
__attribute__((weak)) struct chipset_power_state *fill_power_state(void)
__weak struct chipset_power_state *fill_power_state(void)
{
return NULL;
}
/* Board initialization before and after RAM is enabled */
__attribute__((weak)) void mainboard_romstage_entry(
__weak void mainboard_romstage_entry(
struct romstage_params *params)
{
post_code(0x31);
@ -201,7 +202,7 @@ __attribute__((weak)) void mainboard_romstage_entry(
}
/* Save the DIMM information for SMBIOS table 17 */
__attribute__((weak)) void mainboard_save_dimm_info(
__weak void mainboard_save_dimm_info(
struct romstage_params *params)
{
int channel;
@ -330,7 +331,7 @@ __attribute__((weak)) void mainboard_save_dimm_info(
}
/* Add any mainboard specific information */
__attribute__((weak)) void mainboard_add_dimm_info(
__weak void mainboard_add_dimm_info(
struct romstage_params *params,
struct memory_info *mem_info,
int channel, int dimm, int index)
@ -338,44 +339,44 @@ __attribute__((weak)) void mainboard_add_dimm_info(
}
/* Get the memory configuration data */
__attribute__((weak)) int mrc_cache_get_current(int type, uint32_t version,
__weak int mrc_cache_get_current(int type, uint32_t version,
struct region_device *rdev)
{
return -1;
}
/* Save the memory configuration data */
__attribute__((weak)) int mrc_cache_stash_data(int type, uint32_t version,
__weak int mrc_cache_stash_data(int type, uint32_t version,
const void *data, size_t size)
{
return -1;
}
/* Transition RAM from off or self-refresh to active */
__attribute__((weak)) void raminit(struct romstage_params *params)
__weak void raminit(struct romstage_params *params)
{
post_code(0x34);
die("ERROR - No RAM initialization specified!\n");
}
/* Display the memory configuration */
__attribute__((weak)) void report_memory_config(void)
__weak void report_memory_config(void)
{
}
/* Choose top of stack and setup MTRRs */
__attribute__((weak)) void *setup_stack_and_mtrrs(void)
__weak void *setup_stack_and_mtrrs(void)
{
die("ERROR - Must specify top of stack!\n");
return NULL;
}
/* SOC initialization after RAM is enabled */
__attribute__((weak)) void soc_after_ram_init(struct romstage_params *params)
__weak void soc_after_ram_init(struct romstage_params *params)
{
}
/* SOC initialization before RAM is enabled */
__attribute__((weak)) void soc_pre_ram_init(struct romstage_params *params)
__weak void soc_pre_ram_init(struct romstage_params *params)
{
}

View file

@ -124,7 +124,7 @@ int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
return 0;
}
__attribute__((weak)) uintptr_t fsp_soc_get_igd_bar(void)
__weak uintptr_t fsp_soc_get_igd_bar(void)
{
return 0;
}

View file

@ -157,7 +157,7 @@ const char *fsp_get_guid_name(const uint8_t *guid)
return "Unknown GUID";
}
__attribute__((weak)) const char *soc_get_hob_type_name(
__weak const char *soc_get_hob_type_name(
const struct hob_header *hob)
{
return NULL;
@ -173,7 +173,7 @@ void fsp_print_guid_extension_hob(const struct hob_header *hob)
printk(BIOS_SPEW, ": %s\n", fsp_get_guid_name(res->owner_guid));
}
__attribute__((weak)) const char *soc_get_guid_name(const uint8_t *guid)
__weak const char *soc_get_guid_name(const uint8_t *guid)
{
return NULL;
}
@ -212,6 +212,6 @@ void fsp_display_hobs(void)
}
}
__attribute__((weak)) void soc_display_hob(const struct hob_header *hob)
__weak void soc_display_hob(const struct hob_header *hob)
{
}

View file

@ -307,13 +307,13 @@ static enum cb_err fsp_fill_common_arch_params(FSPM_ARCH_UPD *arch_upd,
return CB_SUCCESS;
}
__attribute__((weak))
__weak
uint8_t fsp_memory_mainboard_version(void)
{
return 0;
}
__attribute__((weak))
__weak
uint8_t fsp_memory_soc_version(void)
{
return 0;

View file

@ -12,6 +12,7 @@
#include <arch/cpu.h>
#include <bootstate.h>
#include <compiler.h>
#include <console/console.h>
#include <fsp/util.h>
#include <soc/intel/common/util.h>
@ -87,7 +88,7 @@ BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_EXIT, fsp_notify_dummy,
BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, fsp_notify_dummy,
(void *) READY_TO_BOOT);
__attribute__((weak)) void platform_fsp_notify_status(
__weak void platform_fsp_notify_status(
enum fsp_notify_phase phase)
{
}

View file

@ -10,6 +10,7 @@
*/
#include <arch/cpu.h>
#include <compiler.h>
#include <console/console.h>
#include <fsp/util.h>
#include <lib.h>
@ -50,7 +51,7 @@ static void fspm_display_arch_params(const FSPM_ARCH_UPD *old,
}
/* Display the UPD parameters for MemoryInit */
__attribute__((weak)) void soc_display_fspm_upd_params(
__weak void soc_display_fspm_upd_params(
const FSPM_UPD *fspm_old_upd,
const FSPM_UPD *fspm_new_upd)
{
@ -67,7 +68,7 @@ void fspm_display_upd_values(const FSPM_UPD *old,
}
/* Display the UPD parameters for SiliconInit */
__attribute__((weak)) void soc_display_fsps_upd_params(
__weak void soc_display_fsps_upd_params(
const FSPS_UPD *fsps_old_upd,
const FSPS_UPD *fsps_new_upd)
{

View file

@ -64,7 +64,7 @@ static int smbios_write_wifi(struct device *dev, int *handle,
}
#endif
__attribute__((weak))
__weak
int get_wifi_sar_limits(struct wifi_sar_limits *sar_limits)
{
return -1;