diff options
Diffstat (limited to 'src/include/cpu')
-rw-r--r-- | src/include/cpu/amd/model_fxx_msr.h | 25 | ||||
-rw-r--r-- | src/include/cpu/amd/msr.h (renamed from src/include/cpu/amd/model_10xxx_msr.h) | 6 |
2 files changed, 3 insertions, 28 deletions
diff --git a/src/include/cpu/amd/model_fxx_msr.h b/src/include/cpu/amd/model_fxx_msr.h deleted file mode 100644 index 2ac2d4eb84..0000000000 --- a/src/include/cpu/amd/model_fxx_msr.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef CPU_AMD_MODEL_FXX_MSR_H -#define CPU_AMD_MODEL_FXX_MSR_H - -#define SMM_BASE_MSR 0xc0010111 -#define SMM_ADDR_MSR 0xc0010112 -#define SMM_MASK_MSR 0xc0010113 - -#define HWCR_MSR 0xC0010015 -#define NB_CFG_MSR 0xC001001f -#define LS_CFG_MSR 0xC0011020 -#define IC_CFG_MSR 0xC0011021 -#define DC_CFG_MSR 0xC0011022 -#define BU_CFG_MSR 0xC0011023 - - -#define CPU_ID_FEATURES_MSR 0xc0011004 - -/* D0 only */ -#define CPU_ID_HYPER_EXT_FEATURES 0xc001100d -/* E0 only */ -#define LOGICAL_CPUS_NUM_MSR 0xc001100d - -#define CPU_ID_EXT_FEATURES_MSR 0xc0011005 - -#endif /* CPU_AMD_MODEL_FXX_MSR_H */ diff --git a/src/include/cpu/amd/model_10xxx_msr.h b/src/include/cpu/amd/msr.h index 5faf587929..31af3e6e92 100644 --- a/src/include/cpu/amd/model_10xxx_msr.h +++ b/src/include/cpu/amd/msr.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef CPU_AMD_MODEL_10XXX_MSR_H -#define CPU_AMD_MODEL_10XXX_MSR_H +#ifndef CPU_AMD_MSR_H +#define CPU_AMD_MSR_H #include <cpu/x86/msr.h> @@ -42,4 +42,4 @@ #define LOGICAL_CPUS_NUM_MSR 0xC001100d #define CPU_ID_EXT_FEATURES_MSR 0xC0011005 -#endif /* CPU_AMD_MODEL_10XXX_MSR_H */ +#endif /* CPU_AMD_MSR_H */ |