The patch titled Subject: powerpc: convert config files to generic cmdline has been added to the -mm tree. Its filename is powerpc-convert-config-files-to-generic-cmdline.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/powerpc-convert-config-files-to-generic-cmdline.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/powerpc-convert-config-files-to-generic-cmdline.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Daniel Walker <danielwa@xxxxxxxxx> Subject: powerpc: convert config files to generic cmdline This is a mass convert of the config files to use the new generic cmdline. The command used to convert is as follows, sed -i 's/CONFIG_CMDLINE=/CONFIG_CMDLINE_PREPEND=/g' <config> Link: http://lkml.kernel.org/r/20190319232448.45964-5-danielwa@xxxxxxxxx Signed-off-by: Daniel Walker <danielwa@xxxxxxxxx> Cc: Daniel Walker <dwalker@xxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Christophe Leroy <christophe.leroy@xxxxxx> Cc: Frank Rowand <frowand.list@xxxxxxxxx> Cc: Maksym Kokhan <maksym.kokhan@xxxxxxxxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Rob Herring <robh+dt@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- --- a/arch/powerpc/configs/44x/fsp2_defconfig~powerpc-convert-config-files-to-generic-cmdline +++ a/arch/powerpc/configs/44x/fsp2_defconfig @@ -29,7 +29,7 @@ CONFIG_SWIOTLB=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="ip=on rw" +CONFIG_CMDLINE_PREPEND="ip=on rw" # CONFIG_SUSPEND is not set # CONFIG_PCI is not set CONFIG_NET=y --- a/arch/powerpc/configs/44x/iss476-smp_defconfig~powerpc-convert-config-files-to-generic-cmdline +++ a/arch/powerpc/configs/44x/iss476-smp_defconfig @@ -18,7 +18,7 @@ CONFIG_HZ_100=y CONFIG_MATH_EMULATION=y CONFIG_IRQ_ALL_CPUS=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="root=/dev/issblk0" +CONFIG_CMDLINE_PREPEND="root=/dev/issblk0" # CONFIG_PCI is not set CONFIG_ADVANCED_OPTIONS=y CONFIG_DYNAMIC_MEMSTART=y --- a/arch/powerpc/configs/44x/warp_defconfig~powerpc-convert-config-files-to-generic-cmdline +++ a/arch/powerpc/configs/44x/warp_defconfig @@ -15,7 +15,7 @@ CONFIG_WARP=y CONFIG_PPC4xx_GPIO=y CONFIG_HZ_1000=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="ip=on" +CONFIG_CMDLINE_PREPEND="ip=on" # CONFIG_PCI is not set CONFIG_NET=y CONFIG_PACKET=y --- a/arch/powerpc/configs/holly_defconfig~powerpc-convert-config-files-to-generic-cmdline +++ a/arch/powerpc/configs/holly_defconfig @@ -14,7 +14,7 @@ CONFIG_PPC_HOLLY=y CONFIG_GEN_RTC=y CONFIG_BINFMT_MISC=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0,115200" +CONFIG_CMDLINE_PREPEND="console=ttyS0,115200" # CONFIG_SECCOMP is not set CONFIG_NET=y CONFIG_PACKET=y --- a/arch/powerpc/configs/mvme5100_defconfig~powerpc-convert-config-files-to-generic-cmdline +++ a/arch/powerpc/configs/mvme5100_defconfig @@ -23,7 +23,7 @@ CONFIG_HZ_100=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_COMPACTION is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0,9600 ip=dhcp root=/dev/nfs" +CONFIG_CMDLINE_PREPEND="console=ttyS0,9600 ip=dhcp root=/dev/nfs" CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y --- a/arch/powerpc/configs/skiroot_defconfig~powerpc-convert-config-files-to-generic-cmdline +++ a/arch/powerpc/configs/skiroot_defconfig @@ -53,7 +53,7 @@ CONFIG_NUMA=y CONFIG_PPC_64K_PAGES=y CONFIG_SCHED_SMT=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=tty0 console=hvc0 ipr.fast_reboot=1 quiet" +CONFIG_CMDLINE_PREPEND="console=tty0 console=hvc0 ipr.fast_reboot=1 quiet" # CONFIG_SECCOMP is not set # CONFIG_PPC_MEM_KEYS is not set CONFIG_NET=y --- a/arch/powerpc/configs/storcenter_defconfig~powerpc-convert-config-files-to-generic-cmdline +++ a/arch/powerpc/configs/storcenter_defconfig @@ -13,7 +13,7 @@ CONFIG_STORCENTER=y CONFIG_HZ_100=y CONFIG_BINFMT_MISC=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0,115200" +CONFIG_CMDLINE_PREPEND="console=ttyS0,115200" # CONFIG_SECCOMP is not set CONFIG_NET=y CONFIG_PACKET=m _ Patches currently in -mm which might be from danielwa@xxxxxxxxx are add-generic-builtin-command-line.patch drivers-of-generic-command-line-support.patch powerpc-convert-to-generic-builtin-command-line.patch powerpc-convert-config-files-to-generic-cmdline.patch