[PATCH] ARM: tegra: rebuild tegra_defconfig

[PATCH] ARM: tegra: rebuild tegra_defconfig

[Stephen Warren]

From: Stephen Warren <swarren@nvidia.com>

This simply rebuilds tegra_defconfig on top of next-20130520. As such, it
should introduce no changes; simply moving entries around due to Kconfig
ordering changes. The apparent exceptions are:

AUTO_ZRELADDR: Selected by ARM multi-platform support.
MTD_CHAR: Removed in Kconfig.

This should make it easier to create future defconfig patches on top of
linux-next, since all the extraneous diffs have been removed. It also
makes it more likely that once 3.12 comes around, this defconfig will
already match what's required there.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/configs/tegra_defconfig |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 4dbcd9f..e45fe32 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -21,8 +21,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_TEGRA=y
 CONFIG_GPIO_PCA953X=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
@@ -36,7 +36,6 @@ CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_KEXEC=y
-CONFIG_AUTO_ZRELADDR=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_IDLE=y
@@ -81,7 +80,6 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_CMA=y
 CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_M25P80=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
@@ -105,8 +103,8 @@ CONFIG_BRCMFMAC=m
 CONFIG_RT2X00=y
 CONFIG_RT2800USB=m
 CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_TEGRA=y
 CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_TEGRA=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MPU3050=y
 # CONFIG_LEGACY_PTYS is not set
@@ -134,11 +132,11 @@ CONFIG_CHARGER_TPS65090=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_SENSORS_LM90=y
-CONFIG_MFD_TPS6586X=y
-CONFIG_MFD_TPS65910=y
 CONFIG_MFD_MAX8907=y
-CONFIG_MFD_TPS65090=y
 CONFIG_MFD_PALMAS=y
+CONFIG_MFD_TPS65090=y
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
@@ -211,7 +209,6 @@ CONFIG_TEGRA20_APB_DMA=y
 CONFIG_STAGING=y
 CONFIG_SENSORS_ISL29018=y
 CONFIG_SENSORS_ISL29028=y
-CONFIG_AK8975=y
 CONFIG_MFD_NVEC=y
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_SERIO_NVEC_PS2=y
@@ -221,6 +218,7 @@ CONFIG_TEGRA_IOMMU_GART=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_MEMORY=y
 CONFIG_IIO=y
+CONFIG_AK8975=y
 CONFIG_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_EXT2_FS=y
-- 
1.7.10.4

[PATCH] ARM: tegra: rebuild tegra_defconfig

[Stephen Warren]

On 05/28/2013 11:26 AM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> This simply rebuilds tegra_defconfig on top of next-20130520. As such, it
> should introduce no changes; simply moving entries around due to Kconfig
> ordering changes. The apparent exceptions are:
> 
> AUTO_ZRELADDR: Selected by ARM multi-platform support.
> MTD_CHAR: Removed in Kconfig.
> 
> This should make it easier to create future defconfig patches on top of
> linux-next, since all the extraneous diffs have been removed. It also
> makes it more likely that once 3.12 comes around, this defconfig will
> already match what's required there.

I've applied this (squashed it into) Tegra's for-3.11/defconfig branch.

[PATCH] ARM: tegra: rebuild tegra_defconfig

[Marc Dietrich]

Am Dienstag, 28. Mai 2013, 15:30:29 schrieb Stephen Warren:
> On 05/28/2013 11:26 AM, Stephen Warren wrote:
> > From: Stephen Warren <swarren@nvidia.com>
> > 
> > This simply rebuilds tegra_defconfig on top of next-20130520. As such, it
> > should introduce no changes; simply moving entries around due to Kconfig
> > ordering changes. The apparent exceptions are:
> > 
> > AUTO_ZRELADDR: Selected by ARM multi-platform support.
> > MTD_CHAR: Removed in Kconfig.
> > 
> > This should make it easier to create future defconfig patches on top of
> > linux-next, since all the extraneous diffs have been removed. It also
> > makes it more likely that once 3.12 comes around, this defconfig will
> > already match what's required there.
> 
> I've applied this (squashed it into) Tegra's for-3.11/defconfig branch.

wouldn't it make more sense to apply such a patch just before the merge window 
closes (or better after some release candidate)? This way we would have a 
better chance to have a zero diff between defconfig and tegra_defconfig, e.g. 
not like 3.10 is now.

Marc

[PATCH] ARM: tegra: rebuild tegra_defconfig

[Stephen Warren]

On 05/29/2013 07:38 AM, Marc Dietrich wrote:
> Am Dienstag, 28. Mai 2013, 15:30:29 schrieb Stephen Warren:
>> On 05/28/2013 11:26 AM, Stephen Warren wrote:
>>> From: Stephen Warren <swarren@nvidia.com>
>>>
>>> This simply rebuilds tegra_defconfig on top of next-20130520. As such, it
>>> should introduce no changes; simply moving entries around due to Kconfig
>>> ordering changes. The apparent exceptions are:
>>>
>>> AUTO_ZRELADDR: Selected by ARM multi-platform support.
>>> MTD_CHAR: Removed in Kconfig.
>>>
>>> This should make it easier to create future defconfig patches on top of
>>> linux-next, since all the extraneous diffs have been removed. It also
>>> makes it more likely that once 3.12 comes around, this defconfig will
>>> already match what's required there.
>>
>> I've applied this (squashed it into) Tegra's for-3.11/defconfig branch.
> 
> wouldn't it make more sense to apply such a patch just before the merge window 
> closes (or better after some release candidate)?

