File tree 4 files changed +12
-21
lines changed
4 files changed +12
-21
lines changed Original file line number Diff line number Diff line change @@ -10,5 +10,4 @@ msposd_goke
10
10
msposd_hisi
11
11
msposd_star6b0
12
12
msposd_star6e
13
- msposd_x86
14
- serial_monitor.c
13
+ serial_monitor.c
Original file line number Diff line number Diff line change @@ -45,17 +45,10 @@ star6e: version.h
45
45
$(eval LIB = -lcam_os_wrapper -lm -lmi_rgn -lmi_sys -lmi_venc)
46
46
$(BUILD )
47
47
48
- jetson : version.h
49
- $(eval SDK = ./sdk/gk7205v300)
50
- $(eval CFLAGS += -D_x86 -D_jetson)
51
- $(eval LIB = -lcsfml-graphics -lcsfml-window -lcsfml-system `pkg-config --libs cairo x11` -lm)
52
- $(eval BUILD = $(CC ) $(SRCS ) -I $(SDK ) /include -L $(DRV ) $(CFLAGS ) $(LIB ) -levent_core -O0 -g -o $(OUTPUT ) )
53
- $(BUILD )
54
-
55
- x86 : version.h
48
+ native : version.h
56
49
$(eval SDK = ./sdk/gk7205v300)
57
50
$(eval CFLAGS += -D_x86)
58
51
$(eval LIB = -lcsfml-graphics -lcsfml-window -lcsfml-system `pkg-config --libs cairo x11` -lm)
59
-
60
52
$(eval BUILD = $(CC ) $(SRCS ) -I $(SDK ) /include -L $(DRV ) $(CFLAGS ) $(LIB ) -levent_core -O0 -g -o $(OUTPUT ) )
61
53
$(BUILD )
54
+
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
DL=" https://github.com/OpenIPC/firmware/releases/download/toolchain/toolchain"
3
3
4
+ if [ " $# " -ne 1 ]; then
5
+ echo " Usage: $0 [goke|hisi|star6b0|star6e|native]"
6
+ exit 1
7
+ fi
4
8
5
9
if [[ " $1 " == * " star6b0" ]]; then
6
10
CC=sigmastar-infinity6b0
@@ -13,15 +17,16 @@ elif [[ "$1" == *"hisi" ]]; then
13
17
fi
14
18
15
19
GCC=$PWD /toolchain/$CC /bin/arm-linux-gcc
16
- OUT=msposd_ $1
20
+ OUT=msposd
17
21
18
- if [[ " $1 " != * " jetson " * && " $1 " != * " x86 " * ]]; then
22
+ if [[ " $1 " != * " native " * ]]; then
19
23
if [ ! -e toolchain/$CC ]; then
20
24
wget -c -q --show-progress $DL .$CC .tgz -P $PWD
21
25
mkdir -p toolchain/$CC
22
26
tar -xf toolchain.$CC .tgz -C toolchain/$CC --strip-components=1 || exit 1
23
27
rm -f $CC .tgz
24
28
fi
29
+ OUT=msposd_$1
25
30
fi
26
31
27
32
@@ -41,13 +46,7 @@ elif [ "$1" = "star6b0" ]; then
41
46
elif [ " $1 " = " star6e" ]; then
42
47
DRV=$PWD /firmware/general/package/sigmastar-osdrv-infinity6e/files/lib
43
48
make -B CC=$GCC DRV=$DRV TOOLCHAIN=$PWD /toolchain/$CC OUTPUT=$OUT $1
44
- elif [ " $1 " = " jetson" ]; then
45
- DRV=$PWD
46
- make DRV=$DRV OUTPUT=$OUT $1
47
- elif [ " $1 " = " x86" ]; then
49
+ else
48
50
DRV=$PWD
49
51
make DRV=$DRV OUTPUT=$OUT $1
50
- else
51
- echo " Usage: $0 [goke|hisi|star6b0|star6e|jetson|x86]"
52
- exit 1
53
52
fi
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ int Init_x86(uint16_t *width, uint16_t *height) {
75
75
#endif
76
76
77
77
78
- #ifdef _jetson
78
+ #ifdef _x86
79
79
if (getenv ("DISPLAY" ) == NULL ) {
80
80
/*
81
81
* Use default display screen, especially launch from console
You can’t perform that action at this time.
0 commit comments