summaryrefslogtreecommitdiff
path: root/chip
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2013-07-15 16:17:32 -0700
committerChromeBot <chrome-bot@google.com>2013-07-16 12:06:31 -0700
commit0c73fdae773be0d42c969e4171b0504fcf06b97a (patch)
tree120e5c72cc095911d5761f2004b959176bcc974c /chip
parent873e4425c5e27be3019b0ca47251e6fb94715bd3 (diff)
downloadchrome-ec-0c73fdae773be0d42c969e4171b0504fcf06b97a.tar.gz
Make a top-level config.h file to include sub-configs
This file will soon contain the exhaustive list of all CONFIG defines and their descriptions. Chip-level configs are renamed to config_chip.h to avoid naming conflicts. BUG=chrome-os-partner:18343 BRANCH=none TEST=build all platforms Change-Id: I9e94146f5b4c016894bd3ae3d371c4b9f3f69afe Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/62122 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'chip')
-rw-r--r--chip/host/config_chip.h (renamed from chip/host/config.h)6
-rw-r--r--chip/lm4/config_chip.h (renamed from chip/lm4/config.h)6
-rw-r--r--chip/stm32/config_chip.h (renamed from chip/stm32/config.h)6
3 files changed, 9 insertions, 9 deletions
diff --git a/chip/host/config.h b/chip/host/config_chip.h
index 9825f086e9..44ed02841a 100644
--- a/chip/host/config.h
+++ b/chip/host/config_chip.h
@@ -5,8 +5,8 @@
/* Chip config header file */
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef __CROS_EC_CONFIG_CHIP_H
+#define __CROS_EC_CONFIG_CHIP_H
/* Memory mapping */
#define CONFIG_FLASH_PHYSICAL_SIZE 0x00020000
@@ -46,5 +46,5 @@ extern char __host_flash[CONFIG_FLASH_PHYSICAL_SIZE];
/* Interval between HOOK_TICK notifications */
#define HOOK_TICK_INTERVAL (250 * MSEC)
-#endif /* __CONFIG_H */
+#endif /* __CROS_EC_CONFIG_CHIP_H */
diff --git a/chip/lm4/config.h b/chip/lm4/config_chip.h
index 6be1085c02..849f68087d 100644
--- a/chip/lm4/config.h
+++ b/chip/lm4/config_chip.h
@@ -3,8 +3,8 @@
* found in the LICENSE file.
*/
-#ifndef __CROS_EC_CHIP_CONFIG_H
-#define __CROS_EC_CHIP_CONFIG_H
+#ifndef __CROS_EC_CONFIG_CHIP_H
+#define __CROS_EC_CONFIG_CHIP_H
/* 16.000 Mhz internal oscillator frequency (PIOSC) */
#define INTERNAL_CLOCK 16000000
@@ -109,4 +109,4 @@
/* Compile for running from RAM instead of flash */
/* #define COMPILE_FOR_RAM */
-#endif /* __CROS_EC_CHIP_CONFIG_H */
+#endif /* __CROS_EC_CONFIG_CHIP_H */
diff --git a/chip/stm32/config.h b/chip/stm32/config_chip.h
index 6eb8a48b51..e6df7a7730 100644
--- a/chip/stm32/config.h
+++ b/chip/stm32/config_chip.h
@@ -3,8 +3,8 @@
* found in the LICENSE file.
*/
-#ifndef __CROS_EC_CHIP_CONFIG_H
-#define __CROS_EC_CHIP_CONFIG_H
+#ifndef __CROS_EC_CONFIG_CHIP_H
+#define __CROS_EC_CONFIG_CHIP_H
/* use variant specific configuration for flash / UART / IRQ */
#if defined(CHIP_VARIANT_stm32l15x)
@@ -53,4 +53,4 @@
/* Compile for running from RAM instead of flash */
/* #define COMPILE_FOR_RAM */
-#endif /* __CROS_EC_CHIP_CONFIG_H */
+#endif /* __CROS_EC_CONFIG_CHIP_H */