Skip to content

Commit 9b12166

Browse files
Yong Cong SinChromeos LUCI
authored andcommitted
arch: remove CONFIG_LEGACY_MULTI_LEVEL_TABLE_GENERATION
`CONFIG_LEGACY_MULTI_LEVEL_TABLE_GENERATION` had been deprecated since zephyrproject-rtos#66877 for 2 releases, interrupt controller drivers should have been updated to use the new `IRQ_PARENT_ENTRY_DEFINE()` macro. Remove it. (cherry picked from commit 588ccd9) Original-Signed-off-by: Yong Cong Sin <[email protected]> Original-Signed-off-by: Yong Cong Sin <[email protected]> GitOrigin-RevId: 588ccd9 Cr-Build-Id: 8724909411128659441 Cr-Build-Url: https://cr-buildbucket.appspot.com/build/8724909411128659441 Copybot-Job-Name: zephyr-main-copybot-downstream Change-Id: I0f9b20cc8cac2aa894d86151c08033058beb01e7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/6196369 Tested-by: ChromeOS Prod (Robot) <[email protected]> Bot-Commit: ChromeOS Prod (Robot) <[email protected]> Commit-Queue: ChromeOS Prod (Robot) <[email protected]>
1 parent 467c2fb commit 9b12166

File tree

5 files changed

+1
-93
lines changed

5 files changed

+1
-93
lines changed

arch/common/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ zephyr_library_sources_ifdef(
2727
multilevel_irq.c
2828
)
2929

30-
zephyr_library_sources_ifdef(CONFIG_LEGACY_MULTI_LEVEL_TABLE_GENERATION multilevel_irq_legacy.c)
31-
3230
zephyr_library_sources_ifdef(CONFIG_SHARED_INTERRUPTS shared_irq.c)
3331

3432
if(NOT CONFIG_ARCH_HAS_TIMING_FUNCTIONS AND

arch/common/Kconfig

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,6 @@ config SEMIHOST
1616
This option is compatible with hardware and with QEMU, through the
1717
(automatic) use of the -semihosting-config switch when invoking it.
1818

19-
config LEGACY_MULTI_LEVEL_TABLE_GENERATION
20-
bool "Auto generates the multi-level interrupt LUT (deprecated)"
21-
default y
22-
select DEPRECATED
23-
depends on MULTI_LEVEL_INTERRUPTS
24-
depends on !PLIC
25-
depends on !NXP_IRQSTEER
26-
depends on !RV32M1_INTMUX
27-
depends on !CAVS_ICTL
28-
depends on !DW_ICTL_ACE
29-
depends on !DW_ICTL
30-
help
31-
A make-shift Kconfig to continue generating the multi-level interrupt LUT
32-
with the legacy way using DT macros.
33-
3419
config ISR_TABLE_SHELL
3520
bool "Shell command to dump the ISR tables"
3621
depends on GEN_SW_ISR_TABLE

arch/common/multilevel_irq_legacy.c

Lines changed: 0 additions & 72 deletions
This file was deleted.

soc/mediatek/mt8xxx/mt8196/Kconfig.defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33

44
if SOC_MT8196
55

6-
config LEGACY_MULTI_LEVEL_TABLE_GENERATION
7-
default n
8-
96
config NUM_2ND_LEVEL_AGGREGATORS
107
default 2
118

tests/drivers/interrupt_controller/multi_level_backend/testcase.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ common:
55
tags:
66
- drivers
77
- interrupt
8-
filter: CONFIG_MULTI_LEVEL_INTERRUPTS and not CONFIG_LEGACY_MULTI_LEVEL_TABLE_GENERATION
8+
filter: CONFIG_MULTI_LEVEL_INTERRUPTS
99
platform_allow:
1010
- m2gl025_miv/miv
1111
- qemu_riscv32/qemu_virt_riscv32

0 commit comments

Comments
 (0)