April 2018 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [PATCH 0/6] SSP-IPC: move SSP-specific fields
by Pierre-Louis Bossart 05 Apr '18

05 Apr '18

Align SSP fields definition with ALSA topology ones and group SSP-specific fields in single structure. This is required before we enable DMIC, and will help add new SSP fields for always-on clocks, quirks, etc (exact definition WIP) These patches were tested on Baytrail and compile-tested on APL. Due to the IPC change, kernel patches are required, available at: https://github.com/plbossart/sound/tree/topic/sof-v4.14-rename-ssp No SOFT patches are necessary. This patchset needs to be applied on top of the SOF renames. It follows the same order as the kernel patches to allow for some level of bisection across the two domains. Pierre-Louis Bossart (6): uapi: ipc: align ipc.h with kernel uapi: ipc: change DAI sample_valid_bits definition uapi: ipc: align SSP IPC with kernel uapi: ipc: remove zero-length array for DAI IPC uapi: ipc: start moving SSP-specific fields into ssp structure uapi: ipc: move sample_valid_bits to SSP definitions src/audio/dai.c | 28 ++++++---- src/drivers/apl-ssp.c | 47 ++++++++--------- src/drivers/byt-ssp.c | 51 +++++++++--------- src/include/uapi/ipc.h | 137 ++++++++++++++++++++++++------------------------- 4 files changed, 136 insertions(+), 127 deletions(-) -- 2.14.1

2 7

[Sound-open-firmware] [PATCH 0/7] SOF: Global rename from 'reef' to 'sof'
by Pierre-Louis Bossart 05 Apr '18

05 Apr '18

