erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bootstate: remove need for #ifdef ENV_RAMSTAGE

Browse source 
The BOOT_STATE_INIT_ENTRY macro can only be used in ramstage, however
the current state of the header meant bad build errors in non-ramstage.
Therefore, people had to #ifdef in the source. Remove that requirement.

Change-Id: I8755fc68bbaca6b72fbe8b4db4bcc1ccb35622bd
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11492
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Aaron Durbin 2015-09-02 17:34:04 -05:00
commit 4d3de7e328
9 changed files with 12 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/soc/intel/baytrail/spi.c
View file

@ -316,14 +316,12 @@ void spi_init(void)
ich_set_bbar(0);
}
#ifndef __SMM__
static void spi_init_cb(void *unused)
{
spi_init();
}
BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, spi_init_cb, NULL);
#endif
int spi_claim_bus(struct spi_slave *slave)
{

4
src/soc/intel/braswell/spi.c
View file

@ -295,8 +295,6 @@ void spi_init(void)
cntlr.preop = &ich9_spi->preop;
}
#if ENV_RAMSTAGE
static void spi_init_cb(void *unused)
{
spi_init();
@ -304,8 +302,6 @@ static void spi_init_cb(void *unused)
BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, spi_init_cb, NULL);
#endif /* ENV_RAMSTAGE */
int spi_claim_bus(struct spi_slave *slave)
{
/* Handled by ICH automatically. */

2
src/soc/intel/broadwell/spi.c
View file

@ -312,14 +312,12 @@ void spi_init(void)
pci_write_config_byte(dev, 0xdc, bios_cntl | 0x1);
}
#if ENV_RAMSTAGE
static void spi_init_cb(void *unused)
{
spi_init();
}
BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, spi_init_cb, NULL);
#endif
int spi_claim_bus(struct spi_slave *slave)
{

19
src/soc/intel/common/mrc_cache.c
View file

@ -18,11 +18,13 @@
*/
#include <string.h>
#include <bootstate.h>
#include <console/console.h>
#include <cbmem.h>
#include <fmap.h>
#include <ip_checksum.h>
#include "mrc_cache.h"
#include "nvm.h"
#define MRC_DATA_ALIGN 0x1000
#define MRC_DATA_SIGNATURE (('M'<<0)|('R'<<8)|('C'<<16)|('D'<<24))
@ -154,12 +156,6 @@ int mrc_cache_get_current(const struct mrc_saved_data **cache)
return __mrc_cache_get_current(&region, cache);
}
#if ENV_ROMSTAGE
/*
* romstage code
*/
/* Fill in mrc_saved_data structure with payload. */
static void mrc_cache_fill(struct mrc_saved_data *cache, void *data,
size_t size)
@ -197,15 +193,6 @@ int mrc_cache_stash_data(void *data, size_t size)
return 0;
}
#else
/*
* ramstage code
*/
#include <bootstate.h>
#include "nvm.h"
static int mrc_slot_valid(const struct mrc_data_region *region,
const struct mrc_saved_data *slot,
const struct mrc_saved_data *to_save)
@ -330,5 +317,3 @@ static void update_mrc_cache(void *unused)
}
BOOT_STATE_INIT_ENTRY(BS_WRITE_TABLES, BS_ON_ENTRY, update_mrc_cache, NULL);
#endif /* ENV_ROMSTAGE */