From 35ed3be59fb3fb0c0501fa70e79251b71d963784 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Tue, 13 Dec 2016 22:30:11 +0100 Subject: [PATCH] uboot-envtools: fix code formatting style in uci-defaults files Few minor code formatting style fixes, including: - keep one board per line - always use "|\" (for consistency) - remove redundant double quotes and empty lines Signed-off-by: Piotr Dymacz --- package/boot/uboot-envtools/files/ar71xx | 74 +++++++++++----------- package/boot/uboot-envtools/files/imx6 | 2 +- package/boot/uboot-envtools/files/ipq | 5 +- package/boot/uboot-envtools/files/kirkwood | 16 ++--- package/boot/uboot-envtools/files/mvebu | 4 +- package/boot/uboot-envtools/files/oxnas | 4 +- package/boot/uboot-envtools/files/ramips | 18 +++--- 7 files changed, 62 insertions(+), 61 deletions(-) diff --git a/package/boot/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx index 3d8d877d5e2..6c076a1e5f4 100644 --- a/package/boot/uboot-envtools/files/ar71xx +++ b/package/boot/uboot-envtools/files/ar71xx @@ -14,49 +14,49 @@ touch /etc/config/ubootenv board=$(ar71xx_board_name) case "$board" in -alfa-ap120c | \ -all0258n | \ -ap90q | \ -cap324 | \ -cap4200ag | \ -carambola2 | \ -cpe830 | \ -cpe870 | \ -cr3000 | \ -cr5000 | \ -eap300v2 | \ -gl-ar300m | \ -hornet-ub | \ -hornet-ub-x2 | \ -jwap230 | \ -mr1750 | \ -mr1750v2 | \ -mr600 | \ -mr600v2 | \ -mr900 | \ -mr900v2 | \ -nbg6716 | \ -om5p | \ -om5p-ac | \ -om5p-acv2 | \ -om5p-an | \ -sr3200 | \ -tube2h | \ -wndr3700 | \ +alfa-ap120c|\ +all0258n|\ +ap90q|\ +cap324|\ +cap4200ag|\ +carambola2|\ +cpe830|\ +cpe870|\ +cr3000|\ +cr5000|\ +eap300v2|\ +gl-ar300m|\ +hornet-ub|\ +hornet-ub-x2|\ +jwap230|\ +mr1750|\ +mr1750v2|\ +mr600|\ +mr600v2|\ +mr900|\ +mr900v2|\ +nbg6716|\ +om5p|\ +om5p-ac|\ +om5p-acv2|\ +om5p-an|\ +sr3200|\ +tube2h|\ +wndr3700|\ xd3200) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000" ;; -alfa-ap96 | \ -all0315n | \ -om2p | \ -om2p-hs | \ -om2p-hsv2 | \ -om2p-hsv3 | \ -om2p-lc | \ +alfa-ap96|\ +all0315n|\ +om2p|\ +om2p-hs|\ +om2p-hsv2|\ +om2p-hsv3|\ +om2p-lc|\ om2pv2) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x40000" ;; -dap-2695-a1 | \ +dap-2695-a1|\ wzr-hp-ag300h) ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000" ;; diff --git a/package/boot/uboot-envtools/files/imx6 b/package/boot/uboot-envtools/files/imx6 index d7412b2aaa0..a78c4fbe538 100644 --- a/package/boot/uboot-envtools/files/imx6 +++ b/package/boot/uboot-envtools/files/imx6 @@ -25,7 +25,7 @@ case "$board" in ubootenv_add_uci_config /dev/mmcblk0 0xd1400 0x20000 0x20000 fi ;; -"wandboard") +wandboard) ubootenv_add_uci_config "/dev/mmcblk0" "0x60000" "0x2000" "0x2000" ;; esac diff --git a/package/boot/uboot-envtools/files/ipq b/package/boot/uboot-envtools/files/ipq index 369f90f2b0f..16c7ba6bb7c 100755 --- a/package/boot/uboot-envtools/files/ipq +++ b/package/boot/uboot-envtools/files/ipq @@ -13,12 +13,11 @@ touch /etc/config/ubootenv board=$(ipq806x_board_name) - case "$board" in -"ea8500") +ea8500) ubootenv_add_uci_config "/dev/mtd10" "0x0" "0x20000" "0x20000" ;; -"nbg6817") +nbg6817) ubootenv_add_uci_config "/dev/mtdblock9" "0x0" "0x10000" "0x10000" ;; esac diff --git a/package/boot/uboot-envtools/files/kirkwood b/package/boot/uboot-envtools/files/kirkwood index b4a4d4e1c11..055e0eba427 100644 --- a/package/boot/uboot-envtools/files/kirkwood +++ b/package/boot/uboot-envtools/files/kirkwood @@ -14,16 +14,16 @@ touch /etc/config/ubootenv board=$(kirkwood_board_name) case "$board" in -"dockstar" | \ -"guruplug-server-plus" | \ -"ib62x0" | \ -"linksys-viper" | \ -"pogo_e02" | \ -"sheevaplug" | \ -"sheevaplug-esata" ) +dockstar|\ +guruplug-server-plus|\ +ib62x0|\ +linksys-viper|\ +pogo_e02|\ +sheevaplug|\ +sheevaplug-esata) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000" ;; -"linksys-audi") +linksys-audi) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x4000" "0x4000" ;; esac diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu index 9b826daffc1..2bbbc236614 100644 --- a/package/boot/uboot-envtools/files/mvebu +++ b/package/boot/uboot-envtools/files/mvebu @@ -15,7 +15,9 @@ touch /etc/config/ubootenv board=$(mvebu_board_name) case "$board" in -armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby) +armada-385-linksys-caiman|\ +armada-385-linksys-cobra|\ +armada-385-linksys-shelby) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x40000" ;; armada-385-linksys-rango) diff --git a/package/boot/uboot-envtools/files/oxnas b/package/boot/uboot-envtools/files/oxnas index dff89deca99..ac4744e3e26 100644 --- a/package/boot/uboot-envtools/files/oxnas +++ b/package/boot/uboot-envtools/files/oxnas @@ -14,8 +14,8 @@ touch /etc/config/ubootenv board=$(oxnas_board_name) case "$board" in -akitio | \ -kd20 | \ +akitio|\ +kd20|\ stg212) ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x4000" "0x1F000" "1" ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x4000" "0x1F000" "1" diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips index 4993d106a6a..c5d7ecb3648 100644 --- a/package/boot/uboot-envtools/files/ramips +++ b/package/boot/uboot-envtools/files/ramips @@ -14,18 +14,18 @@ touch /etc/config/ubootenv board=$(ramips_board_name) case "$board" in -all0239-3g | \ -all0256n | \ +all0239-3g|\ +all0256n|\ all5002) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000" ;; -br6425 | \ -linkits7688 | \ -linkits7688d | \ -miwifi-nano | \ -sk-wb8 | \ -wsr-1166 | \ -wsr-600 | \ +br6425|\ +linkits7688|\ +linkits7688d|\ +miwifi-nano|\ +sk-wb8|\ +wsr-1166|\ +wsr-600|\ zbt-wg2626) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x10000" ;; -- 2.30.2