One big patch to replace all occurences of 'reef' by 'sof'. A couple of preceding patches to make the transition easier with no checkpatch warnings. This needs to be used with matching SOFT patches, kernel patches, UCM files and install scripts. https://github.com/plbossart/sound/tree/topic/sof-rename https://github.com/plbossart/sound-open-firmware-tools/tree/topic/sof-rename https://github.com/plbossart/sound-open-firmware/tree/topic/sof-rename https://github.com/plbossart/UCM Pierre-Louis Bossart (7): clean: dos2unix: baytrail.x.in (take2, really clean) clean: dos2unix: haswell.x.in (take2, really clean) clean: dos2unix: broadwell.x.in (take2, really clean) interrupts: fix non-sensical macro interrupts: harden macros with parenthesis clean: fix style warning before big SOF rename sof: global replacement of 'reef' by 'sof' .gitignore | 4 +- Makefile.am | 4 +- configure.ac | 22 +- src/Makefile.am | 2 +- src/arch/host/include/arch/Makefile.am | 2 +- src/arch/host/include/arch/interrupt.h | 2 +- src/arch/host/include/arch/{reef.h => sof.h} | 4 +- src/arch/xtensa/Makefile.am | 42 +- src/arch/xtensa/boot_loader.c | 4 +- src/arch/xtensa/include/arch/Makefile.am | 2 +- src/arch/xtensa/include/arch/interrupt.h | 10 +- src/arch/xtensa/include/arch/{reef.h => sof.h} | 6 +- src/arch/xtensa/include/arch/string.h | 4 +- src/arch/xtensa/init.c | 12 +- src/arch/xtensa/main-entry.S | 2 +- src/arch/xtensa/reset-vector.S | 2 +- src/arch/xtensa/task.c | 8 +- src/arch/xtensa/timer.c | 8 +- src/audio/buffer.c | 20 +- src/audio/component.c | 14 +- src/audio/dai.c | 20 +- src/audio/eq_fir.c | 20 +- src/audio/eq_iir.c | 20 +- src/audio/fir.c | 2 +- src/audio/fir.h | 2 +- src/audio/host.c | 22 +- src/audio/iir.c | 2 +- src/audio/mixer.c | 10 +- src/audio/mux.c | 8 +- src/audio/pipeline.c | 20 +- src/audio/pipeline_static.c | 16 +- src/audio/src.c | 26 +- src/audio/src_generic.c | 6 +- src/audio/src_hifi2ep.c | 6 +- src/audio/src_hifi3.c | 6 +- src/audio/switch.c | 8 +- src/audio/tone.c | 22 +- src/audio/volume.c | 20 +- src/drivers/Makefile.am | 2 +- src/drivers/apl-ssp.c | 8 +- src/drivers/byt-ssp.c | 8 +- src/drivers/dw-dma.c | 32 +- src/drivers/hda-dma.c | 20 +- src/include/Makefile.am | 2 +- src/include/{reef => sof}/Makefile.am | 4 +- src/include/{reef => sof}/agent.h | 12 +- src/include/{reef => sof}/alloc.h | 6 +- src/include/{reef => sof}/atomic.h | 0 src/include/{reef => sof}/audio/Makefile.am | 2 +- src/include/{reef => sof}/audio/buffer.h | 14 +- .../{reef => sof}/audio/coefficients/Makefile.am | 0 .../audio/coefficients/src/Makefile.am | 0 .../src/src_std_int32_10_21_4583_5000.h | 0 .../src/src_std_int32_10_9_4583_5000.h | 0 .../src/src_std_int32_16_7_4125_5000.h | 0 .../coefficients/src/src_std_int32_1_2_2292_5000.h | 0 .../coefficients/src/src_std_int32_1_2_4583_5000.h | 0 .../coefficients/src/src_std_int32_1_3_2292_5000.h | 0 .../coefficients/src/src_std_int32_1_3_4583_5000.h | 0 .../src/src_std_int32_20_21_4211_5000.h | 0 .../src/src_std_int32_20_7_3008_5000.h | 0 .../src/src_std_int32_21_20_4211_5000.h | 0 .../src/src_std_int32_21_40_4010_5000.h | 0 .../src/src_std_int32_21_80_4010_5000.h | 0 .../coefficients/src/src_std_int32_2_1_2292_5000.h | 0 .../coefficients/src/src_std_int32_2_1_4583_5000.h | 0 .../coefficients/src/src_std_int32_2_3_4583_5000.h | 0 .../src/src_std_int32_32_21_4583_5000.h | 0 .../coefficients/src/src_std_int32_3_1_2292_5000.h | 0 .../coefficients/src/src_std_int32_3_1_4583_5000.h | 0 .../coefficients/src/src_std_int32_3_2_4583_5000.h | 0 .../coefficients/src/src_std_int32_3_4_4583_5000.h | 0 .../src/src_std_int32_40_21_4010_5000.h | 0 .../coefficients/src/src_std_int32_4_3_4583_5000.h | 0 .../coefficients/src/src_std_int32_5_7_4583_5000.h | 0 .../coefficients/src/src_std_int32_7_8_4583_5000.h | 0 .../src/src_std_int32_8_21_3274_5000.h | 0 .../coefficients/src/src_std_int32_8_7_2494_5000.h | 0 .../coefficients/src/src_std_int32_8_7_4583_5000.h | 0 .../audio/coefficients/src/src_std_int32_define.h | 0 .../audio/coefficients/src/src_std_int32_table.h | 54 +- .../src/src_tiny_int16_1_2_3281_5000.h | 0 .../src/src_tiny_int16_1_3_1641_5000.h | 0 .../src/src_tiny_int16_1_3_3281_5000.h | 0 .../src/src_tiny_int16_20_21_3015_5000.h | 0 .../src/src_tiny_int16_21_20_3015_5000.h | 0 .../src/src_tiny_int16_2_1_3281_5000.h | 0 .../src/src_tiny_int16_2_3_3281_5000.h | 0 .../src/src_tiny_int16_3_1_1641_5000.h | 0 .../src/src_tiny_int16_3_1_3281_5000.h | 0 .../src/src_tiny_int16_3_2_3281_5000.h | 0 .../src/src_tiny_int16_7_8_3281_5000.h | 0 .../src/src_tiny_int16_8_7_3281_5000.h | 0 .../audio/coefficients/src/src_tiny_int16_define.h | 0 .../audio/coefficients/src/src_tiny_int16_table.h | 24 +- src/include/{reef => sof}/audio/component.h | 16 +- src/include/{reef => sof}/audio/format.h | 0 src/include/{reef => sof}/audio/pipeline.h | 14 +- src/include/{reef => sof}/clock.h | 2 +- src/include/{reef => sof}/dai.h | 2 +- src/include/{reef => sof}/debug.h | 4 +- src/include/{reef => sof}/dma-trace.h | 16 +- src/include/{reef => sof}/dma.h | 8 +- src/include/{reef => sof}/dw-dma.h | 4 +- src/include/{reef => sof}/hda-dma.h | 0 src/include/{reef => sof}/init.h | 4 +- src/include/{reef => sof}/intel-ipc.h | 0 src/include/{reef => sof}/interrupt-map.h | 50 +- src/include/{reef => sof}/interrupt.h | 10 +- src/include/{reef => sof}/io.h | 0 src/include/{reef => sof}/ipc.h | 16 +- src/include/{reef => sof}/list.h | 0 src/include/{reef => sof}/lock.h | 6 +- src/include/{reef => sof}/mailbox.h | 2 +- src/include/{reef => sof}/math/Makefile.am | 0 src/include/{reef => sof}/math/numbers.h | 0 src/include/{reef => sof}/math/trig.h | 0 src/include/{reef => sof}/notifier.h | 6 +- src/include/{reef => sof}/panic.h | 8 +- src/include/{reef => sof}/schedule.h | 16 +- src/include/{reef/reef.h => sof/sof.h} | 8 +- src/include/{reef => sof}/ssp.h | 12 +- src/include/{reef => sof}/stream.h | 4 +- src/include/{reef => sof}/string.h | 4 +- src/include/{reef => sof}/task.h | 4 +- src/include/{reef => sof}/test | 0 src/include/{reef => sof}/timer.h | 0 src/include/{reef => sof}/trace.h | 10 +- src/include/{reef => sof}/wait.h | 12 +- src/include/{reef => sof}/work.h | 4 +- src/init/Makefile.am | 2 +- src/init/init.c | 40 +- src/ipc/apl-ipc.c | 32 +- src/ipc/byt-ipc.c | 32 +- src/ipc/cnl-ipc.c | 32 +- src/ipc/dma-copy.c | 12 +- src/ipc/handler.c | 34 +- src/ipc/hsw-ipc.c | 34 +- src/ipc/ipc.c | 36 +- src/ipc/pmc-ipc.c | 16 +- src/lib/Makefile.am | 2 +- src/lib/agent.c | 22 +- src/lib/alloc.c | 14 +- src/lib/dma-trace.c | 16 +- src/lib/interrupt.c | 30 +- src/lib/lib.c | 4 +- src/lib/notifier.c | 10 +- src/lib/schedule.c | 24 +- src/lib/trace.c | 14 +- src/lib/work.c | 18 +- src/library/include/platform/interrupt.h | 2 +- src/library/include/platform/timer.h | 2 +- src/math/numbers.c | 2 +- src/math/trig.c | 4 +- src/platform/apollolake/Makefile.am | 4 +- src/platform/apollolake/apollolake.x.in | 138 +-- src/platform/apollolake/base_module.c | 4 +- src/platform/apollolake/clk.c | 14 +- src/platform/apollolake/dai.c | 10 +- src/platform/apollolake/dma.c | 6 +- src/platform/apollolake/include/platform/dma.h | 2 +- .../apollolake/include/platform/interrupt.h | 46 +- src/platform/apollolake/include/platform/memory.h | 68 +- .../apollolake/include/platform/platform.h | 4 +- src/platform/apollolake/include/platform/timer.h | 2 +- src/platform/apollolake/interrupt.c | 28 +- src/platform/apollolake/memory.c | 2 +- src/platform/apollolake/platform.c | 38 +- src/platform/apollolake/timer.c | 4 +- src/platform/baytrail/Makefile.am | 2 +- src/platform/baytrail/baytrail.x.in | 1016 ++++++++++---------- src/platform/baytrail/clk.c | 14 +- src/platform/baytrail/dai.c | 10 +- src/platform/baytrail/dma.c | 4 +- src/platform/baytrail/include/platform/interrupt.h | 2 +- src/platform/baytrail/include/platform/memory.h | 34 +- src/platform/baytrail/include/platform/platform.h | 4 +- src/platform/baytrail/include/platform/timer.h | 2 +- src/platform/baytrail/memory.c | 2 +- src/platform/baytrail/platform.c | 40 +- src/platform/baytrail/timer.c | 4 +- src/platform/cannonlake/Makefile.am | 6 +- src/platform/cannonlake/base_module.c | 2 +- src/platform/cannonlake/boot_ldr.x.in | 78 +- src/platform/cannonlake/cannonlake.x.in | 138 +-- src/platform/cannonlake/clk.c | 14 +- src/platform/cannonlake/dai.c | 10 +- src/platform/cannonlake/dma.c | 6 +- .../cannonlake/include/platform/interrupt.h | 42 +- src/platform/cannonlake/include/platform/memory.h | 64 +- .../cannonlake/include/platform/platform.h | 4 +- src/platform/cannonlake/include/platform/timer.h | 2 +- src/platform/cannonlake/interrupt.c | 28 +- src/platform/cannonlake/memory.c | 2 +- src/platform/cannonlake/platform.c | 38 +- src/platform/cannonlake/timer.c | 4 +- src/platform/haswell/Makefile.am | 2 +- src/platform/haswell/broadwell.x.in | 1016 ++++++++++---------- src/platform/haswell/clk.c | 14 +- src/platform/haswell/dai.c | 10 +- src/platform/haswell/dma.c | 4 +- src/platform/haswell/haswell.x.in | 1016 ++++++++++---------- src/platform/haswell/include/platform/interrupt.h | 2 +- src/platform/haswell/include/platform/memory.h | 36 +- src/platform/haswell/include/platform/platform.h | 4 +- src/platform/haswell/include/platform/timer.h | 2 +- src/platform/haswell/memory.c | 2 +- src/platform/haswell/platform.c | 42 +- src/platform/haswell/timer.c | 4 +- src/tasks/Makefile.am | 2 +- src/tasks/audio.c | 26 +- version.sh | 6 +- 212 files changed, 2702 insertions(+), 2702 deletions(-) rename src/arch/host/include/arch/{reef.h => sof.h} (97%) rename src/arch/xtensa/include/arch/{reef.h => sof.h} (98%) rename src/include/{reef => sof}/Makefile.am (88%) rename src/include/{reef => sof}/agent.h (91%) rename src/include/{reef => sof}/alloc.h (98%) rename src/include/{reef => sof}/atomic.h (100%) rename src/include/{reef => sof}/audio/Makefile.am (67%) rename src/include/{reef => sof}/audio/buffer.h (97%) rename src/include/{reef => sof}/audio/coefficients/Makefile.am (100%) rename src/include/{reef => sof}/audio/coefficients/src/Makefile.am (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_10_21_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_10_9_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_16_7_4125_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_1_2_2292_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_1_2_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_1_3_2292_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_1_3_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_20_21_4211_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_20_7_3008_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_21_20_4211_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_21_40_4010_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_21_80_4010_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_2_1_2292_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_2_1_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_2_3_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_32_21_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_3_1_2292_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_3_1_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_3_2_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_3_4_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_40_21_4010_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_4_3_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_5_7_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_7_8_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_8_21_3274_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_8_7_2494_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_8_7_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_define.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_table.h (79%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_1_2_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_1_3_1641_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_1_3_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_20_21_3015_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_21_20_3015_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_2_1_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_2_3_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_3_1_1641_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_3_1_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_3_2_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_7_8_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_8_7_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_define.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_table.h (71%) rename src/include/{reef => sof}/audio/component.h (98%) rename src/include/{reef => sof}/audio/format.h (100%) rename src/include/{reef => sof}/audio/pipeline.h (96%) rename src/include/{reef => sof}/clock.h (98%) rename src/include/{reef => sof}/dai.h (99%) rename src/include/{reef => sof}/debug.h (99%) rename src/include/{reef => sof}/dma-trace.h (92%) rename src/include/{reef => sof}/dma.h (98%) rename src/include/{reef => sof}/dw-dma.h (97%) rename src/include/{reef => sof}/hda-dma.h (100%) rename src/include/{reef => sof}/init.h (97%) rename src/include/{reef => sof}/intel-ipc.h (100%) rename src/include/{reef => sof}/interrupt-map.h (69%) rename src/include/{reef => sof}/interrupt.h (95%) rename src/include/{reef => sof}/io.h (100%) rename src/include/{reef => sof}/ipc.h (96%) rename src/include/{reef => sof}/list.h (100%) rename src/include/{reef => sof}/lock.h (98%) rename src/include/{reef => sof}/mailbox.h (99%) rename src/include/{reef => sof}/math/Makefile.am (100%) rename src/include/{reef => sof}/math/numbers.h (100%) rename src/include/{reef => sof}/math/trig.h (100%) rename src/include/{reef => sof}/notifier.h (96%) rename src/include/{reef => sof}/panic.h (96%) rename src/include/{reef => sof}/schedule.h (94%) rename src/include/{reef/reef.h => sof/sof.h} (96%) rename src/include/{reef => sof}/ssp.h (98%) rename src/include/{reef => sof}/stream.h (96%) rename src/include/{reef => sof}/string.h (96%) rename src/include/{reef => sof}/task.h (97%) rename src/include/{reef => sof}/test (100%) rename src/include/{reef => sof}/timer.h (100%) rename src/include/{reef => sof}/trace.h (97%) rename src/include/{reef => sof}/wait.h (96%) rename src/include/{reef => sof}/work.h (98%) -- 2.14.1

