08-cmcc_rax3000m.patch 3.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102
  1. --- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
  2. +++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
  3. @@ -34,7 +34,7 @@ mediatek_setup_interfaces()
  4. bananapi,bpi-r3)
  5. ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "eth1 wan"
  6. ;;
  7. - cmcc,rax3000m|\
  8. + cmcc,rax3000m*|\
  9. h3c,magic-nx30-pro)
  10. ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1
  11. ;;
  12. @@ -103,9 +103,7 @@ mediatek_setup_macs()
  13. wan_mac=$(macaddr_add "$lan_mac" 3)
  14. label_mac=$lan_mac
  15. ;;
  16. - cmcc,rax3000m)
  17. - case "$(cmdline_get_var root)" in
  18. - /dev/mmc*)
  19. + cmcc,rax3000m-emmc)
  20. wan_mac=$(mmc_get_mac_binary factory 0x2a)
  21. lan_mac=$(mmc_get_mac_binary factory 0x24)
  22. label_mac=$wan_mac
  23. --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
  24. +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
  25. @@ -46,9 +46,9 @@ case "$board" in
  26. [ "$PHYNBR" = "0" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress
  27. [ "$PHYNBR" = "1" ] && macaddr_setbit_la $(macaddr_add $addr 2) > /sys${DEVPATH}/macaddress
  28. ;;
  29. - cmcc,rax3000m)
  30. - case "$(cmdline_get_var root)" in
  31. - /dev/mmc*)
  32. + cmcc,rax3000m*)
  33. + case "$board" in
  34. + cmcc,rax3000m-emmc)
  35. addr=$(mmc_get_mac_binary factory 0xa)
  36. ;;
  37. *)
  38. --- a/target/linux/mediatek/image/filogic.mk
  39. +++ b/target/linux/mediatek/image/filogic.mk
  40. @@ -251,37 +251,36 @@ TARGET_DEVICES += cetron_ct3003
  41. define Device/cmcc_rax3000m
  42. DEVICE_VENDOR := CMCC
  43. - DEVICE_MODEL := RAX3000M
  44. - DEVICE_DTS := mt7981b-cmcc-rax3000m
  45. - DEVICE_DTS_OVERLAY := mt7981b-cmcc-rax3000m-emmc mt7981b-cmcc-rax3000m-nand
  46. + DEVICE_MODEL := RAX3000M NAND
  47. + DEVICE_DTS := mt7981b-cmcc-rax3000m-nand
  48. DEVICE_DTS_DIR := ../dts
  49. - DEVICE_DTC_FLAGS := --pad 4096
  50. - DEVICE_DTS_LOADADDR := 0x43f00000
  51. DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware kmod-usb3 \
  52. e2fsprogs f2fsck mkf2fs
  53. - KERNEL_LOADADDR := 0x44000000
  54. - KERNEL := kernel-bin | gzip
  55. - KERNEL_INITRAMFS := kernel-bin | lzma | \
  56. - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
  57. - KERNEL_INITRAMFS_SUFFIX := -recovery.itb
  58. + UBINIZE_OPTS := -E 5
  59. + BLOCKSIZE := 128k
  60. + PAGESIZE := 2048
  61. + IMAGE_SIZE := 116736k
  62. KERNEL_IN_UBI := 1
  63. - UBOOTENV_IN_UBI := 1
  64. - IMAGES := sysupgrade.itb
  65. - IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m
  66. - IMAGE/sysupgrade.itb := append-kernel | \
  67. - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \
  68. - pad-rootfs | append-metadata
  69. - ARTIFACTS := \
  70. - emmc-gpt.bin emmc-preloader.bin emmc-bl31-uboot.fip \
  71. - nand-preloader.bin nand-bl31-uboot.fip
  72. - ARTIFACT/emmc-gpt.bin := mt798x-gpt emmc
  73. - ARTIFACT/emmc-preloader.bin := mt7981-bl2 emmc-ddr4
  74. - ARTIFACT/emmc-bl31-uboot.fip := mt7981-bl31-uboot cmcc_rax3000m-emmc
  75. - ARTIFACT/nand-preloader.bin := mt7981-bl2 spim-nand-ddr4
  76. - ARTIFACT/nand-bl31-uboot.fip := mt7981-bl31-uboot cmcc_rax3000m-nand
  77. + IMAGES += factory.bin
  78. + IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
  79. + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
  80. endef
  81. TARGET_DEVICES += cmcc_rax3000m
  82. +define Device/cmcc_rax3000m-emmc
  83. + DEVICE_VENDOR := CMCC
  84. + DEVICE_MODEL := RAX3000M eMMC
  85. + DEVICE_DTS := mt7981b-cmcc-rax3000m-emmc
  86. + DEVICE_DTS_DIR := ../dts
  87. + DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware kmod-usb3 \
  88. + e2fsprogs f2fsck mkf2fs losetup kmod-fs-f2fs kmod-mmc
  89. + KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
  90. + KERNEL_INITRAMFS := kernel-bin | lzma | \
  91. + fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
  92. + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
  93. +endef
  94. +TARGET_DEVICES += cmcc_rax3000m-emmc
  95. +
  96. define Device/confiabits_mt7981
  97. DEVICE_VENDOR := Confiabits
  98. DEVICE_MODEL := MT7981