Fix merge conflction

54shady · Feb 1, 2023 · 06c3af8 · 06c3af8
1 parent af04bd7
commit 06c3af8
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 92 deletions.
diff --git a/rk3288/debug/i2c/Makefile b/rk3288/debug/i2c/Makefile
@@ -14,11 +14,7 @@ else
 DEBFLAGS = -O2
 endif
 
-<<<<<<<< HEAD:rk3399/debug/usb/Makefile
-obj-m := usbmouse_as_key.o
-========
 obj-m := myi2c.o
->>>>>>>> rk3288-nxt:rk3288/debug/i2c/Makefile
 
 KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
 KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)

diff --git a/rk3288/debug/netlink/Makefile b/rk3288/debug/netlink/Makefile
@@ -5,16 +5,11 @@
 # Usage
 # make CROSS_COMPILE=<cross_compiler_prefix> KERNEL_DIR=<your_kernel_dir> KERNEL_BUID_OUTPUT=<kernel_buid_output>
 #
-<<<<<<<< HEAD:x86/hlist/Makefile
-# 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
-========
-
 PWD := $(shell pwd)
 BUILD_ENV = $(PWD)/../../buildenv
 cross_compiler_prefix = $(shell awk -F "CROSS_COMPILE=" '/CROSS_COMPILE=/{print $$2}' $(BUILD_ENV))
 kernel_output = $(shell awk -F "KERNEL_BUILD_OUTPUT=" '/KERNEL_BUILD_OUTPUT=/{print $$2}' $(BUILD_ENV))
 kernel_dir = $(shell awk -F "KERNEL_DIR=" '/KERNEL_DIR=/{print $$2}' $(BUILD_ENV))
->>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
 
 # Add your debugging flag (or not) to CFLAGS
 ifeq ($(DEBUG),y)
@@ -23,37 +18,19 @@ else
 DEBFLAGS = -O2
 endif
 
-<<<<<<<< HEAD:x86/hlist/Makefile
-<<<<<<<< HEAD:x86/hlist/Makefile
-obj-m := demo.o
-
-KERNEL_DIR ?= /lib/modules/`uname -r`/build
-========
-obj-m := vfs_rw.o
-========
 obj-m := demo1_kernel.o
 obj-m += demo2_kernel.o
 obj-m += demo3_kernel.o
->>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
 
 KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
->>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
 KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 PWD := $(shell pwd)
 ARCH := x86_64
 
 modules:
-<<<<<<<< HEAD:x86/hlist/Makefile
-<<<<<<<< HEAD:x86/hlist/Makefile
-	$(MAKE) -C $(KERNEL_DIR) ARCH=$(ARCH) M=$(PWD) O=$(KERNEL_DIR) modules
-========
-	$(MAKE) -C $(KERNEL_DIR) ARCH=arm64 M=$(PWD) O=$(KERNEL_BUID_OUTPUT) modules
->>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
-========
 	$(MAKE) CROSS_COMPILE=$(cross_compiler_prefix) -C $(kernel_dir) O=$(kernel_output) M=$(PWD) modules
->>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
 
 clean:
 	rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions modules.order Module.symvers

diff --git a/rk3288/debug/notify_chain/Makefile b/rk3288/debug/notify_chain/Makefile
@@ -14,14 +14,8 @@ else
 DEBFLAGS = -O2
 endif
 
-<<<<<<<< HEAD:rk3399/debug/char/Makefile
-obj-m := char_skeleton_drv.o
-obj-m += spinlock.o
-
-========
 obj-m := chain_core.o notifier.o register.o
 obj-m += demo1_core.o demo1_notifier.o demo1_register.o
->>>>>>>> rk3288-nxt:rk3288/debug/notify_chain/Makefile
 KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
 KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
 CC = $(CROSS_COMPILE)gcc

diff --git a/rk3288/debug/platform_driver_test/skeleton_ss.h b/rk3288/debug/platform_driver_test/skeleton_ss.h
@@ -30,12 +30,6 @@ const char *dts_name[] = {
 	"pin_a_name",
 	"pin_b_name",
 	"pin_c_name",
-<<<<<<<< HEAD:rk3399/debug/platform_driver_test/skeleton_ss.h
-	"pin_d_name",
-	"pin_e_name",
-	"pin_f_name",
-========
->>>>>>>> rk3288-nxt:rk3288/debug/platform_driver_test/skeleton_ss.h
 };
 
 #endif
diff --git a/rk3399/debug/char/Makefile b/rk3399/debug/char/Makefile
@@ -14,14 +14,8 @@ else
 DEBFLAGS = -O2
 endif
 
-<<<<<<<< HEAD:rk3399/debug/char/Makefile
 obj-m := char_skeleton_drv.o
 obj-m += spinlock.o
-
-========
-obj-m := chain_core.o notifier.o register.o
-obj-m += demo1_core.o demo1_notifier.o demo1_register.o
->>>>>>>> rk3288-nxt:rk3288/debug/notify_chain/Makefile
 KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
 KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
 CC = $(CROSS_COMPILE)gcc

