0001-delete-um-for-yocto.patch 8.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224
  1. From 1b0a28e4b3a42c9bccf486b567421ed793c90dfd Mon Sep 17 00:00:00 2001
  2. From: zhangjb <zhangjb194813@linux.alibaba.com>
  3. Date: Tue, 28 Dec 2021 20:28:19 +0800
  4. Subject: [PATCH] delete-um-for-yocto
  5. ---
  6. Makefile | 52 +++++++------------
  7. .../drivers/staging/imgtec/plato/plato_drv.c | 2 +-
  8. .../drivers/staging/imgtec/tc/drm_pdp_drv.c | 2 +-
  9. .../kernel/drivers/staging/imgtec/tc/tc_drv.c | 2 +-
  10. .../server/env/linux/pvr_platform_drv.c | 4 +-
  11. tools/prepare.sh | 22 ++++----
  12. tools/prepare_driver.sh | 5 ++
  13. 7 files changed, 41 insertions(+), 48 deletions(-)
  14. create mode 100755 tools/prepare_driver.sh
  15. diff --git a/Makefile b/Makefile
  16. index 40ab37788..c08dd78e8 100644
  17. --- a/Makefile
  18. +++ b/Makefile
  19. @@ -17,20 +17,20 @@ BUILD_LOG_START="\033[47;30m>>> $(MODULE_NAME) $@ begin\033[0m"
  20. BUILD_LOG_END ="\033[47;30m<<< $(MODULE_NAME) $@ end\033[0m"
  21. -export PATH+=:$(ROOT_DIR)/buildroot/output/host/bin
  22. +#export PATH+=:$(ROOT_DIR)/buildroot/output/host/bin
  23. #export WINDOW_SYSTEM=nulldrmws
  24. #export WINDOW_SYSTEM=xorg
  25. -export WINDOW_SYSTEM=lws-generic
  26. +#export WINDOW_SYSTEM=lws-generic
  27. #export WINDOW_SYSTEM=wayland
  28. #export WINDOW_SYSTEM=nullws
  29. -export MIPS_ELF_ROOT=$(ROOT_DIR)/gpu_bxm_4_64/tools/mips-mti-elf/2014.07-1
  30. -export SYSROOT=$(ROOT_DIR)/buildroot/output/host/opt/ext-toolchain/sysroot
  31. -export DISCIMAGE=$(ROOT_DIR)/buildroot/output/host/opt/ext-toolchain/sysroot
  32. -export KERNELDIR=$(ROOT_DIR)/buildroot/output/build/linux-custom
  33. -export BUILD=debug
  34. +export MIPS_ELF_ROOT=$(LINUX_ROOT)/tools/mips-mti-elf/2014.07-1
  35. +export SYSROOT=$(SYSROOT_DIR)
  36. +#export DISCIMAGE=$(ROOT_DIR)/buildroot/output/host/opt/ext-toolchain/sysroot
  37. +#export KERNELDIR=$(ROOT_DIR)/buildroot/output/build/linux-custom
  38. +#export BUILD=debug
  39. #export BUILD=release
  40. -export LINUX_ROOT=$(ROOT_DIR)/gpu_bxm_4_64
  41. -export LLVM_BUILD_DIR=$(ROOT_DIR)/gpu_bxm_4_64/tools/llvm
  42. +#export LINUX_ROOT=$(ROOT_DIR)/gpu_bxm_4_64
  43. +#export LLVM_BUILD_DIR=$(ROOT_DIR)/gpu_bxm_4_64/tools/llvm
  44. export RGX_BVNC=36.52.104.182
  45. export DRIVERDIR=rogue_km
  46. export LIBDIR=rogue
  47. @@ -52,9 +52,9 @@ ifeq ($(JOBS),)
  48. endif
  49. endif
  50. -all: info driver lib test install_local_output install_rootfs
  51. -.PHONY: info driver lib test install_local_output install_rootfs \
  52. - install_addons clean_driver clean_lib clean_test clean_output clean
  53. +all: info driver test install_local_output install_rootfs
  54. +.PHONY: info driver test install_local_output install_rootfs \
  55. + install_addons clean_driver clean_test clean_output clean
  56. info:
  57. @echo $(BUILD_LOG_START)
  58. @@ -82,20 +82,11 @@ clean_driver:
  59. make -C $(DRIVERDIR)/build/linux/thead_linux CROSS_COMPILE=$(CROSS_COMPILE) ARCH=$(ARCH) BUILD=$(BUILD) RGX_BVNC=$(RGX_BVNC) clean
  60. @echo $(BUILD_LOG_END)
  61. -prepare_lib:
  62. - @bash ./tools/prepare.sh $(SYSROOT) $(KERNELDIR) $(DISCIMAGE)
  63. +prepare_driver:
  64. + @bash ./tools/prepare_driver.sh $(KERNELDIR) $(DISCIMAGE)
  65. -lib: prepare_lib
  66. - @echo $(BUILD_LOG_START)
  67. - make -C $(LIBDIR)/build/linux/thead_linux CROSS_COMPILE=$(TOOLCHAIN_PREFIX) ARCH=$(ARCH) BUILD=$(BUILD) RGX_BVNC=$(RGX_BVNC)
  68. - @echo $(BUILD_LOG_END)
  69. -
  70. -clean_lib:
  71. - @echo $(BUILD_LOG_START)
  72. - make -C $(LIBDIR)/build/linux/thead_linux CROSS_COMPILE=$(TOOLCHAIN_PREFIX) ARCH=$(ARCH) BUILD=$(BUILD) RGX_BVNC=$(RGX_BVNC) clean
  73. - @echo $(BUILD_LOG_END)
  74. -test: lib driver
  75. +test: driver
  76. @echo $(BUILD_LOG_START)
  77. @echo "Test cases are built when build lib"
  78. @echo $(BUILD_LOG_END)
  79. @@ -104,23 +95,20 @@ clean_test:
  80. @echo $(BUILD_LOG_START)
  81. @echo $(BUILD_LOG_END)
  82. -install_driver:
  83. - sudo -E make -C $(DRIVERDIR)/build/linux/thead_linux CROSS_COMPILE=$(CROSS_COMPILE) ARCH=$(ARCH) BUILD=$(BUILD) RGX_BVNC=$(RGX_BVNC) kbuild_install
  84. -
  85. -install_lib:
  86. - sudo -E make -C $(LIBDIR)/build/linux/thead_linux CROSS_COMPILE=$(CROSS_COMPILE) ARCH=$(ARCH) BUILD=$(BUILD) RGX_BVNC=$(RGX_BVNC) install
  87. +install_driver: prepare_driver
  88. + make -C $(DRIVERDIR)/build/linux/thead_linux CROSS_COMPILE=$(CROSS_COMPILE) ARCH=$(ARCH) BUILD=$(BUILD) RGX_BVNC=$(RGX_BVNC) kbuild_install
  89. install_prepare:
  90. mkdir -p ./output/rootfs/$(DIR_TARGET_KO)
  91. mkdir -p ./output/rootfs/$(DIR_TARGET_LIB)
  92. mkdir -p ./output/rootfs/$(DIR_TARGET_TEST)
  93. -install_addons: install_prepare install_driver install_lib
  94. +install_addons: install_prepare install_driver
  95. @if [ -d addons/$(BOARD_NAME) ]; then \
  96. cp -rf addons/$(BOARD_NAME)/* ./output/rootfs/$(DIR_TARGET_BASE); \
  97. fi
  98. -install_local_output: driver lib test install_addons
  99. +install_local_output: driver test install_addons
  100. @echo $(BUILD_LOG_START)
  101. find $(DRIVERDIR) -name "*.ko" | xargs -i cp -f {} ./output/rootfs/$(DIR_TARGET_KO)
  102. chmod +x ./output/rootfs/$(DIR_TARGET_KO)/*.sh
  103. @@ -145,5 +133,5 @@ clean_output:
  104. rm -rf $(INSTALL_DIR_ROOTFS)/$(DIR_TARGET_BASE)
  105. @echo $(BUILD_LOG_END)
  106. -clean: clean_output clean_driver clean_lib clean_test
  107. +clean: clean_output clean_driver clean_test
  108. diff --git a/rogue_km/kernel/drivers/staging/imgtec/plato/plato_drv.c b/rogue_km/kernel/drivers/staging/imgtec/plato/plato_drv.c
  109. index 5bab0b740..ee9503f94 100644
  110. --- a/rogue_km/kernel/drivers/staging/imgtec/plato/plato_drv.c
  111. +++ b/rogue_km/kernel/drivers/staging/imgtec/plato/plato_drv.c
  112. @@ -91,7 +91,7 @@ static struct pci_driver plato_pci_driver = {
  113. };
  114. module_pci_driver(plato_pci_driver);
  115. -MODULE_DEVICE_TABLE(pci, plato_pci_tbl);
  116. +//MODULE_DEVICE_TABLE(pci, plato_pci_tbl);
  117. static struct plato_debug_register plato_noc_regs[] = {
  118. {"NOC Offset 0x00", 0x00, 0},
  119. diff --git a/rogue_km/kernel/drivers/staging/imgtec/tc/drm_pdp_drv.c b/rogue_km/kernel/drivers/staging/imgtec/tc/drm_pdp_drv.c
  120. index 7b12b1ca3..0cdeb9047 100644
  121. --- a/rogue_km/kernel/drivers/staging/imgtec/tc/drm_pdp_drv.c
  122. +++ b/rogue_km/kernel/drivers/staging/imgtec/tc/drm_pdp_drv.c
  123. @@ -880,5 +880,5 @@ module_platform_driver(pdp_platform_driver);
  124. MODULE_AUTHOR("Imagination Technologies Ltd. <gpl-support@imgtec.com>");
  125. MODULE_DESCRIPTION(DRIVER_DESC);
  126. -MODULE_DEVICE_TABLE(platform, pdp_platform_device_id_table);
  127. +//MODULE_DEVICE_TABLE(platform, pdp_platform_device_id_table);
  128. MODULE_LICENSE("Dual MIT/GPL");
  129. diff --git a/rogue_km/kernel/drivers/staging/imgtec/tc/tc_drv.c b/rogue_km/kernel/drivers/staging/imgtec/tc/tc_drv.c
  130. index fd9ba461b..c69498fdf 100644
  131. --- a/rogue_km/kernel/drivers/staging/imgtec/tc/tc_drv.c
  132. +++ b/rogue_km/kernel/drivers/staging/imgtec/tc/tc_drv.c
  133. @@ -666,7 +666,7 @@ static struct pci_driver tc_pci_driver = {
  134. module_pci_driver(tc_pci_driver);
  135. -MODULE_DEVICE_TABLE(pci, tc_pci_tbl);
  136. +//MODULE_DEVICE_TABLE(pci, tc_pci_tbl);
  137. int tc_enable(struct device *dev)
  138. {
  139. diff --git a/rogue_km/services/server/env/linux/pvr_platform_drv.c b/rogue_km/services/server/env/linux/pvr_platform_drv.c
  140. index b1586c9bf..172f8e52f 100644
  141. --- a/rogue_km/services/server/env/linux/pvr_platform_drv.c
  142. +++ b/rogue_km/services/server/env/linux/pvr_platform_drv.c
  143. @@ -259,7 +259,7 @@ static const struct of_device_id pvr_of_ids[] = {
  144. };
  145. #if !defined(CHROMIUMOS_KERNEL) || !defined(MODULE)
  146. -MODULE_DEVICE_TABLE(of, pvr_of_ids);
  147. +//MODULE_DEVICE_TABLE(of, pvr_of_ids);
  148. #endif
  149. #endif
  150. @@ -271,7 +271,7 @@ static struct platform_device_id pvr_platform_ids[] = {
  151. };
  152. #if !defined(CHROMIUMOS_KERNEL) || !defined(MODULE)
  153. -MODULE_DEVICE_TABLE(platform, pvr_platform_ids);
  154. +//MODULE_DEVICE_TABLE(platform, pvr_platform_ids);
  155. #endif
  156. static struct platform_driver pvr_platform_driver = {
  157. diff --git a/tools/prepare.sh b/tools/prepare.sh
  158. index ab269d0d5..67fd3c2cb 100755
  159. --- a/tools/prepare.sh
  160. +++ b/tools/prepare.sh
  161. @@ -1,16 +1,16 @@
  162. #!/bin/bash
  163. -if [ ! -d $1/usr/local ]; then
  164. - echo "Install libdrm in the $SYSROOT"
  165. - cd tools/drm/libdrm-2.4.101/riscv64-unknown-linux-gnu-binaries/
  166. - DESTDIR="$SYSROOT" sudo -E ninja install
  167. -# sudo -E make -C libdrm-2.4.99/riscv64-unknown-linux-gnu-binaries DESTDIR="$SYSROOT" install
  168. - sudo cp $1/usr/local/lib/riscv64-unknown-linux-gnu $1/usr/local/lib/riscv64-linux-gnu -rf
  169. - cd -
  170. - cd $2
  171. - make INSTALL_MOD_PATH=$3 modules_install
  172. - cd -
  173. -fi
  174. +#if [ ! -d $1/usr/local ]; then
  175. +# echo "Install libdrm in the $SYSROOT"
  176. +# cd tools/drm/libdrm-2.4.101/riscv64-unknown-linux-gnu-binaries/
  177. +# DESTDIR="$SYSROOT" sudo -E ninja install
  178. +## sudo -E make -C libdrm-2.4.99/riscv64-unknown-linux-gnu-binaries DESTDIR="$SYSROOT" install
  179. +# sudo cp $1/usr/local/lib/riscv64-unknown-linux-gnu $1/usr/local/lib/riscv64-linux-gnu -rf
  180. +# cd -
  181. +# cd $2
  182. +# make INSTALL_MOD_PATH=$3 modules_install
  183. +# cd -
  184. +#fi
  185. if [ ! -d tools/mips-mti-elf ]; then
  186. echo "unzip the MIPS TOOLCHAIN"
  187. diff --git a/tools/prepare_driver.sh b/tools/prepare_driver.sh
  188. new file mode 100755
  189. index 000000000..4e54022c5
  190. --- /dev/null
  191. +++ b/tools/prepare_driver.sh
  192. @@ -0,0 +1,5 @@
  193. +#!/bin/bash
  194. +
  195. +cd $1
  196. +make INSTALL_MOD_PATH=$2 modules_install
  197. +cd -