diff options
author | Harald Welte <laforge@gnumonks.org> | 2017-05-15 17:49:06 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-05-15 21:43:47 +0200 |
commit | 9d7773352d18e105e5a371c7adc9e0ff2aabcf66 (patch) | |
tree | edcba9ac0857eedf1247a7088ee282acf41f0db3 | |
parent | ad92f0835341330097f4be62ee2257abcd69977c (diff) |
use system-installed libosmo{core,gsm}.alaforge/remove-libosmocore
Change-Id: I88cb9999abf060f96551172976606ef26b959bf5
-rw-r--r-- | src/target/firmware/Makefile | 8 | ||||
-rw-r--r-- | src/target/firmware/comm/msgb.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 2ae2f4dc..c6cee365 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -2,6 +2,8 @@ ## Osmocom-BB: Target firmware Makefile ## +SYSROOT=/usr/local/arm-none-eabi + # # Environments # @@ -101,8 +103,8 @@ ANY_APP_LIBS+= calypso/libcalypso.a \ layer1/liblayer1.a \ lib/libmini.a \ comm/libcomm.a \ - ../../shared/libosmocore/build-target/src/.libs/libosmocore.a \ - ../../shared/libosmocore/build-target/src/gsm/.libs/libosmogsm.a + $(SYSROOT)/lib/libosmocore.a \ + $(SYSROOT)/lib/libosmogsm.a # @@ -110,7 +112,7 @@ ANY_APP_LIBS+= calypso/libcalypso.a \ # # Global include path -INCLUDES=-Iinclude/ -I../../../include -I../../shared/libosmocore/include -I../../shared/libosmocore/build-target/include +INCLUDES=-Iinclude/ -I../../../include -I$(SYSROOT)/include # Libraries are defined in subdirectories -include calypso/Makefile diff --git a/src/target/firmware/comm/msgb.c b/src/target/firmware/comm/msgb.c index 3524ba58..fa58d7f1 100644 --- a/src/target/firmware/comm/msgb.c +++ b/src/target/firmware/comm/msgb.c @@ -44,7 +44,7 @@ struct supermsg { uint8_t buf[MSGB_DATA_SIZE]; }; static struct supermsg msgs[MSGB_NUM]; -void *_talloc_zero(void *ctx, unsigned int size, const char *name) +void *_talloc_zero(const void *ctx, size_t size, const char *name) { unsigned long flags; unsigned int i; @@ -70,7 +70,7 @@ panic: return NULL; /* not reached */ } -void talloc_free(void *msg) +int _talloc_free(void *msg, const char *location) { struct supermsg *smsg = container_of(msg, struct supermsg, msg); /* no locking required, since this is atomic */ |