summaryrefslogtreecommitdiff
path: root/arch/sandbox
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2018-11-15 19:56:15 -0700
committerSimon Glass <sjg@chromium.org>2018-11-29 09:30:05 -0700
commit1180030d12e0c4f03522fa99f730e724845210fc (patch)
tree65b3fbce2d5b94b6ea8553c9762fd1049b058404 /arch/sandbox
parent856b8f5629700fc329ea08b071ad04ecc377aea5 (diff)
sandbox: Enable sound
Now that the buffer-overflow bug is fixed, we can enable sound on sandbox. Drop the code which exits early. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sandbox')
-rw-r--r--arch/sandbox/cpu/sdl.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index c940a473d7..c7a8d94549 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -268,25 +268,6 @@ int sandbox_sdl_sound_init(void)
if (sdl.audio_active)
return 0;
- /*
- * At present all sandbox sounds crash. This is probably due to
- * symbol name conflicts with U-Boot. We can remove the malloc()
- * probles with:
- *
- * #define USE_DL_PREFIX
- *
- * and get this:
- *
- * Assertion 'e->pollfd->fd == e->fd' failed at pulse/mainloop.c:676,
- * function dispatch_pollfds(). Aborting.
- *
- * The right solution is probably to make U-Boot's names private or
- * link os.c and sdl.c against their libraries before liking with
- * U-Boot. TBD. For now sound is disabled.
- */
- printf("(Warning: sandbox sound disabled)\n");
- return 0;
-
/* Set the audio format */
wanted.freq = SAMPLE_RATE;
wanted.format = AUDIO_S16;