diff --git a/rk3399/debug/misc/Makefile b/rk3399/debug/misc/Makefile
@@ -14,27 +14,17 @@ else
 DEBFLAGS = -O2
 endif
 
-<<<<<<<< HEAD:x86/hlist/Makefile
-obj-m := demo.o
-
-KERNEL_DIR ?= /lib/modules/`uname -r`/build
-========
 obj-m := vfs_rw.o
 
 KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
->>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
 KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 PWD := $(shell pwd)
 ARCH := x86_64
 
 modules:
-<<<<<<<< HEAD:x86/hlist/Makefile
-	$(MAKE) -C $(KERNEL_DIR) ARCH=$(ARCH) M=$(PWD) O=$(KERNEL_DIR) modules
-========
 	$(MAKE) -C $(KERNEL_DIR) ARCH=arm64 M=$(PWD) O=$(KERNEL_BUID_OUTPUT) modules
->>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
 
 clean:
 	rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions modules.order Module.symvers

diff --git a/rk3399/debug/platform_driver_test/skeleton_ss.h b/rk3399/debug/platform_driver_test/skeleton_ss.h
@@ -30,12 +30,9 @@ const char *dts_name[] = {
 	"pin_a_name",
 	"pin_b_name",
 	"pin_c_name",
-<<<<<<<< HEAD:rk3399/debug/platform_driver_test/skeleton_ss.h
 	"pin_d_name",
 	"pin_e_name",
 	"pin_f_name",
-========
->>>>>>>> rk3288-nxt:rk3288/debug/platform_driver_test/skeleton_ss.h
 };
 
 #endif
diff --git a/rk3399/debug/usb/Makefile b/rk3399/debug/usb/Makefile
@@ -14,11 +14,7 @@ else
 DEBFLAGS = -O2
 endif
 
-<<<<<<<< HEAD:rk3399/debug/usb/Makefile
 obj-m := usbmouse_as_key.o
-========
-obj-m := myi2c.o
->>>>>>>> rk3288-nxt:rk3288/debug/i2c/Makefile
 
 KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
 KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)

diff --git a/x86/hlist/Makefile b/x86/hlist/Makefile
@@ -5,16 +5,7 @@
 # Usage
 # make CROSS_COMPILE=<cross_compiler_prefix> KERNEL_DIR=<your_kernel_dir> KERNEL_BUID_OUTPUT=<kernel_buid_output>
 #
-<<<<<<<< HEAD:x86/hlist/Makefile
 # 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
-========
-
-PWD := $(shell pwd)
-BUILD_ENV = $(PWD)/../../buildenv
-cross_compiler_prefix = $(shell awk -F "CROSS_COMPILE=" '/CROSS_COMPILE=/{print $$2}' $(BUILD_ENV))
-kernel_output = $(shell awk -F "KERNEL_BUILD_OUTPUT=" '/KERNEL_BUILD_OUTPUT=/{print $$2}' $(BUILD_ENV))
-kernel_dir = $(shell awk -F "KERNEL_DIR=" '/KERNEL_DIR=/{print $$2}' $(BUILD_ENV))
->>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
 
 # Add your debugging flag (or not) to CFLAGS
 ifeq ($(DEBUG),y)
@@ -23,40 +14,20 @@ else
 DEBFLAGS = -O2
 endif
 
-<<<<<<<< HEAD:x86/hlist/Makefile
-<<<<<<<< HEAD:x86/hlist/Makefile
 obj-m := demo.o
 
 KERNEL_DIR ?= /lib/modules/`uname -r`/build
-========
-obj-m := vfs_rw.o
-========
-obj-m := demo1_kernel.o
-obj-m += demo2_kernel.o
-obj-m += demo3_kernel.o
->>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
-
-KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build
->>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
 KERNEL_BUID_OUTPUT ?=$(KERNEL_DIR)
 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 PWD := $(shell pwd)
 ARCH := x86_64
 
 modules:
-<<<<<<<< HEAD:x86/hlist/Makefile
-<<<<<<<< HEAD:x86/hlist/Makefile
 	$(MAKE) -C $(KERNEL_DIR) ARCH=$(ARCH) M=$(PWD) O=$(KERNEL_DIR) modules
-========
-	$(MAKE) -C $(KERNEL_DIR) ARCH=arm64 M=$(PWD) O=$(KERNEL_BUID_OUTPUT) modules
->>>>>>>> rk3399-nxt:rk3399/debug/misc/Makefile
-========
-	$(MAKE) CROSS_COMPILE=$(cross_compiler_prefix) -C $(kernel_dir) O=$(kernel_output) M=$(PWD) modules
->>>>>>>> rk3288-nxt:rk3288/debug/netlink/Makefile
 
 clean:
-	rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions modules.order Module.symvers
+	rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions modules.order Module.symvers *.mod
 
 depend .depend dep:
 	$(CC) $(CFLAGS) -M *.c > .depend