summaryrefslogtreecommitdiffstats
path: root/arch/x86/cpu/baytrail
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-14 21:51:32 -0500
committerTom Rini <trini@konsulko.com>2016-01-14 21:51:32 -0500
commit4edde96111aefac63d6aaca6ba87a90d149e973e (patch)
tree83996996fc15554644c114e4f4d534d78cef15fd /arch/x86/cpu/baytrail
parenta737028e80603f49a4757adec10b5842d0689dbb (diff)
parent5c2ed61ce235fd835a3f594bc983dfc20959568c (diff)
downloadtalos-obmc-uboot-4edde96111aefac63d6aaca6ba87a90d149e973e.tar.gz
talos-obmc-uboot-4edde96111aefac63d6aaca6ba87a90d149e973e.zip
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/baytrail')
-rw-r--r--arch/x86/cpu/baytrail/fsp_configs.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c
index a72d615f21..d49b8d2737 100644
--- a/arch/x86/cpu/baytrail/fsp_configs.c
+++ b/arch/x86/cpu/baytrail/fsp_configs.c
@@ -121,16 +121,23 @@ const struct pch_azalia_config azalia_config = {
};
/**
- * Override the FSP's UPD.
+ * Override the FSP's configuration data.
* If the device tree does not specify an integer setting, use the default
* provided in Intel's Baytrail_FSP_Gold4.tgz release FSP/BayleyBayFsp.bsf file.
*/
-void update_fsp_upd(struct upd_region *fsp_upd)
+void update_fsp_configs(struct fsp_config_data *config,
+ struct fspinit_rtbuf *rt_buf)
{
+ struct upd_region *fsp_upd = &config->fsp_upd;
struct memory_down_data *mem;
const void *blob = gd->fdt_blob;
int node;
+ /* Initialize runtime buffer for fsp_init() */
+ rt_buf->common.stack_top = config->common.stack_top - 32;
+ rt_buf->common.boot_mode = config->common.boot_mode;
+ rt_buf->common.upd_data = &config->fsp_upd;
+
fsp_upd->azalia_config_ptr = (uint32_t)&azalia_config;
node = fdtdec_next_compatible(blob, 0, COMPAT_INTEL_BAYTRAIL_FSP);
OpenPOWER on IntegriCloud