Perhaps. It probably also depends a lot on when Kconfig changes get
applied in other areas as far as when it makes sense. I deferred it this
time around in order to pick up some tegra_defconfig changes that made
it into 3.10-rc3.

> This way we would have a 
> better chance to have a zero diff between defconfig and tegra_defconfig, e.g. 
> not like 3.10 is now.

I don't understand this; what is "defconfig" if not "tegra_defconfig"?

[PATCH] ARM: tegra: rebuild tegra_defconfig

[Marc Dietrich]

On Wednesday 29 May 2013 09:29:48 Stephen Warren wrote:
> On 05/29/2013 07:38 AM, Marc Dietrich wrote:
> > Am Dienstag, 28. Mai 2013, 15:30:29 schrieb Stephen Warren:
> >> On 05/28/2013 11:26 AM, Stephen Warren wrote:
> >>> From: Stephen Warren <swarren@nvidia.com>
> >>> 
> >>> This simply rebuilds tegra_defconfig on top of next-20130520. As such,
> >>> it
> >>> should introduce no changes; simply moving entries around due to Kconfig
> >>> ordering changes. The apparent exceptions are:
> >>> 
> >>> AUTO_ZRELADDR: Selected by ARM multi-platform support.
> >>> MTD_CHAR: Removed in Kconfig.
> >>> 
> >>> This should make it easier to create future defconfig patches on top of
> >>> linux-next, since all the extraneous diffs have been removed. It also
> >>> makes it more likely that once 3.12 comes around, this defconfig will
> >>> already match what's required there.
> >> 
> >> I've applied this (squashed it into) Tegra's for-3.11/defconfig branch.
> > 
> > wouldn't it make more sense to apply such a patch just before the merge
> > window closes (or better after some release candidate)?
> 
> Perhaps. It probably also depends a lot on when Kconfig changes get
> applied in other areas as far as when it makes sense. I deferred it this
> time around in order to pick up some tegra_defconfig changes that made
> it into 3.10-rc3.

ok, nice.

> > This way we would have a
> > better chance to have a zero diff between defconfig and tegra_defconfig,
> > e.g. not like 3.10 is now.
> 
> I don't understand this; what is "defconfig" if not "tegra_defconfig"?

defconfig: make tegra_defconfig; make saveconfig

diff -u tegra_defconfig defconfig

Marc

[PATCH] ARM: tegra: rebuild tegra_defconfig

[Stephen Warren]

On 05/29/2013 11:30 AM, Marc Dietrich wrote:
> On Wednesday 29 May 2013 09:29:48 Stephen Warren wrote:
>> On 05/29/2013 07:38 AM, Marc Dietrich wrote:
>>> Am Dienstag, 28. Mai 2013, 15:30:29 schrieb Stephen Warren:
>>>> On 05/28/2013 11:26 AM, Stephen Warren wrote:
>>>>> From: Stephen Warren <swarren@nvidia.com>
>>>>>
>>>>> This simply rebuilds tegra_defconfig on top of next-20130520. As such,
>>>>> it
>>>>> should introduce no changes; simply moving entries around due to Kconfig
>>>>> ordering changes. The apparent exceptions are:
...
>>> This way we would have a
>>> better chance to have a zero diff between defconfig and tegra_defconfig,
>>> e.g. not like 3.10 is now.
>>
>> I don't understand this; what is "defconfig" if not "tegra_defconfig"?
> 
> defconfig: make tegra_defconfig; make saveconfig
> 
> diff -u tegra_defconfig defconfig

Oh right. Yes, if you do that in the for-3.11/defconfig branch itself,
there will be diffs.

That will always be true; that branch won't have any of the new
drivers/features that will be added in linux-next and the next mainline
kernel, so at the very least you'd end up removing some options doing that.

I expect most people editing defconfig will be doing it based on some
linux-next version rather than right on top of for-3.11/defconfig, so
they can pick up, enable, and test new drivers or features. If you run
the commands above in next-20130529, there should be a zero diff (unless
someone made some Kconfig changes between
next-20130528 and next-20130529 anyway).

[PATCH] ARM: tegra: rebuild tegra_defconfig

[Stephen Warren]

From: Stephen Warren <swarren@nvidia.com>

Run "make tegra_defconfig; make savedefconf" on v3.16-rc1. This allows
other people to do the same thing to adjust the defconfig file without
their patch bringing in a bunch of irrelevant diffs.

All of the removed options either have been removed from Kconfig, or
are now default y.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
I intend to apply this immediately to Tegra's for-3.17/defconfig branch.

 arch/arm/configs/tegra_defconfig | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index fb25e2982f64..157a4f144479 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -23,14 +23,11 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
-CONFIG_TEGRA_EMC_SCALING_ENABLE=y
-CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_TEGRA=y
@@ -74,9 +71,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_TUNNEL=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_CAN=y
-CONFIG_CAN_RAW=y
-CONFIG_CAN_BCM=y
-CONFIG_CAN_DEV=y
 CONFIG_CAN_MCP251X=y
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
@@ -96,7 +90,6 @@ CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_MTD=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_SPI_NOR=y
-CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_AD525X_DPOT=y
 CONFIG_AD525X_DPOT_I2C=y
@@ -144,6 +137,7 @@ CONFIG_SPI_TEGRA20_SFLASH=y
 CONFIG_SPI_TEGRA20_SLINK=y
 CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_PALMAS=y
+CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_TPS6586X=y
@@ -291,5 +285,4 @@ CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_CRYPTO_TWOFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_TEGRA_AES=y
 CONFIG_CRC_CCITT=y
-- 
1.8.1.5