diff options
Diffstat (limited to 'target')
-rw-r--r-- | target/arm/kernel/raspberry-pi4 (renamed from target/arm/kernel/raspberry-pi3p) | 0 | ||||
-rw-r--r-- | target/arm/systems/raspberry-pi4 (renamed from target/arm/systems/raspberry-pi3p) | 8 | ||||
-rw-r--r-- | target/config/Config.in.cpu | 10 | ||||
-rw-r--r-- | target/config/Config.in.runtime | 20 | ||||
-rw-r--r-- | target/linux/Config.in.kernelcfg | 3 | ||||
-rw-r--r-- | target/linux/patches/59aeb16c7f1254f1383476956dda0766d10c918a/disable-gcc-plugins.patch | 22 |
6 files changed, 50 insertions, 13 deletions
diff --git a/target/arm/kernel/raspberry-pi3p b/target/arm/kernel/raspberry-pi4 index 7928b3968..7928b3968 100644 --- a/target/arm/kernel/raspberry-pi3p +++ b/target/arm/kernel/raspberry-pi4 diff --git a/target/arm/systems/raspberry-pi3p b/target/arm/systems/raspberry-pi4 index d2100a948..6f36bf036 100644 --- a/target/arm/systems/raspberry-pi3p +++ b/target/arm/systems/raspberry-pi4 @@ -1,8 +1,8 @@ -config ADK_TARGET_SYSTEM_RASPBERRY_PI3P - bool "Raspberry PI 3 Model B+" +config ADK_TARGET_SYSTEM_RASPBERRY_PI4 + bool "Raspberry PI 4" depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_CORTEX_A53 + select ADK_TARGET_CPU_ARM_CORTEX_A72 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL @@ -23,5 +23,5 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3P select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_IMAGE help - Raspberry PI 3 Model B+ + Raspberry PI 4 diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 30e35ca93..3762ddf82 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -178,6 +178,16 @@ config ADK_TARGET_CPU_ARM_CORTEX_A57 select ADK_TARGET_CPU_WITH_THUMB2 depends on ADK_TARGET_ARCH_ARM +config ADK_TARGET_CPU_ARM_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_ARM + config ADK_TARGET_CPU_ARM_CORTEX_M7 bool "cortex-m7" select ADK_TARGET_SUPPORTS_NPTL diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 8a3e482a8..6d17102b8 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -169,7 +169,9 @@ config ADK_RUNTIME_TMPFS_SIZE default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI3 - default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI3P + default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI4 + default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 + default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 default "32768" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "16384" if ADK_TARGET_SYSTEM_QEMU_X86_64 default "16384" if ADK_TARGET_SYSTEM_QEMU_X86 @@ -293,9 +295,9 @@ config ADK_RUNTIME_GETTY_VGA default y if ADK_TARGET_SYSTEM_RASPBERRY_PI0 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3 - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI4 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_ARANYM_M68K @@ -315,7 +317,9 @@ config ADK_RUNTIME_GETTY_SERIAL default n if ADK_TARGET_SYSTEM_RASPBERRY_PI default n if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default n if ADK_TARGET_SYSTEM_RASPBERRY_PI3 - default n if ADK_TARGET_SYSTEM_RASPBERRY_PI3P + default n if ADK_TARGET_SYSTEM_RASPBERRY_PI4 + default n if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 + default n if ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n if ADK_TARGET_SYSTEM_ARANYM_M68K default n if ADK_TARGET_MODEL_PCENGINES_ALIX1C @@ -356,9 +360,9 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3 - default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3P + default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI4 default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 - default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 + default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 default "ttyDA1" if ADK_TARGET_SYSTEM_QEMU_METAG default "ttyS2" if ADK_TARGET_SYSTEM_KINETIS_K70 default "ttyS2" if ADK_TARGET_SYSTEM_SOM_C6745 @@ -507,8 +511,8 @@ config ADK_RUNTIME_WAIT_FOR_ETHERNET default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI4 + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 config ADK_SIMPLE_NETWORK_CONFIG bool "simple network configuration" diff --git a/target/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg index bd6f65b57..e1feb5e0e 100644 --- a/target/linux/Config.in.kernelcfg +++ b/target/linux/Config.in.kernelcfg @@ -7,6 +7,7 @@ depends on ADK_TARGET_OS_LINUX default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK && ADK_TARGET_LINUX_KERNEL_VERSION_GIT default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG && ADK_TARGET_LINUX_KERNEL_VERSION_GIT +default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_BOARD_BCM28XX && ADK_TARGET_LINUX_KERNEL_VERSION_GIT config ADK_TARGET_LINUX_KERNEL_USE_MINICONFIG bool "Use mini.config from OpenADK" @@ -26,7 +27,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "bcmrpi_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI0 default "bcm2709_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default "bcm2709_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI3 - default "bcm2709_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI3P + 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 "twr-k70f120m_defconfig" if ADK_TARGET_SYSTEM_KINETIS_K70 diff --git a/target/linux/patches/59aeb16c7f1254f1383476956dda0766d10c918a/disable-gcc-plugins.patch b/target/linux/patches/59aeb16c7f1254f1383476956dda0766d10c918a/disable-gcc-plugins.patch new file mode 100644 index 000000000..271fc5402 --- /dev/null +++ b/target/linux/patches/59aeb16c7f1254f1383476956dda0766d10c918a/disable-gcc-plugins.patch @@ -0,0 +1,22 @@ +diff -Nur linux-59aeb16c7f1254f1383476956dda0766d10c918a.orig/arch/arm/Kconfig linux-59aeb16c7f1254f1383476956dda0766d10c918a/arch/arm/Kconfig +--- linux-59aeb16c7f1254f1383476956dda0766d10c918a.orig/arch/arm/Kconfig 2022-01-21 19:27:36.000000000 +0100 ++++ linux-59aeb16c7f1254f1383476956dda0766d10c918a/arch/arm/Kconfig 2022-02-13 02:06:15.880669581 +0100 +@@ -88,7 +88,6 @@ + select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG + select HAVE_FUNCTION_TRACER if !XIP_KERNEL + select HAVE_FUTEX_CMPXCHG if FUTEX +- select HAVE_GCC_PLUGINS + select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7) + select HAVE_IDE if PCI || ISA || PCMCIA + select HAVE_IRQ_TIME_ACCOUNTING +diff -Nur linux-59aeb16c7f1254f1383476956dda0766d10c918a.orig/arch/arm64/Kconfig linux-59aeb16c7f1254f1383476956dda0766d10c918a/arch/arm64/Kconfig +--- linux-59aeb16c7f1254f1383476956dda0766d10c918a.orig/arch/arm64/Kconfig 2022-01-21 19:27:37.000000000 +0100 ++++ linux-59aeb16c7f1254f1383476956dda0766d10c918a/arch/arm64/Kconfig 2022-02-13 02:06:27.852961034 +0100 +@@ -165,7 +165,6 @@ + select HAVE_FUNCTION_TRACER + select HAVE_FUNCTION_ERROR_INJECTION + select HAVE_FUNCTION_GRAPH_TRACER +- select HAVE_GCC_PLUGINS + select HAVE_HW_BREAKPOINT if PERF_EVENTS + select HAVE_IRQ_TIME_ACCOUNTING + select HAVE_NMI |