From: Joel Stanley <joel@jms.id.au> Date: 2021-08-16 08:32:15
The first was a build warning I noticed when testing something
unrelated.
I took a moment to look into it, and came up with the second patch which
updates the defconfig to make it easier to maintain in the future
It also fixes a regression where the MTD partition support dropped out
of the config. Given noone noticed the regression since v4.20 was
released, perhaps it could be left disabled?
Joel Stanley (2):
powerpc/config: Fix IPV6 warning in mpc855_ads
powerpc/configs: Regenerate mpc885_ads_defconfig
arch/powerpc/configs/mpc885_ads_defconfig | 49 +++++++++++------------
1 file changed, 23 insertions(+), 26 deletions(-)
--
2.32.0
From: Joel Stanley <joel@jms.id.au> Date: 2021-08-16 08:33:15
When building this config there's a warning:
79:warning: override: reassigning to symbol IPV6
Commit 9a1762a4a4ff ("powerpc/8xx: Update mpc885_ads_defconfig to
improve CI") added CONFIG_IPV6=y, but left '# CONFIG_IPV6 is not set'
in.
IPV6 is default y, so remove both to clean up the build.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
arch/powerpc/configs/mpc885_ads_defconfig | 2 --
1 file changed, 2 deletions(-)
@@ -21,7 +21,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_SYN_COOKIES=y-# CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set CONFIG_MTD=y CONFIG_MTD_BLOCK=y
From: Joel Stanley <joel@jms.id.au> Date: 2021-08-16 08:33:53
Regenrate atop v5.14-rc6.
The chagnes are mostly re-ordering, except for the following which fall
out due to dependenacies:
- CONFIG_DEBUG_KERNEL=y selected by EXPERT
- CONFIG_PPC_EARLY_DEBUG_CPM_ADDR=0xff002008 which is the default
setting
CONFIG_MTD_PHYSMAP_OF is not longer enabled, as it depends on
MTD_PHYSMAP which is not enabled. This is a regression from commit
642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c"),
which added the extra dependency. Add CONFIG_MTD_PHYSMAP=y so this stays
in the config.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
arch/powerpc/configs/mpc885_ads_defconfig | 47 +++++++++++------------
1 file changed, 23 insertions(+), 24 deletions(-)
@@ -1,19 +1,30 @@-CONFIG_PPC_8xx=y # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y+CONFIG_BPF_JIT=y+CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_EXPERT=y # CONFIG_ELF_CORE is not set # CONFIG_BASE_FULL is not set # CONFIG_FUTEX is not set+CONFIG_PERF_EVENTS=y # CONFIG_VM_EVENT_COUNTERS is not set-# CONFIG_BLK_DEV_BSG is not set-CONFIG_PARTITION_ADVANCED=y+CONFIG_PPC_8xx=y+CONFIG_8xx_GPIO=y+CONFIG_SMC_UCODE_PATCH=y+CONFIG_PIN_TLB=y CONFIG_GEN_RTC=y CONFIG_HZ_100=y+CONFIG_MATH_EMULATION=y+CONFIG_PPC_16K_PAGES=y+CONFIG_ADVANCED_OPTIONS=y # CONFIG_SECCOMP is not set+CONFIG_STRICT_KERNEL_RWX=y+CONFIG_MODULES=y+# CONFIG_BLK_DEV_BSG is not set+CONFIG_PARTITION_ADVANCED=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
@@ -33,6 +44,7 @@ CONFIG_MTD_CFI_GEOMETRY=y # CONFIG_MTD_CFI_I2 is not set CONFIG_MTD_CFI_I4=y CONFIG_MTD_CFI_AMDSTD=y+CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y # CONFIG_BLK_DEV is not set CONFIG_NETDEVICES=y
@@ -45,38 +57,25 @@ CONFIG_DAVICOM_PHY=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_CPM=y CONFIG_SERIAL_CPM_CONSOLE=y+CONFIG_SPI=y+CONFIG_SPI_FSL_SPI=y # CONFIG_HWMON is not set+CONFIG_WATCHDOG=y+CONFIG_8xxx_WDT=y # CONFIG_USB_SUPPORT is not set # CONFIG_DNOTIFY is not set CONFIG_TMPFS=y CONFIG_CRAMFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y+CONFIG_CRYPTO=y+CONFIG_CRYPTO_DEV_TALITOS=y CONFIG_CRC32_SLICEBY4=y CONFIG_DEBUG_INFO=y CONFIG_MAGIC_SYSRQ=y-CONFIG_DETECT_HUNG_TASK=y-CONFIG_PPC_16K_PAGES=y-CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_FS=y-CONFIG_PPC_PTDUMP=y-CONFIG_MODULES=y-CONFIG_SPI=y-CONFIG_SPI_FSL_SPI=y-CONFIG_CRYPTO=y-CONFIG_CRYPTO_DEV_TALITOS=y-CONFIG_8xx_GPIO=y-CONFIG_WATCHDOG=y-CONFIG_8xxx_WDT=y-CONFIG_SMC_UCODE_PATCH=y-CONFIG_ADVANCED_OPTIONS=y-CONFIG_PIN_TLB=y-CONFIG_PERF_EVENTS=y-CONFIG_MATH_EMULATION=y-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y-CONFIG_STRICT_KERNEL_RWX=y-CONFIG_BPF_JIT=y CONFIG_DEBUG_VM_PGTABLE=y+CONFIG_DETECT_HUNG_TASK=y CONFIG_BDI_SWITCH=y CONFIG_PPC_EARLY_DEBUG=y-CONFIG_PPC_EARLY_DEBUG_CPM_ADDR=0xff002008+CONFIG_PPC_PTDUMP=y
When building this config there's a warning:
79:warning: override: reassigning to symbol IPV6
Commit 9a1762a4a4ff ("powerpc/8xx: Update mpc885_ads_defconfig to
improve CI") added CONFIG_IPV6=y, but left '# CONFIG_IPV6 is not set'
in.
IPV6 is default y, so remove both to clean up the build.
Signed-off-by: Joel Stanley <joel@jms.id.au>
@@ -21,7 +21,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_SYN_COOKIES=y-# CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set CONFIG_MTD=y CONFIG_MTD_BLOCK=y
Typos.
You mean you did redo a "make savedefconfig" ?
quoted hunk
The chagnes are mostly re-ordering, except for the following which fall
out due to dependenacies:
- CONFIG_DEBUG_KERNEL=y selected by EXPERT
- CONFIG_PPC_EARLY_DEBUG_CPM_ADDR=0xff002008 which is the default
setting
CONFIG_MTD_PHYSMAP_OF is not longer enabled, as it depends on
MTD_PHYSMAP which is not enabled. This is a regression from commit
642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c"),
which added the extra dependency. Add CONFIG_MTD_PHYSMAP=y so this stays
in the config.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
arch/powerpc/configs/mpc885_ads_defconfig | 47 +++++++++++------------
1 file changed, 23 insertions(+), 24 deletions(-)
@@ -1,19 +1,30 @@-CONFIG_PPC_8xx=y # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y+CONFIG_BPF_JIT=y+CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_EXPERT=y # CONFIG_ELF_CORE is not set # CONFIG_BASE_FULL is not set # CONFIG_FUTEX is not set+CONFIG_PERF_EVENTS=y # CONFIG_VM_EVENT_COUNTERS is not set-# CONFIG_BLK_DEV_BSG is not set-CONFIG_PARTITION_ADVANCED=y+CONFIG_PPC_8xx=y+CONFIG_8xx_GPIO=y+CONFIG_SMC_UCODE_PATCH=y+CONFIG_PIN_TLB=y CONFIG_GEN_RTC=y CONFIG_HZ_100=y+CONFIG_MATH_EMULATION=y+CONFIG_PPC_16K_PAGES=y+CONFIG_ADVANCED_OPTIONS=y # CONFIG_SECCOMP is not set+CONFIG_STRICT_KERNEL_RWX=y+CONFIG_MODULES=y+# CONFIG_BLK_DEV_BSG is not set+CONFIG_PARTITION_ADVANCED=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
@@ -33,6 +44,7 @@ CONFIG_MTD_CFI_GEOMETRY=y # CONFIG_MTD_CFI_I2 is not set CONFIG_MTD_CFI_I4=y CONFIG_MTD_CFI_AMDSTD=y+CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y # CONFIG_BLK_DEV is not set CONFIG_NETDEVICES=y
@@ -45,38 +57,25 @@ CONFIG_DAVICOM_PHY=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_CPM=y CONFIG_SERIAL_CPM_CONSOLE=y+CONFIG_SPI=y+CONFIG_SPI_FSL_SPI=y # CONFIG_HWMON is not set+CONFIG_WATCHDOG=y+CONFIG_8xxx_WDT=y # CONFIG_USB_SUPPORT is not set # CONFIG_DNOTIFY is not set CONFIG_TMPFS=y CONFIG_CRAMFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y+CONFIG_CRYPTO=y+CONFIG_CRYPTO_DEV_TALITOS=y CONFIG_CRC32_SLICEBY4=y CONFIG_DEBUG_INFO=y CONFIG_MAGIC_SYSRQ=y-CONFIG_DETECT_HUNG_TASK=y-CONFIG_PPC_16K_PAGES=y-CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_FS=y-CONFIG_PPC_PTDUMP=y-CONFIG_MODULES=y-CONFIG_SPI=y-CONFIG_SPI_FSL_SPI=y-CONFIG_CRYPTO=y-CONFIG_CRYPTO_DEV_TALITOS=y-CONFIG_8xx_GPIO=y-CONFIG_WATCHDOG=y-CONFIG_8xxx_WDT=y-CONFIG_SMC_UCODE_PATCH=y-CONFIG_ADVANCED_OPTIONS=y-CONFIG_PIN_TLB=y-CONFIG_PERF_EVENTS=y-CONFIG_MATH_EMULATION=y-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y-CONFIG_STRICT_KERNEL_RWX=y-CONFIG_BPF_JIT=y CONFIG_DEBUG_VM_PGTABLE=y+CONFIG_DETECT_HUNG_TASK=y CONFIG_BDI_SWITCH=y CONFIG_PPC_EARLY_DEBUG=y-CONFIG_PPC_EARLY_DEBUG_CPM_ADDR=0xff002008+CONFIG_PPC_PTDUMP=y
The first was a build warning I noticed when testing something
unrelated.
I took a moment to look into it, and came up with the second patch which
updates the defconfig to make it easier to maintain in the future
It also fixes a regression where the MTD partition support dropped out
of the config. Given noone noticed the regression since v4.20 was
released, perhaps it could be left disabled?
Most likely nobody is using this board anymore. But that's a good to have it to perform CI builds.
So we should leave that kind of config.
Joel Stanley (2):
powerpc/config: Fix IPV6 warning in mpc855_ads
powerpc/configs: Regenerate mpc885_ads_defconfig
arch/powerpc/configs/mpc885_ads_defconfig | 49 +++++++++++------------
1 file changed, 23 insertions(+), 26 deletions(-)