From 9be50e2ca96021c9b31ae919c8b7fa4c224b0e73 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 16 Jan 2024 07:46:14 +0000 Subject: [PATCH] soc: bcm2711: Port to HWMv2 Ports the bcm2711 SoC configuration to hardware model version 2 Signed-off-by: Jamie McCrae --- soc/{arm64 => v2/broadcom}/bcm2711/CMakeLists.txt | 0 .../bcm2711/Kconfig.soc => v2/broadcom/bcm2711/Kconfig} | 1 - soc/{arm64 => v2/broadcom}/bcm2711/Kconfig.defconfig | 3 --- soc/v2/broadcom/bcm2711/Kconfig.soc | 8 ++++++++ soc/{arm64 => v2/broadcom}/bcm2711/mmu_regions.c | 0 soc/v2/broadcom/bcm2711/soc.yml | 4 ++++ 6 files changed, 12 insertions(+), 4 deletions(-) rename soc/{arm64 => v2/broadcom}/bcm2711/CMakeLists.txt (100%) rename soc/{arm64/bcm2711/Kconfig.soc => v2/broadcom/bcm2711/Kconfig} (92%) rename soc/{arm64 => v2/broadcom}/bcm2711/Kconfig.defconfig (87%) create mode 100644 soc/v2/broadcom/bcm2711/Kconfig.soc rename soc/{arm64 => v2/broadcom}/bcm2711/mmu_regions.c (100%) create mode 100644 soc/v2/broadcom/bcm2711/soc.yml diff --git a/soc/arm64/bcm2711/CMakeLists.txt b/soc/v2/broadcom/bcm2711/CMakeLists.txt similarity index 100% rename from soc/arm64/bcm2711/CMakeLists.txt rename to soc/v2/broadcom/bcm2711/CMakeLists.txt diff --git a/soc/arm64/bcm2711/Kconfig.soc b/soc/v2/broadcom/bcm2711/Kconfig similarity index 92% rename from soc/arm64/bcm2711/Kconfig.soc rename to soc/v2/broadcom/bcm2711/Kconfig index 4e1b69462ea..2cfb4b2e4e4 100644 --- a/soc/arm64/bcm2711/Kconfig.soc +++ b/soc/v2/broadcom/bcm2711/Kconfig @@ -2,7 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_BCM2711 - bool "bcm2711" select ARM64 select CPU_CORTEX_A72 select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS diff --git a/soc/arm64/bcm2711/Kconfig.defconfig b/soc/v2/broadcom/bcm2711/Kconfig.defconfig similarity index 87% rename from soc/arm64/bcm2711/Kconfig.defconfig rename to soc/v2/broadcom/bcm2711/Kconfig.defconfig index 0016ca57d03..21776e5ef16 100644 --- a/soc/arm64/bcm2711/Kconfig.defconfig +++ b/soc/v2/broadcom/bcm2711/Kconfig.defconfig @@ -3,9 +3,6 @@ if SOC_BCM2711 -config SOC - default "bcm2711" - config NUM_IRQS int default 260 diff --git a/soc/v2/broadcom/bcm2711/Kconfig.soc b/soc/v2/broadcom/bcm2711/Kconfig.soc new file mode 100644 index 00000000000..d3c79214257 --- /dev/null +++ b/soc/v2/broadcom/bcm2711/Kconfig.soc @@ -0,0 +1,8 @@ +# Copyright 2023 honglin leng +# SPDX-License-Identifier: Apache-2.0 + +config SOC_BCM2711 + bool + +config SOC + default "bcm2711" if SOC_BCM2711 diff --git a/soc/arm64/bcm2711/mmu_regions.c b/soc/v2/broadcom/bcm2711/mmu_regions.c similarity index 100% rename from soc/arm64/bcm2711/mmu_regions.c rename to soc/v2/broadcom/bcm2711/mmu_regions.c diff --git a/soc/v2/broadcom/bcm2711/soc.yml b/soc/v2/broadcom/bcm2711/soc.yml new file mode 100644 index 00000000000..ebe1b40e7a0 --- /dev/null +++ b/soc/v2/broadcom/bcm2711/soc.yml @@ -0,0 +1,4 @@ +series: +- name: bcm2711 + socs: + - name: bcm2711