From 4694dae214d82d61a35685cfc899b9ccf088e69f Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Mon, 27 Apr 2015 12:42:43 -0400 Subject: [PATCH] boot_time: Only set CPU_CLOCK_FREQ_MHZ if necessary Removes the assignment of kconfig option CONFIG_CPU_CLOCK_FREQ_MHZ from boot_time project configuration files that redundantly set it to the default value (20). Change-Id: I901b2d4dc85d1de53dc4a1809b422ee16301ac03 Signed-off-by: Peter Mitsis --- samples/microkernel/benchmark/boot_time/generic_pc/prj.conf | 2 -- .../benchmark/boot_time/generic_pc/prj_pentium4_best.conf | 1 - .../benchmark/boot_time/generic_pc/prj_pentium4_default.conf | 1 - .../benchmark/boot_time/generic_pc/prj_pentium4_worst.conf | 1 - samples/nanokernel/benchmark/boot_time/generic_pc/prj.conf | 2 -- .../benchmark/boot_time/generic_pc/prj_pentium4_best.conf | 1 - .../benchmark/boot_time/generic_pc/prj_pentium4_default.conf | 1 - .../benchmark/boot_time/generic_pc/prj_pentium4_worst.conf | 1 - 8 files changed, 10 deletions(-) diff --git a/samples/microkernel/benchmark/boot_time/generic_pc/prj.conf b/samples/microkernel/benchmark/boot_time/generic_pc/prj.conf index e877fb4e68..7d744bb6fc 100644 --- a/samples/microkernel/benchmark/boot_time/generic_pc/prj.conf +++ b/samples/microkernel/benchmark/boot_time/generic_pc/prj.conf @@ -1,6 +1,4 @@ -# needed to enable boot time measurement with simics CPU clock of 20MHz CONFIG_BOOT_TIME_MEASUREMENT=y -CONFIG_CPU_CLOCK_FREQ_MHZ=20 # Let stack canaries use non-random number generator. # This option is NOT to be used in production code. diff --git a/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_best.conf b/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_best.conf index 1c8157005c..39700d827b 100644 --- a/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_best.conf +++ b/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_best.conf @@ -12,7 +12,6 @@ CONFIG_PRINTK=y # System Monitoring Options # CONFIG_BOOT_TIME_MEASUREMENT=y -CONFIG_CPU_CLOCK_FREQ_MHZ=20 # # Miscellaneous Kernel Options diff --git a/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_default.conf b/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_default.conf index ef2d6b4e81..3143577189 100644 --- a/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_default.conf +++ b/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_default.conf @@ -26,7 +26,6 @@ CONFIG_PRINTK=y # System Monitoring Options # CONFIG_BOOT_TIME_MEASUREMENT=y -CONFIG_CPU_CLOCK_FREQ_MHZ=20 # # Miscellaneous Kernel Options diff --git a/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_worst.conf b/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_worst.conf index 9b5dae826b..7c96cafe89 100644 --- a/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_worst.conf +++ b/samples/microkernel/benchmark/boot_time/generic_pc/prj_pentium4_worst.conf @@ -34,7 +34,6 @@ CONFIG_PRINTK=y # System Monitoring Options # CONFIG_BOOT_TIME_MEASUREMENT=y -CONFIG_CPU_CLOCK_FREQ_MHZ=20 # # Miscellaneous Kernel Options diff --git a/samples/nanokernel/benchmark/boot_time/generic_pc/prj.conf b/samples/nanokernel/benchmark/boot_time/generic_pc/prj.conf index 8121b30aca..7d744bb6fc 100644 --- a/samples/nanokernel/benchmark/boot_time/generic_pc/prj.conf +++ b/samples/nanokernel/benchmark/boot_time/generic_pc/prj.conf @@ -1,6 +1,4 @@ -# enable Boot Time measurement with simics CPU clock of 20MHz CONFIG_BOOT_TIME_MEASUREMENT=y -CONFIG_CPU_CLOCK_FREQ_MHZ=20 # Let stack canaries use non-random number generator. # This option is NOT to be used in production code. diff --git a/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_best.conf b/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_best.conf index 7d4b08ec8f..791aee62bf 100644 --- a/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_best.conf +++ b/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_best.conf @@ -12,7 +12,6 @@ CONFIG_PRINTK=y # System Monitoring Options # CONFIG_BOOT_TIME_MEASUREMENT=y -CONFIG_CPU_CLOCK_FREQ_MHZ=20 # # Miscellaneous Kernel Options diff --git a/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_default.conf b/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_default.conf index a9be3edd8a..a369ccca1d 100644 --- a/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_default.conf +++ b/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_default.conf @@ -27,7 +27,6 @@ CONFIG_PRINTK=y # System Monitoring Options # CONFIG_BOOT_TIME_MEASUREMENT=y -CONFIG_CPU_CLOCK_FREQ_MHZ=20 # # Miscellaneous Kernel Options diff --git a/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_worst.conf b/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_worst.conf index 5f3b513940..99ecfa77f7 100644 --- a/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_worst.conf +++ b/samples/nanokernel/benchmark/boot_time/generic_pc/prj_pentium4_worst.conf @@ -26,7 +26,6 @@ CONFIG_PRINTK=y # System Monitoring Options # CONFIG_BOOT_TIME_MEASUREMENT=y -CONFIG_CPU_CLOCK_FREQ_MHZ=20 # # Miscellaneous Kernel Options