mirror of https://github.com/thesofproject/sof.git
make: cavs: make memory windows a configurable feature
Disabled for Sue configuration. Signed-off-by: Marcin Maka <marcin.maka@linux.intel.com>
This commit is contained in:
parent
101610ea43
commit
62f6742f4e
|
@ -242,6 +242,7 @@ case "$with_platform" in
|
||||||
AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
|
AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
|
||||||
AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
|
AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
|
||||||
AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
|
AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
|
||||||
|
AC_DEFINE([CONFIG_MEM_WND], [1], [Configure Memory Windows])
|
||||||
;;
|
;;
|
||||||
haswell*)
|
haswell*)
|
||||||
|
|
||||||
|
@ -295,6 +296,7 @@ case "$with_platform" in
|
||||||
AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
|
AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
|
||||||
AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
|
AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
|
||||||
AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
|
AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
|
||||||
|
AC_DEFINE([CONFIG_MEM_WND], [1], [Configure Memory Windows])
|
||||||
;;
|
;;
|
||||||
suecreek*)
|
suecreek*)
|
||||||
|
|
||||||
|
@ -332,6 +334,7 @@ case "$with_platform" in
|
||||||
AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
|
AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
|
||||||
AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
|
AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
|
||||||
AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
|
AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
|
||||||
|
AC_DEFINE([CONFIG_MEM_WND], [1], [Configure Memory Windows])
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
if test "$have_rimage" = "no" && test "$have_doc" = "no"; then
|
if test "$have_rimage" = "no" && test "$have_doc" = "no"; then
|
||||||
|
|
|
@ -74,7 +74,7 @@ static const struct sof_ipc_fw_ready ready = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
#if !defined(CONFIG_SUECREEK)
|
#if defined(CONFIG_MEM_WND)
|
||||||
#define SRAM_WINDOW_HOST_OFFSET(x) (0x80000 + x * 0x20000)
|
#define SRAM_WINDOW_HOST_OFFSET(x) (0x80000 + x * 0x20000)
|
||||||
|
|
||||||
#define NUM_WINDOWS 7
|
#define NUM_WINDOWS 7
|
||||||
|
@ -194,20 +194,13 @@ struct work_queue_timesource platform_generic_queue[] = {
|
||||||
struct timer *platform_timer =
|
struct timer *platform_timer =
|
||||||
&platform_generic_queue[PLATFORM_MASTER_CORE_ID].timer;
|
&platform_generic_queue[PLATFORM_MASTER_CORE_ID].timer;
|
||||||
|
|
||||||
#if defined(CONFIG_SUECREEK)
|
|
||||||
int platform_boot_complete(uint32_t boot_message)
|
|
||||||
{
|
|
||||||
mailbox_dspbox_write(0, &ready, sizeof(ready));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
int platform_boot_complete(uint32_t boot_message)
|
int platform_boot_complete(uint32_t boot_message)
|
||||||
{
|
{
|
||||||
mailbox_dspbox_write(0, &ready, sizeof(ready));
|
mailbox_dspbox_write(0, &ready, sizeof(ready));
|
||||||
|
#if defined(CONFIG_MEM_WND)
|
||||||
mailbox_dspbox_write(sizeof(ready), &sram_window,
|
mailbox_dspbox_write(sizeof(ready), &sram_window,
|
||||||
sram_window.ext_hdr.hdr.size);
|
sram_window.ext_hdr.hdr.size);
|
||||||
|
#endif // defined(CONFIG_MEM_WND)
|
||||||
|
|
||||||
#if defined(CONFIG_APOLLOLAKE)
|
#if defined(CONFIG_APOLLOLAKE)
|
||||||
/* boot now complete so we can relax the CPU */
|
/* boot now complete so we can relax the CPU */
|
||||||
|
@ -221,12 +214,10 @@ int platform_boot_complete(uint32_t boot_message)
|
||||||
ipc_write(IPC_DIPCIDD, SRAM_WINDOW_HOST_OFFSET(0) >> 12);
|
ipc_write(IPC_DIPCIDD, SRAM_WINDOW_HOST_OFFSET(0) >> 12);
|
||||||
ipc_write(IPC_DIPCIDR, 0x80000000 | SOF_IPC_FW_READY);
|
ipc_write(IPC_DIPCIDR, 0x80000000 | SOF_IPC_FW_READY);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined(CONFIG_SUECREEK)
|
#if defined(CONFIG_MEM_WND)
|
||||||
static void platform_memory_windows_init(void)
|
static void platform_memory_windows_init(void)
|
||||||
{
|
{
|
||||||
/* window0, for fw status & outbox/uplink mbox */
|
/* window0, for fw status & outbox/uplink mbox */
|
||||||
|
@ -296,7 +287,7 @@ int platform_init(struct sof *sof)
|
||||||
|
|
||||||
trace_point(TRACE_BOOT_PLATFORM_MBOX);
|
trace_point(TRACE_BOOT_PLATFORM_MBOX);
|
||||||
|
|
||||||
#if !defined(CONFIG_SUECREEK)
|
#if defined(CONFIG_MEM_WND)
|
||||||
platform_memory_windows_init();
|
platform_memory_windows_init();
|
||||||
#endif
|
#endif
|
||||||
trace_point(TRACE_BOOT_PLATFORM_SHIM);
|
trace_point(TRACE_BOOT_PLATFORM_SHIM);
|
||||||
|
|
Loading…
Reference in New Issue