* [PATCH v2 1/3] powerpc/config: Fix IPV6 warning in mpc855_ads
2021-08-17 4:54 [PATCH v2 0/3] powerpc: mpc855_ads defconfig fixes Joel Stanley
@ 2021-08-17 4:54 ` Joel Stanley
2021-08-17 4:54 ` [PATCH v2 2/3] powerpc/config: Renable MTD_PHYSMAP_OF Joel Stanley
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Joel Stanley @ 2021-08-17 4:54 UTC (permalink / raw)
To: Michael Ellerman, Christophe Leroy, linuxppc-dev
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.
Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Fixes: 9a1762a4a4ff ("powerpc/8xx: Update mpc885_ads_defconfig to improve CI")
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
arch/powerpc/configs/mpc885_ads_defconfig | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index d21f266cea9a..5cd17adf903f 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -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
@@ -76,7 +75,6 @@ CONFIG_PERF_EVENTS=y
CONFIG_MATH_EMULATION=y
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_IPV6=y
CONFIG_BPF_JIT=y
CONFIG_DEBUG_VM_PGTABLE=y
CONFIG_BDI_SWITCH=y
--
2.32.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 2/3] powerpc/config: Renable MTD_PHYSMAP_OF
2021-08-17 4:54 [PATCH v2 0/3] powerpc: mpc855_ads defconfig fixes Joel Stanley
2021-08-17 4:54 ` [PATCH v2 1/3] powerpc/config: Fix IPV6 warning in mpc855_ads Joel Stanley
@ 2021-08-17 4:54 ` Joel Stanley
2021-08-17 5:10 ` Christophe Leroy
2021-08-17 4:54 ` [PATCH v2 3/3] powerpc/configs: Regenerate mpc885_ads_defconfig Joel Stanley
2021-08-27 13:15 ` [PATCH v2 0/3] powerpc: mpc855_ads defconfig fixes Michael Ellerman
3 siblings, 1 reply; 7+ messages in thread
From: Joel Stanley @ 2021-08-17 4:54 UTC (permalink / raw)
To: Michael Ellerman, Christophe Leroy, linuxppc-dev
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, as Christophe said
it is useful for build coverage.
Fixes: 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c")
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
arch/powerpc/configs/mpc885_ads_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index 5cd17adf903f..cd08f9ed2c8d 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -33,6 +33,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
--
2.32.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 2/3] powerpc/config: Renable MTD_PHYSMAP_OF
2021-08-17 4:54 ` [PATCH v2 2/3] powerpc/config: Renable MTD_PHYSMAP_OF Joel Stanley
@ 2021-08-17 5:10 ` Christophe Leroy
0 siblings, 0 replies; 7+ messages in thread
From: Christophe Leroy @ 2021-08-17 5:10 UTC (permalink / raw)
To: Joel Stanley, Michael Ellerman, linuxppc-dev
Le 17/08/2021 à 06:54, Joel Stanley a écrit :
> 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, as Christophe said
> it is useful for build coverage.
>
> Fixes: 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c")
> Signed-off-by: Joel Stanley <joel@jms.id.au>
Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> ---
> arch/powerpc/configs/mpc885_ads_defconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
> index 5cd17adf903f..cd08f9ed2c8d 100644
> --- a/arch/powerpc/configs/mpc885_ads_defconfig
> +++ b/arch/powerpc/configs/mpc885_ads_defconfig
> @@ -33,6 +33,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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 3/3] powerpc/configs: Regenerate mpc885_ads_defconfig
2021-08-17 4:54 [PATCH v2 0/3] powerpc: mpc855_ads defconfig fixes Joel Stanley
2021-08-17 4:54 ` [PATCH v2 1/3] powerpc/config: Fix IPV6 warning in mpc855_ads Joel Stanley
2021-08-17 4:54 ` [PATCH v2 2/3] powerpc/config: Renable MTD_PHYSMAP_OF Joel Stanley
@ 2021-08-17 4:54 ` Joel Stanley
2021-08-17 5:10 ` Christophe Leroy
2021-08-27 13:15 ` [PATCH v2 0/3] powerpc: mpc855_ads defconfig fixes Michael Ellerman
3 siblings, 1 reply; 7+ messages in thread
From: Joel Stanley @ 2021-08-17 4:54 UTC (permalink / raw)
To: Michael Ellerman, Christophe Leroy, linuxppc-dev
Regenerate atop v5.14-rc6 by doing a make savedefconfig.
The changes a re-ordering except for the following (which are still set
indirectly):
- CONFIG_DEBUG_KERNEL=y selected by EXPERT
- CONFIG_PPC_EARLY_DEBUG_CPM_ADDR=0xff002008 which is the default
setting
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
arch/powerpc/configs/mpc885_ads_defconfig | 46 +++++++++++------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index cd08f9ed2c8d..c74dc76b1d0d 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -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
@@ -46,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
--
2.32.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 3/3] powerpc/configs: Regenerate mpc885_ads_defconfig
2021-08-17 4:54 ` [PATCH v2 3/3] powerpc/configs: Regenerate mpc885_ads_defconfig Joel Stanley
@ 2021-08-17 5:10 ` Christophe Leroy
0 siblings, 0 replies; 7+ messages in thread
From: Christophe Leroy @ 2021-08-17 5:10 UTC (permalink / raw)
To: Joel Stanley, Michael Ellerman, linuxppc-dev
Le 17/08/2021 à 06:54, Joel Stanley a écrit :
> Regenerate atop v5.14-rc6 by doing a make savedefconfig.
>
> The changes a re-ordering except for the following (which are still set
> indirectly):
>
> - CONFIG_DEBUG_KERNEL=y selected by EXPERT
>
> - CONFIG_PPC_EARLY_DEBUG_CPM_ADDR=0xff002008 which is the default
> setting
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> ---
> arch/powerpc/configs/mpc885_ads_defconfig | 46 +++++++++++------------
> 1 file changed, 22 insertions(+), 24 deletions(-)
>
> diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
> index cd08f9ed2c8d..c74dc76b1d0d 100644
> --- a/arch/powerpc/configs/mpc885_ads_defconfig
> +++ b/arch/powerpc/configs/mpc885_ads_defconfig
> @@ -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
> @@ -46,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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 0/3] powerpc: mpc855_ads defconfig fixes
2021-08-17 4:54 [PATCH v2 0/3] powerpc: mpc855_ads defconfig fixes Joel Stanley
` (2 preceding siblings ...)
2021-08-17 4:54 ` [PATCH v2 3/3] powerpc/configs: Regenerate mpc885_ads_defconfig Joel Stanley
@ 2021-08-27 13:15 ` Michael Ellerman
3 siblings, 0 replies; 7+ messages in thread
From: Michael Ellerman @ 2021-08-27 13:15 UTC (permalink / raw)
To: linuxppc-dev, Michael Ellerman, Joel Stanley, Christophe Leroy
On Tue, 17 Aug 2021 14:24:04 +0930, Joel Stanley wrote:
> v2: fix typos, split out mtd fix from savedefconfig patch
>
> The first patch fixes a build warning I noticed when testing something
> unrelated.
>
> The second fixes a regression where the MTD partition support dropped out
> of the config. I have enabled the dependency so this is still part of
> the config.
>
> [...]
Applied to powerpc/next.
[1/3] powerpc/config: Fix IPV6 warning in mpc855_ads
https://git.kernel.org/powerpc/c/c5ac55b6cbc604ad4144c380feae20f69453df91
[2/3] powerpc/config: Renable MTD_PHYSMAP_OF
https://git.kernel.org/powerpc/c/d0e28a6145c3455b69991245e7f6147eb914b34a
[3/3] powerpc/configs: Regenerate mpc885_ads_defconfig
https://git.kernel.org/powerpc/c/87e0d46bf68913f4c87dba94aadc00da658a874b
cheers
^ permalink raw reply [flat|nested] 7+ messages in thread