From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UPPERCASE_50_75,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF659C433EF for ; Mon, 20 Sep 2021 16:15:41 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 588FE60F70 for ; Mon, 20 Sep 2021 16:15:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 588FE60F70 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F10983260; Mon, 20 Sep 2021 18:15:19 +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="lFiB7bwt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5617C82C47; Mon, 20 Sep 2021 18:14:53 +0200 (CEST) Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 B791480608 for ; Mon, 20 Sep 2021 18:14:46 +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=aford173@gmail.com Received: by mail-il1-x131.google.com with SMTP id i13so19284406ilm.4 for ; Mon, 20 Sep 2021 09:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r5e0fTPS8X3sW6e44hTPEe+3scafX+lIsoP+TlgZOKw=; b=lFiB7bwtbdA4Mgd+2LB86OFAnaxF4CoGbZET1oAxolAGRLw7E+NLt8P7XUop9c3oqX Sw4xPH207N2FTSyxzRqOGkPBoq6MvjstAfe0NO24oKDjQH9MzsTukM3pfErp5zGqfAmG /dulJyZZUbRLLKw3v4ZLpdp/HfkACDsug12kPmdtvVOdcQ2pO9p1M4Kvs34BKsRw4ioN N8651TCey9Gx3/ZO0i0odm4DMM/UhDXeIUBqtu1bKW6/quX1xu9JogbJHnT9aZq9dw/u hGkS0MfHxBF8kEcyKZKWajl2lxLqYZzUkJwgHfxFfRvPsU/v9YCzddWWjpg40Bq61N9s svHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r5e0fTPS8X3sW6e44hTPEe+3scafX+lIsoP+TlgZOKw=; b=lPEqzi11fHBt4K8c6fGrBh9BPm2svEZLgiWg1E7gcrYQs4PA6xShXnmspcnBW97Rrq 7W+ZF3fe4iS9K4TdpSLWTnjKHFQIbQMB1mzaLgA0PNgyLMgcf0ZGst5bxK2ICzAyYuHx IEemKHfodeLw+AHo6me3LYW1mBzWmCbJtx3FpUW1AvoxvrsFQlb53t+9bZ/tTZ2WxYaN /Va07md//wAfoYTynaQsflNhHNLqrS02kZOae3eXI/G4jnXH5jLMehgiiu5Btsu3Fcpp noo1oU1v58s9ZmqmJYA1QZkrJhH2U8t2PV+1PbCSsNroY7OKwI4SCdEVt09FDOebeUCh AIkQ== X-Gm-Message-State: AOAM5304iqYVFngMK50IL8xxuhsMS0wXuLuFjNmqvidWlo04+QqYaZEP IR/uGvCJUT9ZBihqrT1yx2jbeZ87QFc= X-Google-Smtp-Source: ABdhPJzEWBteqirPJopo0xTblMp3cwNUs2ZPtkjlBwd1vsGrKQRnzjaHxA7YqDMcJqjtsy3sv3u6zQ== X-Received: by 2002:a05:6e02:20ed:: with SMTP id q13mr3820150ilv.111.1632154484954; Mon, 20 Sep 2021 09:14:44 -0700 (PDT) Received: from aford-OptiPlex-7050.logicpd.com ([174.46.170.158]) by smtp.gmail.com with ESMTPSA id e13sm8699294iod.36.2021.09.20.09.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 09:14:43 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: marek.vasut+renesas@gmail.com, aford@beaconembedded.com, Adam Ford Subject: [PATCH V2 3/6] ARM: rmobile: beacon: Remove duplicated for RZ/G2 M/N/H Date: Mon, 20 Sep 2021 11:14:29 -0500 Message-Id: <20210920161432.13110-3-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210920161432.13110-1-aford173@gmail.com> References: <20210920161432.13110-1-aford173@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.103.2 at phobos.denx.de X-Virus-Status: Clean Now that TARGET_BEACON_RZG2M can handle all the work that was done with TARGET_BEACON_RZG2N and TARGET_BEACON_RZG2H, remove them since they just create more duplicate code. Signed-off-by: Adam Ford --- V2: Rebase. arch/arm/mach-rmobile/Kconfig.64 | 14 +----- board/beacon/beacon-rzg2m/Kconfig | 2 +- configs/r8a774b1_beacon_defconfig | 73 ------------------------------- configs/r8a774e1_beacon_defconfig | 73 ------------------------------- 4 files changed, 2 insertions(+), 160 deletions(-) diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64 index 2bde898928..19fc3cab3a 100644 --- a/arch/arm/mach-rmobile/Kconfig.64 +++ b/arch/arm/mach-rmobile/Kconfig.64 @@ -71,14 +71,8 @@ choice prompt "Renesas ARM64 SoCs board select" optional -config TARGET_BEACON_RZG2H - bool "Beacon EmbeddedWorks RZ/G2H Dev Kit" - select R8A774E1 - select RZ_G2 - select PINCTRL_PFC_R8A774E1 - config TARGET_BEACON_RZG2M - bool "Beacon EmbeddedWorks RZ/G2M Dev Kit" + bool "Beacon EmbeddedWorks RZ/G2 Dev Kit" select R8A774A1 select R8A774B1 select R8A774E1 @@ -89,12 +83,6 @@ config TARGET_BEACON_RZG2M imply MULTI_DTB_FIT imply MULTI_DTB_FIT_USER_DEFINED_AREA -config TARGET_BEACON_RZG2N - bool "Beacon EmbeddedWorks RZ/G2N Dev Kit" - select R8A774B1 - select RZ_G2 - select PINCTRL_PFC_R8A774B1 - config TARGET_CONDOR bool "Condor board" imply R8A77980 diff --git a/board/beacon/beacon-rzg2m/Kconfig b/board/beacon/beacon-rzg2m/Kconfig index 99c23a3d14..c03857cf2f 100644 --- a/board/beacon/beacon-rzg2m/Kconfig +++ b/board/beacon/beacon-rzg2m/Kconfig @@ -1,4 +1,4 @@ -if TARGET_BEACON_RZG2H || TARGET_BEACON_RZG2M || TARGET_BEACON_RZG2N +if TARGET_BEACON_RZG2M config SYS_SOC default "rmobile" diff --git a/configs/r8a774b1_beacon_defconfig b/configs/r8a774b1_beacon_defconfig deleted file mode 100644 index 6f1a6085ec..0000000000 --- a/configs/r8a774b1_beacon_defconfig +++ /dev/null @@ -1,73 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_ENV_OFFSET=0x0 -CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a774b1-beacon-rzg2n-kit" -CONFIG_RCAR_GEN3=y -CONFIG_TARGET_BEACON_RZG2N=y -# CONFIG_SPL is not set -CONFIG_LTO=y -CONFIG_FIT=y -CONFIG_SUPPORT_RAW_INITRD=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set -CONFIG_DEFAULT_FDT_FILE="r8a774b1-beacon-rzg2n-kit.dtb" -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_MTD=y -CONFIG_CMD_PART=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_CONTROL=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_MMC=y -CONFIG_SYS_MMC_ENV_DEV=1 -CONFIG_SYS_MMC_ENV_PART=2 -CONFIG_VERSION_VARIABLE=y -CONFIG_REGMAP=y -CONFIG_SYSCON=y -CONFIG_CLK=y -CONFIG_CLK_RENESAS=y -CONFIG_RCAR_GPIO=y -CONFIG_DM_PCA953X=y -CONFIG_DM_I2C=y -CONFIG_SYS_I2C_RCAR_I2C=y -CONFIG_SYS_I2C_RCAR_IIC=y -CONFIG_MMC_IO_VOLTAGE=y -CONFIG_MMC_UHS_SUPPORT=y -CONFIG_MMC_HS200_SUPPORT=y -CONFIG_RENESAS_SDHI=y -CONFIG_MTD=y -CONFIG_DM_MTD=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_BITBANGMII=y -CONFIG_PHY_REALTEK=y -CONFIG_DM_ETH=y -CONFIG_RENESAS_RAVB=y -CONFIG_DM_REGULATOR=y -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_REGULATOR_GPIO=y -CONFIG_SPECIFY_CONSOLE_INDEX=y -CONFIG_SCIF_CONSOLE=y -CONFIG_SPI=y -CONFIG_DM_SPI=y -CONFIG_RENESAS_RPC_SPI=y -CONFIG_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_GENERIC=y -CONFIG_USB_STORAGE=y -CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/r8a774e1_beacon_defconfig b/configs/r8a774e1_beacon_defconfig deleted file mode 100644 index 9cde39f467..0000000000 --- a/configs/r8a774e1_beacon_defconfig +++ /dev/null @@ -1,73 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_ENV_OFFSET=0x0 -CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a774e1-beacon-rzg2h-kit" -CONFIG_RCAR_GEN3=y -CONFIG_TARGET_BEACON_RZG2H=y -# CONFIG_SPL is not set -CONFIG_LTO=y -CONFIG_FIT=y -CONFIG_SUPPORT_RAW_INITRD=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set -CONFIG_DEFAULT_FDT_FILE="r8a774e1-beacon-rzg2h-kit.dtb" -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_MTD=y -CONFIG_CMD_PART=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_CONTROL=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_MMC=y -CONFIG_SYS_MMC_ENV_DEV=1 -CONFIG_SYS_MMC_ENV_PART=2 -CONFIG_VERSION_VARIABLE=y -CONFIG_REGMAP=y -CONFIG_SYSCON=y -CONFIG_CLK=y -CONFIG_CLK_RENESAS=y -CONFIG_RCAR_GPIO=y -CONFIG_DM_PCA953X=y -CONFIG_DM_I2C=y -CONFIG_SYS_I2C_RCAR_I2C=y -CONFIG_SYS_I2C_RCAR_IIC=y -CONFIG_MMC_IO_VOLTAGE=y -CONFIG_MMC_UHS_SUPPORT=y -CONFIG_MMC_HS200_SUPPORT=y -CONFIG_RENESAS_SDHI=y -CONFIG_MTD=y -CONFIG_DM_MTD=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_BITBANGMII=y -CONFIG_PHY_REALTEK=y -CONFIG_DM_ETH=y -CONFIG_RENESAS_RAVB=y -CONFIG_DM_REGULATOR=y -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_REGULATOR_GPIO=y -CONFIG_SPECIFY_CONSOLE_INDEX=y -CONFIG_SCIF_CONSOLE=y -CONFIG_SPI=y -CONFIG_DM_SPI=y -CONFIG_RENESAS_RPC_SPI=y -CONFIG_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_GENERIC=y -CONFIG_USB_STORAGE=y -CONFIG_OF_LIBFDT_OVERLAY=y -- 2.25.1