2 8

[Sound-open-firmware] [PATCH] dist: fix make dist for topology M4
by Liam Girdwood 05 Apr '18

05 Apr '18

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/topology/m4/Makefile.am b/topology/m4/Makefile.am index 35b3f81..d7b867f 100644 --- a/topology/m4/Makefile.am +++ b/topology/m4/Makefile.am @@ -1,3 +1,11 @@ EXTRA_DIST = \ - build.m4 \ - local.m4 + buffer.m4 \ + dai.m4 \ + mixer.m4 \ + mixercontrol.m4 \ + pcm.m4 \ + pga.m4 \ + pipeline.m4 \ + src.m4 \ + tone.m4 \ + utils.m4 -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] dist: fix make dist for SRC
by Liam Girdwood 05 Apr '18

05 Apr '18

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 40e37794..8a0415e9 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -11,7 +11,7 @@ COMP_SRC = \ fir.c \ tone.c \ src.c \ - src_core.c \ + src_generic.c \ mixer.c \ mux.c \ volume.c \ -- 2.14.1

1 0

[Sound-open-firmware] SOF 1.1 Release
by Liam Girdwood 05 Apr '18

05 Apr '18

Sound Open Firmware 1.1 has now been released and available here :- git://git.alsa-project.org/sound-open-firmware.git git://git.alsa-project.org/sound-open-firmware-tools.git Significant changes since 1.0 :- o Support for Playback/Capture on Intel Apollolake and Cannonlake platforms. o Initial support for Intel Haswell and Broadwell platforms. o Support for DMA based firmware tracing to host userspace. o SIMD optimisations for SRC on xtensa ISA. o Initial support for running firmware components on host. Plans for 1.2 :- o Playback/Capture on Haswell/Broadwell. o SIMD optimisations for volume and mixer. o Improved host based component testing. o Initial runtime module support. SOF Linux driver dependencies for ALSA/ASoC have also started to upstream. Driver patches will continue to flow in anticipation for base SOF driver in 4.18. Thanks Liam

1 0

[Sound-open-firmware] [PATCH] soft: global rename from reef to sof
by Pierre-Louis Bossart 05 Apr '18

05 Apr '18

no functionality change, just string replacement Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- README | 2 +- topology/Makefile.am | 56 +++++++++++----------- .../{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} | 0 .../{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} | 0 topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} | 0 topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} | 0 .../{reef-bxt-nocodec.m4 => sof-bxt-nocodec.m4} | 0 topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} | 0 .../{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} | 0 topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} | 0 topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} | 0 topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} | 0 .../{reef-cht-max98090.m4 => sof-cht-max98090.m4} | 0 .../{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} | 0 topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} | 0 topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} | 0 16 files changed, 29 insertions(+), 29 deletions(-) rename topology/{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} (100%) rename topology/{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} (100%) rename topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} (100%) rename topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} (100%) rename topology/{reef-bxt-nocodec.m4 => sof-bxt-nocodec.m4} (100%) rename topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} (100%) rename topology/{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} (100%) rename topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} (100%) rename topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} (100%) rename topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} (100%) rename topology/{reef-cht-max98090.m4 => sof-cht-max98090.m4} (100%) rename topology/{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} (100%) rename topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} (100%) rename topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} (100%) diff --git a/README b/README index 4eca4b5..d5134e9 100644 --- a/README +++ b/README @@ -28,7 +28,7 @@ assist in debugging :- e.g. convert to flat binary, then ELF then dissasemble -rimage -i /lib/firmware/intel/reef-byt.ri -o image.bin -b -m byt +rimage -i /lib/firmware/intel/sof-byt.ri -o image.bin -b -m byt xtensa-byt-elf-objcopy -I binary -O elf32-xtensa-le -B xtensa image.bin image.bin.elf diff --git a/topology/Makefile.am b/topology/Makefile.am index a7e86fd..db15223 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -16,20 +16,20 @@ DEPS = \ # MACHINES = \ - reef-cht-nocodec.tplg \ - reef-cht-max98090.tplg \ - reef-apl-nocodec.tplg \ - reef-bxt-nocodec.tplg \ - reef-byt-nocodec.tplg \ - reef-bdw-rt286.tplg \ - reef-bdw-rt5640.tplg \ - reef-byt-rt5640.tplg \ - reef-byt-rt5645.tplg \ - reef-byt-rt5651.tplg \ - reef-byt-da7213.tplg \ - reef-cnl-rt274.tplg \ - reef-hsw-rt5640.tplg \ - reef-apl-tdf8532.tplg + sof-cht-nocodec.tplg \ + sof-cht-max98090.tplg \ + sof-apl-nocodec.tplg \ + sof-bxt-nocodec.tplg \ + sof-byt-nocodec.tplg \ + sof-bdw-rt286.tplg \ + sof-bdw-rt5640.tplg \ + sof-byt-rt5640.tplg \ + sof-byt-rt5645.tplg \ + sof-byt-rt5651.tplg \ + sof-byt-da7213.tplg \ + sof-cnl-rt274.tplg \ + sof-hsw-rt5640.tplg \ + sof-apl-tdf8532.tplg # Uncomment the following line if you want to debug conf files .PRECIOUS: %.conf @@ -47,17 +47,17 @@ clean: rm -f *.tplg EXTRA_DIST = \ - reef-cht-nocodec.m4 \ - reef-cht-max98090.m4 \ - reef-apl-nocodec.m4 \ - reef-bxt-nocodec.m4 \ - reef-byt-nocodec.m4 \ - reef-bdw-rt286.m4 \ - reef-bdw-rt5640.m4 \ - reef-byt-rt5640.m4 \ - reef-byt-rt5645.m4 \ - reef-byt-rt5651.m4 \ - reef-byt-da7213.m4 \ - reef-cnl-rt274.m4 \ - reef-hsw-rt5640.m4 \ - reef-apl-tdf8532.m4 + sof-cht-nocodec.m4 \ + sof-cht-max98090.m4 \ + sof-apl-nocodec.m4 \ + sof-bxt-nocodec.m4 \ + sof-byt-nocodec.m4 \ + sof-bdw-rt286.m4 \ + sof-bdw-rt5640.m4 \ + sof-byt-rt5640.m4 \ + sof-byt-rt5645.m4 \ + sof-byt-rt5651.m4 \ + sof-byt-da7213.m4 \ + sof-cnl-rt274.m4 \ + sof-hsw-rt5640.m4 \ + sof-apl-tdf8532.m4 diff --git a/topology/reef-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4 similarity index 100% rename from topology/reef-apl-nocodec.m4 rename to topology/sof-apl-nocodec.m4 diff --git a/topology/reef-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 similarity index 100% rename from topology/reef-apl-tdf8532.m4 rename to topology/sof-apl-tdf8532.m4 diff --git a/topology/reef-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4 similarity index 100% rename from topology/reef-bdw-rt286.m4 rename to topology/sof-bdw-rt286.m4 diff --git a/topology/reef-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4 similarity index 100% rename from topology/reef-bdw-rt5640.m4 rename to topology/sof-bdw-rt5640.m4 diff --git a/topology/reef-bxt-nocodec.m4 b/topology/sof-bxt-nocodec.m4 similarity index 100% rename from topology/reef-bxt-nocodec.m4 rename to topology/sof-bxt-nocodec.m4 diff --git a/topology/reef-byt-da7213.m4 b/topology/sof-byt-da7213.m4 similarity index 100% rename from topology/reef-byt-da7213.m4 rename to topology/sof-byt-da7213.m4 diff --git a/topology/reef-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4 similarity index 100% rename from topology/reef-byt-nocodec.m4 rename to topology/sof-byt-nocodec.m4 diff --git a/topology/reef-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4 similarity index 100% rename from topology/reef-byt-rt5640.m4 rename to topology/sof-byt-rt5640.m4 diff --git a/topology/reef-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4 similarity index 100% rename from topology/reef-byt-rt5645.m4 rename to topology/sof-byt-rt5645.m4 diff --git a/topology/reef-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4 similarity index 100% rename from topology/reef-byt-rt5651.m4 rename to topology/sof-byt-rt5651.m4 diff --git a/topology/reef-cht-max98090.m4 b/topology/sof-cht-max98090.m4 similarity index 100% rename from topology/reef-cht-max98090.m4 rename to topology/sof-cht-max98090.m4 diff --git a/topology/reef-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4 similarity index 100% rename from topology/reef-cht-nocodec.m4 rename to topology/sof-cht-nocodec.m4 diff --git a/topology/reef-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4 similarity index 100% rename from topology/reef-cnl-rt274.m4 rename to topology/sof-cnl-rt274.m4 diff --git a/topology/reef-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4 similarity index 100% rename from topology/reef-hsw-rt5640.m4 rename to topology/sof-hsw-rt5640.m4 -- 2.14.1

