update kernel and bootloader, fix mini.config for rpi4

5 files changed, 53 insertions, 5 deletions

diff --git a/target/arm/kernel/raspberry-pi4 b/target/arm/kernel/raspberry-pi4
index 7928b3968..77c23a997 100644
--- a/target/arm/kernel/raspberry-pi4
+++ b/target/arm/kernel/raspberry-pi4
@@ -22,4 +22,21 @@ CONFIG_MAILBOX=y
 CONFIG_BCM2835_MBOX=y
 CONFIG_RASPBERRYPI_POWER=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_STAGING=y
+CONFIG_CLK_BCM2711_DVP=y
+CONFIG_CLK_BCM2835=y
+CONFIG_CLK_RASPBERRYPI=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_RASPBERRYPI_EXP=y
+CONFIG_GPIO_BCM_VIRT=y
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_STMPE=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 49f835f62..f9c134415 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -207,7 +207,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT
 	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "b02c139d3608c8ae87f5398a3a29854f6df7a041" if ADK_TARGET_ARCH_KVX
 	default "b6a72d383cf0d4c9c448c1f4e5e8d496ea5c1fd8" if ADK_TARGET_ARCH_LM32
-	default "8ad43539c638a719b9a3d7503a75a2ecad304431" if ADK_TARGET_BOARD_BCM28XX
+	default "dc419608fb4e13bf1e33e6add31860730dd953fa" if ADK_TARGET_BOARD_BCM28XX
 	default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537
 	default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
@@ -221,7 +221,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT_VER
 	string "kernel version"
 	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "5.19" if ADK_TARGET_LINUX_ARCH_LOONGARCH
-	default "5.15.89" if ADK_TARGET_BOARD_BCM28XX
+	default "6.1.36" if ADK_TARGET_BOARD_BCM28XX
 	default "5.10.110" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 534d731e1..55963479a 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -148,6 +148,9 @@ config ADK_LINUX_KERNEL_MMC_SDHCI_IO_ACCESSORS
 config ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM
 	bool
 
+config ADK_LINUX_KERNEL_MMC_SDHCI_IPROC
+	bool
+
 config ADK_LINUX_KERNEL_MMC_BCM2835_MMC
 	bool
 
@@ -469,6 +472,7 @@ config ADK_LINUX_KERNEL_MMC_BCM2835_MMC
 	select ADK_LINUX_KERNEL_BLK_DEV_THROTTLING
 	select ADK_LINUX_KERNEL_MMC_SDHCI
 	select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM
+	select ADK_LINUX_KERNEL_MMC_SDHCI_IPROC
 	select ADK_LINUX_KERNEL_MMC_BCM2835_DMA
 	select ADK_LINUX_KERNEL_MMC_BCM2835_SDHOST
 	depends on ADK_TARGET_BOARD_BCM28XX
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 4009f4474..5f3562a30 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -21,6 +21,9 @@ config ADK_LINUX_KERNEL_NET_VENDOR_AMD
 config ADK_LINUX_KERNEL_NET_VENDOR_ATHEROS
 	bool
 
+config ADK_LINUX_KERNEL_NET_VENDOR_BROADCOM
+	bool
+
 config ADK_LINUX_KERNEL_NET_VENDOR_DEC
 	bool
 
@@ -155,6 +158,17 @@ config ADK_LINUX_KERNEL_AG71XX
 	help
 	  Atheros AG71XX ethernet driver
 
+config ADK_LINUX_KERNEL_BCMGENET
+	tristate "Broadcom GENET internal MAC support"
+	select ADK_LINUX_KERNEL_NET_VENDOR_BROADCOM
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI4 || \
+		   ADK_TARGET_SYSTEM_RASPBERRY_PI4_64
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI4 || \
+		     ADK_TARGET_SYSTEM_RAPSBERRY_PI4_64
+	default n
+	help
+	  Broadcom GENET internal MAC support
+
 config ADK_LINUX_KERNEL_DE2104X
 	tristate "DE2104X ethernet driver"
 	select ADK_LINUX_KERNEL_NET_VENDOR_DEC
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 959e96022..7af98abfe 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -16,6 +16,12 @@ config ADK_LINUX_KERNEL_SERIAL_8250_CONSOLE
 config ADK_LINUX_KERNEL_SERIAL_8250_PNP
 	bool
 
+config ADK_LINUX_KERNEL_SERIAL_8250_EXTENDED
+	bool
+
+config ADK_LINUX_KERNEL_SERIAL_8250_SHARE_IRQ
+	bool
+
 config ADK_LINUX_KERNEL_SERIAL_ARC_CONSOLE
 	bool
 
@@ -79,6 +85,9 @@ config ADK_LINUX_KERNEL_SERIAL_8250_INGENIC
 config ADK_LINUX_KERNEL_SERIAL_MILKYMIST_CONSOLE
 	bool
 
+config ADK_LINUX_KERNEL_SERIAL_8250_BCM2835AUX
+	bool
+
 config ADK_LINUX_KERNEL_SERIAL_BFIN
 	bool "BFIN serial driver"
 	select ADK_LINUX_KERNEL_SERIAL_BFIN_CONSOLE
@@ -115,6 +124,9 @@ config ADK_LINUX_KERNEL_SERIAL_8250
 	select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	select ADK_LINUX_KERNEL_SERIAL_8250_DMA if ADK_TARGET_SYSTEM_ORANGE_PI0
 	select ADK_LINUX_KERNEL_SERIAL_8250_INGENIC if ADK_TARGET_SYSTEM_IMGTEC_CI20
+	select ADK_LINUX_KERNEL_SERIAL_8250_BCM2835AUX if ADK_TARGET_SYSTEM_RASPBERRY_PI4
+	select ADK_LINUX_KERNEL_SERIAL_8250_EXTENDED if ADK_TARGET_SYSTEM_RASPBERRY_PI4
+	select ADK_LINUX_KERNEL_SERIAL_8250_SHARE_IRQ if ADK_TARGET_SYSTEM_RASPBERRY_PI4
 	depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \
 		|| ADK_TARGET_SYSTEM_IMGTEC_CI20 \
 		|| ADK_TARGET_SYSTEM_LINKSYS_NSLU2 \
@@ -147,6 +159,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250
 		|| ADK_TARGET_SYSTEM_SYNOPSYS_HSDK \
 		|| ADK_TARGET_CPU_ARC_ARCHS \
 		|| ADK_TARGET_SYSTEM_SOM_C6745 \
+		|| ADK_TARGET_SYSTEM_RASPBERRY_PI4 \
 		|| ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7
 	default y if ADK_TARGET_SYSTEM_IMGTEC_CI20
@@ -180,6 +193,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250
 	default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
 	default y if ADK_TARGET_CPU_ARC_ARCHS
 	default y if ADK_TARGET_SYSTEM_SOM_C6745
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI4
 	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default n
 	help
@@ -252,8 +266,7 @@ config ADK_LINUX_KERNEL_SERIAL_AMBA_PL011
 		|| ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE \
 		|| ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
 		|| ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9