summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-05-24 09:56:06 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2018-05-24 13:23:52 +0000
commitbb748c5f92325b3342aed0286c05a4f8e385fd29 (patch)
tree4ec3b5d9558649cd7bad0a911ddeba38527ba655 /src
parent963500fe0bd9c43623a4ce67a2b73c2a22480141 (diff)
downloadcoreboot-bb748c5f92325b3342aed0286c05a4f8e385fd29.tar.xz
AMD: Remove some leftover includes
Change-Id: I740d945693b4f16495488fb76ad6d1ee531185ac Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/26508 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/include/cpu/amd/gx2def.h536
-rw-r--r--src/include/cpu/amd/sc520.h317
2 files changed, 0 insertions, 853 deletions
diff --git a/src/include/cpu/amd/gx2def.h b/src/include/cpu/amd/gx2def.h
deleted file mode 100644
index 195d584e05..0000000000
--- a/src/include/cpu/amd/gx2def.h
+++ /dev/null
@@ -1,536 +0,0 @@
-#ifndef CPU_AMD_GX2DEF_H
-#define CPU_AMD_GX2DEF_H
-
-#define CPU_ID_1_X 0x540 /* Stepping ID 1.x*/
-#define CPU_ID_2_0 0x551 /* Stepping ID 2.0*/
-#define CPU_ID_2_1 0x552 /* Stepping ID 2.1*/
-#define CPU_ID_2_2 0x553 /* Stepping ID 2.2*/
-
-#define CPU_REV_1_0 0x011
-#define CPU_REV_1_1 0x012
-#define CPU_REV_1_2 0x013
-#define CPU_REV_1_3 0x014
-#define CPU_REV_2_0 0x020
-#define CPU_REV_2_1 0x021
-#define CPU_REV_2_2 0x022
-#define CPU_REV_3_0 0x030
-
-/* GeodeLink Control Processor Registers, GLIU1, Port 3 ; MSR_GLCP = 4c00xxxx */
-#define GLCP_CLK_DIS_DELAY (MSR_GLCP + 0x08)
-#define GLCP_PMCLKDISABLE (MSR_GLCP + 0x09)
-#define GLCP_DBGOUT (MSR_GLCP + 0x0C)
-#define GLCP_PROCSTAT (MSR_GLCP + 0x0D)
-#define GLCP_DBGCLKCTL (MSR_GLCP + 0x16)
-#define GLCP_CHIP_REVID (MSR_GLCP + 0x17)
-#define GLCP_TH_OD (MSR_GLCP + 0x1E)
-#define GLCP_FIFOCTL (MSR_GLCP + 0x5E)
-
-/* GLCP_SYS_RSTPLL, Upper 32 bits */
-#define GLCP_SYS_RSTPLL_MDIV_SHIFT 9
-#define GLCP_SYS_RSTPLL_VDIV_SHIFT 6
-#define GLCP_SYS_RSTPLL_FBDIV_SHIFT 0
-
-/* GLCP_SYS_RSTPLL, Lower 32 bits */
-#define GLCP_SYS_RSTPLL_SWFLAGS_SHIFT 26
-#define GLCP_SYS_RSTPLL_SWFLAGS_MASK (0x3f << 26)
-#define GLCP_SYS_RSTPLL_LOCKWAIT 24
-#define GLCP_SYS_RSTPLL_HOLDCOUNT 16
-#define GLCP_SYS_RSTPLL_BYPASS 15
-#define GLCP_SYS_RSTPLL_PD 14
-#define GLCP_SYS_RSTPLL_RESETPLL 13
-#define GLCP_SYS_RSTPLL_DDRMODE 10
-#define GLCP_SYS_RSTPLL_VA_SEMI_SYNC_MODE 9
-#define GLCP_SYS_RSTPLL_PCI_SEMI_SYNC_MODE 8
-#define GLCP_SYS_RSTPLL_CHIP_RESET 0
-
-/* MSR routing as follows */
-/* MSB = 1 means not for CPU */
-/* next 3 bits 1st port */
-/* next3 bits next port if through an GLIU */
-/* etc... */
-
-/* Redcloud as follows. */
-/* GLIU0*/
-/* port0 - GLIU0 */
-/* port1 - MC */
-/* port2 - GLIU1 */
-/* port3 - CPU */
-/* port4 - VG */
-/* port5 - GP */
-/* port6 - DF */
-
-/* GLIU1*/
-/* port1 - GLIU0 */
-/* port3 - GLCP */
-/* port4 - PCI */
-/* port5 - FG */
-
-#define GL0_GLIU0 0
-#define GL0_MC 1
-#define GL0_GLIU1 2
-#define GL0_CPU 3
-#define GL0_VG 4
-#define GL0_GP 5
-#define GL0_DF 6
-
-#define GL1_GLIU0 1
-#define GL1_GLCP 3
-#define GL1_PCI 4
-#define GL1_FG 5
-
-/* 1000xxxx - To get on GeodeLink one bit has to be set */
-#define MSR_GLIU0 ((GL0_GLIU0 << 29) + (1 << 28))
-#define MSR_MC (GL0_MC << 29) /* 2000xxxx */
-#define MSR_GLIU1 (GL0_GLIU1 << 29) /* 4000xxxx */
-/* 6000xxxx - this is not used for BIOS since code executing on CPU doesn't
- * need to be routed
- */
-#define MSR_CPU (GL0_CPU << 29)
-#define MSR_VG (GL0_VG << 29) /* 8000xxxx */
-#define MSR_GP (GL0_GP << 29) /* A000xxxx */
-#define MSR_DF (GL0_DF << 29) /* C000xxxx */
-
-#define MSR_GLCP ((GL1_GLCP << 26) + MSR_GLIU1) /* 4C00xxxx */
-#define MSR_PCI ((GL1_PCI << 26) + MSR_GLIU1) /* 5000xxxx */
-#define MSR_FG ((GL1_FG << 26) + MSR_GLIU1) /* 5400xxxx */
-
-/* GeodeLink Interface Unit 0 (GLIU0) port0 */
-#define GLIU0_GLD_MSR_CAP (MSR_GLIU0 + 0x2000)
-#define GLIU0_GLD_MSR_PM (MSR_GLIU0 + 0x2004)
-
-#define GLIU0_DESC_BASE (MSR_GLIU0 + 0x20)
-#define GLIU0_CAP (MSR_GLIU0 + 0x86)
-#define GLIU0_GLD_MSR_COH (MSR_GLIU0 + 0x80)
-
-/* Memory Controller GLIU0 port 1 */
-#define MC_GLD_MSR_CAP (MSR_MC + 0x2000)
-#define MC_GLD_MSR_PM (MSR_MC + 0x2004)
-
-#define MC_CF07_DATA (MSR_MC + 0x18)
-#define CF07_UPPER_D1_SZ_SHIFT 28
-#define CF07_UPPER_D1_MB_SHIFT 24
-#define CF07_UPPER_D1_CB_SHIFT 20
-#define CF07_UPPER_D1_PSZ_SHIFT 16
-#define CF07_UPPER_D0_SZ_SHIFT 12
-#define CF07_UPPER_D0_MB_SHIFT 8
-#define CF07_UPPER_D0_CB_SHIFT 4
-#define CF07_UPPER_D0_PSZ_SHIFT 0
-#define CF07_LOWER_REF_INT_SHIFT 8
-#define CF07_LOWER_LOAD_MODE_DDR_SET (1 << 28)
-#define CF07_LOWER_LOAD_MODE_DLL_RESET (1 << 27)
-#define CF07_LOWER_EMR_QFC_SET (1 << 26)
-#define CF07_LOWER_EMR_DRV_SET (1 << 25)
-#define CF07_LOWER_REF_TEST_SET (1 << 3)
-#define CF07_LOWER_PROG_DRAM_SET (1 << 0)
-
-#define MC_CF8F_DATA (MSR_MC + 0x19)
-#define CF8F_UPPER_XOR_BS_SHIFT 19
-#define CF8F_UPPER_XOR_MB0_SHIFT 18
-#define CF8F_UPPER_XOR_BA1_SHIFT 17
-#define CF8F_UPPER_XOR_BA0_SHIFT 16
-#define CF8F_UPPER_REORDER_DIS_SET (1 << 8)
-#define CF8F_UPPER_REG_DIMM_SHIFT 4
-#define CF8F_LOWER_CAS_LAT_SHIFT 28
-#define CF8F_LOWER_REF2ACT_SHIFT 24
-#define CF8F_LOWER_ACT2PRE_SHIFT 20
-#define CF8F_LOWER_PRE2ACT_SHIFT 16
-#define CF8F_LOWER_ACT2CMD_SHIFT 12
-#define CF8F_LOWER_ACT2ACT_SHIFT 8
-#define CF8F_UPPER_32BIT_SET (1 << 5)
-#define CF8F_UPPER_HOI_LOI_SET (1 << 1)
-
-#define MC_CF1017_DATA (MSR_MC + 0x1A)
-#define CF1017_LOWER_PM1_UP_DLY_SET (1 << 8)
-#define CF1017_LOWER_WR2DAT_SHIFT 0
-
-#define MC_CFCLK_DBUG (MSR_MC + 0x1D)
-#define CFCLK_UPPER_MTST_B2B_DIS_SET (1 << 2)
-#define CFCLK_UPPER_MTST_DQS_EN_SET (1 << 1)
-#define CFCLK_UPPER_MTEST_EN_SET (1 << 0)
-#define CFCLK_LOWER_MASK_CKE_SET1 (1 << 9)
-#define CFCLK_LOWER_MASK_CKE_SET0 (1 << 8)
-#define CFCLK_LOWER_SDCLK_SET (0x0F << 0)
-
-#define MC_CF_RDSYNC (MSR_MC + 0x1F)
-
-/* GLIU1 GLIU0 port2 */
-#define GLIU1_GLD_MSR_CAP (MSR_GLIU1 + 0x2000)
-#define GLIU1_GLD_MSR_PM (MSR_GLIU1 + 0x2004)
-#define GLIU1_GLD_MSR_COH (MSR_GLIU1 + 0x80)
-
-/* CPU ; does not need routing instructions since we are executing there. */
-#define CPU_GLD_MSR_CAP 0x2000
-#define CPU_GLD_MSR_CONFIG 0x2001
-#define CPU_GLD_MSR_PM 0x2004
-#define CPU_GLD_MSR_DIAG 0x2005
-#define DIAG_SEL1_MODE_SHIFT 16
-#define DIAG_SEL1_SET (1 << 31)
-#define DIAG_SEL0__MODE_SHIFT 0
-#define DIAG_SET0_SET (1 << 15)
-#define CPU_PF_BTB_CONF 0x1100
-#define BTB_ENABLE_SET (1 << 0)
-#define RETURN_STACK_ENABLE_SET (1 << 4)
-#define CPU_PF_BTBRMA_BIST 0x110C
-#define CPU_XC_CONFIG 0x1210
-#define XC_CONFIG_SUSP_ON_HLT (1 << 0)
-#define CPU_ID_CONFIG 0x1250
-#define ID_CONFIG_SERIAL_SET (1 << 0)
-#define CPU_AC_MSR 0x1301
-#define CPU_EX_BIST 0x1428
-
-/* IM */
-#define CPU_IM_CONFIG 0x1700
-#define IM_CONFIG_LOWER_ICD_SET (1 << 8)
-#define IM_CONFIG_LOWER_QWT_SET (1 << 20)
-#define CPU_IC_INDEX 0x1710
-#define CPU_IC_DATA 0x1711
-#define CPU_IC_TAG 0x1712
-#define CPU_IC_TAG_I 0x1713
-#define CPU_ITB_INDEX 0x1720
-#define CPU_ITB_LRU 0x1721
-#define CPU_ITB_ENTRY 0x1722
-#define CPU_ITB_ENTRY_I 0x1723
-#define CPU_IM_BIST_TAG 0x1730
-#define CPU_IM_BIST_DATA 0x1731
-
-/* various CPU MSRs */
-#define CPU_DM_CONFIG0 0x1800
-#define DM_CONFIG0_UPPER_WSREQ_SHIFT 12
-#define DM_CONFIG0_LOWER_DCDIS_SET (1<<8)
-#define DM_CONFIG0_LOWER_WBINVD_SET (1<<5)
-#define DM_CONFIG0_LOWER_MISSER_SET (1<<1)
-
-/* configuration MSRs */
-#define CPU_RCONF_DEFAULT 0x1808
-#define RCONF_DEFAULT_UPPER_ROMRC_SHIFT 24
-#define RCONF_DEFAULT_UPPER_ROMBASE_SHIFT 4
-#define RCONF_DEFAULT_UPPER_DEVRC_HI_SHIFT 0
-#define RCONF_DEFAULT_LOWER_DEVRC_LOW_SHIFT 28
-#define RCONF_DEFAULT_LOWER_SYSTOP_SHIFT 8
-#define RCONF_DEFAULT_LOWER_SYSRC_SHIFT 0
-#define CPU_RCONF_BYPASS 0x180A
-#define CPU_RCONF_A0_BF 0x180B
-#define CPU_RCONF_C0_DF 0x180C
-#define CPU_RCONF_E0_FF 0x180D
-#define CPU_RCONF_SMM 0x180E
-#define RCONF_SMM_UPPER_SMMTOP_SHIFT 12
-#define RCONF_SMM_UPPER_RCSMM_SHIFT 0
-#define RCONF_SMM_LOWER_SMMBASE_SHIFT 12
-#define RCONF_SMM_LOWER_RCNORM_SHIFT 0
-#define RCONF_SMM_LOWER_EN_SET (1<<8)
-#define CPU_RCONF_DMM 0x180F
-#define RCONF_DMM_UPPER_DMMTOP_SHIFT 12
-#define RCONF_DMM_UPPER_RCDMM_SHIFT 0
-#define RCONF_DMM_LOWER_DMMBASE_SHIFT 12
-#define RCONF_DMM_LOWER_RCNORM_SHIFT 0
-#define RCONF_DMM_LOWER_EN_SET (1<<8)
-
-#define CPU_RCONF0 0x1810
-#define CPU_RCONF1 0x1811
-#define CPU_RCONF2 0x1812
-#define CPU_RCONF3 0x1813
-#define CPU_RCONF4 0x1814
-#define CPU_RCONF5 0x1815
-#define CPU_RCONF6 0x1816
-#define CPU_RCONF7 0x1817
-#define CPU_CR1_MSR 0x1881
-#define CPU_CR2_MSR 0x1882
-#define CPU_CR3_MSR 0x1883
-#define CPU_CR4_MSR 0x1884
-#define CPU_DC_INDEX 0x1890
-#define CPU_DC_DATA 0x1891
-#define CPU_DC_TAG 0x1892
-#define CPU_DC_TAG_I 0x1893
-#define CPU_SNOOP 0x1894
-#define CPU_DTB_INDEX 0x1898
-#define CPU_DTB_LRU 0x1899
-#define CPU_DTB_ENTRY 0x189A
-#define CPU_DTB_ENTRY_I 0x189B
-#define CPU_L2TB_INDEX 0x189C
-#define CPU_L2TB_LRU 0x189D
-#define CPU_L2TB_ENTRY 0x189E
-#define CPU_L2TB_ENTRY_I 0x189F
-#define CPU_DM_BIST 0x18C0
-
-/* SMM */
-#define CPU_AC_SMM_CTL 0x1301
-#define SMM_NMI_EN_SET (1<<0)
-#define SMM_SUSP_EN_SET (1<<1)
-#define NEST_SMI_EN_SET (1<<2)
-#define SMM_INST_EN_SET (1<<3)
-#define INTL_SMI_EN_SET (1<<4)
-#define EXTL_SMI_EN_SET (1<<5)
-
-#define CPU_FPU_MSR_MODE 0x1A00
-#define FPU_IE_SET (1<<0)
-
-#define CPU_FP_UROM_BIST 0x1A03
-
-#define CPU_BC_CONF_0 0x1900
-#define TSC_SUSP_SET (1<<5)
-#define SUSP_EN_SET (1<<12)
-
-/* VG GLIU0 port4 */
-#define VG_GLD_MSR_CAP (MSR_VG + 0x2000)
-#define VG_GLD_MSR_CONFIG (MSR_VG + 0x2001)
-#define VG_GLD_MSR_PM (MSR_VG + 0x2004)
-
-#define GP_GLD_MSR_CAP (MSR_GP + 0x2000)
-#define GP_GLD_MSR_CONFIG (MSR_GP + 0x2001)
-#define GP_GLD_MSR_PM (MSR_GP + 0x2004)
-
-/* DF GLIU0 port6 */
-#define DF_GLD_MSR_CAP (MSR_DF + 0x2000)
-#define DF_GLD_MSR_MASTER_CONF (MSR_DF + 0x2001)
-#define DF_LOWER_LCD_SHIFT 6
-#define DF_GLD_MSR_PM (MSR_DF + 0x2004)
-
-/* GeodeLink Control Processor GLIU1 port3 */
-#define GLCP_GLD_MSR_CAP (MSR_GLCP + 0x2000)
-#define GLCP_GLD_MSR_CONF (MSR_GLCP + 0x2001)
-#define GLCP_GLD_MSR_PM (MSR_GLCP + 0x2004)
-
-#define GLCP_DELAY_CONTROLS (MSR_GLCP + 0x0F)
-
-#define GLCP_SYS_RSTPLL (MSR_GLCP + 0x14 /* R/W */)
-#define RSTPLL_UPPER_MDIV_SHIFT 9
-#define RSTPLL_UPPER_VDIV_SHIFT 6
-#define RSTPLL_UPPER_FBDIV_SHIFT 0
-#define RSTPLL_LOWER_SWFLAGS_SHIFT 26
-#define RSTPLL_LOWER_SWFLAGS_MASK (0x3F<<RSTPLL_LOWER_SWFLAGS_SHIFT)
-#define RSTPPL_LOWER_HOLD_COUNT_SHIFT 16
-#define RSTPPL_LOWER_BYPASS_SHIFT 15
-#define RSTPPL_LOWER_TST_SHIFT 11
-#define RSTPPL_LOWER_SDRMODE_SHIFT 10
-#define RSTPPL_LOWER_BOOTSTRAP_SHIFT 4
-#define RSTPPL_LOWER_LOCK_SET (1<<25)
-#define RSTPPL_LOWER_LOCKWAIT_SET (1<<24)
-#define RSTPPL_LOWER_BYPASS_SET (1<<15)
-#define RSTPPL_LOWER_PD_SET (1<<14)
-#define RSTPPL_LOWER_PLL_RESET_SET (1<<13)
-#define RSTPPL_LOWER_SDRMODE_SET (1<<10)
-#define RSTPPL_LOWER_CPU_SEMI_SYNC_SET (1<<9)
-#define RSTPPL_LOWER_PCI_SEMI_SYNC_SET (1<<8)
-#define RSTPPL_LOWER_CHIP_RESET_SET (1<<0)
-
-#define GLCP_DOTPLL (MSR_GLCP + 0x15 /* R/W */)
-#define DOTPPL_LOWER_PD_SET (1<<14)
-
-/* GLIU1 port 4 */
-#define GLPCI_GLD_MSR_CAP (MSR_PCI + 0x2000)
-#define GLPCI_GLD_MSR_CONFIG (MSR_PCI + 0x2001)
-#define GLPCI_GLD_MSR_PM (MSR_PCI + 0x2004)
-
-#define GLPCI_CTRL (MSR_PCI + 0x2010)
-#define GLPCI_CTRL_UPPER_FTH_SHIFT 28
-#define GLPCI_CTRL_UPPER_RTH_SHIFT 24
-#define GLPCI_CTRL_UPPER_SBRTH_SHIFT 20
-#define GLPCI_CTRL_UPPER_DTL_SHIFT 14
-#define GLPCI_CTRL_UPPER_WTO_SHIFT 11
-#define GLPCI_CTRL_UPPER_LAT_SHIFT 3
-#define GLPCI_CTRL_UPPER_ILTO_SHIFT 8
-#define GLPCI_CTRL_LOWER_IRFT_SHIFT 18
-#define GLPCI_CTRL_LOWER_IRFC_SHIFT 16
-#define GLPCI_CTRL_LOWER_ER_SET (1<<11)
-#define GLPCI_CTRL_LOWER_LDE_SET (1<<9)
-#define GLPCI_CTRL_LOWER_OWC_SET (1<<4)
-#define GLPCI_CTRL_LOWER_IWC_SET (1<<3)
-#define GLPCI_CTRL_LOWER_PCD_SET (1<<2)
-#define GLPCI_CTRL_LOWER_ME_SET (1<<0)
-
-#define GLPCI_ARB (MSR_PCI + 0x2011)
-#define GLPCI_ARB_UPPER_BM1_SET (1<<17)
-#define GLPCI_ARB_UPPER_BM0_SET (1<<16)
-#define GLPCI_ARB_UPPER_CPRE_SET (1<<15)
-#define GLPCI_ARB_UPPER_PRE2_SET (1<<10)
-#define GLPCI_ARB_UPPER_PRE1_SET (1<<9)
-#define GLPCI_ARB_UPPER_PRE0_SET (1<<8)
-#define GLPCI_ARB_UPPER_CRME_SET (1<<7)
-#define GLPCI_ARB_UPPER_RME2_SET (1<<2)
-#define GLPCI_ARB_UPPER_RME1_SET (1<<1)
-#define GLPCI_ARB_UPPER_RME0_SET (1<<0)
-#define GLPCI_ARB_LOWER_PRCM_SHIFT 24
-#define GLPCI_ARB_LOWER_FPVEC_SHIFT 16
-#define GLPCI_ARB_LOWER_RMT_SHIFT 6
-#define GLPCI_ARB_LOWER_IIE_SET (1<<8)
-#define GLPCI_ARB_LOWER_PARK_SET (1<<0)
-
-#define GLPCI_REN (MSR_PCI + 0x2014)
-#define GLPCI_A0_BF (MSR_PCI + 0x2015)
-#define GLPCI_C0_DF (MSR_PCI + 0x2016)
-#define GLPCI_E0_FF (MSR_PCI + 0x2017)
-#define GLPCI_RC0 (MSR_PCI + 0x2018)
-#define GLPCI_RC1 (MSR_PCI + 0x2019)
-#define GLPCI_RC2 (MSR_PCI + 0x201A)
-#define GLPCI_RC3 (MSR_PCI + 0x201B)
-#define GLPCI_RC4 (MSR_PCI + 0x201C)
-#define GLPCI_RC_UPPER_TOP_SHIFT 12
-#define GLPCI_RC_LOWER_BASE_SHIFT 12
-#define GLPCI_RC_LOWER_EN_SET (1<<8)
-#define GLPCI_RC_LOWER_PF_SET (1<<5)
-#define GLPCI_RC_LOWER_WC_SET (1<<4)
-#define GLPCI_RC_LOWER_WP_SET (1<<2)
-#define GLPCI_RC_LOWER_CD_SET (1<<0)
-#define GLPCI_ExtMSR (MSR_PCI + 0x201E)
-#define GLPCI_SPARE (MSR_PCI + 0x201F)
-#define GLPCI_SPARE_LOWER_AILTO_SET (1<<6)
-#define GLPCI_SPARE_LOWER_PPD_SET (1<<5)
-#define GLPCI_SPARE_LOWER_PPC_SET (1<<4)
-#define GLPCI_SPARE_LOWER_MPC_SET (1<<3)
-#define GLPCI_SPARE_LOWER_MME_SET (1<<2)
-#define GLPCI_SPARE_LOWER_NSE_SET (1<<1)
-#define GLPCI_SPARE_LOWER_SUPO_SET (1<<0)
-
-/* FooGlue GLIU1 port 5 */
-#define FG_GLD_MSR_CAP (MSR_FG + 0x2000)
-#define FG_GLD_MSR_CONFIG (MSR_FG + 0x2001)
-#define FG_GLD_MSR_PM (MSR_FG + 0x2004)
-#define FG_GIO_MSR_SEL (MSR_FG + 0x2010)
-#define FG_BIST (MSR_FG + 0x2005)
-
-/* from MC spec */
-#define MIN_MOD_BANKS 1
-#define MAX_MOD_BANKS 2
-#define MIN_DEV_BANKS 2
-#define MAX_DEV_BANKS 4
-#define MAX_COL_ADDR 17
-
-/* more fun stuff */
-/* Base Mask - map power of 2 size aligned region */
-#define BM 1
-#define BMO 2 /* BM with an offset */
-#define R 3 /* Range - 4k range minimum */
-#define RO 4 /* R with offset */
-/* Swiss 0xCeese - maps a 256K region in to 16K 0xcunks. Set W/R */
-#define SC 5
-#define BMIO 6 /* Base Mask IO */
-#define SCIO 7 /* Swiss 0xCeese IO */
-/* Special marker for Shadow SC descriptors so setShadow proc is independent
- * of CPU
- */
-#define SC_SHADOW 8
-/* Special marker for SYSMEM R descriptors so GLIUInit proc is independent
- * of CPU
- */
-#define R_SYSMEM 9
-#define BMO_SMM 10 /* Special marker for SMM */
-#define BM_SMM 11 /* Special marker for SMM */
-#define BMO_DMM 12 /* Special marker for DMM */
-#define BM_DMM 13 /* Special marker for DMM */
-#define RO_FB 14 /* special for Frame buffer. */
-#define R_FB 15 /* special for FB. */
-#define OTHER 0x0FE /* Special marker for other */
-#define GL_END 0x0FF /* end */
-
-#define MSR_GL0 (GL1_GLIU0 << 29)
-
-/* Set up desc addresses from 20 - E8 */
-/* This is chip specific! */
-//remove after MSRINIT is gone
-#define MSR_GLIU0_BASE1 (MSR_GLIU0 + 0x20) /* BM */
-#define MSR_GLIU0_BASE2 (MSR_GLIU0 + 0x21) /* BM */
-#define MSR_GLIU0_SHADOW (MSR_GLIU0 + 0x2C) /* SCO should only be SC */
-#define MSR_GLIU0_SYSMEM (MSR_GLIU0 + 0x28) /* RO should only be R */
-
-#define MSR_GLIU1_BASE1 (MSR_GLIU1 + 0x20) /* BM */
-#define MSR_GLIU1_BASE2 (MSR_GLIU1 + 0x21) /* BM */
-#define MSR_GLIU1_SHADOW (MSR_GLIU1 + 0x2D) /* SCO should only be SC */
-#define MSR_GLIU1_SYSMEM (MSR_GLIU1 + 0x29) /* RO should only be R */
-
-#define GLIU0_P2D_BM_0 (MSR_GLIU0 + 0x20) /* BASE1 */
-#define GLIU0_P2D_BM_1 (MSR_GLIU0 + 0x21) /* BASE2 */
-#define GLIU0_P2D_BM_2 (MSR_GLIU0 + 0x22)
-#define GLIU0_P2D_BM_3 (MSR_GLIU0 + 0x23)
-#define GLIU0_P2D_BM_4 (MSR_GLIU0 + 0x24)
-#define GLIU0_P2D_BM_5 (MSR_GLIU0 + 0x25)
-
-#define GLIU0_P2D_BMO_0 (MSR_GLIU0 + 0x26) /* SMM */
-#define GLIU0_P2D_BMO_1 (MSR_GLIU0 + 0x27) /* DMM */
-
-#define GLIU0_P2D_R_0 (MSR_GLIU0 + 0x28) /* SYSMEM */
-
-#define GLIU0_P2D_RO_0 (MSR_GLIU0 + 0x29)
-#define GLIU0_P2D_RO_1 (MSR_GLIU0 + 0x2A)
-#define GLIU0_P2D_RO_2 (MSR_GLIU0 + 0x2B)
-
-#define GLIU0_P2D_SC_0 (MSR_GLIU0 + 0x2C) /* SHADOW */
-
-#define GLIU0_IOD_BM_0 (MSR_GLIU0 + 0xE0)
-#define GLIU0_IOD_BM_1 (MSR_GLIU0 + 0xE1)
-#define GLIU0_IOD_BM_2 (MSR_GLIU0 + 0xE2)
-
-#define GLIU0_IOD_SC_0 (MSR_GLIU0 + 0xE3)
-#define GLIU0_IOD_SC_1 (MSR_GLIU0 + 0xE4)
-#define GLIU0_IOD_SC_2 (MSR_GLIU0 + 0xE5)
-#define GLIU0_IOD_SC_3 (MSR_GLIU0 + 0xE6)
-#define GLIU0_IOD_SC_4 (MSR_GLIU0 + 0xE7)
-#define GLIU0_IOD_SC_5 (MSR_GLIU0 + 0xE8)
-
-#define GLIU1_P2D_BM_0 (MSR_GLIU1 + 0x20) /* BASE1 */
-#define GLIU1_P2D_BM_1 (MSR_GLIU1 + 0x21) /* BASE2 */
-#define GLIU1_P2D_BM_2 (MSR_GLIU1 + 0x22)
-#define GLIU1_P2D_BM_3 (MSR_GLIU1 + 0x23) /* SMM */
-#define GLIU1_P2D_BM_4 (MSR_GLIU1 + 0x24) /* DMM */
-#define GLIU1_P2D_BM_5 (MSR_GLIU1 + 0x25)
-#define GLIU1_P2D_BM_6 (MSR_GLIU1 + 0x26)
-#define GLIU1_P2D_BM_7 (MSR_GLIU1 + 0x27)
-#define GLIU1_P2D_BM_8 (MSR_GLIU1 + 0x28)
-
-#define GLIU1_P2D_R_0 (MSR_GLIU1 + 0x29) /* SYSMEM */
-#define GLIU1_P2D_R_1 (MSR_GLIU1 + 0x2A)
-#define GLIU1_P2D_R_2 (MSR_GLIU1 + 0x2B)
-#define GLIU1_P2D_R_3 (MSR_GLIU1 + 0x2C)
-
-#define GLIU1_P2D_SC_0 (MSR_GLIU1 + 0x2D) /* SHADOW */
-
-#define GLIU1_IOD_BM_0 (MSR_GLIU1 + 0xE0)
-#define GLIU1_IOD_BM_1 (MSR_GLIU1 + 0xE1)
-#define GLIU1_IOD_BM_2 (MSR_GLIU1 + 0xE2)
-
-#define GLIU1_IOD_SC_0 (MSR_GLIU1 + 0xE3) /* FooGlue F0 for FPU */
-#define GLIU1_IOD_SC_1 (MSR_GLIU1 + 0xE4)
-#define GLIU1_IOD_SC_2 (MSR_GLIU1 + 0xE5)
-#define GLIU1_IOD_SC_3 (MSR_GLIU1 + 0xE6)
-#define GLIU1_IOD_SC_4 (MSR_GLIU1 + 0xE7)
-#define GLIU1_IOD_SC_5 (MSR_GLIU1 + 0xE8)
-
-/* definitions that are "once you are mostly up, start VSA" type things */
-#define SMM_OFFSET 0x40400000
-#define SMM_SIZE 128 /* changed SMM_SIZE from 256 KB to 128 KB */
-#define DMM_OFFSET 0x0C0000000
-#define DMM_SIZE 128
-#define FB_OFFSET 0x41000000
-#define PCI_MEM_TOP 0x0EFFFFFFF /* Top of PCI mem allocation region */
-#define PCI_IO_TOP 0x0EFFF /* Top of PCI I/O allocation region */
-#define END_OPTIONROM_SPACE 0x0DFFF /* E0000 is reserved for SystemROMs */
-
-#define MDD_SMBUS 0x06000 /* SMBUS IO location */
-#define MDD_GPIO 0x06100 /* GPIO & ICF IO location */
-#define MDD_MFGPT 0x06200 /* General Purpose Timers IO location */
-#define MDD_IRQ_MAPPER 0x06300 /* IRQ Mapper */
-#define ACPI_BASE 0x09C00 /* ACPI Base */
-/* Power Management Logic - placed at the end of ACPI */
-#define MDD_PM 0x09D00
-
-#define CS5535_IDSEL 0x02000000 /* IDSEL = AD25, device #15 */
-#define CHIPSET_DEV_NUM 15
-#define IDSEL_BASE 11 /* bit 11 = device 1 */
-
-/* SB LBAR IO + MEMORY MAP */
-#define SMBUS_BASE (0x6000)
-#define GPIO_BASE (0x6100)
-#define MFGPT_BASE (0x6200)
-#define IRQMAP_BASE (0x6300)
-#define PMLogic_BASE (0x9D00)
-
-
-#if !defined(__ASSEMBLER__)
-#if defined(__PRE_RAM__)
-void cpuRegInit(void);
-void SystemPreInit(void);
-void asmlinkage mainboard_romstage_entry(unsigned long bist);
-#endif
-void cpubug(void);
-#endif
-
-#endif /* CPU_AMD_GX2DEF_H */
diff --git a/src/include/cpu/amd/sc520.h b/src/include/cpu/amd/sc520.h
deleted file mode 100644
index a0390adc04..0000000000
--- a/src/include/cpu/amd/sc520.h
+++ /dev/null
@@ -1,317 +0,0 @@
-#ifndef __CPU_AMD_SC520_H__
-#define __CPU_AMD_SC520_H__
-
-/* handy dandy stuff for the sc520 MMCR */
-
-/* default location of the MMCR */
-#define MMCR 0xfffef000
-
-/* the PAR register struct definition, the location in memory,
- * and a handy pointer for you to use
- */
-
-struct parreg {
- unsigned long reg[16];
-};
-
-#define PARREG ((struct parreg *)0xfffef088)
-//static volatile struct parreg *par = PARREG;
-
-
-#define MMCRPIC ((struct mmcrpic *) 0xfffefd00)
-//static volatile struct mmcrpic *pic = MMCRPIC;
-
-#define M_GINT_MODE 1
-#define M_S1_MODE 2
-#define M_S2_MODE 4
-
-
-/* here is the real mmcr struct */
-
-struct memregs {
- /* make these shorts, we are lsb and the hardware seems to like it
- * better
- */
- unsigned short drcctl;
- unsigned short drctmctl;
- unsigned short drccfg;
- unsigned char pad1[2];
- unsigned char drcbendadr[4];
- unsigned char pad2[4];
- unsigned char eccctl;
- unsigned char eccsta;
- unsigned char eccckbpos;
- unsigned char ecccktest;
- unsigned long eccsbadd;
- unsigned long eccmbadd;
- unsigned char pad3[18];
-};
-struct dbctl {
- unsigned char dbctl;
- unsigned char pad4[15];
-};
-
-struct romregs {
- unsigned char bootcs;
- unsigned char pad5[3];
- unsigned char romcs1;
- unsigned char pad6[1];
- unsigned char romcs2;
- unsigned char pad7[6];
-};
-
-
-struct hostbridge {
- unsigned short ctl;
- unsigned short tgtirqctl;
- unsigned short tgtirqsta;
- unsigned short mstirqctl;
- unsigned short mstirqsta;
- unsigned char pad8[2];
- unsigned long mstintadd;
-};
-
-struct sysarb {
- unsigned char ctl;
- unsigned char sta;
- unsigned char menb;
- unsigned long prictl;
- unsigned char pad9[8];
-};
-
-struct sysmap {
- unsigned char adddecctl;
- unsigned char pada[1];
- unsigned short wpvsta;
- unsigned char padb[4];
- unsigned long par[16];
- unsigned char padc[0xb38];
-};
-
-struct gpctl {
- unsigned char gpecho;
- unsigned char gpcsdw;
- unsigned char gpcsqual;
- unsigned char padd[5];
- unsigned char gpcsrt;
- unsigned char gpcspw;
- unsigned char gpcsoff;
- unsigned char gprdw;
- unsigned char gprdoff;
- unsigned char gpwrw;
- unsigned char gpwroff;
- unsigned char gpalew;
- unsigned char gpaleoff;
- unsigned char pade[15];
-};
-
-struct pio {
- unsigned short pfs15_0;
- unsigned short pfs31_16;
- unsigned char cspfs;
- unsigned char padf[1];
- unsigned char clksel;
- unsigned char padg[1];
- unsigned short dsctl;
- unsigned short dir15_0;
- unsigned short dir31_16;
- unsigned short padh;
- unsigned short data15_0;
- unsigned short data31_16;
- unsigned short set15_0;
- unsigned short set31_16;
- unsigned short clr15_0;
- unsigned short clr31_16;
- unsigned char padi[0x24];
-};
-
-struct swtmr {
- unsigned short swtmrmilli;
- unsigned short swtmrmicro;
- unsigned char swtmrcfg;
- unsigned char padj[0xb];
-};
-
-struct gptmr {
- unsigned short ctl;
- unsigned short cnt;
- unsigned short maxcmpa, maxcmpb;
-};
-
-struct gptimers {
- unsigned char status;
- unsigned char pad;
- struct gptmr timer[2];
- /* yes, they REALLY DID make timer 2 different. */
- /* yikes */
- unsigned short ctl2;
- unsigned short cnt2;
- unsigned char paddumb[8];
- unsigned short maxcmpa2;
-
- unsigned char pada[0x20];
-};
-
-struct watchdog {
- unsigned short ctl;
- unsigned short cntll;
- unsigned short cntlh;
- unsigned char pad[10];
-};
-
-struct uart {
- unsigned char ctl, sta, fcrshad, pad;
-};
-
-struct uarts {
- struct uart uart[2];
- unsigned char pad[8];
-};
-
-struct ssi {
- unsigned char ctl, xmit, cmd, sta, rcv;
- unsigned char pad[0x2b];
-};
-
-
-/* interrupt control registers */
-/* defined this way for portability. Shame we can't just use plan 9 c. */
-struct pic {
- unsigned char pcicr;
- unsigned char pad1;
- unsigned char mpicmode;
- unsigned char sl1picmode;
- unsigned char sl2picmode;
- unsigned char pad2[3];
- unsigned char swint16_1;
- unsigned char pad3;
- unsigned char swint22_17;
- unsigned char pad4[5];
- unsigned short intpinpol;
- unsigned char pad5[2];
- unsigned char pichostmap;
- unsigned char pad6[3];
- unsigned char eccmap;
- unsigned char pad7[1];
- unsigned char gptmr0map;
- unsigned char gptmr1map;
- unsigned char gptmr2map;
- unsigned char pad8[3];
- unsigned char pit0map;
- unsigned char pit1map;
- unsigned char pit2map;
- unsigned char pad9[5];
- unsigned char uart1map;
- unsigned char uart2map;
- unsigned char pad99[6];
- unsigned char pciintamap;
- unsigned char pciintbmap;
- unsigned char pciintcmap;
- unsigned char pciintdmap;
- unsigned char pad10[12];
- unsigned char dmabcintmap;
- unsigned char ssimap;
- unsigned char wdtmap;
- unsigned char rtcmap;
- unsigned char wpvmap;
- unsigned char icemap;
- unsigned char ferrmap;
- unsigned char pad11[9];
- unsigned char gp0imap;
- unsigned char gp1imap;
- unsigned char gp2imap;
- unsigned char gp3imap;
- unsigned char gp4imap;
- unsigned char gp5imap;
- unsigned char gp6imap;
- unsigned char gp7imap;
- unsigned char gp8imap;
- unsigned char gp9imap;
- unsigned char gp10imap;
- unsigned char padend[0x14];
-};
-
-struct reset {
- unsigned char sysinfo;
- unsigned char pad1;
- unsigned char rescfg;
- unsigned char pad2;
- unsigned char ressta;
- unsigned char pad3[0xb];
-};
-
-struct dmacontrol {
- unsigned char ctl;
- unsigned char mmio;
- unsigned short extchanmapa;
- unsigned short extchanmapb;
- unsigned char extpg0;
- unsigned char extpg1;
- unsigned char extpg2;
- unsigned char extpg3;
- unsigned char extpg5;
- unsigned char extpg6;
- unsigned char extpg7;
- unsigned char pad[3];
- unsigned char exttc3;
- unsigned char exttc5;
- unsigned char exttc6;
- unsigned char exttc7;
- unsigned char pad1[4];
- unsigned char bcctl;
- unsigned char bcsta;
- unsigned char bsintenb;
- unsigned char bcval;
- unsigned char pad2[4];
- unsigned short nxtaddl3;
- unsigned short nxtaddh3;
- unsigned short nxtaddl5;
- unsigned short nxtaddh5;
- unsigned short nxtaddl6;
- unsigned short nxtaddh6;
- unsigned short nxtaddl7;
- unsigned short nxtaddh7;
- unsigned short nxtttcl3;
- unsigned char nxtttch3;
- unsigned char pad3;
- unsigned short nxtttcl5;
- unsigned char nxtttch5;
- unsigned char pad5;
- unsigned short nxtttcl6;
- unsigned char nxtttch6;
- unsigned char pad6;
- unsigned short nxtttcl7;
- unsigned char nxtttch7;
- unsigned char pad7;
-};
-
-
-
-
-struct mmcr {
- unsigned short revid;
- unsigned char cpucontrol;
- unsigned char pad1[11];
- struct memregs memregs;
- struct dbctl dbctl;
- struct romregs romregs;
- struct hostbridge hostbridge;
- struct sysarb sysarb;
- struct sysmap sysmap;
- struct gpctl gpctl;
- struct pio pio;
- struct swtmr swtmr;
- struct gptimers gptimers;
- struct watchdog watchdog;
- struct uarts uarts;
- struct ssi ssi;
- struct pic pic;
- struct reset reset;
- struct dmacontrol dmacontrol;
- unsigned char padend[0x23d];
-};
-
-
-#define MMCRDEFAULT ((struct mmcr *) 0xfffef000)
-
-#endif /* __CPU_AMD_SC520_H__ */