actually link against libosmocore for the target

diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile
index aef1d42..bf819e7 100644 (file)
--- a/src/target/firmware/Makefile
+++ b/src/target/firmware/Makefile
@@ -1,6 +1,6 @@
 
 # Global include path
-INCLUDES=-Iinclude/ -I../../../include
+INCLUDES=-Iinclude/ -I../../../include -I../../shared/libosmocore/build-target/include
 
 # Various objects that are currently linked into all applications
 FLASH_OBJS=flash/cfi_flash.o
@@ -20,7 +20,7 @@ APPLICATIONS=hello_world l1test compal_dump compal_dsp_dump layer1 loader
 
 # Things that go in all applications
 ANY_APP_OBJS+=$(START:.S=.o) $(ABB_OBJS) $(RF_OBJS) $(DISPLAY_OBJS) $(FLASH_OBJS)
-ANY_APP_LIBS+=calypso/libcalypso.a layer1/liblayer1.a lib/libmini.a comm/libcomm.a
+ANY_APP_LIBS+=calypso/libcalypso.a layer1/liblayer1.a lib/libmini.a comm/libcomm.a ../../shared/libosmocore/build-target/src/.libs/libosmocore.a
 
 # Libraries are defined in subdirectories
 -include calypso/Makefile

diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc
index a42cca4..0d3b8b3 100644 (file)
--- a/src/target/firmware/Makefile.inc
+++ b/src/target/firmware/Makefile.inc
@@ -20,7 +20,7 @@ CFLAGS += -Os -ffunction-sections
 CFLAGS += -g$(DEBUGF)
 
 # Uncomment this line if you want to enable Tx (Transmit) Support.
-#CFLAGS += -DCONFIG_TX_ENABLE
+CFLAGS += -DCONFIG_TX_ENABLE
 
 # some older toolchains don't support this, ignore it for now
 #ASFLAGS=-Wa,-adhlns=$(<:.S=.lst),--g$(DEBUGF) $(INCLUDES) -D__ASSEMBLY__

diff --git a/src/target/firmware/comm/msgb.c b/src/target/firmware/comm/msgb.c
index 499060c..866fd3c 100644 (file)
--- a/src/target/firmware/comm/msgb.c
+++ b/src/target/firmware/comm/msgb.c
@@ -36,7 +36,7 @@ void *tall_msgb_ctx;
 #ifdef NO_TALLOC
 /* This is a poor mans static allocator for msgb objects */
 #define MSGB_DATA_SIZE 256+4
-#define MSGB_NUM       16
+#define MSGB_NUM       32
 struct supermsg {
        uint8_t allocated;
        struct msgb msg;