From patchwork Mon Apr 6 05:58:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 1266689 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=jzS1fMcH; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48wfyV04n0z9sQt for ; Mon, 6 Apr 2020 16:00:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 62B498153D; Mon, 6 Apr 2020 07:59:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jzS1fMcH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2D41881577; Mon, 6 Apr 2020 07:59:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 650C4800DF for ; Mon, 6 Apr 2020 07:59:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=twoerner@gmail.com Received: by mail-qt1-x841.google.com with SMTP id z12so11973753qtq.5 for ; Sun, 05 Apr 2020 22:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9whRvKU79HE7HevEbDZGh4yaddAjDClroM7kYYJ8Q38=; b=jzS1fMcHM/hQ9nR1zn4bfmIhQNX0nYREUx1NUy+BVI7pKOGgqg8ZDVm5/6/+Q0/ExB KnZFvtZme1N/Ydu8vjuw5ICQBckF5d5sMU5GNLR68cy//DjDwU0+aFWJbFzdZu0p5nCu YkTtdqC4J/Qb9cT7UVr7fayVQobdFSAMcs9o+5IwOhdauIP7Ms818djl6HusPj51XlZv shbUeaAzQ+cXcyM42l0oq+IW77WtD/lN6tAvoNVFVM9wBr25/U/MgR1N76/nOQoZ9BfG baJomMz64Biu6qZ0ZsEPsW0FhduugXs7ZT0aOfAWZ/HF2s/yI+WIWTlW+4Qy24jynnHX z6Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9whRvKU79HE7HevEbDZGh4yaddAjDClroM7kYYJ8Q38=; b=AKrr28ZfC0dQgi7IMunZEGi5aHcwPUVfeiJGT9wJopiIqpnPyTxy3gsRMWhHOqXiao 3GOiAk9+4HAnWnXYcbh7b47qi3yl+xyoxIsLUhzlYJBkifrXoTcamiP4WFZYbFKL7qPa z5fFPe8nNGfNFeSA/DzIXY8k2UmFChgXMa1N0aPJcPy1MMBmVteFZHJw0j7FVFT9mLiS Ez+8wWcxxmaCsVQk7rKpqGL7D+c9/sfUyZP4k/1LkpBehWCJsGhA/5eN4q420y0PKzYF BqtYm/iunve0Jm6bVwJG1GTF+7+2XphGxUFSl3zoBWvL4pT3lT/+8ErQvBSchkLbAPAe nKvg== X-Gm-Message-State: AGi0PuaNb++t7oI5OGiE6QQScXVpUr7S7Mz3NulwNIp+z2/smsQQpoy/ 860llOOOFpu/+9Gcz9/AwyXQv41y X-Google-Smtp-Source: APiQypLIdl10PaBGek4ugZDi9iLqHduVZGxUh4MryAy1Q1QnWCBTkjvgSGoAtsl0+DYUCgXyELH4OA== X-Received: by 2002:ac8:1885:: with SMTP id s5mr3940664qtj.253.1586152790082; Sun, 05 Apr 2020 22:59:50 -0700 (PDT) Received: from linux-uys3.suse ([206.248.190.95]) by smtp.gmail.com with ESMTPSA id l62sm13978702qte.52.2020.04.05.22.59.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Apr 2020 22:59:49 -0700 (PDT) From: Trevor Woerner To: U-Boot Mailing List Cc: Albert ARIBAUD , Heiko Schocher , Joe Hershberger , Marek Vasut , Ye Li , Mark Kettenis , Lukasz Majewski , Jean-Jacques Hiblot , Marcel Ziswiler , Adam Ford Subject: [PATCH 3/5] rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X Date: Mon, 6 Apr 2020 01:58:57 -0400 Message-Id: <20200406055900.9519-3-twoerner@gmail.com> X-Mailer: git-send-email 2.25.0.114.g5b0ca878e0 In-Reply-To: <20200406055900.9519-1-twoerner@gmail.com> References: <20200406055900.9519-1-twoerner@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean Have this symbol follow the pattern of all other such symbols. This patch also removes a TODO from the code. Signed-off-by: Trevor Woerner --- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 3 +-- arch/arm/mach-orion5x/Kconfig | 4 ++-- configs/edminiv2_defconfig | 2 +- drivers/ata/mvsata_ide.c | 2 +- drivers/i2c/mvtwsi.c | 2 +- drivers/net/Kconfig | 2 +- drivers/net/mvgbe.c | 2 +- drivers/usb/host/Kconfig | 2 +- drivers/usb/host/ehci-marvell.c | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3096b97c6f..d56f375c8b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -547,7 +547,7 @@ config TARGET_APF27 select CPU_ARM926EJS select SUPPORT_SPL -config ORION5X +config ARCH_ORION5X bool "Marvell Orion" select CPU_ARM926EJS diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5d32dec29c..2b44ffb493 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -67,8 +67,7 @@ machine-$(CONFIG_ARCH_MEDIATEK) += mediatek machine-$(CONFIG_ARCH_MESON) += meson machine-$(CONFIG_ARCH_MVEBU) += mvebu machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 -# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X -machine-$(CONFIG_ORION5X) += orion5x +machine-$(CONFIG_ARCH_ORION5X) += orion5x machine-$(CONFIG_ARCH_OWL) += owl machine-$(CONFIG_ARCH_RMOBILE) += rmobile machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index 2984a3edda..23c13e22f5 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig @@ -1,4 +1,4 @@ -if ORION5X +if ARCH_ORION5X choice prompt "Marvell Orion board select" @@ -16,6 +16,6 @@ config SYS_SOC source "board/LaCie/edminiv2/Kconfig" config SPL_LDSCRIPT - default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X + default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ARCH_ORION5X endif diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index 2bbd6a783b..552b2d5b44 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y -CONFIG_ORION5X=y +CONFIG_ARCH_ORION5X=y CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/drivers/ata/mvsata_ide.c b/drivers/ata/mvsata_ide.c index 38181235af..9ac16555d6 100644 --- a/drivers/ata/mvsata_ide.c +++ b/drivers/ata/mvsata_ide.c @@ -8,7 +8,7 @@ #include #include -#if defined(CONFIG_ORION5X) +#if defined(CONFIG_ARCH_ORION5X) #include #elif defined(CONFIG_KIRKWOOD) #include diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 382cf4b304..77fe35a42b 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; */ #ifndef CONFIG_DM_I2C -#if defined(CONFIG_ORION5X) +#if defined(CONFIG_ARCH_ORION5X) #include #elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU)) #include diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 4d1013c984..3fd3e72219 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -303,7 +303,7 @@ config FSLDMAFEC config MVGBE bool "Marvell Orion5x/Kirkwood network interface support" - depends on KIRKWOOD || ORION5X + depends on KIRKWOOD || ARCH_ORION5X select PHYLIB if DM_ETH help This driver supports the network interface units in the diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index 037e59ec6e..b0b8d349a8 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -26,7 +26,7 @@ #if defined(CONFIG_KIRKWOOD) #include -#elif defined(CONFIG_ORION5X) +#elif defined(CONFIG_ARCH_ORION5X) #include #endif diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 0987ff25b1..5574e9f989 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -121,7 +121,7 @@ config USB_EHCI_ATMEL config USB_EHCI_MARVELL bool "Support for Marvell on-chip EHCI USB controller" - depends on ARCH_MVEBU || KIRKWOOD || ORION5X + depends on ARCH_MVEBU || KIRKWOOD || ARCH_ORION5X default y ---help--- Enables support for the on-chip EHCI controller on MVEBU SoCs. diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index 8efe6b63b9..3b10cdfc58 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -15,7 +15,7 @@ #if defined(CONFIG_KIRKWOOD) #include -#elif defined(CONFIG_ORION5X) +#elif defined(CONFIG_ARCH_ORION5X) #include #endif