diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2015-11-20 10:26:13 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-11-21 13:12:18 -0800 |
| commit | 32267c1094a1961ad8acd180f3220faed51794d0 (patch) | |
| tree | 84d1cc21128defd5ae23e9abf283a57afff05bc6 | |
| parent | 70bb65cd2e48c4347ed483fcd916ab9d94e9c62f (diff) | |
| download | chrome-ec-32267c1094a1961ad8acd180f3220faed51794d0.tar.gz | |
cr50: rename hw generated register definitions file
This common for all g based boards file should not be associated with
a single board.
BRANCH=none
BUG=none
TEST=the device still builds and boots.
Change-Id: I34c49a095abd8e49b492c318823dd8f56609fdc8
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/313631
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
| -rw-r--r-- | chip/g/build.mk | 2 | ||||
| -rw-r--r-- | chip/g/config_chip.h | 2 | ||||
| -rw-r--r-- | chip/g/hw_regdefs.h (renamed from chip/g/cr50_fpga_regdefs.h) | 0 | ||||
| -rw-r--r-- | chip/g/registers.h | 2 | ||||
| -rwxr-xr-x | util/g_regs (renamed from util/cr50_regs) | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/chip/g/build.mk b/chip/g/build.mk index 1648389d42..d28ff1b5ef 100644 --- a/chip/g/build.mk +++ b/chip/g/build.mk @@ -13,7 +13,7 @@ CFLAGS_CPU+=-march=armv7-m -mcpu=cortex-m3 ver_defs := GC___MAJOR_REV__ GC___MINOR_REV__ bld_defs := GC_SWDP_BUILD_DATE_DEFAULT GC_SWDP_BUILD_TIME_DEFAULT ver_params := $(shell echo "$(ver_defs) $(bld_defs)" | $(CPP) $(CPPFLAGS) -P \ - -imacros chip/g/${CHIP_VARIANT}_regdefs.h | sed -e "s/__REV\([A-Z]\)__/\1/") + -imacros chip/g/hw_regdefs.h | sed -e "s/__REV\([A-Z]\)__/\1/") ver_str := $(shell printf "%s%s %d_%d" $(ver_params)) CPPFLAGS+= -DGC_REVISION="$(ver_str)" diff --git a/chip/g/config_chip.h b/chip/g/config_chip.h index cbb54dfc13..3ce93389d0 100644 --- a/chip/g/config_chip.h +++ b/chip/g/config_chip.h @@ -7,7 +7,7 @@ #define __CROS_EC_CONFIG_CHIP_H #include "core/cortex-m/config_core.h" -#include "cr50_fpga_regdefs.h" +#include "hw_regdefs.h" /* Describe the RAM layout */ #define CONFIG_RAM_BASE 0x10000 diff --git a/chip/g/cr50_fpga_regdefs.h b/chip/g/hw_regdefs.h index e58b214a68..e58b214a68 100644 --- a/chip/g/cr50_fpga_regdefs.h +++ b/chip/g/hw_regdefs.h diff --git a/chip/g/registers.h b/chip/g/registers.h index 88e0a6aa7b..ccadca163f 100644 --- a/chip/g/registers.h +++ b/chip/g/registers.h @@ -7,7 +7,7 @@ #define __CROS_EC_REGISTERS_H #include "common.h" -#include "cr50_fpga_regdefs.h" +#include "hw_regdefs.h" #include "util.h" /* Constants for setting baud rate */ diff --git a/util/cr50_regs b/util/g_regs index 1351abb60b..28e6f4a53d 100755 --- a/util/cr50_regs +++ b/util/g_regs @@ -15,7 +15,7 @@ my $usage = " Usage: $prog [HEADER] This converts the FPGA release's generated C header file into the -cr50_fpga_regdefs.h file that is included by chip/g/registers.h. +hw_regdefs.h file that is included by chip/g/registers.h. Mostly it just prefaces the macros with GC_ to avoid name collision. "; |