HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59758 )
Change subject: {LGA775,i945}: Add support for x86_64 ......................................................................
{LGA775,i945}: Add support for x86_64
Change-Id: Idf8fe129d56a95f68d7a9a53ef2dbd37d124aefb Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/cpu/intel/socket_LGA775/Kconfig M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/gma.c M src/northbridge/intel/i945/northbridge.c M src/northbridge/intel/i945/raminit.c M src/northbridge/intel/i945/rcven.c 6 files changed, 12 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/59758/1
diff --git a/src/cpu/intel/socket_LGA775/Kconfig b/src/cpu/intel/socket_LGA775/Kconfig index 7d0bce7..9ec263c 100644 --- a/src/cpu/intel/socket_LGA775/Kconfig +++ b/src/cpu/intel/socket_LGA775/Kconfig @@ -5,6 +5,7 @@
config SOCKET_SPECIFIC_OPTIONS def_bool y + select HAVE_EXP_X86_64_SUPPORT select CPU_INTEL_MODEL_6FX select CPU_INTEL_MODEL_F3X select CPU_INTEL_MODEL_F4X diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig index 7a05d20..648324c 100644 --- a/src/northbridge/intel/i945/Kconfig +++ b/src/northbridge/intel/i945/Kconfig @@ -13,6 +13,7 @@ select INTEL_GMA_SSC_ALTERNATE_REF select INTEL_EDID select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT + select HAVE_EXP_X86_64_SUPPORT
config VBOOT select VBOOT_STARTS_IN_BOOTBLOCK diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index 0d014fb..cf3d9fe 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -73,7 +73,7 @@
static int intel_gma_init_lvds(struct northbridge_intel_i945_config *conf, unsigned int pphysbase, unsigned int piobase, - u8 *mmiobase, unsigned int pgfx) + u8 *mmiobase, uintptr_t pgfx) { struct edid edid; struct edid_mode *mode; @@ -95,7 +95,7 @@
printk(BIOS_SPEW, "i915lightup: graphics %p mmio %p addrport %04x physbase %08x\n", - (void *)pgfx, mmiobase, piobase, pphysbase); + (void *)(uintptr_t)pgfx, mmiobase, piobase, pphysbase);
intel_gmbus_read_edid(mmiobase + GMBUS0, GMBUS_PORT_PANEL, 0x50, edid_data, sizeof(edid_data)); @@ -356,8 +356,8 @@
if (CONFIG(LINEAR_FRAMEBUFFER)) { printk(BIOS_SPEW, "memset %p to 0x00 for %d bytes\n", - (void *)pgfx, hactive * vactive * 4); - memset((void *)pgfx, 0x00, hactive * vactive * 4); + (void *)(uintptr_t)pgfx, hactive * vactive * 4); + memset((void *)(uintptr_t)pgfx, 0x00, hactive * vactive * 4);
fb_new_framebuffer_info_from_edid(&edid, pgfx); } else { @@ -373,7 +373,7 @@
static int intel_gma_init_vga(struct northbridge_intel_i945_config *conf, unsigned int pphysbase, unsigned int piobase, - u8 *mmiobase, unsigned int pgfx) + u8 *mmiobase, uintptr_t pgfx) { int i; u32 hactive, vactive; @@ -381,7 +381,7 @@ u32 uma_size;
printk(BIOS_SPEW, "mmiobase %x addrport %x physbase %x\n", - (u32)mmiobase, piobase, pphysbase); + (u32)(uintptr_t)mmiobase, piobase, pphysbase);
gtt_setup(mmiobase);
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index e1e35e9..6c055e9 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -61,7 +61,7 @@
/* cbmem_top can be shifted downwards due to alignment. Mark the region between cbmem_top and tomk as unusable */ - cbmem_topk = ((uint32_t)cbmem_top() / KiB); + cbmem_topk = ((uintptr_t)cbmem_top() / KiB); delta_cbmem = tomk_stolen - cbmem_topk; tomk_stolen -= delta_cbmem;
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index 03419ca..7c992c6 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -70,7 +70,7 @@ udelay(1); }
-static void ram_read32(u32 offset) +static void ram_read32(uintptr_t offset) { PRINTK_DEBUG(" RAM read: %08x\n", offset);
diff --git a/src/northbridge/intel/i945/rcven.c b/src/northbridge/intel/i945/rcven.c index b95170f..ca54bad 100644 --- a/src/northbridge/intel/i945/rcven.c +++ b/src/northbridge/intel/i945/rcven.c @@ -10,7 +10,8 @@ */ static u32 sample_strobes(int channel_offset, struct sys_info *sysinfo) { - u32 reg32, addr; + u32 reg32; + uintptr_t addr; int i;
mchbar_setbits32(C0DRC1 + channel_offset, 1 << 6);
-
HAOUAS Elyes (Code Review)