Skip to content

Commit 06c3af8

Browse files
54shady54shady
committed
Fix merge conflction
1 parent af04bd7 commit 06c3af8

File tree

9 files changed

+1
-92
lines changed

9 files changed

+1
-92
lines changed

‎rk3288/debug/i2c/Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ else
1414
DEBFLAGS = -O2
1515
endif
1616

17-
<<<<<<<< HEAD:rk3399/debug/usb/Makefile
18-
obj-m := usbmouse_as_key.o
19-
========
2017
obj-m := myi2c.o
21-
>>>>>>>> rk3288-nxt:rk3288/debug/i2c/Makefile
2218

2319
KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
2420
KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)

‎rk3288/debug/netlink/Makefile‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@
55
# Usage
66
# make CROSS_COMPILE=<cross_compiler_prefix> KERNEL_DIR=<your_kernel_dir> KERNEL_BUID_OUTPUT=<kernel_buid_output>
77
#
8-
<<<<<<<< HEAD:x86/hlist/Makefile
9-
# make CROSS_COMPILE=/home/zeroway/rk3399/tool/gcc-linaro-4.9.4-2017.01-i686_aarch64-linux-gnu/bin/aarch64-linux-gnu- KERNEL_DIR=/home/zeroway/rk3399/src/firefly/kernel KERNEL_BUID_OUTPUT=/home/zeroway/rk3399/src/firefly/out/target/product/rk3399_firefly_box/obj/KERNEL
10-
========
11-
128
PWD := $(shell pwd)
139
BUILD_ENV = $(PWD)/../../buildenv
1410
cross_compiler_prefix = $(shell awk -F "CROSS_COMPILE=" '/CROSS_COMPILE=/{print $$2}' $(BUILD_ENV))
1511
kernel_output = $(shell awk -F "KERNEL_BUILD_OUTPUT=" '/KERNEL_BUILD_OUTPUT=/{print $$2}' $(BUILD_ENV))
1612
kernel_dir = $(shell awk -F "KERNEL_DIR=" '/KERNEL_DIR=/{print $$2}' $(BUILD_ENV))
17-
>>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
1813

1914
# Add your debugging flag (or not) to CFLAGS
2015
ifeq ($(DEBUG),y)
@@ -23,37 +18,19 @@ else
2318
DEBFLAGS = -O2
2419
endif
2520

26-
<<<<<<<< HEAD:x86/hlist/Makefile
27-
<<<<<<<< HEAD:x86/hlist/Makefile
28-
obj-m := demo.o
29-
30-
KERNEL_DIR ?= /lib/modules/`uname -r`/build
31-
========
32-
obj-m := vfs_rw.o
33-
========
3421
obj-m := demo1_kernel.o
3522
obj-m += demo2_kernel.o
3623
obj-m += demo3_kernel.o
37-
>>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
3824

3925
KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
40-
>>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
4126
KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
4227
CC = $(CROSS_COMPILE)gcc
4328
LD = $(CROSS_COMPILE)ld
4429
PWD := $(shell pwd)
4530
ARCH := x86_64
4631

4732
modules:
48-
<<<<<<<< HEAD:x86/hlist/Makefile
49-
<<<<<<<< HEAD:x86/hlist/Makefile
50-
$(MAKE) -C $(KERNEL_DIR) ARCH=$(ARCH) M=$(PWD) O=$(KERNEL_DIR) modules
51-
========
52-
$(MAKE) -C $(KERNEL_DIR) ARCH=arm64 M=$(PWD) O=$(KERNEL_BUID_OUTPUT) modules
53-
>>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
54-
========
5533
$(MAKE) CROSS_COMPILE=$(cross_compiler_prefix) -C $(kernel_dir) O=$(kernel_output) M=$(PWD) modules
56-
>>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
5734

5835
clean:
5936
rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions modules.order Module.symvers

‎rk3288/debug/notify_chain/Makefile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,8 @@ else
1414
DEBFLAGS = -O2
1515
endif
1616

17-
<<<<<<<< HEAD:rk3399/debug/char/Makefile
18-
obj-m := char_skeleton_drv.o
19-
obj-m += spinlock.o
20-
21-
========
2217
obj-m := chain_core.o notifier.o register.o
2318
obj-m += demo1_core.o demo1_notifier.o demo1_register.o
24-
>>>>>>>> rk3288-nxt:rk3288/debug/notify_chain/Makefile
2519
KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
2620
KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
2721
CC = $(CROSS_COMPILE)gcc

‎rk3288/debug/platform_driver_test/skeleton_ss.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ const char *dts_name[] = {
3030
"pin_a_name",
3131
"pin_b_name",
3232
"pin_c_name",
33-
<<<<<<<< HEAD:rk3399/debug/platform_driver_test/skeleton_ss.h
34-
"pin_d_name",
35-
"pin_e_name",
36-
"pin_f_name",
37-
========
38-
>>>>>>>> rk3288-nxt:rk3288/debug/platform_driver_test/skeleton_ss.h
3933
};
4034

4135
#endif

‎rk3399/debug/char/Makefile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,8 @@ else
1414
DEBFLAGS = -O2
1515
endif
1616

17-
<<<<<<<< HEAD:rk3399/debug/char/Makefile
1817
obj-m := char_skeleton_drv.o
1918
obj-m += spinlock.o
20-
21-
========
22-
obj-m := chain_core.o notifier.o register.o
23-
obj-m += demo1_core.o demo1_notifier.o demo1_register.o
24-
>>>>>>>> rk3288-nxt:rk3288/debug/notify_chain/Makefile
2519
KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
2620
KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
2721
CC = $(CROSS_COMPILE)gcc

