From ddae6a6eb108b4cf286f7b0cc613e9ae3b6b6e40 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sat, 13 Jul 2019 20:06:43 +0200 Subject: [PATCH] Fix BPI-R2 support --- config-bpi-r2 | 1 + root/package/kernel/mt7623-preloader/Makefile | 65 +++++++++++++++++++ root/target/linux/mediatek/image/Makefile | 20 +++--- root/target/linux/mediatek/image/mt7623.mk | 3 +- root/target/linux/mediatek/mt7623/config-4.19 | 2 +- 5 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 root/package/kernel/mt7623-preloader/Makefile diff --git a/config-bpi-r2 b/config-bpi-r2 index 687d184f..3c8e764d 100644 --- a/config-bpi-r2 +++ b/config-bpi-r2 @@ -2,6 +2,7 @@ CONFIG_TARGET_mediatek=y CONFIG_TARGET_mediatek_mt7623=y CONFIG_TARGET_mediatek_mt7623_DEVICE_7623n-bananapi-bpi-r2=y CONFIG_TARGET_ROOTFS_EXT4FS=y +# CONFIG_TARGET_ROOTFS_SQUASHFS is not set CONFIG_PACKAGE_kmod-cryptodev=y CONFIG_OPENSSL_HARDWARE_SUPPORT=y CONFIG_OPENSSL_ENGINE_CRYPTO=y diff --git a/root/package/kernel/mt7623-preloader/Makefile b/root/package/kernel/mt7623-preloader/Makefile new file mode 100644 index 00000000..73a1f9e0 --- /dev/null +++ b/root/package/kernel/mt7623-preloader/Makefile @@ -0,0 +1,65 @@ +# +# Copyright (C) 2012-2016 OpenWrt.org +# Copyright (C) 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)/kernel.mk +#include $(INCLUDE_DIR)/image.mk + +PKG_NAME:=mt7623n-preloader +PKG_VERSION:=2017-08-03 +PKG_RELEASE:=888ad5203d0c9d7dd3d6855c2a9234a70d78dc50 + +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_RELEASE) + +PKG_FLAGS:=nonshared + +include $(INCLUDE_DIR)/package.mk + +BPI_PRELOADER_URL:=@GITHUB/BPI-SINOVOIP/BPI-files/$(PKG_RELEASE)/SD/100MB/ +BPI_PRELOADER_PREFIX:=bpi-preloader-$(PKG_RELEASE) + +define Download/BPI-R2-preloader-2k.img.gz + FILE:=$(BPI_PRELOADER_PREFIX)-BPI-R2-preloader-2k.img.gz + URL:=$(BPI_PRELOADER_URL) + URL_FILE:=BPI-R2-preloader-2k.img.gz + HASH:=9a961a26be17dd410866a2385fca47b6f0e7cce88eed6248ff5fb145cf935d93 +endef +$(eval $(call Download,BPI-R2-preloader-2k.img.gz)) + + +define Package/mt7623n-preloader + SECTION:=boot + CATEGORY:=Boot Loaders + DEPENDS:=@TARGET_mediatek_mt7623 + TITLE:=mt7623n-preloader + DEFAULT:=y if TARGET_mediatek +endef + +define Package/mt7623n-preloader/description + Preloader image for mt7623n based boards like Bannana Pi R2. +endef + +define Build/Prepare + rm -rf $(PKG_BUILD_DIR) + mkdir -p $(PKG_BUILD_DIR) + cp $(DL_DIR)/$(BPI_PRELOADER_PREFIX)-BPI-R2-preloader-2k.img.gz $(PKG_BUILD_DIR)/bpi-r2-preloader.bin.gz +endef + +define Build/Compile + true +endef + +define Package/brcm2708-gpu-fw/install + true +endef + +define Build/InstallDev + mkdir -p $(STAGING_DIR_IMAGE) + gunzip -c $(PKG_BUILD_DIR)/bpi-r2-preloader.bin.gz > $(STAGING_DIR_IMAGE)/bpi-r2-preloader.bin +endef + +$(eval $(call BuildPackage,mt7623n-preloader)) diff --git a/root/target/linux/mediatek/image/Makefile b/root/target/linux/mediatek/image/Makefile index 854146b1..089682ac 100644 --- a/root/target/linux/mediatek/image/Makefile +++ b/root/target/linux/mediatek/image/Makefile @@ -8,9 +8,6 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -FAT32_BLOCK_SIZE=1024 -FAT32_BLOCKS=$(shell echo $$((32*1024*1024/$(FAT32_BLOCK_SIZE)))) - # for arm KERNEL_LOADADDR := 0x80008000 @@ -20,9 +17,15 @@ KERNEL_LOADADDR = 0x41080000 endif ifndef $(CONFIG_TARGET_ROOTFS_PARTSIZE) - CONFIG_TARGET_ROOTFS_PARTSIZE := 256 + CONFIG_TARGET_ROOTFS_PARTSIZE := 512 endif +ifndef $(CONFIG_TARGET_KERNEL_PARTSIZE) + CONFIG_TARGET_KERNEL_PARTSIZE := 64 +endif + +FAT32_BLOCK_SIZE=1024 +FAT32_BLOCKS=$(shell echo $$(($(CONFIG_TARGET_KERNEL_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) define Build/mediatek-sdcard rm -f $@.boot @@ -30,11 +33,11 @@ define Build/mediatek-sdcard mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)-uEnv.txt ::uEnv.txt mcopy -i $@.boot $(IMAGE_KERNEL) ::uImage ./gen_mediatek_sdcard_img.sh $@ \ - $(STAGING_DIR_IMAGE)/mtk-bpi-r2-preloader-sd.bin \ + $(STAGING_DIR_IMAGE)/bpi-r2-preloader.bin \ $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)-uboot-mediatek.bin \ $@.boot \ $(IMAGE_ROOTFS) \ - 32 \ + $(CONFIG_TARGET_KERNEL_PARTSIZE) \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) rm -f $@.boot endef @@ -66,7 +69,7 @@ endef define Device/Default PROFILES = Default $$(DEVICE_NAME) KERNEL_NAME := zImage - FILESYSTEMS := squashfs +# FILESYSTEMS := squashfs DEVICE_DTS_DIR := $(DTS_DIR) IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata @@ -75,9 +78,10 @@ ifeq ($(SUBTARGET),mt7623) KERNEL_NAME := zImage KERNEL := kernel-bin | append-dtb | uImage none KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none - FILESYSTEMS += ext4 + FILESYSTEMS := ext4 endif ifeq ($(SUBTARGET),mt7622) + FILESYSTEMS := squashfs KERNEL_NAME := Image KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb diff --git a/root/target/linux/mediatek/image/mt7623.mk b/root/target/linux/mediatek/image/mt7623.mk index d361b9ec..08bf3b06 100644 --- a/root/target/linux/mediatek/image/mt7623.mk +++ b/root/target/linux/mediatek/image/mt7623.mk @@ -15,7 +15,8 @@ define Device/7623n-bananapi-bpi-r2 # DEVICE_PACKAGES := wmt uboot-mtk-bpi-r2 kmod-crypto-hw-mtk kmod-nat-hw-mtk DEVICE_PACKAGES := wmt uboot-mtk-bpi-r2 kmod-crypto-hw-mtk kmod-mt6625l-wlan-gen2 kmod-usb-core kmod-ata-core kmod-usb3 kmod-usb2 kmod-usb-ohci mt7623n-preloader SUPPORTED_DEVICES := bananapi,bpi-r2 - IMAGES := sysupgrade.tar sysupgrade-sd.img.gz sysupgrade-emmc.img.gz sdcard.img.gz +# IMAGES := sysupgrade.tar sysupgrade-sd.img.gz sysupgrade-emmc.img.gz sdcard.img.gz + IMAGES := sdcard.img.gz IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata IMAGE/sysupgrade-sd.img.gz := sysupgrade-bpi-r2-sd | gzip | append-metadata IMAGE/sysupgrade-emmc.img.gz := sysupgrade-bpi-r2-emmc | gzip | append-metadata diff --git a/root/target/linux/mediatek/mt7623/config-4.19 b/root/target/linux/mediatek/mt7623/config-4.19 index 4155d399..ffb4add8 100644 --- a/root/target/linux/mediatek/mt7623/config-4.19 +++ b/root/target/linux/mediatek/mt7623/config-4.19 @@ -43,7 +43,7 @@ CONFIG_ARM_GIC=y CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y -# CONFIG_ARM_LPAE is not set +CONFIG_ARM_LPAE=y CONFIG_ARM_MEDIATEK_CPUFREQ=y CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PATCH_PHYS_VIRT=y