lkml.org 
[lkml]   [2023]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 24/27] sparc32: Drop config SPARC_LEON
    From: Sam Ravnborg <sam@ravnborg.org>

    The only support sparc32 CPU is LEON, so there is no need for a
    config option to select it.

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Arnd Bergmann <arnd@kernel.org>
    Cc: Andreas Larsson <andreas@gaisler.com>
    ---
    arch/sparc/Kconfig | 27 +++++++++------------------
    arch/sparc/configs/sparc32_defconfig | 1 -
    drivers/usb/host/Kconfig | 2 +-
    drivers/usb/host/ehci-hcd.c | 4 ++--
    drivers/usb/host/uhci-hcd.c | 2 +-
    5 files changed, 13 insertions(+), 23 deletions(-)

    diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
    index 7ae304bab2d8..0fc52c3c7487 100644
    --- a/arch/sparc/Kconfig
    +++ b/arch/sparc/Kconfig
    @@ -9,6 +9,10 @@ config 64BIT

    Say yes to build a 64-bit kernel - formerly known as sparc64
    Say no to build a 32-bit kernel - formerly known as sparc
    + The 32-bit kernel target the synthesizable LEON SPARC processor.
    + LEON is a part of the GRLIB collection of IP cores that are
    + distributed under GPL. GRLIB can be downloaded from www.gaisler.com.
    + You can download a sparc-linux cross-compilation toolchain at www.gaisler.com.

    config SPARC
    bool
    @@ -60,6 +64,10 @@ config SPARC32
    select HAVE_UID16
    select LOCK_MM_AND_FIND_VMA
    select OLD_SIGACTION
    + select USB_EHCI_BIG_ENDIAN_MMIO
    + select USB_EHCI_BIG_ENDIAN_DESC
    + select USB_UHCI_BIG_ENDIAN_MMIO
    + select USB_UHCI_BIG_ENDIAN_DESC
    select ZONE_DMA

    config SPARC64
    @@ -348,22 +356,6 @@ config SERIAL_CONSOLE

    If unsure, say N.

    -config SPARC_LEON
    - bool "Sparc Leon processor family"
    - depends on SPARC32
    - select USB_EHCI_BIG_ENDIAN_MMIO
    - select USB_EHCI_BIG_ENDIAN_DESC
    - select USB_UHCI_BIG_ENDIAN_MMIO
    - select USB_UHCI_BIG_ENDIAN_DESC
    - help
    - If you say Y here if you are running on a SPARC-LEON processor.
    - The LEON processor is a synthesizable VHDL model of the
    - SPARC-v8 standard. LEON is part of the GRLIB collection of
    - IP cores that are distributed under GPL. GRLIB can be downloaded
    - from www.gaisler.com. You can download a sparc-linux cross-compilation
    - toolchain at www.gaisler.com.
    -
    -if SPARC_LEON
    menu "U-Boot options"

    config UBOOT_LOAD_ADDR
    @@ -394,7 +386,6 @@ config UBOOT_ENTRY_ADDR
    Kernel.

    endmenu
    -endif

    endmenu

    @@ -416,7 +407,7 @@ config SUN_LDOMS

    config LEON_PCI
    bool
    - depends on PCI && SPARC_LEON
    + depends on PCI && SPARC32
    default y

    config SPARC_GRPCI1
    diff --git a/arch/sparc/configs/sparc32_defconfig b/arch/sparc/configs/sparc32_defconfig
    index 71273fc578bf..dfd326f20876 100644
    --- a/arch/sparc/configs/sparc32_defconfig
    +++ b/arch/sparc/configs/sparc32_defconfig
    @@ -10,7 +10,6 @@ CONFIG_BLK_DEV_INITRD=y
    # CONFIG_RD_ZSTD is not set
    CONFIG_SMP=y
    CONFIG_HZ_100=y
    -CONFIG_SPARC_LEON=y
    CONFIG_SUN_OPENPROMFS=y
    CONFIG_SUN_OPENPROMIO=y
    # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
    diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
    index 4448d0ab06f0..c5f94c70482f 100644
    --- a/drivers/usb/host/Kconfig
    +++ b/drivers/usb/host/Kconfig
    @@ -595,7 +595,7 @@ config USB_UHCI_HCD

    config USB_UHCI_SUPPORT_NON_PCI_HC
    bool
    - default y if (SPARC_LEON || USB_UHCI_PLATFORM)
    + default y if (SPARC32 || USB_UHCI_PLATFORM)

    config USB_UHCI_PLATFORM
    bool
    diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
    index 802bfafb1012..5011bc8348bb 100644
    --- a/drivers/usb/host/ehci-hcd.c
    +++ b/drivers/usb/host/ehci-hcd.c
    @@ -1329,7 +1329,7 @@ MODULE_LICENSE ("GPL");
    #include "ehci-xilinx-of.c"
    #endif

    -#ifdef CONFIG_SPARC_LEON
    +#ifdef CONFIG_SPARC32
    #include "ehci-grlib.c"
    #endif

    @@ -1343,7 +1343,7 @@ static struct platform_driver * const platform_drivers[] = {
    #ifdef CONFIG_XPS_USB_HCD_XILINX
    &ehci_hcd_xilinx_of_driver,
    #endif
    -#ifdef CONFIG_SPARC_LEON
    +#ifdef CONFIG_SPARC32
    &ehci_grlib_driver,
    #endif
    };
    diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
    index fd2408b553cf..7cb820963988 100644
    --- a/drivers/usb/host/uhci-hcd.c
    +++ b/drivers/usb/host/uhci-hcd.c
    @@ -846,7 +846,7 @@ static const char hcd_name[] = "uhci_hcd";
    #define PCI_DRIVER uhci_pci_driver
    #endif

    -#ifdef CONFIG_SPARC_LEON
    +#ifdef CONFIG_SPARC32
    #include "uhci-grlib.c"
    #define PLATFORM_DRIVER uhci_grlib_driver
    #endif
    --
    2.34.1


    \
     
     \ /
      Last update: 2023-12-19 23:11    [W:5.585 / U:1.836 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site