Project

General

Profile

0001-Fix-build-against-new-libosmocore.patch

pespin, 10/22/2018 07:57 AM

View differences:

src/target/firmware/Makefile
95 95
ABB_OBJS=abb/twl3025.o
96 96
RF_OBJS=rf/trf6151.o
97 97

  
98
LIBOSMOCORE_PREFIX=/build/new/out
98 99
# Objects that go in all applications
99 100
ANY_APP_OBJS+=$(ABB_OBJS) $(RF_OBJS) $(FLASH_OBJS)
100 101
ANY_APP_LIBS+=	calypso/libcalypso.a \
101 102
		layer1/liblayer1.a \
102 103
		lib/libmini.a \
103 104
		comm/libcomm.a \
104
		../../shared/libosmocore/build-target/src/.libs/libosmocore.a \
105
		../../shared/libosmocore/build-target/src/gsm/.libs/libosmogsm.a \
106
		../../shared/libosmocore/build-target/src/codec/.libs/libosmocodec.a
105
		$(LIBOSMOCORE_PREFIX)/lib/libosmocore.a \
106
		$(LIBOSMOCORE_PREFIX)/lib/libosmogsm.a \
107
		$(LIBOSMOCORE_PREFIX)/lib/libosmocodec.a
107 108

  
108 109

  
109 110
#
......
111 112
#
112 113

  
113 114
# Global include path
114
INCLUDES=-Iinclude/ -I../../../include -I../../shared/libosmocore/include -I../../shared/libosmocore/build-target/include
115
INCLUDES=-Iinclude/ -I../../../include -I$(LIBOSMOCORE_PREFIX)/include
115 116

  
116 117
# Libraries are defined in subdirectories
117 118
-include calypso/Makefile
src/target/firmware/Makefile.mtk
15 15
BOARD_mt62xx_OBJS=$(mtk_COMMON_OBJS) board/mt62xx/init.o
16 16
BOARD_mt62xx_ENVIRONMENTS=mtkram
17 17

  
18
LIBOSMOCORE_PREFIX=/build/new/out
18 19
# Global include path
19
INCLUDES=-Iinclude/ -I../../../include -I../../shared/libosmocore/include
20
INCLUDES=-Iinclude/ -I../../../include -I$(LIBOSMOCORE_PREFIX)/include
20 21

  
21 22
FLASH_OBJS=flash/cfi_flash.o
22 23

  
......
24 25
ANY_APP_OBJS+=$(FLASH_OBJS)
25 26

  
26 27
# Various objects that are currently linked into all applications
27
ANY_APP_LIBS+=lib/libmini.a comm/libcomm.a ../../shared/libosmocore/build-target/src/.libs/libosmocore.a
28
ANY_APP_LIBS+=lib/libmini.a comm/libcomm.a $(LIBOSMOCORE_PREFIX)/lib/libosmocore.a
28 29

  
29 30
# Libraries are defined in subdirectories
30 31
-include comm/Makefile
src/target/firmware/comm/msgb.c
44 44
	uint8_t buf[MSGB_DATA_SIZE];
45 45
};
46 46
static struct supermsg msgs[MSGB_NUM];
47
void *_talloc_zero(void *ctx, unsigned int size, const char *name)
47
void *_talloc_zero(const void *ctx, size_t size, const char *name)
48 48
{
49 49
	unsigned long flags;
50 50
	unsigned int i;
......
70 70

  
71 71
	return NULL; /* not reached */
72 72
}
73
void talloc_free(void *msg)
73

  
74
int _talloc_free(void *msg, const char *location)
74 75
{
75 76
	struct supermsg *smsg = container_of(msg, struct supermsg, msg);
76 77
	/* no locking required, since this is atomic */
77 78
	smsg->allocated = 0;
79
	return 0;
78 80
}
79 81
#endif
src/target/firmware/solve_envs.py
1
#!/usr/bin/env python
1
#!/usr/bin/env python2
2 2

  
3 3
import sys
4 4

  
5
- 
Add picture from clipboard (Maximum size: 48.8 MB)