diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:00 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:00 +0200 |
| commit | d7609640e7cb9d213b9d3cbcf9394c677719d369 (patch) | |
| tree | 1487faa310e5f6dd91a5d033644abb470b8f3719 /arch/sandbox/Makefile | |
| parent | d1e65d2a7bd9162e7009da870adb15c70b620320 (diff) | |
| parent | 9d73b518fc3c61640123f8499aab7f8373e41dbd (diff) | |
| download | barebox-d7609640e7cb9d213b9d3cbcf9394c677719d369.tar.gz barebox-d7609640e7cb9d213b9d3cbcf9394c677719d369.tar.xz | |
Merge branch 'for-next/sandbox'
Conflicts:
arch/sandbox/mach-sandbox/include/mach/linux.h
Diffstat (limited to 'arch/sandbox/Makefile')
| -rw-r--r-- | arch/sandbox/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index 9fd18a23b5..c0aa8c6ed2 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -9,8 +9,7 @@ lds-y := $(BOARD)/barebox.lds TEXT_BASE = $(CONFIG_TEXT_BASE) - -CFLAGS += -Dmalloc=barebox_malloc \ +CFLAGS += -Dmalloc=barebox_malloc -Dcalloc=barebox_calloc \ -Dfree=barebox_free -Drealloc=barebox_realloc \ -Dread=barebox_read -Dwrite=barebox_write \ -Dopen=barebox_open -Dclose=barebox_close \ @@ -40,9 +39,10 @@ archprepare: maketools PHONY += maketools +SDL_LIBS-$(CONFIG_DRIVER_VIDEO_SDL) := $(shell pkg-config sdl --libs) cmd_barebox__ = $(CC) -o $@ -Wl,-T,$(barebox-lds) \ -Wl,--start-group $(barebox-common) -Wl,--end-group \ - -lrt -lpthread + -lrt -lpthread $(SDL_LIBS-y) common-y += $(BOARD) arch/sandbox/os/ |