From 15ff1812e2e7f5ce7debf8350db79230c7d39d88 Mon Sep 17 00:00:00 2001 From: zhuoli Date: Mon, 19 Jul 2021 15:36:38 +0800 Subject: [PATCH] Generate uapi files for L2 musl; remove redundant files Signed-off-by: zhuoli --- kernel_module_build.sh | 7 ++++ .../usr/include/asm-generic/Kbuild.asm | 3 -- .../prebuilts/usr/include/asm/..install.cmd | 1 - linux-4.19/prebuilts/usr/include/asm/.install | 0 linux-4.19/prebuilts/usr/include/linux/Kbuild | 13 -------- .../usr/include/linux/usb/f_accessory.h | 33 +++++++++++++++++++ 6 files changed, 40 insertions(+), 17 deletions(-) delete mode 100644 linux-4.19/prebuilts/usr/include/asm-generic/Kbuild.asm delete mode 100644 linux-4.19/prebuilts/usr/include/asm/..install.cmd delete mode 100644 linux-4.19/prebuilts/usr/include/asm/.install delete mode 100644 linux-4.19/prebuilts/usr/include/linux/Kbuild create mode 100644 linux-4.19/prebuilts/usr/include/linux/usb/f_accessory.h diff --git a/kernel_module_build.sh b/kernel_module_build.sh index 8cdd404..d60d82d 100755 --- a/kernel_module_build.sh +++ b/kernel_module_build.sh @@ -45,6 +45,13 @@ else exit 1 fi +if [ $2 == "Hi3516DV300" ];then + if [ ! -d "${OUT_DIR}/../ohos-arm-release/obj/third_party/musl/usr/include/arm-linux-ohosmusl" ];then + mkdir -p ${OUT_DIR}/../ohos-arm-release/obj/third_party/musl/usr/include/arm-linux-ohosmusl + fi + cp -r $(pwd)/linux-4.19/prebuilts/usr/include/* ${OUT_DIR}/../ohos-arm-release/obj/third_party/musl/usr/include/arm-linux-ohosmusl + rm -rf ${OUT_DIR}/../ohos-arm-release/obj/third_party/musl/usr/include/arm-linux-ohosmusl/asm-arm +fi if [ $2 == "hispark_taurus" ];then cp -rf ${LINUX_KERNEL_UIMAGE_FILE} ${OUT_DIR}/uImage_hi3516dv300_smp diff --git a/linux-4.19/prebuilts/usr/include/asm-generic/Kbuild.asm b/linux-4.19/prebuilts/usr/include/asm-generic/Kbuild.asm deleted file mode 100644 index 405cc17..0000000 --- a/linux-4.19/prebuilts/usr/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1d9abab91ade3a7bd93472cf5dd825305b111e5f5eeb3b5d0cbb7067bebea2d -size 783 diff --git a/linux-4.19/prebuilts/usr/include/asm/..install.cmd b/linux-4.19/prebuilts/usr/include/asm/..install.cmd deleted file mode 100644 index 747328c..0000000 --- a/linux-4.19/prebuilts/usr/include/asm/..install.cmd +++ /dev/null @@ -1 +0,0 @@ -cmd_/home/zzzuo/workshop/harmony/L2_2.0/kernel/linux/patches/linux-4.19/prebuilts/../../../../..//kernel/linux-4.19/hdr_install/arm_header/include/asm/.install := /bin/sh scripts/headers_install.sh /home/zzzuo/workshop/harmony/L2_2.0/kernel/linux/patches/linux-4.19/prebuilts/../../../../..//kernel/linux-4.19/hdr_install/arm_header/include/asm ./arch/arm/include/uapi/asm fcntl.h posix_types.h ioctls.h byteorder.h swab.h perf_regs.h kvm_para.h hwcap.h signal.h auxvec.h mman.h statfs.h kvm.h unistd.h stat.h setup.h types.h ptrace.h sigcontext.h; /bin/sh scripts/headers_install.sh /home/zzzuo/workshop/harmony/L2_2.0/kernel/linux/patches/linux-4.19/prebuilts/../../../../..//kernel/linux-4.19/hdr_install/arm_header/include/asm ./arch/arm/include/generated/uapi/asm bpf_perf_event.h sembuf.h termios.h msgbuf.h poll.h termbits.h ipcbuf.h sockios.h resource.h errno.h siginfo.h param.h bitsperlong.h shmbuf.h socket.h ioctl.h unistd-eabi.h unistd-common.h unistd-oabi.h; touch /home/zzzuo/workshop/harmony/L2_2.0/kernel/linux/patches/linux-4.19/prebuilts/../../../../..//kernel/linux-4.19/hdr_install/arm_header/include/asm/.install diff --git a/linux-4.19/prebuilts/usr/include/asm/.install b/linux-4.19/prebuilts/usr/include/asm/.install deleted file mode 100644 index e69de29..0000000 diff --git a/linux-4.19/prebuilts/usr/include/linux/Kbuild b/linux-4.19/prebuilts/usr/include/linux/Kbuild deleted file mode 100644 index ca2787d..0000000 --- a/linux-4.19/prebuilts/usr/include/linux/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list - -ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),) -no-export-headers += a.out.h -endif - -ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h),) -no-export-headers += kvm.h -endif - -ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),) -no-export-headers += kvm_para.h -endif diff --git a/linux-4.19/prebuilts/usr/include/linux/usb/f_accessory.h b/linux-4.19/prebuilts/usr/include/linux/usb/f_accessory.h new file mode 100644 index 0000000..b020ed2 --- /dev/null +++ b/linux-4.19/prebuilts/usr/include/linux/usb/f_accessory.h @@ -0,0 +1,33 @@ +/* + * This header was generated from the Linux kernel headers by update_headers.py, + * to provide necessary information from kernel to userspace, such as constants, + * structures, and macros, and thus, contains no copyrightable information. + */ +#ifndef _UAPI_LINUX_USB_F_ACCESSORY_H +#define _UAPI_LINUX_USB_F_ACCESSORY_H +#define USB_ACCESSORY_VENDOR_ID 0x18D1 +#define USB_ACCESSORY_PRODUCT_ID 0x2D00 +#define USB_ACCESSORY_ADB_PRODUCT_ID 0x2D01 +#define ACCESSORY_STRING_MANUFACTURER 0 +#define ACCESSORY_STRING_MODEL 1 +#define ACCESSORY_STRING_DESCRIPTION 2 +#define ACCESSORY_STRING_VERSION 3 +#define ACCESSORY_STRING_URI 4 +#define ACCESSORY_STRING_SERIAL 5 +#define ACCESSORY_GET_PROTOCOL 51 +#define ACCESSORY_SEND_STRING 52 +#define ACCESSORY_START 53 +#define ACCESSORY_REGISTER_HID 54 +#define ACCESSORY_UNREGISTER_HID 55 +#define ACCESSORY_SET_HID_REPORT_DESC 56 +#define ACCESSORY_SEND_HID_EVENT 57 +#define ACCESSORY_SET_AUDIO_MODE 58 +#define ACCESSORY_GET_STRING_MANUFACTURER _IOW('M', 1, char[256]) +#define ACCESSORY_GET_STRING_MODEL _IOW('M', 2, char[256]) +#define ACCESSORY_GET_STRING_DESCRIPTION _IOW('M', 3, char[256]) +#define ACCESSORY_GET_STRING_VERSION _IOW('M', 4, char[256]) +#define ACCESSORY_GET_STRING_URI _IOW('M', 5, char[256]) +#define ACCESSORY_GET_STRING_SERIAL _IOW('M', 6, char[256]) +#define ACCESSORY_IS_START_REQUESTED _IO('M', 7) +#define ACCESSORY_GET_AUDIO_MODE _IO('M', 8) +#endif -- Gitee