Message ID | 23b30e8e9e31e7a6af4aa7d317699e1538ad89c2.1694685860.git.tanyuan@tinylab.org (mailing list archive) |
---|---|
State | Rejected, archived |
Headers | show |
Series | Kconfig: Add dependencies of POWER_RESET for pmac32 | expand |
Yuan Tan <tanyuan@tinylab.org> writes: > Use 'make savedefconfig' to cleanup pmac32_defconfig, based on Linux > 7.6-rc1 Thanks but I don't like doing these updates in a single commit like this, it's easy to accidentally lose a symbol. I prefer an explanation for what's changing for each symbol. See 1ce7fda142af ("powerpc/configs/64s: Drop IPV6 which is default y") and the commits leading up to it, to see what I mean. But I suspect you probably don't want to go to all that effort, which is fine :) So I won't take patch 1, but patch 2 and 3 look fine. No need to resend, I'll deal with any merge fixup needed. cheers
Hi Michael On 9/14/2023 9:10 PM, Michael Ellerman wrote: > Yuan Tan <tanyuan@tinylab.org> writes: >> Use 'make savedefconfig' to cleanup pmac32_defconfig, based on Linux >> 7.6-rc1 > Thanks but I don't like doing these updates in a single commit like > this, it's easy to accidentally lose a symbol. Yeah I have the same concerns too. > > I prefer an explanation for what's changing for each symbol. See > 1ce7fda142af ("powerpc/configs/64s: Drop IPV6 which is default y") and > the commits leading up to it, to see what I mean. > > But I suspect you probably don't want to go to all that effort, which is > fine :) I am not familiar with other options, so I'd better not do that. :) By the way, just to be cautious, since the defconfig can only be updated by 'savedefconfig'[1], how can we write an explanation for a single change in an option? I mean, when I change one option, the value of the other undetermined option will be set just like in patch 1. [1]: https://lore.kernel.org/all/54da2376-dc65-0a96-55df-7a5acfbb9bff@csgroup.eu/ > > So I won't take patch 1, but patch 2 and 3 look fine. No need to resend, > I'll deal with any merge fixup needed. > > cheers Thank you :)
Yuan Tan <tanyuan@tinylab.org> writes: > On 9/14/2023 9:10 PM, Michael Ellerman wrote: >> Yuan Tan <tanyuan@tinylab.org> writes: >>> Use 'make savedefconfig' to cleanup pmac32_defconfig, based on Linux >>> 7.6-rc1 >> Thanks but I don't like doing these updates in a single commit like >> this, it's easy to accidentally lose a symbol. > Yeah I have the same concerns too. >> >> I prefer an explanation for what's changing for each symbol. See >> 1ce7fda142af ("powerpc/configs/64s: Drop IPV6 which is default y") and >> the commits leading up to it, to see what I mean. >> >> But I suspect you probably don't want to go to all that effort, which is >> fine :) > > I am not familiar with other options, so I'd better not do that. :) > > By the way, just to be cautious, since the defconfig can only be updated > by 'savedefconfig'[1], how can we write an explanation for a single > change in an option? Well the defconfig can be updated manually, but the changes you make manually should match what savedefconfig would do. > I mean, when I change one option, the value of the other undetermined > option will be set just like in patch 1. At that point I just stage the change to the option I'm changing, and leave the other lines modified by savedefconfig alone. That way you can commit the changes made by savedefconfig in multiple steps, explaining what happens along the way, and the end result is the same as what savedefconfig generates. So for example at the moment if you do savedefconfig on pmac32_defconfig, the start of the diff looks like: 1 diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig 2 index 57ded82c2840..17df965be099 100644 3 --- a/arch/powerpc/configs/pmac32_defconfig 4 +++ b/arch/powerpc/configs/pmac32_defconfig 5 @@ -1,4 +1,3 @@ 6 -CONFIG_ALTIVEC=y 7 # CONFIG_LOCALVERSION_AUTO is not set 8 CONFIG_SYSVIPC=y 9 CONFIG_POSIX_MQUEUE=y 10 @@ -8,12 +7,8 @@ CONFIG_IKCONFIG=y 11 CONFIG_IKCONFIG_PROC=y 12 CONFIG_LOG_BUF_SHIFT=14 13 CONFIG_BLK_DEV_INITRD=y 14 -# CONFIG_COMPAT_BRK is not set 15 CONFIG_PROFILING=y 16 -CONFIG_MODULES=y 17 -CONFIG_MODULE_UNLOAD=y 18 -CONFIG_MODULE_FORCE_UNLOAD=y 19 -CONFIG_PARTITION_ADVANCED=y 20 +CONFIG_ALTIVEC=y 21 # CONFIG_PPC_CHRP is not set 22 CONFIG_CPU_FREQ=y 23 CONFIG_CPU_FREQ_GOV_POWERSAVE=y So you can stage lines 6 and 20, and commit that as "Update for symbol movement", ie. nothing changed other than a symbol moved. Then repeat that until eventually the config is up to date. cheers
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index a205da9ee5f2..11d489c2c3e0 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig @@ -1,4 +1,3 @@ -CONFIG_ALTIVEC=y # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y @@ -8,12 +7,8 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -# CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_PARTITION_ADVANCED=y +CONFIG_ALTIVEC=y # CONFIG_PPC_CHRP is not set CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -21,12 +16,15 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_PMAC=y CONFIG_GEN_RTC=y CONFIG_HIGHMEM=y -CONFIG_BINFMT_MISC=m CONFIG_HIBERNATION=y CONFIG_PM_DEBUG=y CONFIG_APM_EMULATION=y -CONFIG_PCCARD=m -CONFIG_YENTA=m +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_BINFMT_MISC=m +# CONFIG_COMPAT_BRK is not set CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -100,6 +98,8 @@ CONFIG_BT_HCIBFUSB=m CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_MAC80211_LEDS=y +CONFIG_PCCARD=m +CONFIG_YENTA=m # CONFIG_STANDALONE is not set CONFIG_CONNECTOR=y CONFIG_MAC_FLOPPY=m @@ -179,7 +179,6 @@ CONFIG_SERIAL_8250=m CONFIG_SERIAL_PMACZILOG=y CONFIG_SERIAL_PMACZILOG_TTYS=y CONFIG_SERIAL_PMACZILOG_CONSOLE=y -CONFIG_NVRAM=y CONFIG_I2C_CHARDEV=m CONFIG_APM_POWER=y CONFIG_BATTERY_PMU=y @@ -189,7 +188,6 @@ CONFIG_AGP_UNINORTH=m CONFIG_DRM=m CONFIG_DRM_RADEON=m CONFIG_DRM_LEGACY=y -CONFIG_DRM_R128=m CONFIG_FB=y CONFIG_FB_OF=y CONFIG_FB_CONTROL=y @@ -275,23 +273,19 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_ISO8859_1=m -CONFIG_CRC_T10DIF=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_XMON=y -CONFIG_XMON_DEFAULT=y -CONFIG_BOOTX_TEXT=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRC_T10DIF=y +CONFIG_DEBUG_KERNEL=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DETECT_HUNG_TASK=y +CONFIG_XMON=y +CONFIG_XMON_DEFAULT=y +CONFIG_BOOTX_TEXT=y
Use 'make savedefconfig' to cleanup pmac32_defconfig, based on Linux 7.6-rc1 Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Yuan Tan <tanyuan@tinylab.org> --- arch/powerpc/configs/pmac32_defconfig | 44 ++++++++++++--------------- 1 file changed, 19 insertions(+), 25 deletions(-)