‎rk3399/debug/misc/Makefile‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,17 @@ else
1414
DEBFLAGS = -O2
1515
endif
1616

17-
<<<<<<<< HEAD:x86/hlist/Makefile
18-
obj-m := demo.o
19-
20-
KERNEL_DIR ?= /lib/modules/`uname -r`/build
21-
========
2217
obj-m := vfs_rw.o
2318

2419
KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
25-
>>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
2620
KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
2721
CC = $(CROSS_COMPILE)gcc
2822
LD = $(CROSS_COMPILE)ld
2923
PWD := $(shell pwd)
3024
ARCH := x86_64
3125

3226
modules:
33-
<<<<<<<< HEAD:x86/hlist/Makefile
34-
$(MAKE) -C $(KERNEL_DIR) ARCH=$(ARCH) M=$(PWD) O=$(KERNEL_DIR) modules
35-
========
3627
$(MAKE) -C $(KERNEL_DIR) ARCH=arm64 M=$(PWD) O=$(KERNEL_BUID_OUTPUT) modules
37-
>>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
3828

3929
clean:
4030
rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions modules.order Module.symvers

‎rk3399/debug/platform_driver_test/skeleton_ss.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,9 @@ const char *dts_name[] = {
3030
"pin_a_name",
3131
"pin_b_name",
3232
"pin_c_name",
33-
<<<<<<<< HEAD:rk3399/debug/platform_driver_test/skeleton_ss.h
3433
"pin_d_name",
3534
"pin_e_name",
3635
"pin_f_name",
37-
========
38-
>>>>>>>> rk3288-nxt:rk3288/debug/platform_driver_test/skeleton_ss.h
3936
};
4037

4138
#endif

‎rk3399/debug/usb/Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ else
1414
DEBFLAGS = -O2
1515
endif
1616

17-
<<<<<<<< HEAD:rk3399/debug/usb/Makefile
1817
obj-m := usbmouse_as_key.o
19-
========
20-
obj-m := myi2c.o
21-
>>>>>>>> rk3288-nxt:rk3288/debug/i2c/Makefile
2218

2319
KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
2420
KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)

‎x86/hlist/Makefile‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@
55
# Usage
66
# make CROSS_COMPILE=<cross_compiler_prefix> KERNEL_DIR=<your_kernel_dir> KERNEL_BUID_OUTPUT=<kernel_buid_output>
77
#
8-
<<<<<<<< HEAD:x86/hlist/Makefile
98
# make CROSS_COMPILE=/home/zeroway/rk3399/tool/gcc-linaro-4.9.4-2017.01-i686_aarch64-linux-gnu/bin/aarch64-linux-gnu- KERNEL_DIR=/home/zeroway/rk3399/src/firefly/kernel KERNEL_BUID_OUTPUT=/home/zeroway/rk3399/src/firefly/out/target/product/rk3399_firefly_box/obj/KERNEL
10-
========
11-
12-
PWD := $(shell pwd)
13-
BUILD_ENV = $(PWD)/../../buildenv
14-
cross_compiler_prefix = $(shell awk -F "CROSS_COMPILE=" '/CROSS_COMPILE=/{print $$2}' $(BUILD_ENV))
15-
kernel_output = $(shell awk -F "KERNEL_BUILD_OUTPUT=" '/KERNEL_BUILD_OUTPUT=/{print $$2}' $(BUILD_ENV))
16-
kernel_dir = $(shell awk -F "KERNEL_DIR=" '/KERNEL_DIR=/{print $$2}' $(BUILD_ENV))
17-
>>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
189

1910
# Add your debugging flag (or not) to CFLAGS
2011
ifeq ($(DEBUG),y)
@@ -23,40 +14,20 @@ else
2314
DEBFLAGS = -O2
2415
endif
2516

26-
<<<<<<<< HEAD:x86/hlist/Makefile
27-
<<<<<<<< HEAD:x86/hlist/Makefile
2817
obj-m := demo.o
2918

3019
KERNEL_DIR ?= /lib/modules/`uname -r`/build
31-
========
32-
obj-m := vfs_rw.o
33-
========
34-
obj-m := demo1_kernel.o
35-
obj-m += demo2_kernel.o
36-
obj-m += demo3_kernel.o
37-
>>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
38-
39-
KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
40-
>>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
4120
KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
4221
CC = $(CROSS_COMPILE)gcc
4322
LD = $(CROSS_COMPILE)ld
4423
PWD := $(shell pwd)
4524
ARCH := x86_64
4625

4726
modules:
48-
<<<<<<<< HEAD:x86/hlist/Makefile
49-
<<<<<<<< HEAD:x86/hlist/Makefile
5027
$(MAKE) -C $(KERNEL_DIR) ARCH=$(ARCH) M=$(PWD) O=$(KERNEL_DIR) modules
51-
========
52-
$(MAKE) -C $(KERNEL_DIR) ARCH=arm64 M=$(PWD) O=$(KERNEL_BUID_OUTPUT) modules
53-
>>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
54-
========
55-
$(MAKE) CROSS_COMPILE=$(cross_compiler_prefix) -C $(kernel_dir) O=$(kernel_output) M=$(PWD) modules
56-
>>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
5728

5829
clean:
59-
rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions modules.order Module.symvers
30+
rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions modules.order Module.symvers *.mod
6031

6132
depend .depend dep:
6233
$(CC) $(CFLAGS) -M *.c > .depend

0 commit comments

Comments
 (0)