Some "make help" text lines extend beyond 80 characters. Wrap them at 79
characters.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Steven Miao <[email protected]>
Cc: [email protected]
---
arch/blackfin/Makefile | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 1fce08632ad763ab..a6ce3ba90b6706a5 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -155,12 +155,18 @@ install:
define archhelp
echo '* vmImage - Alias to selected kernel format (vmImage.gz by default)'
- echo ' vmImage.bin - Uncompressed Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bin)'
- echo ' vmImage.bz2 - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)'
- echo '* vmImage.gz - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)'
- echo ' vmImage.lzma - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)'
- echo ' vmImage.lzo - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzo)'
- echo ' vmImage.xip - XIP Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.xip)'
+ echo ' vmImage.bin - Uncompressed Kernel-only image for U-Boot'
+ echo ' (arch/$(ARCH)/boot/vmImage.bin)'
+ echo ' vmImage.bz2 - Kernel-only image for U-Boot'
+ echo ' (arch/$(ARCH)/boot/vmImage.bz2)'
+ echo '* vmImage.gz - Kernel-only image for U-Boot'
+ echo ' (arch/$(ARCH)/boot/vmImage.gz)'
+ echo ' vmImage.lzma - Kernel-only image for U-Boot'
+ echo ' (arch/$(ARCH)/boot/vmImage.lzma)'
+ echo ' vmImage.lzo - Kernel-only image for U-Boot'
+ echo ' (arch/$(ARCH)/boot/vmImage.lzo)'
+ echo ' vmImage.xip - XIP Kernel-only image for U-Boot'
+ echo ' (arch/$(ARCH)/boot/vmImage.xip)'
echo ' install - Install kernel using'
echo ' (your) ~/bin/$(INSTALLKERNEL) or'
echo ' (distribution) PATH: $(INSTALLKERNEL) or'
--
1.9.1
Some "make help" text lines extend beyond 80 characters. Wrap them at 79
characters.
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
scripts/kconfig/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index d9b1fef0c67e3cb4..d19de3665bfbe984 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -122,7 +122,8 @@ tinyconfig:
# Help text used by make help
help:
@echo ' config - Update current config utilising a line-oriented program'
- @echo ' nconfig - Update current config utilising a ncurses menu based program'
+ @echo ' nconfig - Update current config utilising a ncurses menu based'
+ @echo ' program'
@echo ' menuconfig - Update current config utilising a menu based program'
@echo ' xconfig - Update current config utilising a QT based front-end'
@echo ' gconfig - Update current config utilising a GTK based front-end'
@@ -138,7 +139,8 @@ help:
@echo ' alldefconfig - New config with all symbols set to default'
@echo ' randconfig - New config with random answer to all options'
@echo ' listnewconfig - List new options'
- @echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their default value'
+ @echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their'
+ @echo ' default value'
@echo ' kvmconfig - Enable additional options for guest kernel support'
@echo ' tinyconfig - Configure the tiniest possible kernel'
--
1.9.1
next-20150526 has 12 defconfigs with names longer than 24 characters,
breaking alignment in "make help".
The "winners" are "atngw100mkii_evklcd100_defconfig" and
"atngw100mkii_evklcd101_defconfig", counting in at 32 characters.
Extend the defconfig field size to 32 to restore alignment.
Don't use a larger value, to not encourage people to create even longer
defconfig names.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Haavard Skinnemoen <[email protected]>
Cc: Hans-Christian Egtvedt <[email protected]>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 92a70785920535c6..ac6fa61b2cf3b222 100644
--- a/Makefile
+++ b/Makefile
@@ -1300,7 +1300,7 @@ help:
@echo ''
@$(if $(boards), \
$(foreach b, $(boards), \
- printf " %-24s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \
+ printf " %-32s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \
echo '')
@$(if $(board-dirs), \
$(foreach b, $(board-dirs), \
--
1.9.1
Around Tue 26 May 2015 13:39:55 +0200 or thereabout, Geert Uytterhoeven wrote:
> next-20150526 has 12 defconfigs with names longer than 24 characters,
> breaking alignment in "make help".
>
> The "winners" are "atngw100mkii_evklcd100_defconfig" and
> "atngw100mkii_evklcd101_defconfig", counting in at 32 characters.
>
> Extend the defconfig field size to 32 to restore alignment.
> Don't use a larger value, to not encourage people to create even longer
> defconfig names.
(-:
They were very explicit to the ordering code.
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Haavard Skinnemoen <[email protected]>
> Cc: Hans-Christian Egtvedt <[email protected]>
Acked-by: Hans-Christian Egtvedt <[email protected]>
> ---
> Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
<snipp diff>
--
mvh
Hans-Christian Egtvedt
On Tue, May 26, 2015 at 01:39:54PM +0200, Geert Uytterhoeven wrote:
> Some "make help" text lines extend beyond 80 characters. Wrap them at 79
> characters.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
Applied to kbuild.git#kconfig.
Michal