add support for raspberry pi4 64 bit

8 files changed, 39 insertions, 11 deletions

diff --git a/target/aarch64/kernel/raspberry-pi3p-64 b/target/aarch64/kernel/raspberry-pi4-64
index 6d9ace351..bb71b29de 100644
--- a/target/aarch64/kernel/raspberry-pi3p-64
+++ b/target/aarch64/kernel/raspberry-pi4-64
@@ -8,3 +8,4 @@ CONFIG_MAILBOX=y
 CONFIG_BCM2835_MBOX=y
 CONFIG_RASPBERRYPI_POWER=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_CLK_RASPBERRYPI=y
diff --git a/target/aarch64/systems/raspberry-pi3p-64 b/target/aarch64/systems/raspberry-pi4-64
index 3ac86b45b..e06ac6dbe 100644
--- a/target/aarch64/systems/raspberry-pi3p-64
+++ b/target/aarch64/systems/raspberry-pi4-64
@@ -1,7 +1,7 @@
-config ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64
-	bool "Raspberry PI 3 Model B+"
+config ADK_TARGET_SYSTEM_RASPBERRY_PI4_64
+	bool "Raspberry PI 4"
 	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_CPU_AARCH64_CORTEX_A53
+	select ADK_TARGET_CPU_AARCH64_CORTEX_A72
 	select ADK_TARGET_BOARD_BCM28XX
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
@@ -22,5 +22,5 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_TARGET_KERNEL_IMAGE
 	help
-	  Raspberry PI 3 Model B+ (AARCH64)
+	  Raspberry PI 4 (AARCH64)
 
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 3762ddf82..d3ec4a373 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -21,6 +21,16 @@ config ADK_TARGET_CPU_AARCH64_CORTEX_A57
 	select ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_AARCH64
 
+config ADK_TARGET_CPU_AARCH64_CORTEX_A72
+        bool "cortex-a72"
+	select ADK_TARGET_SUPPORTS_THREADS
+	select ADK_TARGET_SUPPORTS_NPTL
+	select ADK_TARGET_SUPPORTS_LT
+	select ADK_TARGET_CPU_WITH_FPU_VFPV4
+	select ADK_TARGET_CPU_WITH_NEON
+	select ADK_TARGET_CPU_WITH_THUMB2
+	depends on ADK_TARGET_ARCH_AARCH64
+
 # alpha
 config ADK_TARGET_CPU_ALPHA_EV4
 	bool "ev4"
diff --git a/target/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg
index e1feb5e0e..c025a42e5 100644
--- a/target/linux/Config.in.kernelcfg
+++ b/target/linux/Config.in.kernelcfg
@@ -29,7 +29,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG
 	default "bcm2709_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI3
 	default "bcm2711_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI4
 	default "bcmrpi3_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64
-	default "bcmrpi3_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64
+	default "bcm2711_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI4_64
 	default "twr-k70f120m_defconfig" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "imx_v7_cbi_hb_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "imx_v6_v7_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 49f0a1202..9c549620e 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -137,7 +137,7 @@ config ADK_LINUX_KERNEL_BT_HCIUART_BCM
 	select ADK_LINUX_KERNEL_BT_HCIUART
 	select ADK_LINUX_KERNEL_BT_HCIUART_3WIRE
 	select ADK_LINUX_KERNEL_BT_BCM
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3 || ADK_TARGET_SYSTEM_RASPBERRY_PI3P
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3
 	default n
 	help
 	  The Broadcom protocol support enables Bluetooth HCI over serial
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 4fa9dc7c6..fbff94d54 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -233,10 +233,10 @@ config ADK_LINUX_KERNEL_USB_LAN78XX
 	tristate "Microchip LAN78XX"
 	select ADK_LINUX_KERNEL_USB_NET_DRIVERS
 	select ADK_LINUX_KERNEL_USB_USBNET
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3P \
-		|| ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3 \
+		|| ADK_TARGET_SYSTEM_RASPBERRY_PI3_64
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64
 	default n
 	help
 	  Microchip LAN78XX Based USB Ethernet Adapters.
diff --git a/target/linux/config/Config.in.wireless b/target/linux/config/Config.in.wireless
index 44d6fa401..382f412df 100644
--- a/target/linux/config/Config.in.wireless
+++ b/target/linux/config/Config.in.wireless
@@ -158,7 +158,6 @@ config ADK_LINUX_KERNEL_BRCMFMAC_SDIO
 		ADK_TARGET_SYSTEM_PHYTEC_IMX6
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI0
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P
 	default n
 	help
 	  Driver for Broadcom FullMac wireless cards (SDIO).
diff --git a/target/linux/patches/59aeb16c7f1254f1383476956dda0766d10c918a/localversion.patch b/target/linux/patches/59aeb16c7f1254f1383476956dda0766d10c918a/localversion.patch
new file mode 100644
index 000000000..b4b4b95d7
--- /dev/null
+++ b/target/linux/patches/59aeb16c7f1254f1383476956dda0766d10c918a/localversion.patch
@@ -0,0 +1,18 @@
+diff -Nur linux-59aeb16c7f1254f1383476956dda0766d10c918a.orig/arch/arm/configs/bcm2711_defconfig linux-59aeb16c7f1254f1383476956dda0766d10c918a/arch/arm/configs/bcm2711_defconfig
+--- linux-59aeb16c7f1254f1383476956dda0766d10c918a.orig/arch/arm/configs/bcm2711_defconfig	2022-01-21 19:27:36.000000000 +0100
++++ linux-59aeb16c7f1254f1383476956dda0766d10c918a/arch/arm/configs/bcm2711_defconfig	2022-02-15 12:41:31.879194595 +0100
+@@ -1,4 +1,4 @@
+-CONFIG_LOCALVERSION="-v7l"
++CONFIG_LOCALVERSION=""
+ # CONFIG_LOCALVERSION_AUTO is not set
+ CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y
+diff -Nur linux-59aeb16c7f1254f1383476956dda0766d10c918a.orig/arch/arm64/configs/bcm2711_defconfig linux-59aeb16c7f1254f1383476956dda0766d10c918a/arch/arm64/configs/bcm2711_defconfig
+--- linux-59aeb16c7f1254f1383476956dda0766d10c918a.orig/arch/arm64/configs/bcm2711_defconfig	2022-01-21 19:27:37.000000000 +0100
++++ linux-59aeb16c7f1254f1383476956dda0766d10c918a/arch/arm64/configs/bcm2711_defconfig	2022-02-15 12:41:11.014686670 +0100
+@@ -1,4 +1,4 @@
+-CONFIG_LOCALVERSION="-v8"
++CONFIG_LOCALVERSION=""
+ # CONFIG_LOCALVERSION_AUTO is not set
+ CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y