1 0

[Sound-open-firmware] [PATCH 1/3] clean: dos2unix: baytrail.x.in
by Liam Girdwood 04 Apr '18

04 Apr '18

Remove any DOS line termination. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/baytrail/baytrail.x.in | 1026 +++++++++++++++++------------------ 1 file changed, 508 insertions(+), 518 deletions(-) diff --git a/src/platform/baytrail/baytrail.x.in b/src/platform/baytrail/baytrail.x.in index 6d4b084c..6692cf7a 100755 --- a/src/platform/baytrail/baytrail.x.in +++ b/src/platform/baytrail/baytrail.x.in @@ -1,518 +1,508 @@ -/* - * Linker Script for Baytrail. - * - * This script is run through the GNU C preprocessor to align the memory - * offsets with headers. - * - * Use spaces for formatting as cpp ignore tab sizes. - */ - -#include <platform/memory.h> -#include <xtensa/config/core-isa.h> - -OUTPUT_ARCH(xtensa) - -MEMORY -{ - vector_reset_text : - org = XCHAL_RESET_VECTOR0_PADDR, - len = REEF_MEM_RESET_TEXT_SIZE - vector_reset_lit : - org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, - len = REEF_MEM_RESET_LIT_SIZE - vector_base_text : - org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE - vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int2_text : - org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int3_text : - org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int4_text : - org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int5_text : - org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int6_text : - org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int7_text : - org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_kernel_text : - org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_user_text : - org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_double_text : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_text_start : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE, - len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE) - reef_data_ro : - org = DRAM0_BASE, - len = REEF_MEM_RO_SIZE - reef_data : - org = DRAM0_BASE + REEF_MEM_RO_SIZE, - len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) - system_heap : - org = HEAP_SYSTEM_BASE, - len = HEAP_SYSTEM_SIZE - runtime_heap : - org = HEAP_RUNTIME_BASE, - len = HEAP_RUNTIME_SIZE - buffer_heap : - org = HEAP_BUFFER_BASE, - len = HEAP_BUFFER_SIZE - reef_stack : - org = REEF_STACK_END, - len = REEF_STACK_BASE - REEF_STACK_END -} - -PHDRS -{ - vector_reset_text_phdr PT_LOAD; - vector_reset_lit_phdr PT_LOAD; - vector_base_text_phdr PT_LOAD; - vector_base_lit_phdr PT_LOAD; - vector_int2_text_phdr PT_LOAD; - vector_int2_lit_phdr PT_LOAD; - vector_int3_text_phdr PT_LOAD; - vector_int3_lit_phdr PT_LOAD; - vector_int4_text_phdr PT_LOAD; - vector_int4_lit_phdr PT_LOAD; - vector_int5_text_phdr PT_LOAD; - vector_int5_lit_phdr PT_LOAD; - vector_int6_text_phdr PT_LOAD; - vector_int6_lit_phdr PT_LOAD; - vector_int7_text_phdr PT_LOAD; - vector_int7_lit_phdr PT_LOAD; - vector_kernel_text_phdr PT_LOAD; - vector_kernel_lit_phdr PT_LOAD; - vector_user_text_phdr PT_LOAD; - vector_user_lit_phdr PT_LOAD; - vector_double_text_phdr PT_LOAD; - vector_double_lit_phdr PT_LOAD; - reef_text_start_phdr PT_LOAD; - reef_data_ro_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_data_bss_phdr PT_LOAD; - system_heap_phdr PT_LOAD; - runtime_heap_phdr PT_LOAD; - buffer_heap_phdr PT_LOAD; - reef_stack_phdr PT_LOAD; -} - -/* Default entry point: */ -ENTRY(_ResetVector) -_rom_store_table = 0; - -/* ABI0 does not use Window base */ -PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR); - -/* Various memory-map dependent cache attribute settings: */ -_memmap_cacheattr_wb_base = 0x44024000; -_memmap_cacheattr_wt_base = 0x11021000; -_memmap_cacheattr_bp_base = 0x22022000; -_memmap_cacheattr_unused_mask = 0x00F00FFF; -_memmap_cacheattr_wb_trapnull = 0x4422422F; -_memmap_cacheattr_wba_trapnull = 0x4422422F; -_memmap_cacheattr_wbna_trapnull = 0x25222222; -_memmap_cacheattr_wt_trapnull = 0x1122122F; -_memmap_cacheattr_bp_trapnull = 0x2222222F; -_memmap_cacheattr_wb_strict = 0x44F24FFF; -_memmap_cacheattr_wt_strict = 0x11F21FFF; -_memmap_cacheattr_bp_strict = 0x22F22FFF; -_memmap_cacheattr_wb_allvalid = 0x44224222; -_memmap_cacheattr_wt_allvalid = 0x11221222; -_memmap_cacheattr_bp_allvalid = 0x22222222; -PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wbna_trapnull); - -SECTIONS -{ - .ResetVector.text : ALIGN(4) - { - _ResetVector_text_start = ABSOLUTE(.); - KEEP (*(.ResetVector.text)) - _ResetVector_text_end = ABSOLUTE(.); - } >vector_reset_text :vector_reset_text_phdr - - .ResetVector.literal : ALIGN(4) - { - _ResetVector_literal_start = ABSOLUTE(.); - *(.ResetVector.literal) - _ResetVector_literal_end = ABSOLUTE(.); - } >vector_reset_lit :vector_reset_lit_phdr - - .WindowVectors.text : ALIGN(4) - { - _WindowVectors_text_start = ABSOLUTE(.); - KEEP (*(.WindowVectors.text)) - _WindowVectors_text_end = ABSOLUTE(.); - } >vector_base_text :vector_base_text_phdr - - .Level2InterruptVector.literal : ALIGN(4) - { - _Level2InterruptVector_literal_start = ABSOLUTE(.); - *(.Level2InterruptVector.literal) - _Level2InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int2_lit :vector_int2_lit_phdr - - .Level2InterruptVector.text : ALIGN(4) - { - _Level2InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level2InterruptVector.text)) - _Level2InterruptVector_text_end = ABSOLUTE(.); - } >vector_int2_text :vector_int2_text_phdr - - .Level3InterruptVector.literal : ALIGN(4) - { - _Level3InterruptVector_literal_start = ABSOLUTE(.); - *(.Level3InterruptVector.literal) - _Level3InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int3_lit :vector_int3_lit_phdr - - .Level3InterruptVector.text : ALIGN(4) - { - _Level3InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level3InterruptVector.text)) - _Level3InterruptVector_text_end = ABSOLUTE(.); - } >vector_int3_text :vector_int3_text_phdr - - .Level4InterruptVector.literal : ALIGN(4) - { - _Level4InterruptVector_literal_start = ABSOLUTE(.); - *(.Level4InterruptVector.literal) - _Level4InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int4_lit :vector_int4_lit_phdr - - .Level4InterruptVector.text : ALIGN(4) - { - _Level4InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level4InterruptVector.text)) - _Level4InterruptVector_text_end = ABSOLUTE(.); - } >vector_int4_text :vector_int4_text_phdr - - .Level5InterruptVector.literal : ALIGN(4) - { - _Level5InterruptVector_literal_start = ABSOLUTE(.); - *(.Level5InterruptVector.literal) - _Level5InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int5_lit :vector_int5_lit_phdr - - .Level5InterruptVector.text : ALIGN(4) - { - _Level5InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level5InterruptVector.text)) - _Level5InterruptVector_text_end = ABSOLUTE(.); - } >vector_int5_text :vector_int5_text_phdr - - .DebugExceptionVector.literal : ALIGN(4) - { - _DebugExceptionVector_literal_start = ABSOLUTE(.); - *(.DebugExceptionVector.literal) - _DebugExceptionVector_literal_end = ABSOLUTE(.); - } >vector_int6_lit :vector_int6_lit_phdr - - .DebugExceptionVector.text : ALIGN(4) - { - _DebugExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.DebugExceptionVector.text)) - _DebugExceptionVector_text_end = ABSOLUTE(.); - } >vector_int6_text :vector_int6_text_phdr - - .NMIExceptionVector.literal : ALIGN(4) - { - _NMIExceptionVector_literal_start = ABSOLUTE(.); - *(.NMIExceptionVector.literal) - _NMIExceptionVector_literal_end = ABSOLUTE(.); - } >vector_int7_lit :vector_int7_lit_phdr - - .NMIExceptionVector.text : ALIGN(4) - { - _NMIExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.NMIExceptionVector.text)) - _NMIExceptionVector_text_end = ABSOLUTE(.); - } >vector_int7_text :vector_int7_text_phdr - - .KernelExceptionVector.literal : ALIGN(4) - { - _KernelExceptionVector_literal_start = ABSOLUTE(.); - *(.KernelExceptionVector.literal) - _KernelExceptionVector_literal_end = ABSOLUTE(.); - } >vector_kernel_lit :vector_kernel_lit_phdr - - .KernelExceptionVector.text : ALIGN(4) - { - _KernelExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.KernelExceptionVector.text)) - _KernelExceptionVector_text_end = ABSOLUTE(.); - } >vector_kernel_text :vector_kernel_text_phdr - - .UserExceptionVector.literal : ALIGN(4) - { - _UserExceptionVector_literal_start = ABSOLUTE(.); - *(.UserExceptionVector.literal) - _UserExceptionVector_literal_end = ABSOLUTE(.); - } >vector_user_lit :vector_user_lit_phdr - - .UserExceptionVector.text : ALIGN(4) - { - _UserExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.UserExceptionVector.text)) - _UserExceptionVector_text_end = ABSOLUTE(.); - } >vector_user_text :vector_user_text_phdr - - .DoubleExceptionVector.literal : ALIGN(4) - { - _DoubleExceptionVector_literal_start = ABSOLUTE(.); - *(.DoubleExceptionVector.literal) - _DoubleExceptionVector_literal_end = ABSOLUTE(.); - } >vector_double_lit :vector_double_lit_phdr - - .DoubleExceptionVector.text : ALIGN(4) - { - _DoubleExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.DoubleExceptionVector.text)) - _DoubleExceptionVector_text_end = ABSOLUTE(.); - } >vector_double_text :vector_double_text_phdr - - .text : ALIGN(4) - { - _stext = .; - _text_start = ABSOLUTE(.); - *(.entry.text) - *(.init.literal) - KEEP(*(.init)) - *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) - *(.fini.literal) - KEEP(*(.fini)) - *(.gnu.version) - _text_end = ABSOLUTE(.); - _etext = .; - } >reef_text_start :reef_text_start_phdr - - .reset.rodata : ALIGN(4) - { - _reset_rodata_start = ABSOLUTE(.); - *(.reset.rodata) - _reset_rodata_end = ABSOLUTE(.); - } >reef_data_ro :reef_data_ro_phdr - - .rodata : ALIGN(4) - { - _rodata_start = ABSOLUTE(.); - *(.rodata) - *(.rodata.*) - *(.gnu.linkonce.r.*) - *(.rodata1) - __XT_EXCEPTION_TABLE__ = ABSOLUTE(.); - KEEP (*(.xt_except_table)) - KEEP (*(.gcc_except_table)) - *(.gnu.linkonce.e.*) - *(.gnu.version_r) - KEEP (*(.eh_frame)) - /* C++ constructor and destructor tables, properly ordered: */ - KEEP (*crtbegin.o(.ctors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - /* C++ exception handlers table: */ - __XT_EXCEPTION_DESCS__ = ABSOLUTE(.); - *(.xt_except_desc) - *(.gnu.linkonce.h.*) - __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.); - *(.xt_except_desc_end) - *(.dynamic) - *(.gnu.version_d) - . = ALIGN(4); /* this table MUST be 4-byte aligned */ - _bss_table_start = ABSOLUTE(.); - LONG(_bss_start) - LONG(_bss_end) - _bss_table_end = ABSOLUTE(.); - _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .data : ALIGN(4) - { - _data_start = ABSOLUTE(.); - *(.data) - *(.data.*) - *(.gnu.linkonce.d.*) - KEEP(*(.gnu.linkonce.d.*personality*)) - *(.data1) - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - *(.sdata2) - *(.sdata2.*) - *(.gnu.linkonce.s2.*) - KEEP(*(.jcr)) - _symbol_strings_start = ABSOLUTE(.); - LONG(_symbol_strings_start) - *(._symbol_strings) - LONG(_symbol_strings_end) - _symbol_strings_end = ABSOLUTE(.); - _symbol_table_start = ABSOLUTE(.); - LONG(_symbol_table_start) - *(._symbol_table) - LONG(_symbol_table_end) - _symbol_table_end = ABSOLUTE(.); - _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .lit4 : ALIGN(4) - { - _lit4_start = ABSOLUTE(.); - *(*.lit4) - *(.lit4.*) - *(.gnu.linkonce.lit4.*) - _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .bss (NOLOAD) : ALIGN(8) - { - . = ALIGN (8); - _bss_start = ABSOLUTE(.); - *(.dynsbss) - *(.sbss) - *(.sbss.*) - *(.gnu.linkonce.sb.*) - *(.scommon) - *(.sbss2) - *(.sbss2.*) - *(.gnu.linkonce.sb2.*) - *(.dynbss) - *(.bss) - *(.bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - . = ALIGN (8); - _bss_end = ABSOLUTE(.); - } >reef_data :reef_data_bss_phdr - - /* stack */ - _end = REEF_STACK_END; - PROVIDE(end = REEF_STACK_END); - _stack_sentry = REEF_STACK_END; - __stack = REEF_STACK_BASE; - - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - - .xt.insn 0 : - { - KEEP (*(.xt.insn)) - KEEP (*(.gnu.linkonce.x.*)) - } - .xt.prop 0 : - { - KEEP (*(.xt.prop)) - KEEP (*(.xt.prop.*)) - KEEP (*(.gnu.linkonce.prop.*)) - } - .xt.lit 0 : - { - KEEP (*(.xt.lit)) - KEEP (*(.xt.lit.*)) - KEEP (*(.gnu.linkonce.p.*)) - } - .xt.profile_range 0 : - { - KEEP (*(.xt.profile_range)) - KEEP (*(.gnu.linkonce.profile_range.*)) - } - .xt.profile_ranges 0 : - { - KEEP (*(.xt.profile_ranges)) - KEEP (*(.gnu.linkonce.xt.profile_ranges.*)) - } - .xt.profile_files 0 : - { - KEEP (*(.xt.profile_files)) - KEEP (*(.gnu.linkonce.xt.profile_files.*)) - } - - .system_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _system_heap_start = ABSOLUTE(.); - . = . + HEAP_SYSTEM_SIZE; - _system_heap_end = ABSOLUTE(.); - } >system_heap :system_heap_phdr - - .runtime_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _runtime_heap_start = ABSOLUTE(.); - . = . + HEAP_RUNTIME_SIZE; - _runtime_heap_end = ABSOLUTE(.); - } >runtime_heap :runtime_heap_phdr - - .buffer_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _system_heap_start = ABSOLUTE(.); - . = . + HEAP_BUFFER_SIZE; - _system_heap_end = ABSOLUTE(.); - } >buffer_heap :buffer_heap_phdr - - .reef_stack (NOLOAD) : ALIGN(8) - { - . = ALIGN (4096); - _reef_stack_start = ABSOLUTE(.); - . = . + REEF_STACK_SIZE; - _reef_stack_end = ABSOLUTE(.); - } >reef_stack :reef_stack_phdr -} - +/* + * Linker Script for Baytrail. + * + * This script is run through the GNU C preprocessor to align the memory + * offsets with headers. + * + * Use spaces for formatting as cpp ignore tab sizes. + */ + +#include <platform/memory.h> +#include <xtensa/config/core-isa.h> + +OUTPUT_ARCH(xtensa) + +MEMORY +{ + vector_reset_text : + org = XCHAL_RESET_VECTOR0_PADDR, + len = REEF_MEM_RESET_TEXT_SIZE + vector_reset_lit : + org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, + len = REEF_MEM_RESET_LIT_SIZE + vector_base_text : + org = XCHAL_VECBASE_RESET_PADDR, + len = REEF_MEM_VECBASE_LIT_SIZE + vector_int2_lit : + org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int2_text : + org = XCHAL_INTLEVEL2_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int3_lit : + org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int3_text : + org = XCHAL_INTLEVEL3_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int4_lit : + org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int4_text : + org = XCHAL_INTLEVEL4_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int5_lit : + org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int5_text : + org = XCHAL_INTLEVEL5_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int6_lit : + org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int6_text : + org = XCHAL_INTLEVEL6_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int7_lit : + org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int7_text : + org = XCHAL_INTLEVEL7_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_kernel_lit : + org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_kernel_text : + org = XCHAL_KERNEL_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_user_lit : + org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_user_text : + org = XCHAL_USER_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_double_lit : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_double_text : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + reef_text_start : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE, + len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE) + reef_data_ro : + org = DRAM0_BASE, + len = REEF_MEM_RO_SIZE + reef_data : + org = DRAM0_BASE + REEF_MEM_RO_SIZE, + len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) + system_heap : + org = HEAP_SYSTEM_BASE, + len = HEAP_SYSTEM_SIZE + runtime_heap : + org = HEAP_RUNTIME_BASE, + len = HEAP_RUNTIME_SIZE + buffer_heap : + org = HEAP_BUFFER_BASE, + len = HEAP_BUFFER_SIZE + reef_stack : + org = REEF_STACK_END, + len = REEF_STACK_BASE - REEF_STACK_END +} + +PHDRS +{ + vector_reset_text_phdr PT_LOAD; + vector_reset_lit_phdr PT_LOAD; + vector_base_text_phdr PT_LOAD; + vector_base_lit_phdr PT_LOAD; + vector_int2_text_phdr PT_LOAD; + vector_int2_lit_phdr PT_LOAD; + vector_int3_text_phdr PT_LOAD; + vector_int3_lit_phdr PT_LOAD; + vector_int4_text_phdr PT_LOAD; + vector_int4_lit_phdr PT_LOAD; + vector_int5_text_phdr PT_LOAD; + vector_int5_lit_phdr PT_LOAD; + vector_int6_text_phdr PT_LOAD; + vector_int6_lit_phdr PT_LOAD; + vector_int7_text_phdr PT_LOAD; + vector_int7_lit_phdr PT_LOAD; + vector_kernel_text_phdr PT_LOAD; + vector_kernel_lit_phdr PT_LOAD; + vector_user_text_phdr PT_LOAD; + vector_user_lit_phdr PT_LOAD; + vector_double_text_phdr PT_LOAD; + vector_double_lit_phdr PT_LOAD; + reef_text_start_phdr PT_LOAD; + reef_data_ro_phdr PT_LOAD; + reef_data_phdr PT_LOAD; + reef_data_bss_phdr PT_LOAD; + system_heap_phdr PT_LOAD; + runtime_heap_phdr PT_LOAD; + buffer_heap_phdr PT_LOAD; + reef_stack_phdr PT_LOAD; +} + +/* Default entry point: */ +ENTRY(_ResetVector) +_rom_store_table = 0; + +/* ABI0 does not use Window base */ +PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR); + +/* Various memory-map dependent cache attribute settings: */ +_memmap_cacheattr_wb_base = 0x44024000; +_memmap_cacheattr_wt_base = 0x11021000; +_memmap_cacheattr_bp_base = 0x22022000; +_memmap_cacheattr_unused_mask = 0x00F00FFF; +_memmap_cacheattr_wb_trapnull = 0x4422422F; +_memmap_cacheattr_wba_trapnull = 0x4422422F; +_memmap_cacheattr_wbna_trapnull = 0x25222222; +_memmap_cacheattr_wt_trapnull = 0x1122122F; +_memmap_cacheattr_bp_trapnull = 0x2222222F; +_memmap_cacheattr_wb_strict = 0x44F24FFF; +_memmap_cacheattr_wt_strict = 0x11F21FFF; +_memmap_cacheattr_bp_strict = 0x22F22FFF; +_memmap_cacheattr_wb_allvalid = 0x44224222; +_memmap_cacheattr_wt_allvalid = 0x11221222; +_memmap_cacheattr_bp_allvalid = 0x22222222; +PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wbna_trapnull); + +SECTIONS +{ + .ResetVector.text : ALIGN(4) + { + _ResetVector_text_start = ABSOLUTE(.); + KEEP (*(.ResetVector.text)) + _ResetVector_text_end = ABSOLUTE(.); + } >vector_reset_text :vector_reset_text_phdr + + .ResetVector.literal : ALIGN(4) + { + _ResetVector_literal_start = ABSOLUTE(.); + *(.ResetVector.literal) + _ResetVector_literal_end = ABSOLUTE(.); + } >vector_reset_lit :vector_reset_lit_phdr + + .WindowVectors.text : ALIGN(4) + { + _WindowVectors_text_start = ABSOLUTE(.); + KEEP (*(.WindowVectors.text)) + _WindowVectors_text_end = ABSOLUTE(.); + } >vector_base_text :vector_base_text_phdr + + .Level2InterruptVector.literal : ALIGN(4) + { + _Level2InterruptVector_literal_start = ABSOLUTE(.); + *(.Level2InterruptVector.literal) + _Level2InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int2_lit :vector_int2_lit_phdr + + .Level2InterruptVector.text : ALIGN(4) + { + _Level2InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level2InterruptVector.text)) + _Level2InterruptVector_text_end = ABSOLUTE(.); + } >vector_int2_text :vector_int2_text_phdr + + .Level3InterruptVector.literal : ALIGN(4) + { + _Level3InterruptVector_literal_start = ABSOLUTE(.); + *(.Level3InterruptVector.literal) + _Level3InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int3_lit :vector_int3_lit_phdr + + .Level3InterruptVector.text : ALIGN(4) + { + _Level3InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level3InterruptVector.text)) + _Level3InterruptVector_text_end = ABSOLUTE(.); + } >vector_int3_text :vector_int3_text_phdr + + .Level4InterruptVector.literal : ALIGN(4) + { + _Level4InterruptVector_literal_start = ABSOLUTE(.); + *(.Level4InterruptVector.literal) + _Level4InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int4_lit :vector_int4_lit_phdr + + .Level4InterruptVector.text : ALIGN(4) + { + _Level4InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level4InterruptVector.text)) + _Level4InterruptVector_text_end = ABSOLUTE(.); + } >vector_int4_text :vector_int4_text_phdr + + .Level5InterruptVector.literal : ALIGN(4) + { + _Level5InterruptVector_literal_start = ABSOLUTE(.); + *(.Level5InterruptVector.literal) + _Level5InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int5_lit :vector_int5_lit_phdr + + .Level5InterruptVector.text : ALIGN(4) + { + _Level5InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level5InterruptVector.text)) + _Level5InterruptVector_text_end = ABSOLUTE(.); + } >vector_int5_text :vector_int5_text_phdr + + .DebugExceptionVector.literal : ALIGN(4) + { + _DebugExceptionVector_literal_start = ABSOLUTE(.); + *(.DebugExceptionVector.literal) + _DebugExceptionVector_literal_end = ABSOLUTE(.); + } >vector_int6_lit :vector_int6_lit_phdr + + .DebugExceptionVector.text : ALIGN(4) + { + _DebugExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.DebugExceptionVector.text)) + _DebugExceptionVector_text_end = ABSOLUTE(.); + } >vector_int6_text :vector_int6_text_phdr + + .NMIExceptionVector.literal : ALIGN(4) + { + _NMIExceptionVector_literal_start = ABSOLUTE(.); + *(.NMIExceptionVector.literal) + _NMIExceptionVector_literal_end = ABSOLUTE(.); + } >vector_int7_lit :vector_int7_lit_phdr + + .NMIExceptionVector.text : ALIGN(4) + { + _NMIExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.NMIExceptionVector.text)) + _NMIExceptionVector_text_end = ABSOLUTE(.); + } >vector_int7_text :vector_int7_text_phdr + + .KernelExceptionVector.literal : ALIGN(4) + { + _KernelExceptionVector_literal_start = ABSOLUTE(.); + *(.KernelExceptionVector.literal) + _KernelExceptionVector_literal_end = ABSOLUTE(.); + } >vector_kernel_lit :vector_kernel_lit_phdr + + .KernelExceptionVector.text : ALIGN(4) + { + _KernelExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.KernelExceptionVector.text)) + _KernelExceptionVector_text_end = ABSOLUTE(.); + } >vector_kernel_text :vector_kernel_text_phdr + + .UserExceptionVector.literal : ALIGN(4) + { + _UserExceptionVector_literal_start = ABSOLUTE(.); + *(.UserExceptionVector.literal) + _UserExceptionVector_literal_end = ABSOLUTE(.); + } >vector_user_lit :vector_user_lit_phdr + + .UserExceptionVector.text : ALIGN(4) + { + _UserExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.UserExceptionVector.text)) + _UserExceptionVector_text_end = ABSOLUTE(.); + } >vector_user_text :vector_user_text_phdr + + .DoubleExceptionVector.literal : ALIGN(4) + { + _DoubleExceptionVector_literal_start = ABSOLUTE(.); + *(.DoubleExceptionVector.literal) + _DoubleExceptionVector_literal_end = ABSOLUTE(.); + } >vector_double_lit :vector_double_lit_phdr + + .DoubleExceptionVector.text : ALIGN(4) + { + _DoubleExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.DoubleExceptionVector.text)) + _DoubleExceptionVector_text_end = ABSOLUTE(.); + } >vector_double_text :vector_double_text_phdr + + .text : ALIGN(4) + { + _stext = .; + _text_start = ABSOLUTE(.); + *(.entry.text) + *(.init.literal) + KEEP(*(.init)) + *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) + *(.fini.literal) + KEEP(*(.fini)) + *(.gnu.version) + _text_end = ABSOLUTE(.); + _etext = .; + } >reef_text_start :reef_text_start_phdr + + .reset.rodata : ALIGN(4) + { + _reset_rodata_start = ABSOLUTE(.); + *(.reset.rodata) + _reset_rodata_end = ABSOLUTE(.); + } >reef_data_ro :reef_data_ro_phdr + + .rodata : ALIGN(4) + { + _rodata_start = ABSOLUTE(.); + *(.rodata) + *(.rodata.*) + *(.gnu.linkonce.r.*) + *(.rodata1) + __XT_EXCEPTION_TABLE__ = ABSOLUTE(.); + KEEP (*(.xt_except_table)) + KEEP (*(.gcc_except_table)) + *(.gnu.linkonce.e.*) + *(.gnu.version_r) + KEEP (*(.eh_frame)) + /* C++ constructor and destructor tables, properly ordered: */ + KEEP (*crtbegin.o(.ctors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + KEEP (*crtbegin.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + /* C++ exception handlers table: */ + __XT_EXCEPTION_DESCS__ = ABSOLUTE(.); + *(.xt_except_desc) + *(.gnu.linkonce.h.*) + __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.); + *(.xt_except_desc_end) + *(.dynamic) + *(.gnu.version_d) + . = ALIGN(4); /* this table MUST be 4-byte aligned */ + _bss_table_start = ABSOLUTE(.); + LONG(_bss_start) + LONG(_bss_end) + _bss_table_end = ABSOLUTE(.); + _rodata_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .data : ALIGN(4) + { + _data_start = ABSOLUTE(.); + *(.data) + *(.data.*) + *(.gnu.linkonce.d.*) + KEEP(*(.gnu.linkonce.d.*personality*)) + *(.data1) + *(.sdata) + *(.sdata.*) + *(.gnu.linkonce.s.*) + *(.sdata2) + *(.sdata2.*) + *(.gnu.linkonce.s2.*) + KEEP(*(.jcr)) + _data_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .lit4 : ALIGN(4) + { + _lit4_start = ABSOLUTE(.); + *(*.lit4) + *(.lit4.*) + *(.gnu.linkonce.lit4.*) + _lit4_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .bss (NOLOAD) : ALIGN(8) + { + . = ALIGN (8); + _bss_start = ABSOLUTE(.); + *(.dynsbss) + *(.sbss) + *(.sbss.*) + *(.gnu.linkonce.sb.*) + *(.scommon) + *(.sbss2) + *(.sbss2.*) + *(.gnu.linkonce.sb2.*) + *(.dynbss) + *(.bss) + *(.bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + . = ALIGN (8); + _bss_end = ABSOLUTE(.); + } >reef_data :reef_data_bss_phdr + + /* stack */ + _end = REEF_STACK_END; + PROVIDE(end = REEF_STACK_END); + _stack_sentry = REEF_STACK_END; + __stack = REEF_STACK_BASE; + + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + + .xt.insn 0 : + { + KEEP (*(.xt.insn)) + KEEP (*(.gnu.linkonce.x.*)) + } + .xt.prop 0 : + { + KEEP (*(.xt.prop)) + KEEP (*(.xt.prop.*)) + KEEP (*(.gnu.linkonce.prop.*)) + } + .xt.lit 0 : + { + KEEP (*(.xt.lit)) + KEEP (*(.xt.lit.*)) + KEEP (*(.gnu.linkonce.p.*)) + } + .xt.profile_range 0 : + { + KEEP (*(.xt.profile_range)) + KEEP (*(.gnu.linkonce.profile_range.*)) + } + .xt.profile_ranges 0 : + { + KEEP (*(.xt.profile_ranges)) + KEEP (*(.gnu.linkonce.xt.profile_ranges.*)) + } + .xt.profile_files 0 : + { + KEEP (*(.xt.profile_files)) + KEEP (*(.gnu.linkonce.xt.profile_files.*)) + } + + .system_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _system_heap_start = ABSOLUTE(.); + . = . + HEAP_SYSTEM_SIZE; + _system_heap_end = ABSOLUTE(.); + } >system_heap :system_heap_phdr + + .runtime_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _runtime_heap_start = ABSOLUTE(.); + . = . + HEAP_RUNTIME_SIZE; + _runtime_heap_end = ABSOLUTE(.); + } >runtime_heap :runtime_heap_phdr + + .buffer_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _system_heap_start = ABSOLUTE(.); + . = . + HEAP_BUFFER_SIZE; + _system_heap_end = ABSOLUTE(.); + } >buffer_heap :buffer_heap_phdr + + .reef_stack (NOLOAD) : ALIGN(8) + { + . = ALIGN (4096); + _reef_stack_start = ABSOLUTE(.); + . = . + REEF_STACK_SIZE; + _reef_stack_end = ABSOLUTE(.); + } >reef_stack :reef_stack_phdr +} + -- 2.14.1

