aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm4908
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2022-09-03 20:41:00 +0200
committerRafał Miłecki <rafal@milecki.pl>2022-12-01 14:36:49 +0100
commit44fad4b1f635ad4f3cdf72a18adf4bbc692b8b87 (patch)
tree073b3db69a1398faec97fa1103ed1a02ef75348c /target/linux/bcm4908
parentc45f44165bf21855a0fcde8303b40a671a643e25 (diff)
downloadupstream-44fad4b1f635ad4f3cdf72a18adf4bbc692b8b87.tar.gz
upstream-44fad4b1f635ad4f3cdf72a18adf4bbc692b8b87.tar.bz2
upstream-44fad4b1f635ad4f3cdf72a18adf4bbc692b8b87.zip
bcm4908: fix Asus GT-AX6000 image
1. Include Linux DTB 2. Add 50991 variant (seems to differ by 1 PHY we don't support yet) Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit b8f8c6f2dd8d47216117cb5b78184531ab21dddd)
Diffstat (limited to 'target/linux/bcm4908')
-rw-r--r--target/linux/bcm4908/config-5.101
-rw-r--r--target/linux/bcm4908/image/Makefile2
-rw-r--r--target/linux/bcm4908/image/bootfs-bcm4912.its35
-rw-r--r--target/linux/bcm4908/patches-5.10/037-v5.20-0011-arm64-bcmbca-add-arch-bcmbca-machine-entry.patch31
4 files changed, 66 insertions, 3 deletions
diff --git a/target/linux/bcm4908/config-5.10 b/target/linux/bcm4908/config-5.10
index ee45887fc0..99f32deb9e 100644
--- a/target/linux/bcm4908/config-5.10
+++ b/target/linux/bcm4908/config-5.10
@@ -1,5 +1,6 @@
CONFIG_64BIT=y
CONFIG_ARCH_BCM4908=y
+CONFIG_ARCH_BCMBCA=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_ARCH_KEEP_MEMBLOCK=y
CONFIG_ARCH_MMAP_RND_BITS=18
diff --git a/target/linux/bcm4908/image/Makefile b/target/linux/bcm4908/image/Makefile
index 7116c2a9f1..f7d8afd68e 100644
--- a/target/linux/bcm4908/image/Makefile
+++ b/target/linux/bcm4908/image/Makefile
@@ -90,7 +90,7 @@ TARGET_DEVICES += asus_gt-ac5300
define Device/asus_gt-ax6000
DEVICE_VENDOR := Asus
DEVICE_MODEL := GT-AX6000
- DEVICE_DTS := broadcom/bcmbca/bcm4912-asus-gt-ax6000
+ KERNEL := kernel-bin | bootfs
IMAGES := pkgtb
IMAGE/pkgtb := append-rootfs | pkgtb
SOC := bcm4912
diff --git a/target/linux/bcm4908/image/bootfs-bcm4912.its b/target/linux/bcm4908/image/bootfs-bcm4912.its
index 6f4548956c..3d671f9d00 100644
--- a/target/linux/bcm4908/image/bootfs-bcm4912.its
+++ b/target/linux/bcm4908/image/bootfs-bcm4912.its
@@ -12,9 +12,22 @@
data = /incbin/("${images_dir}/u-boot/u-boot-bcm4912.dtb");
};
- fdt_GTAX6000 {
+ fdt_uboot_GTAX6000 {
description = "dtb";
data = /incbin/("${images_dir}/u-boot/GTAX6000.dtb");
+ arch = "arm64";
+ type = "flat_dt";
+ compression = "none";
+
+ hash-1 {
+ algo = "sha256";
+ };
+ };
+
+ fdt_linux_GTAX6000 {
+ description = "dtb";
+ data = /incbin/("${dts_dir}/broadcom/bcmbca/bcm4912-asus-gt-ax6000.dtb");
+ arch = "arm64";
type = "flat_dt";
compression = "none";
@@ -27,8 +40,26 @@
configurations {
conf_ub_GTAX6000 {
description = "GTAX6000";
- fdt = "fdt_GTAX6000";
+ fdt = "fdt_uboot_GTAX6000";
+ loadables = "atf", "uboot";
+ };
+
+ conf_lx_GTAX6000 {
+ description = "BRCM 63xxx linux";
+ kernel = "kernel";
+ fdt = "fdt_linux_GTAX6000";
+ };
+
+ conf_ub_GTAX6000_50991 {
+ description = "GTAX6000_50991";
+ fdt = "fdt_uboot_GTAX6000";
loadables = "atf", "uboot";
};
+
+ conf_lx_GTAX6000_50991 {
+ description = "BRCM 63xxx linux";
+ kernel = "kernel";
+ fdt = "fdt_linux_GTAX6000";
+ };
};
};
diff --git a/target/linux/bcm4908/patches-5.10/037-v5.20-0011-arm64-bcmbca-add-arch-bcmbca-machine-entry.patch b/target/linux/bcm4908/patches-5.10/037-v5.20-0011-arm64-bcmbca-add-arch-bcmbca-machine-entry.patch
new file mode 100644
index 0000000000..1b9a32e30a
--- /dev/null
+++ b/target/linux/bcm4908/patches-5.10/037-v5.20-0011-arm64-bcmbca-add-arch-bcmbca-machine-entry.patch
@@ -0,0 +1,31 @@
+From fdcd652ce2b6b819f5c4dc3cead5215c84ee6933 Mon Sep 17 00:00:00 2001
+From: William Zhang <william.zhang@broadcom.com>
+Date: Wed, 1 Jun 2022 15:56:50 -0700
+Subject: [PATCH] arm64: bcmbca: add arch bcmbca machine entry
+
+Add ARCH_BCMBCA config for Broadcom Broadband SoC chipsets
+
+Signed-off-by: William Zhang <william.zhang@broadcom.com>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm64/Kconfig.platforms | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/arch/arm64/Kconfig.platforms
++++ b/arch/arm64/Kconfig.platforms
+@@ -59,6 +59,15 @@ config ARCH_BCM_IPROC
+ help
+ This enables support for Broadcom iProc based SoCs
+
++config ARCH_BCMBCA
++ bool "Broadcom Broadband SoC"
++ help
++ Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based
++ BCA chipset.
++
++ This enables support for Broadcom BCA ARM-based broadband chipsets,
++ including the DSL, PON and Wireless family of chips.
++
+ config ARCH_BERLIN
+ bool "Marvell Berlin SoC Family"
+ select DW_APB_ICTL