diff options
21 files changed, 41 insertions, 12 deletions
diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index b297779a2..58ae843dc 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -119,7 +119,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4),y) $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) - printf "arm_control=0x200\n" >> \ + printf "arm_64bit=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt diff --git a/package/bcm28xx-bootloader/src/boot/bootcode.bin b/package/bcm28xx-bootloader/src/boot/bootcode.bin Binary files differindex 9e831a273..636933850 100644 --- a/package/bcm28xx-bootloader/src/boot/bootcode.bin +++ b/package/bcm28xx-bootloader/src/boot/bootcode.bin diff --git a/package/bcm28xx-bootloader/src/boot/fixup.dat b/package/bcm28xx-bootloader/src/boot/fixup.dat Binary files differindex 2ff966820..667cafba8 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4.dat b/package/bcm28xx-bootloader/src/boot/fixup4.dat Binary files differindex 4380d320e..9bf503434 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4cd.dat b/package/bcm28xx-bootloader/src/boot/fixup4cd.dat Binary files differindex 79a0b55e7..c0614cd5d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4cd.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4cd.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4db.dat b/package/bcm28xx-bootloader/src/boot/fixup4db.dat Binary files differindex 4d13d6581..9ef1b932b 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4db.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4db.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4x.dat b/package/bcm28xx-bootloader/src/boot/fixup4x.dat Binary files differindex 4d8ff5a96..9c10b2d5e 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4x.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4x.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat Binary files differindex 79a0b55e7..c0614cd5d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_db.dat b/package/bcm28xx-bootloader/src/boot/fixup_db.dat Binary files differindex 3927ea52e..e695c9f9d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_db.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_db.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_x.dat b/package/bcm28xx-bootloader/src/boot/fixup_x.dat Binary files differindex b93bc0620..ea04cdbdb 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_x.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_x.dat diff --git a/package/bcm28xx-bootloader/src/boot/start.elf b/package/bcm28xx-bootloader/src/boot/start.elf Binary files differindex f5d78d670..0af80e5cf 100644 --- a/package/bcm28xx-bootloader/src/boot/start.elf +++ b/package/bcm28xx-bootloader/src/boot/start.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4.elf b/package/bcm28xx-bootloader/src/boot/start4.elf Binary files differindex 300e7a8a4..a5b6bf0ef 100644 --- a/package/bcm28xx-bootloader/src/boot/start4.elf +++ b/package/bcm28xx-bootloader/src/boot/start4.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4cd.elf b/package/bcm28xx-bootloader/src/boot/start4cd.elf Binary files differindex b7fe9328d..eee7efc46 100644 --- a/package/bcm28xx-bootloader/src/boot/start4cd.elf +++ b/package/bcm28xx-bootloader/src/boot/start4cd.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4db.elf b/package/bcm28xx-bootloader/src/boot/start4db.elf Binary files differindex acd07e82c..f3e979f10 100644 --- a/package/bcm28xx-bootloader/src/boot/start4db.elf +++ b/package/bcm28xx-bootloader/src/boot/start4db.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4x.elf b/package/bcm28xx-bootloader/src/boot/start4x.elf Binary files differindex 274a62944..f9901aa7a 100644 --- a/package/bcm28xx-bootloader/src/boot/start4x.elf +++ b/package/bcm28xx-bootloader/src/boot/start4x.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_cd.elf b/package/bcm28xx-bootloader/src/boot/start_cd.elf Binary files differindex 5e616d0c6..46517c526 100644 --- a/package/bcm28xx-bootloader/src/boot/start_cd.elf +++ b/package/bcm28xx-bootloader/src/boot/start_cd.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_db.elf b/package/bcm28xx-bootloader/src/boot/start_db.elf Binary files differindex f10f87fa3..80a04b2ba 100644 --- a/package/bcm28xx-bootloader/src/boot/start_db.elf +++ b/package/bcm28xx-bootloader/src/boot/start_db.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_x.elf b/package/bcm28xx-bootloader/src/boot/start_x.elf Binary files differindex 26c1de866..b21614bc2 100644 --- a/package/bcm28xx-bootloader/src/boot/start_x.elf +++ b/package/bcm28xx-bootloader/src/boot/start_x.elf diff --git a/target/aarch64/kernel/raspberry-pi4-64 b/target/aarch64/kernel/raspberry-pi4-64 index d818141cc..561ef1f16 100644 --- a/target/aarch64/kernel/raspberry-pi4-64 +++ b/target/aarch64/kernel/raspberry-pi4-64 @@ -926,15 +926,6 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_BCM2711_THERMAL=y CONFIG_BCM2835_THERMAL=y -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y -CONFIG_WATCHDOG_OPEN_TIMEOUT=0 - - -CONFIG_BCM2835_WDT=y - - CONFIG_SSB_POSSIBLE=y CONFIG_SSB_SPROM=y CONFIG_SSB_BLOCKIO=y diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index ace1b4b52..36bce6867 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -247,7 +247,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT default "f6e9dab9d1dc1e8fa2acb75504bf5ff86b885b8e" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 default "b02c139d3608c8ae87f5398a3a29854f6df7a041" if ADK_TARGET_ARCH_KVX default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 - default "dd03775ac7638ec56fb6aec35e7932755f282f60" if ADK_TARGET_BOARD_BCM28XX + default "0c7075b4607f90c2fecf5e290e91168a91567d70" if ADK_TARGET_BOARD_BCM28XX default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537 default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70 default "v4.4.52-phy" if ADK_TARGET_SYSTEM_PHYTEC_WEGA @@ -255,7 +255,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT config ADK_TARGET_LINUX_KERNEL_GIT_VER string "kernel version" depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT - default "6.12.21" if ADK_TARGET_BOARD_BCM28XX + default "6.12.51" if ADK_TARGET_BOARD_BCM28XX default "5.16" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70 diff --git a/target/linux/patches/0c7075b4607f90c2fecf5e290e91168a91567d70/defconfig.patch b/target/linux/patches/0c7075b4607f90c2fecf5e290e91168a91567d70/defconfig.patch new file mode 100644 index 000000000..dde888d4e --- /dev/null +++ b/target/linux/patches/0c7075b4607f90c2fecf5e290e91168a91567d70/defconfig.patch @@ -0,0 +1,38 @@ +diff -Nur linux-0c7075b4607f90c2fecf5e290e91168a91567d70.orig/arch/arm64/configs/bcm2711_defconfig linux-0c7075b4607f90c2fecf5e290e91168a91567d70/arch/arm64/configs/bcm2711_defconfig +--- linux-0c7075b4607f90c2fecf5e290e91168a91567d70.orig/arch/arm64/configs/bcm2711_defconfig 2025-10-12 18:01:40.000000000 +0200 ++++ linux-0c7075b4607f90c2fecf5e290e91168a91567d70/arch/arm64/configs/bcm2711_defconfig 2025-10-13 06:38:12.148665505 +0200 +@@ -1,4 +1,4 @@ +-CONFIG_LOCALVERSION="-v8" ++CONFIG_LOCALVERSION="" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y +@@ -78,8 +78,7 @@ + CONFIG_MODULE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_MODULE_SRCVERSION_ALL=y +-CONFIG_MODULE_COMPRESS=y +-CONFIG_MODULE_COMPRESS_XZ=y ++# CONFIG_MODULE_COMPRESS is not set + CONFIG_BLK_DEV_THROTTLING=y + CONFIG_PARTITION_ADVANCED=y + CONFIG_MAC_PARTITION=y +diff -Nur linux-0c7075b4607f90c2fecf5e290e91168a91567d70.orig/arch/arm64/configs/bcm2712_defconfig linux-0c7075b4607f90c2fecf5e290e91168a91567d70/arch/arm64/configs/bcm2712_defconfig +--- linux-0c7075b4607f90c2fecf5e290e91168a91567d70.orig/arch/arm64/configs/bcm2712_defconfig 2025-10-12 18:01:40.000000000 +0200 ++++ linux-0c7075b4607f90c2fecf5e290e91168a91567d70/arch/arm64/configs/bcm2712_defconfig 2025-10-13 06:38:12.148665505 +0200 +@@ -1,4 +1,4 @@ +-CONFIG_LOCALVERSION="-v8-16k" ++CONFIG_LOCALVERSION="" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y +@@ -81,8 +81,7 @@ + CONFIG_MODULE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_MODULE_SRCVERSION_ALL=y +-CONFIG_MODULE_COMPRESS=y +-CONFIG_MODULE_COMPRESS_XZ=y ++# CONFIG_MODULE_COMPRESS is not set + CONFIG_BLK_DEV_THROTTLING=y + CONFIG_PARTITION_ADVANCED=y + CONFIG_MAC_PARTITION=y |