1 2

[Sound-open-firmware] [PATCH] core: atomic: Add atomic addition and subtraction APIs
by Liam Girdwood 04 Apr '18

04 Apr '18

Add APIs to allow atomic additions or subtractions. This API can be used to synchronize buffer W/R pointers between pipelines and components running on different DSP cores. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/arch/xtensa/include/arch/Makefile.am | 1 + src/arch/xtensa/include/arch/atomic.h | 77 ++++++++++++++++++++++++++++++++ src/include/reef/Makefile.am | 1 + src/include/reef/atomic.h | 53 ++++++++++++++++++++++ 4 files changed, 132 insertions(+) create mode 100644 src/arch/xtensa/include/arch/atomic.h create mode 100644 src/include/reef/atomic.h diff --git a/src/arch/xtensa/include/arch/Makefile.am b/src/arch/xtensa/include/arch/Makefile.am index 42b3b700..135ef64c 100644 --- a/src/arch/xtensa/include/arch/Makefile.am +++ b/src/arch/xtensa/include/arch/Makefile.am @@ -1,4 +1,5 @@ noinst_HEADERS = \ + atomic.h \ cache.h \ interrupt.h \ reef.h \ diff --git a/src/arch/xtensa/include/arch/atomic.h b/src/arch/xtensa/include/arch/atomic.h new file mode 100644 index 00000000..80c4522f --- /dev/null +++ b/src/arch/xtensa/include/arch/atomic.h @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * + */ + +#ifndef __ARCH_ATOMIC_H_ +#define __ARCH_ATOMIC_H_ + +#include <stdint.h> +#include <errno.h> + +typedef struct { + volatile int32_t value; +} atomic_t; + +static inline void arch_atomic_init(atomic_t *a, int32_t value) +{ + a->value = value; +} + +static inline void arch_atomic_add(atomic_t *a, int32_t value) +{ + int32_t result, current; + + __asm__ __volatile__( + "1: l32i %1, %2, 0\n" + " wsr %1, scompare1\n" + " add %0, %1, %3\n" + " s32c1i %0, %2, 0\n" + " bne %0, %1, 1b\n" + : "=&a" (result), "=&a" (current) + : "a" (&a->value), "a" (value) + : "memory"); +} + +static inline void arch_atomic_sub(atomic_t *a, int32_t value) +{ + int32_t result, current; + + __asm__ __volatile__( + "1: l32i %1, %2, 0\n" + " wsr %1, scompare1\n" + " sub %0, %1, %3\n" + " s32c1i %0, %2, 0\n" + " bne %0, %1, 1b\n" + : "=&a" (result), "=&a" (current) + : "a" (&a->value), "a" (value) + : "memory"); +} + +#endif diff --git a/src/include/reef/Makefile.am b/src/include/reef/Makefile.am index 8b47664d..f6f9bb29 100644 --- a/src/include/reef/Makefile.am +++ b/src/include/reef/Makefile.am @@ -7,6 +7,7 @@ includedir = $(prefix)/include/sof/reef include_HEADERS = \ alloc.h \ + atomic.h \ clock.h \ dai.h \ debug.h \ diff --git a/src/include/reef/atomic.h b/src/include/reef/atomic.h new file mode 100644 index 00000000..b26b7016 --- /dev/null +++ b/src/include/reef/atomic.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * + */ + +#ifndef __INCLUDE_ATOMIC_H_ +#define __INCLUDE_ATOMIC_H_ + +#include <stdint.h> +#include <arch/atomic.h> + +static inline void atomic_init(atomic_t *a, int32_t value) +{ + arch_atomic_init(a, value); +} + +static inline void atomic_add(atomic_t *a, int32_t value) +{ + arch_atomic_add(a, value); +} + +static inline void atomic_sub(atomic_t *a, int32_t value) +{ + arch_atomic_sub(a, value); +} + +#endif -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] ipc: core: rename intel-ipc.c to handler.c
by Liam Girdwood 04 Apr '18

