diff options
| author | Juergen Borleis <jbe@pengutronix.de> | 2015-09-17 10:08:24 +0200 |
|---|---|---|
| committer | Juergen Borleis <jbe@pengutronix.de> | 2015-09-17 10:08:24 +0200 |
| commit | 5cebc86c8359248f6c568cbaa421948ddc69424a (patch) | |
| tree | d0caeb6a7d725b736e00b3d77cd61375ee7d48ee /rules | |
| parent | 914d4405698d9ae9c08d3eda9533bd7afbf10e0c (diff) | |
| download | ptxdist-5cebc86c8359248f6c568cbaa421948ddc69424a.tar.gz ptxdist-5cebc86c8359248f6c568cbaa421948ddc69424a.tar.xz | |
timezone: collect identical menu entries into one
'GMT0', 'GMT-0' and 'GMT+0' use the same entry variable 'TIMEZONE_GMT0'.
Collect them into one menu entry instead, as the corresponding rule already
does.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/timezone.in | 12 | ||||
| -rw-r--r-- | rules/timezone.make | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/rules/timezone.in b/rules/timezone.in index 210f60d94..d88bd1c67 100644 --- a/rules/timezone.in +++ b/rules/timezone.in @@ -57,7 +57,9 @@ config TIMEZONE_FACTORY config TIMEZONE_GMT0 bool - prompt "GMT-0" + prompt "GMT0" + help + This includes GMT-0 and GMT+0 config TIMEZONE_ICELAND bool @@ -99,10 +101,6 @@ config TIMEZONE_GB bool prompt "GB" -config TIMEZONE_GMT0 - bool - prompt "GMT0" - config TIMEZONE_INDIAN bool prompt "Indian" @@ -235,10 +233,6 @@ config TIMEZONE_EST bool prompt "EST" -config TIMEZONE_GMT0 - bool - prompt "GMT+0" - config TIMEZONE_HONGKONG bool prompt "Hongkong" diff --git a/rules/timezone.make b/rules/timezone.make index 8754b9172..cc443bdfd 100644 --- a/rules/timezone.make +++ b/rules/timezone.make @@ -30,7 +30,7 @@ TIMEZONE-$(PTXCONF_TIMEZONE_EUROPE) += "Europe" TIMEZONE-$(PTXCONF_TIMEZONE_EST5EDT) += "EST5EDT" TIMEZONE-$(PTXCONF_TIMEZONE_CANADA) += "Canada" TIMEZONE-$(PTXCONF_TIMEZONE_FACTORY) += "Factory" -TIMEZONE-$(PTXCONF_TIMEZONE_GMT0) += "GMT-0" +TIMEZONE-$(PTXCONF_TIMEZONE_GMT0) += "GMT-0 GMT0 GMT+0" TIMEZONE-$(PTXCONF_TIMEZONE_ICELAND) += "Iceland" TIMEZONE-$(PTXCONF_TIMEZONE_JAPAN) += "Japan" TIMEZONE-$(PTXCONF_TIMEZONE_MST7MDT) += "MST7MDT" @@ -41,7 +41,6 @@ TIMEZONE-$(PTXCONF_TIMEZONE_AUSTRALIA) += "Australia" TIMEZONE-$(PTXCONF_TIMEZONE_CHILE) += "Chile" TIMEZONE-$(PTXCONF_TIMEZONE_EGYPT) += "Egypt" TIMEZONE-$(PTXCONF_TIMEZONE_GB) += "GB" -TIMEZONE-$(PTXCONF_TIMEZONE_GMT0) += "GMT0" TIMEZONE-$(PTXCONF_TIMEZONE_INDIAN) += "Indian" TIMEZONE-$(PTXCONF_TIMEZONE_KWAJALEIN) += "Kwajalein" TIMEZONE-$(PTXCONF_TIMEZONE_MEXICO) += "Mexico" @@ -75,7 +74,6 @@ TIMEZONE-$(PTXCONF_TIMEZONE_UTC) += "UTC" TIMEZONE-$(PTXCONF_TIMEZONE_ASIA) += "Asia" TIMEZONE-$(PTXCONF_TIMEZONE_CST6CDT) += "CST6CDT" TIMEZONE-$(PTXCONF_TIMEZONE_EST) += "EST" -TIMEZONE-$(PTXCONF_TIMEZONE_GMT0) += "GMT+0" TIMEZONE-$(PTXCONF_TIMEZONE_HONGKONG) += "Hongkong" TIMEZONE-$(PTXCONF_TIMEZONE_JAMAICA) += "Jamaica" TIMEZONE-$(PTXCONF_TIMEZONE_MST) += "MST" |