From f055b45453e598d3e428e8f709a620bf40f0ac28 Mon Sep 17 00:00:00 2001 From: Serge Vakulenko Date: Fri, 4 Sep 2015 20:53:19 -0700 Subject: [PATCH] Kconfig: remove hz keyword. --- sys/pic32/Config.generic | 2 +- sys/pic32/duinomite-emega/Config | 1 - sys/pic32/duinomite-emega/Config-uart | 1 - sys/pic32/duinomite-emega/Makefile | 1 - sys/pic32/duinomite/Config | 1 - sys/pic32/duinomite/Config-uart | 1 - sys/pic32/duinomite/Makefile | 1 - sys/pic32/fubarino/Config | 1 - sys/pic32/fubarino/Config-uart-sramc | 2 +- sys/pic32/fubarino/Makefile | 1 - sys/pic32/max32/Config | 1 - sys/pic32/max32/Makefile | 1 - sys/pic32/picadillo/Config | 1 - sys/pic32/picadillo/Config-rambo | 1 - sys/pic32/picadillo/Makefile | 1 - sys/pic32/ubw32/Config | 1 - sys/pic32/ubw32/Config-uart | 1 - sys/pic32/ubw32/Makefile | 1 - sys/pic32/wf32/Config | 1 - sys/pic32/wf32/Makefile | 1 - tools/kconfig/config.h | 1 - tools/kconfig/config.y | 3 --- tools/kconfig/lang.l | 1 - tools/kconfig/mkmakefile.c | 2 -- 24 files changed, 2 insertions(+), 27 deletions(-) diff --git a/sys/pic32/Config.generic b/sys/pic32/Config.generic index 5e8f464..9c0bc58 100644 --- a/sys/pic32/Config.generic +++ b/sys/pic32/Config.generic @@ -12,7 +12,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "CHIPKIT_MAX32" # Board type -hz 100 # Rate of clock interrupt # Linker script ldscript "cfg/bootloader-max32.ld" @@ -22,6 +21,7 @@ timezone 8 dst maxusers 2 # Standard system options +options "HZ=100" # Rate of clock interrupt options "CPU_KHZ=80000" # Oscillator frequency of CPU core options "BUS_KHZ=80000" # Frequency of peripheral bus options "BUS_DIV=1" # Bus clock divisor 1/2/4/8 diff --git a/sys/pic32/duinomite-emega/Config b/sys/pic32/duinomite-emega/Config index cae353a..94512b3 100644 --- a/sys/pic32/duinomite-emega/Config +++ b/sys/pic32/duinomite-emega/Config @@ -17,7 +17,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "DUINOMITE" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-maximite.ld" # Linker script # Standard system options diff --git a/sys/pic32/duinomite-emega/Config-uart b/sys/pic32/duinomite-emega/Config-uart index 80a7fe4..7edff88 100644 --- a/sys/pic32/duinomite-emega/Config-uart +++ b/sys/pic32/duinomite-emega/Config-uart @@ -17,7 +17,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "DUINOMITE" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-maximite.ld" # Linker script # Standard system options diff --git a/sys/pic32/duinomite-emega/Makefile b/sys/pic32/duinomite-emega/Makefile index 7f9246b..42bab90 100644 --- a/sys/pic32/duinomite-emega/Makefile +++ b/sys/pic32/duinomite-emega/Makefile @@ -20,7 +20,6 @@ PARAM += -DLED_KERNEL_PORT=TRISB PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=40000 PARAM += -DCPU_KHZ=80000 -PARAM += -DHZ=100 LDSCRIPT = "cfg/bootloader-maximite.ld" # # Makefile for RetroBSD, pic32 target diff --git a/sys/pic32/duinomite/Config b/sys/pic32/duinomite/Config index 33998d0..4af704a 100644 --- a/sys/pic32/duinomite/Config +++ b/sys/pic32/duinomite/Config @@ -16,7 +16,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "DUINOMITE" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-maximite.ld" # Linker script # Standard system options diff --git a/sys/pic32/duinomite/Config-uart b/sys/pic32/duinomite/Config-uart index 1347c9d..5e26c54 100644 --- a/sys/pic32/duinomite/Config-uart +++ b/sys/pic32/duinomite/Config-uart @@ -16,7 +16,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "DUINOMITE" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-maximite.ld" # Linker script # Standard system options diff --git a/sys/pic32/duinomite/Makefile b/sys/pic32/duinomite/Makefile index 2a2a72f..2bf244b 100644 --- a/sys/pic32/duinomite/Makefile +++ b/sys/pic32/duinomite/Makefile @@ -20,7 +20,6 @@ PARAM += -DLED_KERNEL_PORT=TRISB PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -PARAM += -DHZ=100 LDSCRIPT = "cfg/bootloader-maximite.ld" # # Makefile for RetroBSD, pic32 target diff --git a/sys/pic32/fubarino/Config b/sys/pic32/fubarino/Config index 7602b8a..5bb1c8a 100644 --- a/sys/pic32/fubarino/Config +++ b/sys/pic32/fubarino/Config @@ -16,7 +16,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "FUBARINO" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-max32.ld" # Linker script # Standard system options diff --git a/sys/pic32/fubarino/Config-uart-sramc b/sys/pic32/fubarino/Config-uart-sramc index a9ce476..976e2c6 100644 --- a/sys/pic32/fubarino/Config-uart-sramc +++ b/sys/pic32/fubarino/Config-uart-sramc @@ -17,10 +17,10 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "FUBARINO" # Board type -hz 1000 # Rate of clock interrupt ldscript "cfg/bootloader-max32.ld" # Linker script # Standard system options +options "HZ=1000" # Rate of clock interrupt options "CPU_KHZ=120000" # Oscillator frequency of CPU core options "BUS_KHZ=120000" # Frequency of peripheral bus options "BUS_DIV=1" # Bus clock divisor 1/2/4/8 diff --git a/sys/pic32/fubarino/Makefile b/sys/pic32/fubarino/Makefile index dee83e3..d6d4f22 100644 --- a/sys/pic32/fubarino/Makefile +++ b/sys/pic32/fubarino/Makefile @@ -17,7 +17,6 @@ PARAM += -DLED_KERNEL_PORT=TRISE PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -PARAM += -DHZ=100 LDSCRIPT = "cfg/bootloader-max32.ld" # # Makefile for RetroBSD, pic32 target diff --git a/sys/pic32/max32/Config b/sys/pic32/max32/Config index c71a3f8..d7e6f18 100644 --- a/sys/pic32/max32/Config +++ b/sys/pic32/max32/Config @@ -15,7 +15,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "CHIPKIT_MAX32" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-max32.ld" # Linker script # Standard system options diff --git a/sys/pic32/max32/Makefile b/sys/pic32/max32/Makefile index 095f0e8..14e06df 100644 --- a/sys/pic32/max32/Makefile +++ b/sys/pic32/max32/Makefile @@ -18,7 +18,6 @@ PARAM += -DLED_KERNEL_PORT=TRISA PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -PARAM += -DHZ=100 LDSCRIPT = "cfg/bootloader-max32.ld" # # Makefile for RetroBSD, pic32 target diff --git a/sys/pic32/picadillo/Config b/sys/pic32/picadillo/Config index 6dfdffa..712b4ed 100644 --- a/sys/pic32/picadillo/Config +++ b/sys/pic32/picadillo/Config @@ -16,7 +16,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "PICADILLO_35T" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-max32.ld" # Linker script # Standard system options diff --git a/sys/pic32/picadillo/Config-rambo b/sys/pic32/picadillo/Config-rambo index c4df38a..9b723dc 100644 --- a/sys/pic32/picadillo/Config-rambo +++ b/sys/pic32/picadillo/Config-rambo @@ -16,7 +16,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "PICADILLO_35T" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-max32.ld" # Linker script # Standard system options diff --git a/sys/pic32/picadillo/Makefile b/sys/pic32/picadillo/Makefile index 91f10d3..d821ddc 100644 --- a/sys/pic32/picadillo/Makefile +++ b/sys/pic32/picadillo/Makefile @@ -14,7 +14,6 @@ PARAM += -DUART1_ENABLED PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -PARAM += -DHZ=100 LDSCRIPT = "cfg/bootloader-max32.ld" # # Makefile for RetroBSD, pic32 target diff --git a/sys/pic32/ubw32/Config b/sys/pic32/ubw32/Config index 654cff1..6d736ce 100644 --- a/sys/pic32/ubw32/Config +++ b/sys/pic32/ubw32/Config @@ -17,7 +17,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "UBW32" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-ubw32.ld" # Linker script # Standard system options diff --git a/sys/pic32/ubw32/Config-uart b/sys/pic32/ubw32/Config-uart index 6a7d6fa..9d908ed 100644 --- a/sys/pic32/ubw32/Config-uart +++ b/sys/pic32/ubw32/Config-uart @@ -16,7 +16,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "UBW32" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-ubw32.ld" # Linker script # Standard system options diff --git a/sys/pic32/ubw32/Makefile b/sys/pic32/ubw32/Makefile index 7263383..efcd18b 100644 --- a/sys/pic32/ubw32/Makefile +++ b/sys/pic32/ubw32/Makefile @@ -29,7 +29,6 @@ PARAM += -DLED_KERNEL_PORT=TRISE PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -PARAM += -DHZ=100 LDSCRIPT = "cfg/bootloader-ubw32.ld" # # Makefile for RetroBSD, pic32 target diff --git a/sys/pic32/wf32/Config b/sys/pic32/wf32/Config index ba48c29..67c51fa 100644 --- a/sys/pic32/wf32/Config +++ b/sys/pic32/wf32/Config @@ -13,7 +13,6 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "CHIPKIT_WF32" # Board type -hz 100 # Rate of clock interrupt ldscript "cfg/bootloader-max32.ld" # Linker script # Standard system options diff --git a/sys/pic32/wf32/Makefile b/sys/pic32/wf32/Makefile index cdf5656..7b99370 100644 --- a/sys/pic32/wf32/Makefile +++ b/sys/pic32/wf32/Makefile @@ -19,7 +19,6 @@ PARAM += -DLED_KERNEL_PORT=TRISA PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -PARAM += -DHZ=100 LDSCRIPT = "cfg/bootloader-max32.ld" # # Makefile for RetroBSD, pic32 target diff --git a/tools/kconfig/config.h b/tools/kconfig/config.h index 4192271..a6bcc15 100644 --- a/tools/kconfig/config.h +++ b/tools/kconfig/config.h @@ -162,7 +162,6 @@ struct file_list *ftab, *conf_list, **confp, *comp_list, **compp; int zone, hadtz; int dst; -int hz; int debugging; int maxusers; diff --git a/tools/kconfig/config.y b/tools/kconfig/config.y index c97f995..cf9d1cc 100644 --- a/tools/kconfig/config.y +++ b/tools/kconfig/config.y @@ -170,9 +170,6 @@ Config_spec: | System_spec | - HZ NUMBER - = { hz = $2; } - | TIMEZONE NUMBER = { zone = 60 * $2; check_tz(); } | diff --git a/tools/kconfig/lang.l b/tools/kconfig/lang.l index ac76848..2cd9604 100644 --- a/tools/kconfig/lang.l +++ b/tools/kconfig/lang.l @@ -63,7 +63,6 @@ static struct kt key_words[] = { { "dst", DST }, { "dumps", DUMPS }, { "flags", FLAGS }, - { "hz", HZ }, { "board", BOARD }, { "ldscript", LDSCRIPT }, { "architecture", ARCHITECTURE }, diff --git a/tools/kconfig/mkmakefile.c b/tools/kconfig/mkmakefile.c index 95b4511..838781a 100644 --- a/tools/kconfig/mkmakefile.c +++ b/tools/kconfig/mkmakefile.c @@ -444,8 +444,6 @@ void makefile() } if (maxusers > 0) fprintf(ofp, "PARAM += -DMAXUSERS=%d\n", maxusers); - if (hz > 0) - fprintf(ofp, "PARAM += -DHZ=%d\n", hz); if (ldscript) fprintf(ofp, "LDSCRIPT = \"%s\"\n", ldscript);