diff --git a/build.sh b/build.sh index 9e86c9e8..261cc11d 100755 --- a/build.sh +++ b/build.sh @@ -56,8 +56,8 @@ else fi #_get_repo source https://github.com/ysurac/openmptcprouter-source "master" -_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "fbbb4eb8b41d59b38f41fe382c6e4108a36aa909" -_get_repo feeds/packages https://github.com/openwrt/packages "5646b4ce74f151f8c36d94a7577f60f0c359d09d" +_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "713561a10b6e9a7100a860651b700207223c09ef" +_get_repo feeds/packages https://github.com/openwrt/packages "4939a9c2915ccb38493b486e1ae77ed126bfa9b5" _get_repo feeds/luci https://github.com/openwrt/luci "3fffcdef61b19c8fc6a4fb448cf5abb88d4ba002" if [ -z "$OMR_FEED" ]; then diff --git a/root/target/linux/brcm2708/base-files/lib/upgrade/keep.d/platform b/root/target/linux/brcm2708/base-files/lib/upgrade/keep.d/platform deleted file mode 100644 index e69de29b..00000000 diff --git a/root/target/linux/brcm2708/base-files/lib/upgrade/platform.sh b/root/target/linux/brcm2708/base-files/lib/upgrade/platform.sh deleted file mode 100644 index c688a9cc..00000000 --- a/root/target/linux/brcm2708/base-files/lib/upgrade/platform.sh +++ /dev/null @@ -1,99 +0,0 @@ -. /lib/functions.sh - -REQUIRE_IMAGE_METADATA=1 - -# copied from x86's platform.sh - -platform_check_image() { - local diskdev partdev diff - - [ "$#" -gt 1 ] && return 1 - - export_bootdevice && export_partdevice diskdev 0 || { - echo "Unable to determine upgrade device" - return 1 - } - - get_partitions "/dev/$diskdev" bootdisk - - #extract the boot sector from the image - get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null - - get_partitions /tmp/image.bs image - - #compare tables - diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)" - - rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image - - if [ -n "$diff" ]; then - echo "Partition layout has changed. Full image will be written." - ask_bool 0 "Abort" && exit 1 - return 0 - fi - - return 0; -} - -platform_do_upgrade() { - local diskdev partdev diff - - export_bootdevice && export_partdevice diskdev 0 || { - echo "Unable to determine upgrade device" - return 1 - } - - sync - - if [ "$SAVE_PARTITIONS" = "1" ]; then - get_partitions "/dev/$diskdev" bootdisk - - #extract the boot sector from the image - get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b - - get_partitions /tmp/image.bs image - - #compare tables - diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)" - else - diff=1 - fi - - if [ -n "$diff" ]; then - get_image "$@" | dd of="/dev/$diskdev" bs=2M conv=fsync - - # Separate removal and addtion is necessary; otherwise, partition 1 - # will be missing if it overlaps with the old partition 2 - partx -d - "/dev/$diskdev" - partx -a - "/dev/$diskdev" - - return 0 - fi - - #iterate over each partition from the image and write it to the boot disk - while read part start size; do - if export_partdevice partdev $part; then - echo "Writing image to /dev/$partdev..." - get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync - else - echo "Unable to find partition $part device, skipped." - fi - done < /tmp/partmap.image - - #copy partition uuid - echo "Writing new UUID to /dev/$diskdev..." - get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync -} - -platform_copy_config() { - local partdev - - if export_partdevice partdev 1; then - mkdir -p /boot - [ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot - cp -af "$CONF_TAR" /boot/ -# tar -C / -zxvf "$CONF_TAR" boot/config.txt - sync - unmount /boot - fi -} diff --git a/root/target/linux/brcm2708/image/Makefile b/root/target/linux/brcm2708/image/Makefile deleted file mode 100644 index 713c0db4..00000000 --- a/root/target/linux/brcm2708/image/Makefile +++ /dev/null @@ -1,151 +0,0 @@ -# -# Copyright (C) 2012-2019 OpenWrt.org -# Copyright (C) 2016-2017 LEDE project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/image.mk - -FAT32_BLOCK_SIZE=1024 -FAT32_BLOCKS=$(shell echo $$(($(CONFIG_TARGET_KERNEL_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) - -define Build/Compile - $(CP) $(LINUX_DIR)/COPYING $(KDIR)/COPYING.linux -endef - -### Image scripts ### -define Build/kernel-img - perl $(LINUX_DIR)/scripts/mkknlimg $@ $@.tmp - mv $@.tmp $@ -endef - -define Build/boot-common - rm -f $@.boot - mkfs.fat -C $@.boot $(FAT32_BLOCKS) - mcopy -i $@.boot $(KDIR)/COPYING.linux :: - mcopy -i $@.boot $(KDIR)/LICENCE.broadcom :: - mcopy -i $@.boot $(CMDLINE) ::cmdline.txt - mcopy -i $@.boot $(BOOT_CONFIG) ::config.txt - mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG) - $(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::;) - mmd -i $@.boot ::/overlays - mcopy -i $@.boot $(DTS_DIR)/overlays/*.dtbo ::/overlays/ - mcopy -i $@.boot $(DTS_DIR)/overlays/README ::/overlays/ -endef - -define Build/boot-2708 - mcopy -i $@.boot $(KDIR)/bootcode.bin :: - mcopy -i $@.boot $(KDIR)/start.elf :: - mcopy -i $@.boot $(KDIR)/start_cd.elf :: - mcopy -i $@.boot $(KDIR)/start_x.elf :: - mcopy -i $@.boot $(KDIR)/fixup.dat :: - mcopy -i $@.boot $(KDIR)/fixup_cd.dat :: - mcopy -i $@.boot $(KDIR)/fixup_x.dat :: -endef - -define Build/boot-2711 - mcopy -i $@.boot $(KDIR)/start4.elf :: - mcopy -i $@.boot $(KDIR)/start4cd.elf :: - mcopy -i $@.boot $(KDIR)/start4x.elf :: - mcopy -i $@.boot $(KDIR)/fixup4.dat :: - mcopy -i $@.boot $(KDIR)/fixup4cd.dat :: - mcopy -i $@.boot $(KDIR)/fixup4x.dat :: -endef - -define Build/sdcard-img - ./gen_rpi_sdcard_img.sh $@ $@.boot $(IMAGE_ROOTFS) \ - $(CONFIG_TARGET_KERNEL_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE) -endef - -### Devices ### -define Device/Default - DEVICE_VENDOR := Raspberry Pi - KERNEL := kernel-bin | kernel-img - KERNEL_IMG := kernel.img - IMAGES := factory.img.gz sysupgrade.img.gz - IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | sdcard-img | gzip | append-metadata - IMAGE/factory.img.gz := boot-common | boot-2708 | sdcard-img | gzip - BOOT_CONFIG := config.txt - CMDLINE := cmdline.txt -endef - -define Device/rpi - DEVICE_MODEL := B/B+/CM/Zero/ZeroW - DEVICE_DTS := bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm bcm2708-rpi-zero bcm2708-rpi-zero-w - SUPPORTED_DEVICES := \ - rpi-b rpi-b-plus rpi-cm rpi-zero rpi-zero-w \ - raspberrypi,model-b raspberrypi,model-b-plus raspberrypi,model-b-rev2 \ - raspberrypi,compute-module raspberrypi,compute-module-1 \ - raspberrypi,model-zero raspberrypi,model-zero-w - DEVICE_PACKAGES := \ - brcmfmac-firmware-43430-sdio \ - brcmfmac-firmware-43430-sdio-rpi-zero-w \ - kmod-brcmfmac wpad-basic -endef -ifeq ($(SUBTARGET),bcm2708) - TARGET_DEVICES += rpi -endif - -define Device/rpi-2 - DEVICE_MODEL := 2B/3B/3B+/3CM/4B - DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2711-rpi-4-b bcm2710-rpi-cm3 - SUPPORTED_DEVICES := \ - rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm \ - raspberrypi,2-model-b \ - raspberrypi,3-model-b raspberrypi,3-model-b-plus \ - raspberrypi,3-compute-module raspberrypi,compute-module-3 \ - raspberrypi,4-model-b - DEVICE_PACKAGES := \ - brcmfmac-firmware-43430-sdio \ - brcmfmac-firmware-43430-sdio-rpi-3b \ - brcmfmac-firmware-43455-sdio brcmfmac-firmware-43455-clm_blob \ - brcmfmac-firmware-43455-sdio-rpi-3b-plus brcmfmac-firmware-43455-sdio-rpi-4b \ - kmod-brcmfmac wpad-basic - IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip | append-metadata - IMAGE/factory.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip -endef -ifeq ($(SUBTARGET),bcm2709) - TARGET_DEVICES += rpi-2 -endif - -define Device/rpi-3 - DEVICE_MODEL := 3B/3B+/3CM - KERNEL_IMG := kernel8.img - DEVICE_DTS := broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3 - SUPPORTED_DEVICES := \ - rpi-3-b rpi-3-b-plus \ - raspberrypi,3-model-b raspberrypi,3-model-b-plus \ - raspberrypi,3-compute-module raspberrypi,compute-module-3 - DEVICE_PACKAGES := \ - brcmfmac-firmware-43430-sdio \ - brcmfmac-firmware-43430-sdio-rpi-3b \ - brcmfmac-firmware-43455-sdio brcmfmac-firmware-43455-clm_blob \ - brcmfmac-firmware-43455-sdio-rpi-3b-plus \ - kmod-brcmfmac wpad-basic -endef -ifeq ($(SUBTARGET),bcm2710) - TARGET_DEVICES += rpi-3 -endif - -define Device/rpi-4 - DEVICE_MODEL := 4B - KERNEL_IMG := kernel8.img - DEVICE_DTS := broadcom/bcm2711-rpi-4-b - SUPPORTED_DEVICES := \ - raspberrypi,4-model-b - DEVICE_PACKAGES := \ - brcmfmac-firmware-43455-sdio brcmfmac-firmware-43455-clm_blob \ - brcmfmac-firmware-43455-sdio-rpi-4b \ - kmod-brcmfmac wpad-basic - IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata - IMAGE/factory.img.gz := boot-common | boot-2711 | sdcard-img | gzip - BOOT_CONFIG := config-bcm2711-arm64.txt - CMDLINE := cmdline-bcm2711-arm64.txt -endef -ifeq ($(SUBTARGET),bcm2711) - TARGET_DEVICES += rpi-4 -endif - -$(eval $(call BuildImage)) diff --git a/root/target/linux/brcm2708/image/cmdline-bcm2711-arm64.txt b/root/target/linux/brcm2708/image/cmdline-bcm2711-arm64.txt deleted file mode 100644 index 565cd2a7..00000000 --- a/root/target/linux/brcm2708/image/cmdline-bcm2711-arm64.txt +++ /dev/null @@ -1 +0,0 @@ -console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=squashfs,ext4 rootwait coherent_pool=128M cma=256M@128M swiotlb=force diff --git a/root/target/linux/brcm2708/image/config-bcm2711-arm64.txt b/root/target/linux/brcm2708/image/config-bcm2711-arm64.txt deleted file mode 100644 index 1af8ed0d..00000000 --- a/root/target/linux/brcm2708/image/config-bcm2711-arm64.txt +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# Bootloader configuration - config.txt -################################################################################ - -################################################################################ -# For overclocking and various other settings, see: -# https://www.raspberrypi.org/documentation/configuration/config-txt/README.md -################################################################################ - -# Force aarch64 -arm_64bit=1