From: Shawn Guo <shawnguo@kernel.org>
To: Li Yang <leoyang.li@nxp.com>, Arnd Bergmann <arnd@arndb.de>,
Olof Johansson <olof@lixom.net>
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] arm64: defconfig: run through savedefconfig for ordering
Date: Mon, 17 Feb 2020 13:34:28 +0800 [thread overview]
Message-ID: <20200217053427.GA6042@dragon> (raw)
In-Reply-To: <1581382559-18520-1-git-send-email-leoyang.li@nxp.com>
On Mon, Feb 10, 2020 at 06:55:58PM -0600, Li Yang wrote:
> Used "make defconfig savedefconfig" to regenerate defconfig file in the
> right order to prepare for additional defconfig changes.
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
Arnd, Olof,
How do we handle arm64 defconfig savedefconfig changes? I think it will
likely cause conflicts with changes from other platform maintainers.
Shawn
> ---
> arch/arm64/configs/defconfig | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index 0f212889c931..618001ef5c81 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -471,9 +471,9 @@ CONFIG_DW_WATCHDOG=y
> CONFIG_SUNXI_WATCHDOG=m
> CONFIG_IMX2_WDT=y
> CONFIG_IMX_SC_WDT=m
> +CONFIG_QCOM_WDT=m
> CONFIG_MESON_GXBB_WATCHDOG=m
> CONFIG_MESON_WATCHDOG=m
> -CONFIG_QCOM_WDT=m
> CONFIG_RENESAS_WDT=y
> CONFIG_UNIPHIER_WATCHDOG=y
> CONFIG_BCM2835_WDT=y
> @@ -594,8 +594,8 @@ CONFIG_SND_SOC_TAS571X=m
> CONFIG_SND_SIMPLE_CARD=m
> CONFIG_SND_AUDIO_GRAPH_CARD=m
> CONFIG_I2C_HID=m
> -CONFIG_USB=y
> CONFIG_USB_CONN_GPIO=m
> +CONFIG_USB=y
> CONFIG_USB_OTG=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_TEGRA=y
> @@ -617,7 +617,6 @@ CONFIG_USB_CHIPIDEA_HOST=y
> CONFIG_USB_ISP1760=y
> CONFIG_USB_HSIC_USB3503=y
> CONFIG_NOP_USB_XCEIV=y
> -CONFIG_USB_ULPI=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_RENESAS_USBHS_UDC=m
> CONFIG_USB_RENESAS_USB3=m
> @@ -756,7 +755,6 @@ CONFIG_OWL_PM_DOMAINS=y
> CONFIG_RASPBERRYPI_POWER=y
> CONFIG_IMX_SCU_SOC=y
> CONFIG_QCOM_AOSS_QMP=y
> -CONFIG_QCOM_COMMAND_DB=y
> CONFIG_QCOM_GENI_SE=y
> CONFIG_QCOM_GLINK_SSR=m
> CONFIG_QCOM_RMTFS_MEM=m
> @@ -771,14 +769,12 @@ CONFIG_ARCH_R8A774A1=y
> CONFIG_ARCH_R8A774B1=y
> CONFIG_ARCH_R8A774C0=y
> CONFIG_ARCH_R8A7795=y
> -CONFIG_ARCH_R8A7796=y
> CONFIG_ARCH_R8A77961=y
> CONFIG_ARCH_R8A77965=y
> CONFIG_ARCH_R8A77970=y
> CONFIG_ARCH_R8A77980=y
> CONFIG_ARCH_R8A77990=y
> CONFIG_ARCH_R8A77995=y
> -CONFIG_QCOM_PDC=y
> CONFIG_ROCKCHIP_PM_DOMAINS=y
> CONFIG_ARCH_TEGRA_132_SOC=y
> CONFIG_ARCH_TEGRA_210_SOC=y
> @@ -809,6 +805,7 @@ CONFIG_PWM_ROCKCHIP=y
> CONFIG_PWM_SAMSUNG=y
> CONFIG_PWM_SUN4I=m
> CONFIG_PWM_TEGRA=m
> +CONFIG_QCOM_PDC=y
> CONFIG_RESET_QCOM_AOSS=y
> CONFIG_RESET_QCOM_PDC=m
> CONFIG_RESET_TI_SCI=y
> @@ -880,16 +877,16 @@ CONFIG_NLS_ISO8859_1=y
> CONFIG_SECURITY=y
> CONFIG_CRYPTO_ECHAINIV=y
> CONFIG_CRYPTO_ANSI_CPRNG=y
> +CONFIG_CRYPTO_USER_API_RNG=m
> CONFIG_CRYPTO_DEV_SUN8I_CE=m
> CONFIG_CRYPTO_DEV_FSL_CAAM=m
> -CONFIG_CRYPTO_DEV_HISI_ZIP=m
> -CONFIG_CRYPTO_USER_API_RNG=m
> CONFIG_CRYPTO_DEV_QCOM_RNG=m
> +CONFIG_CRYPTO_DEV_HISI_ZIP=m
> CONFIG_CMA_SIZE_MBYTES=32
> CONFIG_PRINTK_TIME=y
> CONFIG_DEBUG_INFO=y
> -CONFIG_DEBUG_FS=y
> CONFIG_MAGIC_SYSRQ=y
> +CONFIG_DEBUG_FS=y
> CONFIG_DEBUG_KERNEL=y
> # CONFIG_SCHED_DEBUG is not set
> # CONFIG_DEBUG_PREEMPT is not set
> --
> 2.17.1
>
next prev parent reply other threads:[~2020-02-17 5:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 0:55 [PATCH 1/2] arm64: defconfig: run through savedefconfig for ordering Li Yang
2020-02-11 0:55 ` [PATCH 2/2] arm64: defconfig: enable additional drivers needed by NXP QorIQ boards Li Yang
2020-02-17 5:37 ` Shawn Guo
2020-02-18 16:44 ` Leo Li
2020-02-19 2:02 ` Shawn Guo
2020-02-17 5:34 ` Shawn Guo [this message]
2020-02-18 16:54 ` [PATCH 1/2] arm64: defconfig: run through savedefconfig for ordering Leo Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200217053427.GA6042@dragon \
--to=shawnguo@kernel.org \
--cc=arnd@arndb.de \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).