AMD fam10: Drop RAMINIT_SYSINFO

AMD fam10 raminit cannot be built without RAMINIT_SYSINFO, this
is not a true option but copy-paste remainder from AMD K8.

Change-Id: Id8edc112f3bacebd1732304ac9ee6e77cc6263b7
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4581
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Kyösti Mälkki 2013-12-27 14:46:32 +02:00
parent 1709453bad
commit 239c3d32f0
26 changed files with 1 additions and 37 deletions

View File

@ -244,11 +244,7 @@ static void STOP_CAR_AND_CPU(void)
stop_this_cpu(); stop_this_cpu();
} }
#if CONFIG_RAMINIT_SYSINFO
static u32 init_cpus(u32 cpu_init_detectedx, struct sys_info *sysinfo) static u32 init_cpus(u32 cpu_init_detectedx, struct sys_info *sysinfo)
#else
static u32 init_cpus(u32 cpu_init_detectedx)
#endif
{ {
u32 bsp_apicid = 0; u32 bsp_apicid = 0;
u32 apicid; u32 apicid;
@ -903,16 +899,14 @@ static void finalize_node_setup(struct sys_info *sysinfo)
{ {
u8 i; u8 i;
u8 nodes = get_nodes(); u8 nodes = get_nodes();
#if CONFIG_RAMINIT_SYSINFO
u32 reg; u32 reg;
/* read Node0 F0_0x64 bit [8:10] to find out SbLink # */ /* read Node0 F0_0x64 bit [8:10] to find out SbLink # */
reg = pci_read_config32(NODE_HT(0), 0x64); reg = pci_read_config32(NODE_HT(0), 0x64);
sysinfo->sblk = (reg >> 8) & 7; sysinfo->sblk = (reg >> 8) & 7;
sysinfo->sbbusn = 0; sysinfo->sbbusn = 0;
sysinfo->nodes = nodes; sysinfo->nodes = nodes;
sysinfo->sbdn = get_sbdn(sysinfo->sbbusn); sysinfo->sbdn = get_sbdn(sysinfo->sbbusn);
#endif
for (i = 0; i < nodes; i++) { for (i = 0; i < nodes; i++) {
cpuSetAMDPCI(i); cpuSetAMDPCI(i);

View File

@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE select HAVE_MP_TABLE
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select HAVE_DEBUG_CAR select HAVE_DEBUG_CAR

View File

@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SERIAL_CPU_INIT select SERIAL_CPU_INIT
select AMDMCT select AMDMCT
select BOARD_ROMSIZE_KB_2048 select BOARD_ROMSIZE_KB_2048
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select HAVE_DEBUG_CAR select HAVE_DEBUG_CAR

View File

@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select AMDMCT select AMDMCT
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select AMDMCT select AMDMCT
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select LIFT_BSP_APIC_ID select LIFT_BSP_APIC_ID
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select AMDMCT select AMDMCT
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select AMDMCT select AMDMCT
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select AMDMCT select AMDMCT
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select AMDMCT select AMDMCT
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE select HAVE_MP_TABLE
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_2048 select BOARD_ROMSIZE_KB_2048
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select HAVE_DEBUG_CAR select HAVE_DEBUG_CAR

View File

@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE select HAVE_MP_TABLE
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_2048 select BOARD_ROMSIZE_KB_2048
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select HAVE_DEBUG_CAR select HAVE_DEBUG_CAR

View File

@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT
config MAINBOARD_DIR config MAINBOARD_DIR

View File

@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT
config MAINBOARD_DIR config MAINBOARD_DIR

View File

@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT
config MAINBOARD_DIR config MAINBOARD_DIR

View File

@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE select HAVE_MP_TABLE
select LIFT_BSP_APIC_ID select LIFT_BSP_APIC_ID
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select AMDMCT select AMDMCT
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select AMDMCT select AMDMCT
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select AMDMCT select AMDMCT
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select GFXUMA select GFXUMA
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select BOARD_ROMSIZE_KB_512 select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select AMDMCT select AMDMCT
select SB_HT_CHAIN_UNITID_OFFSET_ONLY select SB_HT_CHAIN_UNITID_OFFSET_ONLY

View File

@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select LIFT_BSP_APIC_ID select LIFT_BSP_APIC_ID
select AMDMCT select AMDMCT
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select LIFT_BSP_APIC_ID select LIFT_BSP_APIC_ID
select AMDMCT select AMDMCT
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select QRANK_DIMM_SUPPORT select QRANK_DIMM_SUPPORT

View File

@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SERIAL_CPU_INIT select SERIAL_CPU_INIT
select AMDMCT select AMDMCT
select BOARD_ROMSIZE_KB_2048 select BOARD_ROMSIZE_KB_2048
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
config MAINBOARD_DIR config MAINBOARD_DIR

View File

@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE select HAVE_MP_TABLE
select LIFT_BSP_APIC_ID select LIFT_BSP_APIC_ID
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID select ENABLE_APIC_EXT_ID
select AMDMCT select AMDMCT
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT

View File

@ -27,7 +27,6 @@
#include <console/loglevel.h> #include <console/loglevel.h>
#include "smbus.h" #include "smbus.h"
#if CONFIG_RAMINIT_SYSINFO
/** /**
* @brief Get SouthBridge device number * @brief Get SouthBridge device number
* @param[in] bus target bus number * @param[in] bus target bus number
@ -45,7 +44,6 @@ u32 get_sbdn(u32 bus)
printk(BIOS_SPEW, "SB700 - Early.c - %s - End.\n", __func__); printk(BIOS_SPEW, "SB700 - Early.c - %s - End.\n", __func__);
return (dev >> 15) & 0x1f; return (dev >> 15) & 0x1f;
} }
#endif
/** /**
* @brief Enable A-Link Express Configuration DMA Access. * @brief Enable A-Link Express Configuration DMA Access.

View File

@ -40,7 +40,6 @@ void sb_Late_Post(void);
void sb7xx_51xx_enable_wideio(u8 wio_index, u16 base); void sb7xx_51xx_enable_wideio(u8 wio_index, u16 base);
void sb7xx_51xx_disable_wideio(u8 wio_index); void sb7xx_51xx_disable_wideio(u8 wio_index);
#if CONFIG_RAMINIT_SYSINFO
/** /**
* @brief Get SouthBridge device number, called by finalize_node_setup() * @brief Get SouthBridge device number, called by finalize_node_setup()
* @param[in] bus target bus number * @param[in] bus target bus number
@ -48,4 +47,3 @@ void sb7xx_51xx_disable_wideio(u8 wio_index);
*/ */
u32 get_sbdn(u32 bus); u32 get_sbdn(u32 bus);
#endif #endif
#endif

View File

@ -26,7 +26,6 @@
#include "cfg.h" /*sb800_cimx_config*/ #include "cfg.h" /*sb800_cimx_config*/
#include "cbmem.h" #include "cbmem.h"
#if CONFIG_RAMINIT_SYSINFO
/** /**
* @brief Get SouthBridge device number * @brief Get SouthBridge device number
* @param[in] bus target bus number * @param[in] bus target bus number
@ -45,8 +44,6 @@ u32 get_sbdn(u32 bus)
printk(BIOS_DEBUG, "SB800 - %s - %s - End.\n", __FILE__, __func__); printk(BIOS_DEBUG, "SB800 - %s - %s - End.\n", __FILE__, __func__);
return (dev >> 15) & 0x1f; return (dev >> 15) & 0x1f;
} }
#endif
/** /**
* @brief South Bridge CIMx romstage entry, * @brief South Bridge CIMx romstage entry,

View File

@ -40,7 +40,6 @@ int acpi_is_wakeup_early(void);
*/ */
void sb800_clk_output_48Mhz(void); void sb800_clk_output_48Mhz(void);
#if CONFIG_RAMINIT_SYSINFO
/** /**
* @brief Get SouthBridge device number, called by finalize_node_setup() * @brief Get SouthBridge device number, called by finalize_node_setup()
* @param[in] bus target bus number * @param[in] bus target bus number
@ -48,4 +47,3 @@ void sb800_clk_output_48Mhz(void);
*/ */
u32 get_sbdn(u32 bus); u32 get_sbdn(u32 bus);
#endif #endif
#endif