lkml.org 
[lkml]   [2024]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[DO NOT MERGE v6 02/37] sh: Kconfig unified OF supported targets.
    Date
    Targets that support OF should be treated as one board.

    Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
    ---
    arch/sh/Kconfig | 1 +
    arch/sh/boards/Kconfig | 24 ++++++++++++++----------
    2 files changed, 15 insertions(+), 10 deletions(-)

    diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
    index 7500521b2b98..ecca128c15fa 100644
    --- a/arch/sh/Kconfig
    +++ b/arch/sh/Kconfig
    @@ -710,6 +710,7 @@ choice
    prompt "Kernel command line"
    optional
    default CMDLINE_OVERWRITE
    + depends on !OF || USE_BUILTIN_DTB
    help
    Setting this option allows the kernel command line arguments
    to be set.
    diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
    index 109bec4dad94..e7e52779ef62 100644
    --- a/arch/sh/boards/Kconfig
    +++ b/arch/sh/boards/Kconfig
    @@ -19,16 +19,9 @@ config SH_DEVICE_TREE
    select TIMER_OF
    select COMMON_CLK
    select GENERIC_CALIBRATE_DELAY
    -
    -config SH_JCORE_SOC
    - bool "J-Core SoC"
    - select SH_DEVICE_TREE
    - select CLKSRC_JCORE_PIT
    - select JCORE_AIC
    - depends on CPU_J2
    - help
    - Select this option to include drivers core components of the
    - J-Core SoC, including interrupt controllers and timers.
    + select GENERIC_IRQ_CHIP
    + select SYS_SUPPORTS_PCI
    + select GENERIC_PCI_IOMAP if PCI

    config SH_SOLUTION_ENGINE
    bool "SolutionEngine"
    @@ -293,6 +286,7 @@ config SH_LANDISK
    bool "LANDISK"
    depends on CPU_SUBTYPE_SH7751R
    select HAVE_PCI
    + select SYS_SUPPORTS_PCI
    help
    I-O DATA DEVICE, INC. "LANDISK Series" support.

    @@ -369,6 +363,16 @@ config SH_APSH4AD0A
    help
    Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A.

    +config SH_OF_BOARD
    + bool "General Open Firmware boards"
    + select SH_DEVICE_TREE
    + select CLKSRC_JCORE_PIT if CPU_J2
    + select JCORE_AIC if CPU_J2
    + select HAVE_PCI if CPU_SUBTYPE_SH7751R
    + help
    + This board means general OF supported targets.
    +
    +
    source "arch/sh/boards/mach-r2d/Kconfig"
    source "arch/sh/boards/mach-highlander/Kconfig"
    source "arch/sh/boards/mach-sdk7780/Kconfig"
    --
    2.39.2

    \
     
     \ /
      Last update: 2024-01-09 09:40    [W:4.670 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site