diff --git a/config-rpi2 b/config-rpi2 index acbf6785..c082cc5a 100644 --- a/config-rpi2 +++ b/config-rpi2 @@ -6,4 +6,4 @@ CONFIG_PACKAGE_kmod-ath9k=y CONFIG_PACKAGE_bcm27xx-eeprom=y CONFIG_PACKAGE_bcm27xx-userland=y CONFIG_KERNEL_ARM_MODULE_PLTS=y -CONFIG_KERNEL_TCP_CONG_BBR=y +CONFIG_PACKAGE_kmod-rtc-pcf8563=y diff --git a/config-rpi3 b/config-rpi3 index 70db978f..46e8f1b8 100644 --- a/config-rpi3 +++ b/config-rpi3 @@ -5,3 +5,4 @@ CONFIG_PACKAGE_kmod-ath10k-ct=n CONFIG_PACKAGE_kmod-ath9k=y CONFIG_KERNEL_ARM_MODULE_PLTS=y CONFIG_KERNEL_TCP_CONG_BBR2=y +CONFIG_PACKAGE_kmod-rtc-pcf8563=y diff --git a/config-rpi4 b/config-rpi4 index c2840279..d9b12965 100644 --- a/config-rpi4 +++ b/config-rpi4 @@ -7,3 +7,4 @@ CONFIG_PACKAGE_bcm27xx-eeprom=y CONFIG_PACKAGE_bcm27xx-userland=y CONFIG_KERNEL_ARM64_MODULE_PLTS=y CONFIG_KERNEL_TCP_CONG_BBR2=y +CONFIG_PACKAGE_kmod-rtc-pcf8563=y diff --git a/root/include/kernel-version.mk b/root/include/kernel-version.mk index 140eba8a..2ceddd7c 100644 --- a/root/include/kernel-version.mk +++ b/root/include/kernel-version.mk @@ -8,7 +8,7 @@ endif LINUX_VERSION-5.4 = .225 LINUX_VERSION-5.15 = .86 -LINUX_VERSION-6.1 = .3 +LINUX_VERSION-6.1 = .8 LINUX_KERNEL_HASH-5.4.132 = 8466adbfb3579e751ede683496df7bb20f258b5f882250f3dd82be63736d00ef LINUX_KERNEL_HASH-5.4.182 = b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d @@ -29,6 +29,8 @@ LINUX_KERNEL_HASH-5.15.83 = 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7 LINUX_KERNEL_HASH-6.1.3 = 6dc89ae7a7513e433c597c7346ed7ff4bfd115ea43a3b5e27a6bdb38c5580317 LINUX_KERNEL_HASH-5.4.225 = 59f596f6714317955cf481590babcf015aff2bc1900bd8e8dc8f7af73bc560aa LINUX_KERNEL_HASH-5.15.86 = 80fcd9efa443502de9e2750f6dfb59e8de43a5d87a6d2be09dca748d79b5f2ee +LINUX_KERNEL_HASH-6.1.8 = b60bb53ab8ba370a270454b11e93d41af29126fc72bd6ede517673e2e57b816d + remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/root/package/kernel/bcm27xx-gpu-fw/Makefile b/root/package/kernel/bcm27xx-gpu-fw/Makefile new file mode 100644 index 00000000..b9991254 --- /dev/null +++ b/root/package/kernel/bcm27xx-gpu-fw/Makefile @@ -0,0 +1,185 @@ +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=bcm27xx-gpu-fw +PKG_VERSION:=2021-08-19 +PKG_RELEASE:=25e2b597ebfb2495eab4816a276758dcc6ea21f1 + +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_RELEASE) + +PKG_FLAGS:=nonshared + +include $(INCLUDE_DIR)/package.mk + +RPI_FIRMWARE_URL:=@GITHUB/raspberrypi/firmware/$(PKG_RELEASE)/boot/ +RPI_FIRMWARE_FILE:=rpi-firmware-$(PKG_RELEASE) + +define Download/LICENCE_broadcom + FILE:=$(RPI_FIRMWARE_FILE)-LICENCE.broadcom + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=LICENCE.broadcom + HASH:=c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b +endef +$(eval $(call Download,LICENCE_broadcom)) + +define Download/bootcode_bin + FILE:=$(RPI_FIRMWARE_FILE)-bootcode.bin + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=bootcode.bin + HASH:=36fba28838867f26670a0cd1de340da62e13171cfdec0e7822737e849b3c0681 +endef +$(eval $(call Download,bootcode_bin)) + +define Download/fixup_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup.dat + HASH:=b06aa43aa668d6982de66044299d1b0dd6b449ec321dd83742aa1eb68774e15b +endef +$(eval $(call Download,fixup_dat)) + +define Download/fixup_cd_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup_cd.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup_cd.dat + HASH:=fff4fd9fbb691100be46269f554acd866eac8cfef39082e03ac12f70fbfe9d95 +endef +$(eval $(call Download,fixup_cd_dat)) + +define Download/fixup_x_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup_x.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup_x.dat + HASH:=d74f97ae37cd476e6d4c8e466c3013be49e891e63b9aabc0c9b7637d85068cd0 +endef +$(eval $(call Download,fixup_x_dat)) + +define Download/fixup4_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup4.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup4.dat + HASH:=a607f4dc3000c188f8daaa3417c70a9e5ecc039fae36ba46807c00294f89cd24 +endef +$(eval $(call Download,fixup4_dat)) + +define Download/fixup4cd_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup4cd.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup4cd.dat + HASH:=fff4fd9fbb691100be46269f554acd866eac8cfef39082e03ac12f70fbfe9d95 +endef +$(eval $(call Download,fixup4cd_dat)) + +define Download/fixup4x_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup4x.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup4x.dat + HASH:=14ba09cba83d82a158481a7267fad06ada73c26c3a27dfd34694955f11ba6e27 +endef +$(eval $(call Download,fixup4x_dat)) + +define Download/start_elf + FILE:=$(RPI_FIRMWARE_FILE)-start.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start.elf + HASH:=8bee170c56529bf1666ad4afdd18ae18c7123e7a2fd30e2992cd0d9a01fa63ee +endef +$(eval $(call Download,start_elf)) + +define Download/start_cd_elf + FILE:=$(RPI_FIRMWARE_FILE)-start_cd.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start_cd.elf + HASH:=27d9354ff1af79a521527a288fe736f7337f91bca12bbc177c80e29dbbef0ffd +endef +$(eval $(call Download,start_cd_elf)) + +define Download/start_x_elf + FILE:=$(RPI_FIRMWARE_FILE)-start_x.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start_x.elf + HASH:=499bfdf3deba7bb0a033d2a4487b7f05bce45de2692c7c6dabc4a456237fd438 +endef +$(eval $(call Download,start_x_elf)) + +define Download/start4_elf + FILE:=$(RPI_FIRMWARE_FILE)-start4.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start4.elf + HASH:=158bf783090223626cf45794bf679a3fadbf64bba55b76e3349b94e01be34202 +endef +$(eval $(call Download,start4_elf)) + +define Download/start4cd_elf + FILE:=$(RPI_FIRMWARE_FILE)-start4cd.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start4cd.elf + HASH:=c4912701f620cdd9e44bbacbfc4adb4be1b6fb7ccf81f6029ce2115511970cc0 +endef +$(eval $(call Download,start4cd_elf)) + +define Download/start4x_elf + FILE:=$(RPI_FIRMWARE_FILE)-start4x.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start4x.elf + HASH:=3eb1adb5dfef21da0a16679ef65314a64196a67c6fca3422df8bc721d6b6fa94 +endef +$(eval $(call Download,start4x_elf)) + +define Package/bcm27xx-gpu-fw + SECTION:=boot + CATEGORY:=Boot Loaders + DEPENDS:=@TARGET_bcm27xx + TITLE:=bcm27xx-gpu-fw + DEFAULT:=y if TARGET_bcm27xx +endef + +define Package/bcm27xx-gpu-fw/description + GPU and kernel boot firmware for bcm27xx. +endef + +define Build/Prepare + rm -rf $(PKG_BUILD_DIR) + mkdir -p $(PKG_BUILD_DIR) + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-LICENCE.broadcom $(PKG_BUILD_DIR)/LICENCE.broadcom + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-bootcode.bin $(PKG_BUILD_DIR)/bootcode.bin + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup.dat $(PKG_BUILD_DIR)/fixup.dat + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup_cd.dat $(PKG_BUILD_DIR)/fixup_cd.dat + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup_x.dat $(PKG_BUILD_DIR)/fixup_x.dat + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup4.dat $(PKG_BUILD_DIR)/fixup4.dat + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup4cd.dat $(PKG_BUILD_DIR)/fixup4cd.dat + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup4x.dat $(PKG_BUILD_DIR)/fixup4x.dat + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start.elf $(PKG_BUILD_DIR)/start.elf + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start_cd.elf $(PKG_BUILD_DIR)/start_cd.elf + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start_x.elf $(PKG_BUILD_DIR)/start_x.elf + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start4.elf $(PKG_BUILD_DIR)/start4.elf + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start4cd.elf $(PKG_BUILD_DIR)/start4cd.elf + $(CP) $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start4x.elf $(PKG_BUILD_DIR)/start4x.elf +endef + +define Build/Compile + true +endef + +define Package/bcm27xx-gpu-fw/install + true +endef + +define Build/InstallDev + $(CP) $(PKG_BUILD_DIR)/bootcode.bin $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/LICENCE.broadcom $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start_cd.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start_x.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start4.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start4cd.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start4x.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup_cd.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup_x.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup4.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup4cd.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup4x.dat $(KERNEL_BUILD_DIR) +endef + +$(eval $(call BuildPackage,bcm27xx-gpu-fw)) diff --git a/root/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch b/root/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch index 240bc1d7..6c18dc8e 100644 --- a/root/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch +++ b/root/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch @@ -9,7 +9,7 @@ Subject: [PATCH] of/ftd: add device tree cmdline --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1172,6 +1172,9 @@ int __init early_init_dt_scan_chosen(cha +@@ -1187,6 +1187,9 @@ int __init early_init_dt_scan_chosen(cha p = of_get_flat_dt_prop(node, "bootargs", &l); if (p != NULL && l > 0) strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); @@ -17,5 +17,5 @@ Subject: [PATCH] of/ftd: add device tree cmdline + if (p != NULL && l > 0) + strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE)); + handle_cmdline: /* - * CONFIG_CMDLINE is meant to be a default in case nothing else