This patch adds two more devices to k8. It adds them to the makefile in
northbridge/amd/k8, and removes some multiple definitions in k8.h and
mainboard.h
Signed-off-by: Myles Watson <[EMAIL PROTECTED]>
Thanks,
Myles
Index: svn/include/arch/x86/amd/k8/k8.h
===================================================================
--- svn.orig/include/arch/x86/amd/k8/k8.h
+++ svn/include/arch/x86/amd/k8/k8.h
@@ -580,7 +580,7 @@ enum {
/* note: we'd like to have this sysinfo common to all K8, there's no need to
* have one different kind per different kind of k8 at this point.
*/
-//#include "raminit.h"
+#include "raminit.h"
struct dimm_size {
u8 per_rank; // it is rows + col + bank_lines + data lines */
@@ -608,14 +608,6 @@ struct mem_info { // pernode
u8 rsv[3];
} __attribute__((packed));
-struct mem_controller {
- unsigned node_id;
- /* NOTE: these are in "BDF" format -- i.e. bus in upper 16, devfn in upper 8 of lower 16 */
- u32 f0, f1, f2, f3;
- u32 channel0[DIMM_SOCKETS];
- u32 channel1[DIMM_SOCKETS];
-};
-
struct link_pair_st {
u32 udev;
u32 upos;
@@ -685,8 +677,9 @@ unsigned int get_core_count(void);
void fill_mem_ctrl(int controllers, struct mem_controller *ctrl_a,
const u16 *spd_addr);
int lapic_remote_read(int apicid, int reg, unsigned int *pvalue);
-void print_apicid_nodeid_coreid(unsigned apicid, struct node_core_id id,
+/*void print_apicid_nodeid_coreid(unsigned apicid, struct node_core_id id,
const char *str);
+*/
unsigned int wait_cpu_state(unsigned apicid, unsigned state);
void set_apicid_cpuid_lo(void);
/* fidvid.c */
Index: svn/mainboard/amd/serengeti/mainboard.h
===================================================================
--- svn.orig/mainboard/amd/serengeti/mainboard.h
+++ svn/mainboard/amd/serengeti/mainboard.h
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define DIMM_SOCKETS 4
-#define NODE_NUMS 16
#define CPU_SOCKET_TYPE SOCKET_AM2
#define MEM_TRAIN_SEQ 0 /* for now */
#define HW_MEM_HOLE_SIZE_AUTO_INC 0
Index: svn/northbridge/amd/k8/Makefile
===================================================================
--- svn.orig/northbridge/amd/k8/Makefile
+++ svn/northbridge/amd/k8/Makefile
@@ -27,6 +27,8 @@ STAGE2_CHIPSET_SRC += $(src)/northbridge
$(src)/northbridge/amd/k8/cpu.c \
$(src)/northbridge/amd/k8/domain.c \
$(src)/northbridge/amd/k8/pci.c \
+ $(src)/northbridge/amd/k8/mcf3.c \
+ $(src)/northbridge/amd/k8/apic.c \
$(src)/northbridge/amd/k8/util.c
endif
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