04 Apr '18

Rename as there is nothing Intel specific about the IPC. It's generic. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/ipc/Makefile.am | 12 ++++++------ src/ipc/{intel-ipc.c => handler.c} | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename src/ipc/{intel-ipc.c => handler.c} (100%) diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am index 1d84dd00..7379217d 100644 --- a/src/ipc/Makefile.am +++ b/src/ipc/Makefile.am @@ -18,7 +18,7 @@ noinst_LIBRARIES = libsof_ipc.a if BUILD_BAYTRAIL libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ byt-ipc.c \ pmc-ipc.c \ dma-copy.c @@ -27,7 +27,7 @@ endif if BUILD_CHERRYTRAIL libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ byt-ipc.c \ pmc-ipc.c \ dma-copy.c @@ -36,7 +36,7 @@ endif if BUILD_BROADWELL libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ hsw-ipc.c \ dma-copy.c endif @@ -44,7 +44,7 @@ endif if BUILD_HASWELL libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ hsw-ipc.c \ dma-copy.c endif @@ -53,7 +53,7 @@ endif if BUILD_APOLLOLAKE libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ apl-ipc.c \ dma-copy.c endif @@ -61,7 +61,7 @@ endif if BUILD_CANNONLAKE libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ cnl-ipc.c \ dma-copy.c endif diff --git a/src/ipc/intel-ipc.c b/src/ipc/handler.c similarity index 100% rename from src/ipc/intel-ipc.c rename to src/ipc/handler.c -- 2.14.1

1 2

[Sound-open-firmware] [PATCH] drivers: ssp: rename ssp.c to byt-ssp.c
by Liam Girdwood 04 Apr '18

04 Apr '18

Make way for hsw-ssp.c and make it easier to differentiate ssp drivers. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/drivers/Makefile.am | 2 +- src/drivers/{ssp.c => byt-ssp.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/drivers/{ssp.c => byt-ssp.c} (100%) diff --git a/src/drivers/Makefile.am b/src/drivers/Makefile.am index 345b6e4f..f4f0fa40 100644 --- a/src/drivers/Makefile.am +++ b/src/drivers/Makefile.am @@ -8,7 +8,7 @@ libdrivers_a_SOURCES += \ apl-ssp.c else libdrivers_a_SOURCES += \ - ssp.c + byt-ssp.c endif if BUILD_APOLLOLAKE diff --git a/src/drivers/ssp.c b/src/drivers/byt-ssp.c similarity index 100% rename from src/drivers/ssp.c rename to src/drivers/byt-ssp.c -- 2.14.1

1 0