[1/2] ARM: shmobile: defconfig: cleanup by savedefconfig

Commit Message

Kuninori Morimoto Dec. 4, 2014, 3:57 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

Current shmobile_defconfig is not created from savedefconfig.
Therefore, next defconfig patch will be unreadable. this patch
tidyup this issue by below command

 > make shmobile_defconfig
 > make savedefconfig
 > cp defconfig ${LINUX}/arch/arm/config/shmobile_defconfig

Signed-off-by: Kuninori Morimoto <[e-mail]>
---
 arch/arm/configs/shmobile_defconfig |   25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

Comments

Geert Uytterhoeven Dec. 4, 2014, 9:16 a.m. UTC | #1

Hi Morimoto-san,

On Thu, Dec 4, 2014 at 4:57 AM, Kuninori Morimoto
<[e-mail]> wrote:
> Current shmobile_defconfig is not created from savedefconfig.
> Therefore, next defconfig patch will be unreadable. this patch
> tidyup this issue by below command

Thanks a lot!

>  > make shmobile_defconfig
>  > make savedefconfig
>  > cp defconfig ${LINUX}/arch/arm/config/shmobile_defconfig

It's actually a good practice to update the defconfigs from time to time,
so people don't have such a hard time to generate updates for it.

Note that you best keep your old .config generated from shmobile_defconfig
and run "make oldconfig". That will catch cases where a "select" was
dropped from a Kconfig file. When just running "make shmobile_defconfig",
you may end up with a .config where some option is suddenly disabled
because it's no longer selected automatically.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [e-mail]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Kuninori Morimoto Dec. 4, 2014, 9:48 a.m. UTC | #2

Hi Geert

> Note that you best keep your old .config generated from shmobile_defconfig
> and run "make oldconfig". That will catch cases where a "select" was
> dropped from a Kconfig file. When just running "make shmobile_defconfig",
> you may end up with a .config where some option is suddenly disabled
> because it's no longer selected automatically.

Thanks ! I didn't know that.

# I tried "shmobile_defconfig + oldconfig" on latest tree.
# and there is no difference between nomal "shmobile_defconfig" and above.
# I guess 1/1 patch was OK this time.

Best regards
---
Kuninori Morimoto
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 63fb531..e04610b 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -19,7 +19,6 @@  CONFIG_ARCH_R8A7791=y
 CONFIG_ARCH_R8A7794=y
 CONFIG_MACH_LAGER=y
 CONFIG_MACH_MARZEN=y
-# CONFIG_SWP_EMULATE is not set
 CONFIG_CPU_BPREDICT_DISABLE=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_ARM_ERRATA_754322=y
@@ -36,6 +35,12 @@  CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_KEXEC=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -98,9 +103,10 @@  CONFIG_GPIO_EM=y
 CONFIG_GPIO_RCAR=y
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
+CONFIG_CPU_THERMAL=y
 CONFIG_RCAR_THERMAL=y
 CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_DA9210=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
@@ -147,7 +153,6 @@  CONFIG_RTC_DRV_S35390A=y
 CONFIG_DMADEVICES=y
 CONFIG_SH_DMAE=y
 CONFIG_RCAR_AUDMAC_PP=y
-CONFIG_RCAR_DMAC=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_PWM=y
 CONFIG_PWM_RENESAS_TPU=y
@@ -155,7 +160,6 @@  CONFIG_PWM_RENESAS_TPU=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
 # CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
@@ -167,16 +171,3 @@  CONFIG_NLS_ISO8859_1=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ARM_UNWIND is not set
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_THERMAL=y
-CONFIG_GENERIC_CPUFREQ_CPU0=y
-CONFIG_REGULATOR_DA9210=y