coreboot March 2012

coreboot@coreboot.org

58 participants
718 discussions

Asus M2N-E problem
by Pavel Hanák 06 Mar '12

06 Mar '12

Hello, as i saw ASUS M2N-E motherboard on the list of supported motherboards, I decided to give a try to this very interesting project. I compiled coreboot via crossgcc with very default options, I only choose the vendor, the board and SeaBIOS as payload. Everything went fine and I flashed coreboot.rom via flashrom utility. Also here everything went fine. Then I did restart, but there was no VGA output. So I connected my laptop as serial console and got an output. According to this output coreboot starts, initializes some of the hardware but in some moment does softreset and this is happening in the infinite loop. I saved the output which looks like this: coreboot-4.0-2082-gccf28ba Tue Mar 6 14:42:21 CET 2012 starting... *sysinfo range: [000cf000,000cf730] bsp_apicid=0x00 Enabling routing table for node 00 done. Enabling UP settings coherent_ht_finalize done core0 started: started ap apicid: * AP 01started SBLink=00 NC node|link=00 entering optimize_link_incoherent_ht sysinfo->link_pair_num=0x1 entering ht_optimize_link pos=0x8a, unfiltered freq_cap=0x8075 pos=0x8a, filtered freq_cap=0x75 pos=0x52, unfiltered freq_cap=0x807f pos=0x52, filtered freq_cap=0x7f freq_cap1=0x75, freq_cap2=0x7f dev1 old_freq=0x0, freq=0x6, needs_reset=0x1 dev2 old_freq=0x0, freq=0x6, needs_reset=0x1 width_cap1=0x11, width_cap2=0x11 dev1 input ln_width1=0x4, ln_width2=0x4 dev1 input width=0x1 dev1 output ln_width1=0x4, ln_width2=0x4 dev1 input|output width=0x11 old dev1 input|output width=0x11 dev2 input|output width=0x11 old dev2 input|output width=0x11 after ht_optimize_link for link pair 0, reset_needed=0x1 after optimize_link_read_pointers_chain, reset_needed=0x1 mcp55_num:01 ht reset - coreboot-4.0-2082-gccf28ba Tue Mar 6 14:42:21 CET 2012 starting... *sysinfo range: [000cf000,000cf730] bsp_apicid=0x00 Enabling routing table for node 00 done. Enabling UP settings coherent_ht_finalize done core0 started: started ap apicid: * AP 01started SBLink=00 NC node|link=00 entering optimize_link_incoherent_ht sysinfo->link_pair_num=0x1 entering ht_optimize_link pos=0x8a, unfiltered freq_cap=0x8075 pos=0x8a, filtered freq_cap=0x75 pos=0x52, unfiltered freq_cap=0x7f pos=0x52, filtered freq_cap=0x7f freq_cap1=0x75, freq_cap2=0x7f dev1 old_freq=0x6, freq=0x6, needs_reset=0x0 dev2 old_freq=0x6, freq=0x6, needs_reset=0x0 width_cap1=0x11, width_cap2=0x11 dev1 input ln_width1=0x4, ln_width2=0x4 dev1 input width=0x1 dev1 output ln_width1=0x4, ln_width2=0x4 dev1 input|output width=0x11 old dev1 input|output width=0x11 dev2 input|output width=0x11 old dev2 input|output width=0x11 after ht_optimize_link for link pair 0, reset_needed=0x0 after optimize_link_read_pointers_chain, reset_needed=0x0 mcp55_num:01 Ram1.00 setting up CPU 00 northbridge registers done. Ram2.00 sdram_set_spd_registers: paramx :000cef10 Enable 64MuxMode & BurstLength32 Unbuffered 266MHz 266MHz set_ecc spd_device: 0x53 Interleaving disabled RAM end at 0x00080000 kB Ram3 ECC enabled Initializing memory: done Setting variable MTRR 2, base: 0MB, range: 512MB, type WB set DQS timing:RcvrEn:Pass1: 00 CTLRMaxDelay=06 done set DQS timing:DQSPos: 00 TrainDQSRdWrPos: buf_a:000ce9d0 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 done set DQS timing:RcvrEn:Pass2: 00 CTLRMaxDelay=5a done Total DQS Training : tsc [00]=00000000151d874b Total DQS Training : tsc [01]=00000000159134eb Total DQS Training : tsc [02]=0000000019f3270b Total DQS Training : tsc [03]=000000001a93b1df Ram4 v_esp=000cef58 testx = 5a5a5a5a Copying data from cache to RAM -- switching to use RAM as stack... DoneM ˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙ INIT detected from --- { APICID = 00 NODEID = 00 COREID = 00} --- Issuing SOFT_RESET... coreboot-4.0-2082-gccf28ba Tue Mar 6 14:42:21 CET 2012 starting... *sysinfo range: [000cf000,000cf730] bsp_apicid=0x00 Enabling routing table for node 00 done. Enabling UP settings coherent_ht_finalize done core0 started: started ap apicid: * AP 01started SBLink=00 NC node|link=00 entering optimize_link_incoherent_ht sysinfo->link_pair_num=0x1 entering ht_optimize_link pos=0x8a, unfiltered freq_cap=0x8075 pos=0x8a, filtered freq_cap=0x75 pos=0x52, unfiltered freq_cap=0x7f pos=0x52, filtered freq_cap=0x7f freq_cap1=0x75, freq_cap2=0x7f dev1 old_freq=0x6, freq=0x6, needs_reset=0x0 dev2 old_freq=0x6, freq=0x6, needs_reset=0x0 width_cap1=0x11, width_cap2=0x11 dev1 input ln_width1=0x4, ln_width2=0x4 dev1 input width=0x1 dev1 output ln_width1=0x4, ln_width2=0x4 dev1 input|output width=0x11 old dev1 input|output width=0x11 dev2 input|output width=0x11 old dev2 input|output width=0x11 after ht_optimize_link for link pair 0, reset_needed=0x0 after optimize_link_read_pointers_chain, reset_needed=0x0 mcp55_num:01 Ram1.00 setting up CPU 00 northbridge registers done. Ram2.00 sdram_set_spd_registers: paramx :000cef10 Enable 64MuxMode & BurstLength32 Unbuffered 266MHz 266MHz set_ecc spd_device: 0x53 Interleaving disabled RAM end at 0x00080000 kB Ram3 ECC enabled Initializing memory: done Setting variable MTRR 2, base: 0MB, range: 512MB, type WB set DQS timing:RcvrEn:Pass1: 00 CTLRMaxDelay=06 done set DQS timing:DQSPos: 00 TrainDQSRdWrPos: buf_a:000ce9d0 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 done set DQS timing:RcvrEn:Pass2: 00 CTLRMaxDelay=5a done Total DQS Training : tsc [00]=00000000151e5153 Total DQS Training : tsc [01]=00000000159202d7 Total DQS Training : tsc [02]=0000000019f3b027 Total DQS Training : tsc [03]=000000001a941b7b Ram4 v_esp=000cef58 testx = 5a5a5a5a Copying data from cache to RAM -- switching to use RAM as stack... INIT detected from --- { APICID = 00 NODEID = 00 COREID = 00} --- Issuing SOFT_RESET... coreboot-4.0-2082-gccf28ba Tue Mar 6 14:42:21 CET 2012 starting... *sysinfo range: [000cf000,000cf730] bsp_apicid=0x00 Enabling routing table for node 00 done. Enabling UP settings coherent_ht_finalize done core0 started: started ap apicid: * AP 01started SBLink=00 NC node|link=00 entering optimize_link_incoherent_ht sysinfo->link_pair_num=0x1 entering ht_optimize_link pos=0x8a, unfiltered freq_cap=0x8075 pos=0x8a, filtered freq_cap=0x75 pos=0x52, unfiltered freq_cap=0x7f pos=0x52, filtered freq_cap=0x7f freq_cap1=0x75, freq_cap2=0x7f dev1 old_freq=0x6, freq=0x6, needs_reset=0x0 dev2 old_freq=0x6, freq=0x6, needs_reset=0x0 width_cap1=0x11, width_cap2=0x11 dev1 input ln_width1=0x4, ln_width2=0x4 dev1 input width=0x1 dev1 output ln_width1=0x4, ln_width2=0x4 dev1 input|output width=0x11 old dev1 input|output width=0x11 dev2 input|output width=0x11 old dev2 input|output width=0x11 after ht_optimize_link for link pair 0, reset_needed=0x0 after optimize_link_read_pointers_chain, reset_needed=0x0 mcp55_num:01 Ram1.00 setting up CPU 00 northbridge registers done. Ram2.00 sdram_set_spd_registers: paramx :000cef10 Enable 64MuxMode & BurstLength32 Unbuffered 266MHz 266MHz set_ecc spd_device: 0x53 Interleaving disabled RAM end at 0x00080000 kB Ram3 ECC enabled Initializing memory: done Setting variable MTRR 2, base: 0MB, range: 512MB, type WB set DQS timing:RcvrEn:Pass1: 00 CTLRMaxDelay=06 done set DQS timing:DQSPos: 00 TrainDQSRdWrPos: buf_a:000ce9d0 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 done set DQS timing:RcvrEn:Pass2: 00 CTLRMaxDelay=5a done Total DQS Training : tsc [00]=00000000151bd15f Total DQS Training : tsc [01]=00000000158f7f1f Total DQS Training : tsc [02]=0000000019f16f1f Total DQS Training : tsc [03]=000000001a91d8e7 Ram4 v_esp=000cef58 testx = 5a5a5a5a Copying data from cache to RAM -- switching to use RAM as stack... DneM ˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙ß˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙ INIT detected from --- { APICID = 00 NODEID = 00 COREID = 00} --- Issuing SOFT_RESET... coreboot-4.0-2082-gccf28ba Tue Mar 6 14:42:21 CET 2012 starting... *sysinfo range: [000cf000,000cf730] bsp_apicid=0x00 Enabling routing table for node 00 done. Enabling UP settings coherent_ht_finalize done core0 started: started ap apicid: * AP 01started SBLink=00 NC node|link=00 entering optimize_link_incoherent_ht sysinfo->link_pair_num=0x1 entering ht_optimize_link pos=0x8a, unfiltered freq_cap=0x8075 pos=0x8a, filtered freq_cap=0x75 pos=0x52, unfiltered freq_cap=0x7f pos=0x52, filtered freq_cap=0x7f freq_cap1=0x75, freq_cap2=0x7f dev1 old_freq=0x6, freq=0x6, needs_reset=0x0 dev2 old_freq=0x6, freq=0x6, needs_reset=0x0 width_cap1=0x11, width_cap2=0x11 dev1 input ln_width1=0x4, ln_width2=0x4 dev1 input width=0x1 dev1 output ln_width1=0x4, ln_width2=0x4 dev1 input|output width=0x11 old dev1 input|output width=0x11 dev2 input|output width=0x11 old dev2 input|output width=0x11 after ht_optimize_link for link pair 0, reset_needed=0x0 after optimize_link_read_pointers_chain, reset_needed=0x0 mcp55_num:01 Ram1.00 setting up CPU 00 northbridge registers done. Ram2.00 sdram_set_spd_registers: paramx :000cef10 Enable 64MuxMode & BurstLength32 Unbuffered 266MHz 266MHz set_ecc spd_device: 0x53 Interleaving disabled RAM end at 0x00080000 kB Ram3 ECC enabled Initializing memory: done Setting variable MTRR 2, base: 0MB, range: 512MB, type WB set DQS timing:RcvrEn:Pass1: 00 CTLRMaxDelay=06 done set DQS timing:DQSPos: 00 TrainDQSRdWrPos: buf_a:000ce9d0 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 done set DQS timing:RcvrEn:Pass2: 00 CTLRMaxDelay=5a done Total DQS Training : tsc [00]=00000000151f1cff Total DQS Training : tsc [01]=000000001592ca9f Total DQS Training : tsc [02]=0000000019f5cac3 Total DQS Training : tsc [03]=000000001a969e5b Ram4 v_esp=000cef58 testx = 5a5a5a5a Copying data from cache to RAM -- switching to use RAM as stack... Ene t INIT detected from --- { APICID = 00 NODEID = 00 COREID = 00} --- Issuing SOFT_RESET... coreboot-4.0-2082-gccf28ba Tue Mar 6 14:42:21 CET 2012 starting... *sysinfo range: [000cf000,000cf730] bsp_apicid=0x00 Enabling routing table for node 00 done. Enabling UP settings coherent_ht_finalize done core0 started: started ap apicid: * AP 01started SBLink=00 NC node|link=00 entering optimize_link_incoherent_ht sysinfo->link_pair_num=0x1 entering ht_optimize_link pos=0x8a, unfiltered freq_cap=0x8075 pos=0x8a, filtered freq_cap=0x75 pos=0x52, unfiltered freq_cap=0x7f pos=0x52, filtered freq_cap=0x7f freq_cap1=0x75, freq_cap2=0x7f dev1 old_freq=0x6, freq=0x6, needs_reset=0x0 dev2 old_freq=0x6, freq=0x6, needs_reset=0x0 width_cap1=0x11, width_cap2=0x11 dev1 input ln_width1=0x4, ln_width2=0x4 dev1 input width=0x1 dev1 output ln_width1=0x4, ln_width2=0x4 dev1 input|output width=0x11 old dev1 input|output width=0x11 dev2 input|output width=0x11 old dev2 input|output width=0x11 after ht_optimize_link for link pair 0, reset_needed=0x0 after optimize_link_read_pointers_chain, reset_needed=0x0 mcp55_num:01 Ram1.00 setting up CPU 00 northbridge registers done. Ram2.00 sdram_set_spd_registers: paramx :000cef10 Enable 64MuxMode & BurstLength32 Unbuffered 266MHz 266MHz set_ecc spd_device: 0x53 Interleaving disabled RAM end at 0x00080000 kB Ram3 ECC enabled Initializing memory: done Setting variable MTRR 2, base: 0MB, range: 512MB, type WB set DQS timing:RcvrEn:Pass1: 00 CTLRMaxDelay=06 done set DQS timing:DQSPos: 00 TrainDQSRdWrPos: buf_a:000ce9d0 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 TrainDQSPos: MutualCSPassW[48] :000ce8b8 done set DQS timing:RcvrEn:Pass2: 00 CTLRMaxDelay=5a done Total DQS Training : tsc [00]=00000000151dc99f Total DQS Training : tsc [01]=0000000015917723 Total DQS Training : tsc [02]=0000000019f308b7 Total DQS Training : tsc [03]=000000001a936dab Ram4 v_esp=000cef58 testx = 5a5a5a5a Copying data from cache to RAM -- switching to use RAM as stack... DoDsabClearing initial memory region: Done Loading image. Searching for fallback/coreboot_ram Check cmos_layout.bin Check fallback/romstage Check fallback/coreboot_ram Stage: loading fallback/coreboot_ram @ 0x100000 (278528 bytes), entry @ 0x100000 Stage: done loading. Jumping to image. INIT detected from --- { APICID = 00 NODEID = 00 COREID = 00} --- Issuing SOFT_RESET... .... Could anybody explain me what is wrong? I am not subscribed to the mailing list, so please use my email address as Cc. Thank you. Pavel

1 0

New patch to review for filo: fd0f87b Fix some compiler warnings
by Mathias Krause 06 Mar '12

06 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/747 -gerrit commit fd0f87b5695eeb3ec120dcdbb9409473582c4949 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 16:10:27 2012 +0100 Fix some compiler warnings The makefile cleanup brought up quite a few compiler warnings about unused functions and/or variables, undefined behaviour, missing return values and type mismatches. Fix those. Change-Id: I0e01b5fafd9d7594ec41c01d849f6ef9a2d56299 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- drivers/flash/lxflash.c | 14 ++------------ fs/blockdev.c | 14 +++++++------- fs/fsys_cramfs.c | 6 +++--- fs/fsys_ext2fs.c | 5 ++--- fs/fsys_xfs.c | 2 +- fs/mini_inflate.c | 5 ++++- i386/wince_load.c | 2 +- include/fs.h | 2 +- main/grub/builtins.c | 6 +++--- main/grub/completions.c | 2 +- main/grub/grub.c | 2 ++ 11 files changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/flash/lxflash.c b/drivers/flash/lxflash.c index ba76741..df18c8d 100644 --- a/drivers/flash/lxflash.c +++ b/drivers/flash/lxflash.c @@ -345,16 +345,6 @@ static __inline void NAND_writeByte(u8 b) outb(b, g_baseAddr + IO_NAND_DATA); } -static void NAND_writeData(u8 *pData, int nSize) -{ - int i; - if(nSize > 528) return; // oversized buffer? - - // write byte by byte, pedestrian way - for(i=0; i<nSize; i++) - NAND_writeByte(pData[i]); -} - //////////////////////////////////////////////////////////////////////////////// // // NAND_getStatus() @@ -521,7 +511,7 @@ __inline int IsECCWritten(u8 *pECC) //////////////////////////////////////////////////////////////////////////////// // -int NAND_close(void) +void NAND_close(void) { if (g_chipID >= 0) wrmsr(MSR_DIVIL_LBAR_FLSH0 + g_chipID, g_orig_flsh); @@ -650,7 +640,7 @@ int NAND_readPage(u32 pageAddr, u8 *pPageBuff) // sanity check if (pageAddr < (g_flashInfo.numBlocks * g_flashInfo.pagesPerBlock)) { - u8 bData = 0, bBadBlock = 0, bReserved = 0; + u8 bBadBlock = 0, bReserved = 0; u8 addr1 = (u8)(pageAddr & 0xff); u8 addr2 = (u8)((pageAddr >> 8) & 0xff); diff --git a/fs/blockdev.c b/fs/blockdev.c index 21d2c29..e1e9d57 100644 --- a/fs/blockdev.c +++ b/fs/blockdev.c @@ -385,8 +385,10 @@ static void *read_sector(unsigned long sector) int count = (NUM_CACHE-hash>8)?8:(NUM_CACHE-hash); int ret; ret = ide_read_blocks(dev_drive, sector, count, buf); - if (ret == 2) - goto nomedium; + if (ret == 2) { + printf("No disk in drive.\n"); + goto err_out; + } if (ret != 0) goto readerr; while (--count>0) { @@ -426,11 +428,9 @@ static void *read_sector(unsigned long sector) readerr: printf("Disk read error dev=%d drive=%d sector=%lu\n", dev_type, dev_drive, sector); - flush_cache(); - dev_name[0] = '\0'; /* force re-open the device next time */ - return 0; - nomedium: - printf("No disk in drive.\n"); +#ifdef CONFIG_IDE_NEW_DISK + err_out: +#endif flush_cache(); dev_name[0] = '\0'; /* force re-open the device next time */ return 0; diff --git a/fs/fsys_cramfs.c b/fs/fsys_cramfs.c index c5a9247..d7cb19b 100644 --- a/fs/fsys_cramfs.c +++ b/fs/fsys_cramfs.c @@ -103,8 +103,8 @@ struct cramfs_buf { struct cramfs_inode inode; char name[NAMELEN_MAX + 1]; u32 block_ptrs[CRAMFS_MAX_BLOCKS]; - char data[CRAMFS_BLOCK * 2]; - char temp[CRAMFS_BLOCK]; + unsigned char data[CRAMFS_BLOCK * 2]; + unsigned char temp[CRAMFS_BLOCK]; /* menu.lst is read 1 byte at a time, try to aleviate * * the performance problem */ long cached_block; /* the uncompressed block in cramfs_buf->data */ @@ -246,7 +246,7 @@ cramfs_read (char *buf, int len) memcpy(buf, cramfs_buf->temp + (filepos % CRAMFS_BLOCK), size); } else { /* just another full block read */ - size = decompress_block(buf, cramfs_buf->data + 2, memcpy); + size = decompress_block((unsigned char *)buf, cramfs_buf->data + 2, memcpy); } if (size < 0) { debug_cramfs("error in decomp (error %d)\n", size); diff --git a/fs/fsys_ext2fs.c b/fs/fsys_ext2fs.c index 30a78ec..96e2e68 100644 --- a/fs/fsys_ext2fs.c +++ b/fs/fsys_ext2fs.c @@ -631,10 +631,9 @@ static int ext4fs_block_map (int logical_block) { struct ext4_extent_header *eh; - struct ext4_extent *ex, *extent; - struct ext4_extent_idx *ei, *index; + struct ext4_extent_idx *ei; + struct ext4_extent *ex; int depth; - int i; #ifdef E2DEBUG unsigned char *i; diff --git a/fs/fsys_xfs.c b/fs/fsys_xfs.c index 4011479..c71af98 100644 --- a/fs/fsys_xfs.c +++ b/fs/fsys_xfs.c @@ -365,7 +365,7 @@ next_dentry (xfs_ino_t *ino) default: namelen = sfe->namelen; *ino = sf_ino ((char *)sfe, namelen); - name = sfe->name; + name = (char *) sfe->name; sfe = (xfs_dir2_sf_entry_t *) ((char *)sfe + namelen + 11 - xfs.i8param); } diff --git a/fs/mini_inflate.c b/fs/mini_inflate.c index 17e3390..eae371d 100644 --- a/fs/mini_inflate.c +++ b/fs/mini_inflate.c @@ -185,7 +185,10 @@ static void decompress_huffman(struct bitstream *stream, unsigned char *dest) dist += (symbol % 2) << ((symbol - 2) >> 1); } stream->decoded += length; - for (i = 0; i < length; i++) *(dest++) = dest[-dist]; + for (i = 0; i < length; i++) { + *dest = dest[-dist]; + dest++; + } } } while (symbol != 256); /* 256 is the end of the data block */ } diff --git a/i386/wince_load.c b/i386/wince_load.c index f3e5475..993815f 100644 --- a/i386/wince_load.c +++ b/i386/wince_load.c @@ -240,7 +240,7 @@ void wince_init_bootarg(u32 entryPoint) g_pBootArgs->dwEdbgBaseAddr = 0; // set the KITL device name to something adequate - strcpy(g_pBootArgs->szDeviceNameRoot, "FILO"); + strcpy((char *) g_pBootArgs->szDeviceNameRoot, "FILO"); g_pBootArgs->dwSig = BOOTARG_SIGNATURE; g_pBootArgs->dwLen = sizeof(BOOT_ARGS); diff --git a/include/fs.h b/include/fs.h index 1bd8ec7..3138ab5 100644 --- a/include/fs.h +++ b/include/fs.h @@ -46,7 +46,7 @@ int usb_read(const int drive, const sector_t sector, const int size, void *buffe #ifdef CONFIG_FLASH_DISK int flash_probe(int drive); int flash_read(int drive, sector_t sector, void *buffer); -int NAND_close(void); +void NAND_close(void); #endif #define DISK_IDE 1 diff --git a/main/grub/builtins.c b/main/grub/builtins.c index e2f4612..3451071 100644 --- a/main/grub/builtins.c +++ b/main/grub/builtins.c @@ -379,9 +379,9 @@ static int dumpmem_func(char *arg, int flags) } // FIXME - if (!safe_parse_maxint(&string_argv[1], &mem_base)) + if (!safe_parse_maxint(&string_argv[1], (int *)&mem_base)) return 1; - if (!safe_parse_maxint(&string_argv[2], &mem_len)) + if (!safe_parse_maxint(&string_argv[2], (int *)&mem_len)) return 1; grub_printf("Dumping memory at 0x%08x (0x%x bytes)\n", @@ -668,7 +668,7 @@ void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev, int appe char drivername[16]; int disk, part; unsigned long addr; - int i, len; + int i; memset(devicename, 0, 16); memset(drivername, 0, 16); diff --git a/main/grub/completions.c b/main/grub/completions.c index a3aeba2..abfe1d9 100644 --- a/main/grub/completions.c +++ b/main/grub/completions.c @@ -120,7 +120,7 @@ int print_completions(int is_filename, int is_completion) if (*buf == '(' && (incomplete || ! *ptr)) { if (!part_choice) { /* disk completions */ - int disk_no, i, j; + int i, j; if (!is_completion) grub_printf (" Possible disks are: "); diff --git a/main/grub/grub.c b/main/grub/grub.c index b4bee04..b629435 100644 --- a/main/grub/grub.c +++ b/main/grub/grub.c @@ -201,6 +201,7 @@ old: } +#ifdef CONFIG_NON_INTERACTIVE static void reboot(void) { for (;;) { grub_printf("Press any key to reboot.\n"); @@ -210,6 +211,7 @@ static void reboot(void) { } } } +#endif /* Define if there is user specified preset menu string */ /* #undef PRESET_MENU_STRING */

1 0

New patch to review for filo: 447421d makefile: build system cleanup
by Mathias Krause 06 Mar '12

06 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/746 -gerrit commit 447421d98e73791e8483a263e4a293700847a9d0 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 13:37:05 2012 +0100 makefile: build system cleanup This patch cleans up the include hierarchies for the Makefile system to decrease the knowledge of the main Makefile about every subdirectory. This allows us to add new drivers without the need to patch the main Makefile but, instead, just add a line to the appropriate Makeflie.inc. Also all standard make variables are cleanup up (e.g. CFLAGS, CPPFLAGS,..). This, in turn, allows modifying them as needed in the included Makefile.inc to add flags or even library dependencies. It's no Linux Kbuild yet, but we're close ;) Change-Id: I67be4fcdd07d6960a7e46bfb6a3c0ea41f280e2b Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 63 +++++++++++++++++++++----------------------- drivers/Makefile.inc | 5 ++- drivers/flash/Makefile.inc | 1 - i386/Makefile.inc | 3 +- main/Makefile.inc | 5 ++- main/grub/Makefile.inc | 2 - 6 files changed, 38 insertions(+), 41 deletions(-) diff --git a/Makefile b/Makefile index 46a265f..20b21bf 100644 --- a/Makefile +++ b/Makefile @@ -49,17 +49,27 @@ ifneq ($(Q),) endif endif +try-run = $(shell set -e; \ + TMP=".$$$$.tmp"; \ + if ($(1)) > /dev/null 2>&1; \ + then echo "$(2)"; \ + else echo "$(3)"; \ + fi; \ + rm -rf "$$TMP") + +cc-option = $(call try-run,$(CC) $(1) -S -xc /dev/null -o "$$TMP",$(1),$(2)) + $(if $(wildcard .xcompile),,$(shell bash util/xcompile/xcompile > .xcompile)) include .xcompile -CROSS_PREFIX = +CROSS_PREFIX ?= CC ?= $(CROSS_PREFIX)gcc -m32 AS ?= $(CROSS_PREFIX)as --32 LD ?= $(CROSS_PREFIX)ld -belf32-i386 -STRIP ?= $(CROSS_PREFIX)strip NM ?= $(CROSS_PREFIX)nm -HOSTCC = gcc -HOSTCXX = g++ +STRIP ?= $(CROSS_PREFIX)strip +HOSTCC ?= gcc +HOSTCXX ?= g++ HOSTCFLAGS := -I$(srck) -I$(objk) -pipe HOSTCXXFLAGS := -I$(srck) -I$(objk) -pipe @@ -72,45 +82,32 @@ else include $(src)/.config -ARCHDIR-$(CONFIG_TARGET_I386) := i386 - -PLATFORM-y += $(ARCHDIR-y)/Makefile.inc -TARGETS-y := - -BUILD-y := main/Makefile.inc main/grub/Makefile.inc fs/Makefile.inc -BUILD-y += drivers/Makefile.inc -BUILD-y += drivers/flash/Makefile.inc - -include $(PLATFORM-y) $(BUILD-y) - LIBPAYLOAD_PREFIX ?= $(obj)/libpayload LIBPAYLOAD = $(LIBPAYLOAD_PREFIX)/lib/libpayload.a INCPAYLOAD = $(LIBPAYLOAD_PREFIX)/include LIBGCC = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) +GCCINCDIR = $(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include -OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y)) -INCLUDES := -I$(INCPAYLOAD) -I$(INCPAYLOAD)/$(ARCHDIR-y) -Iinclude -I$(ARCHDIR-y)/include -Ibuild -INCLUDES += -I$(GCCINCDIR) +ARCHDIR-$(CONFIG_TARGET_I386) := i386 -try-run= $(shell set -e; \ -TMP=".$$$$.tmp"; \ -if ($(1)) > /dev/null 2>&1; \ -then echo "$(2)"; \ -else echo "$(3)"; \ -fi; rm -rf "$$TMP") +CPPFLAGS := -nostdinc -imacros $(obj)/config.h +CPPFLAGS += -I$(INCPAYLOAD) -I$(INCPAYLOAD)/$(ARCHDIR-y) +CPPFLAGS += -I$(ARCHDIR-y)/include -Iinclude -I$(obj) +CPPFLAGS += -I$(GCCINCDIR) -cc-option= $(call try-run,\ -$(CC) $(1) -S -xc /dev/null -o "$$TMP", $(1), $(2)) +CFLAGS := -Wall -Wshadow -Os -pipe +CFLAGS += -fomit-frame-pointer -fno-common -ffreestanding -fno-strict-aliasing +CFLAGS += $(call cc-option, -fno-stack-protector,) -STACKPROTECT += $(call cc-option, -fno-stack-protector,) +LIBS := $(LIBPAYLOAD) $(LIBGCC) -GCCINCDIR = $(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include -CPPFLAGS = -nostdinc -imacros $(obj)/config.h -Iinclude -I$(GCCINCDIR) -MD -CFLAGS += $(STACKPROTECT) $(INCLUDES) -Wall -Os -fomit-frame-pointer -fno-common -ffreestanding -fno-strict-aliasing -Wshadow -pipe +SUBDIRS-y += main/ fs/ drivers/ +SUBDIRS-y += $(ARCHDIR-y)/ -TARGET = $(obj)/filo.elf +$(foreach subdir,$(SUBDIRS-y),$(eval include $(subdir)/Makefile.inc)) -HAVE_LIBCONFIG := $(wildcard $(LIBCONFIG_PATH)) +TARGET := $(obj)/filo.elf +OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y)) all: prepare $(TARGET) @@ -132,7 +129,7 @@ endif $(obj)/filo: $(OBJS) $(LIBPAYLOAD) printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) + $(LD) -N -T $(ARCHDIR-y)/ldscript $(OBJS) --start-group $(LIBS) --end-group -o $@ $(TARGET): $(obj)/filo $(obj)/filo.map printf " STRIP $(subst $(shell pwd)/,,$(@))\n" diff --git a/drivers/Makefile.inc b/drivers/Makefile.inc index 8f814e0..f93c287 100644 --- a/drivers/Makefile.inc +++ b/drivers/Makefile.inc @@ -16,9 +16,10 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # +include drivers/flash/Makefile.inc + TARGETS-$(CONFIG_IDE_DISK) += drivers/ide.o TARGETS-$(CONFIG_IDE_NEW_DISK) += drivers/ide_new.o TARGETS-$(CONFIG_VIA_SOUND) += drivers/via-sound.o TARGETS-$(CONFIG_USB_DISK) += drivers/usb.o -TARGETS-y += drivers/intel.o - +TARGETS-$(CONFIG_TARGET_I386) += drivers/intel.o diff --git a/drivers/flash/Makefile.inc b/drivers/flash/Makefile.inc index a862773..48bf1a1 100644 --- a/drivers/flash/Makefile.inc +++ b/drivers/flash/Makefile.inc @@ -17,4 +17,3 @@ # TARGETS-$(CONFIG_FLASH_DISK) += drivers/flash/lxflash.o - diff --git a/i386/Makefile.inc b/i386/Makefile.inc index 8f1a305..ce3e5c8 100644 --- a/i386/Makefile.inc +++ b/i386/Makefile.inc @@ -16,7 +16,8 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -TARGETS-y += i386/context.o i386/switch.S.o i386/segment.o i386/timer.o i386/sys_info.o +TARGETS-$(CONFIG_TARGET_I386) += i386/context.o i386/switch.S.o i386/segment.o +TARGETS-$(CONFIG_TARGET_I386) += i386/timer.o i386/sys_info.o TARGETS-$(CONFIG_LINUX_LOADER) += i386/linux_load.o TARGETS-$(CONFIG_WINCE_LOADER) += i386/wince_load.o TARGETS-$(CONFIG_ARTEC_BOOT) += i386/artecboot.o diff --git a/main/Makefile.inc b/main/Makefile.inc index e2fab04..fc7c851 100644 --- a/main/Makefile.inc +++ b/main/Makefile.inc @@ -16,8 +16,9 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -TARGETS-$(CONFIG_MULTIBOOT_IMAGE) += main/mb_hdr.o +include main/grub/Makefile.inc + TARGETS-y += main/filo.o main/strtox.o TARGETS-y += main/elfload.o main/ipchecksum.o TARGETS-$(CONFIG_SUPPORT_SOUND) += main/sound.o - +TARGETS-$(CONFIG_MULTIBOOT_IMAGE) += main/mb_hdr.o diff --git a/main/grub/Makefile.inc b/main/grub/Makefile.inc index b79f08f..00273f3 100644 --- a/main/grub/Makefile.inc +++ b/main/grub/Makefile.inc @@ -16,9 +16,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - TARGETS-$(CONFIG_USE_GRUB) += main/grub/grub.o main/grub/builtins.o TARGETS-$(CONFIG_USE_GRUB) += main/grub/cmdline.o main/grub/char_io.o TARGETS-$(CONFIG_USE_GRUB) += main/grub/completions.o TARGETS-$(CONFIG_USE_MD5_PASSWORDS) += main/grub/md5.o -

1 0

New patch to review for filo: 0c3a13b makefile: recreate version.h only when needed
by Mathias Krause 06 Mar '12

06 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/745 -gerrit commit 0c3a13b773ee21af4c1380c01bacc2d9d00f6784 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 13:26:48 2012 +0100 makefile: recreate version.h only when needed Don't recreate version.h on each make invokation but only when needed, i.e. when the make variables have changed. Also make version.h a prerequisite for the object files to rebuild them when the version information changes. Change-Id: I27a057be25902233ac0751db8061e9ad4cd50642 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b4a468..46a265f 100644 --- a/Makefile +++ b/Makefile @@ -112,8 +112,8 @@ TARGET = $(obj)/filo.elf HAVE_LIBCONFIG := $(wildcard $(LIBCONFIG_PATH)) -all: prepare $(obj)/version.h $(TARGET) +all: prepare $(TARGET) HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD)) ifneq ($(strip $(HAVE_LIBPAYLOAD)),) @@ -143,7 +143,7 @@ include util/kconfig/Makefile $(KCONFIG_AUTOHEADER): $(src)/.config $(MAKE) silentoldconfig -$(OBJS): $(KCONFIG_AUTOHEADER) | libpayload +$(OBJS): $(KCONFIG_AUTOHEADER) $(obj)/version.h | libpayload $(obj)/%.o: $(src)/%.c printf " CC $(subst $(shell pwd)/,,$(@))\n" $(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $< @@ -158,7 +158,8 @@ $(obj)/%.map: $(obj)/% endif -$(obj)/version.h: FORCE +$(obj)/version.h: Makefile + printf " GEN $(subst $(shell pwd)/,,$(@))\n" echo '#define PROGRAM_NAME "$(PROGRAM_NAME)"' > $@ echo '#define PROGRAM_VERSION "$(PROGRAM_VERSION)"' >> $@ echo '#define PROGRAM_VERSION_FULL "$(PROGRAM_VERSION) $(BUILD_INFO)"' >> $@ @@ -171,6 +172,7 @@ prepare: $(sort $(dir $(OBJS))) $(obj)/util/kconfig/lxdialog/ clean: rm -rf $(sort $(dir $(OBJS))) $(obj)/util + rm -rf $(obj)/version.h distclean: clean rm -rf $(obj)

1 0

New patch to review for filo: 2bc5424 makefile: avoid unnecessary rebuilds
by Mathias Krause 06 Mar '12

06 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/744 -gerrit commit 2bc5424a1d455622e8168e4c30873f9fff1a15ac Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 13:14:47 2012 +0100 makefile: avoid unnecessary rebuilds The make target libpayload is a phony target which makes filo and all the object files get rebuild on every make invokation. Avoid this by lifting the dependencies and rebuild, i.e. relink filo only when libpayload has changed. Also, when building libpayload as a prerequisite, use $(obj) as DESTDIR, as the user might want to use a different build directory then $(src)/build. Change-Id: Ifa42362ba1d8c88c9996d645314cfdbdf2994759 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 3461614..3b4a468 100644 --- a/Makefile +++ b/Makefile @@ -118,18 +118,19 @@ all: prepare $(obj)/version.h $(TARGET) HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD)) ifneq ($(strip $(HAVE_LIBPAYLOAD)),) libpayload: - @printf "Found Libpayload $(LIBPAYLOAD).\n" + @printf "Found libpayload as $(LIBPAYLOAD)\n" else -libpayload: $(src)/$(LIB_CONFIG) - printf "building libpayload.\n" +libpayload: $(LIBPAYLOAD) +$(LIBPAYLOAD): $(src)/$(LIB_CONFIG) + @printf "Building libpayload...\n" $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build distclean cp lib.config $(LIBCONFIG_PATH)/.config mkdir -p $(LIBCONFIG_PATH)/build $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build oldconfig - $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build DESTDIR=$(src)/build install + $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build DESTDIR=$(obj) install endif -$(obj)/filo: $(OBJS) libpayload +$(obj)/filo: $(OBJS) $(LIBPAYLOAD) printf " LD $(subst $(shell pwd)/,,$(@))\n" $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) @@ -142,7 +143,7 @@ include util/kconfig/Makefile $(KCONFIG_AUTOHEADER): $(src)/.config $(MAKE) silentoldconfig -$(OBJS): $(KCONFIG_AUTOHEADER) libpayload +$(OBJS): $(KCONFIG_AUTOHEADER) | libpayload $(obj)/%.o: $(src)/%.c printf " CC $(subst $(shell pwd)/,,$(@))\n" $(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $< @@ -177,5 +178,4 @@ distclean: clean FORCE: -.PHONY: $(PHONY) prepare clean distclean FORCE - +.PHONY: $(PHONY) prepare clean distclean libpayload FORCE

1 0

New patch to review for filo: 27ba025 makefile: create filo.map in separate step
by Mathias Krause 06 Mar '12

06 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/743 -gerrit commit 27ba025fa013ec555e28983942a5b1d4e006864a Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 09:42:18 2012 +0100 makefile: create filo.map in separate step Instead of copying files around and creating files make is not aware of, use a dedicated target and rule to create filo.map. Also skip piping the result through sort as nm as an option to sort the symbols itself. Also drop the bogus dependency to libpayload as filo.elf is only the striped version of filo and needs no further linking. Change-Id: If010b4ce269a47a99de06db16e0290c3fd90b559 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6603612..3461614 100644 --- a/Makefile +++ b/Makefile @@ -133,11 +133,9 @@ $(obj)/filo: $(OBJS) libpayload printf " LD $(subst $(shell pwd)/,,$(@))\n" $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) -$(TARGET): $(obj)/filo libpayload - cp $(obj)/filo $@ - $(NM) $(obj)/filo | sort > $(obj)/filo.map +$(TARGET): $(obj)/filo $(obj)/filo.map printf " STRIP $(subst $(shell pwd)/,,$(@))\n" - $(STRIP) -s $@ + $(STRIP) -s $< -o $@ include util/kconfig/Makefile @@ -153,6 +151,10 @@ $(obj)/%.S.o: $(src)/%.S printf " AS $(subst $(shell pwd)/,,$(@))\n" $(AS) $(ASFLAGS) -o $@ $< +$(obj)/%.map: $(obj)/% + printf " SYMS $(subst $(shell pwd)/,,$(@))\n" + $(NM) -n $< > $@ + endif $(obj)/version.h: FORCE

1 0

New patch to review for filo: ba947af makefile: create directories on demand
by Mathias Krause 06 Mar '12

06 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/742 -gerrit commit ba947af8efc8d7d5b403150ed16a8c61cdd9750d Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 09:31:38 2012 +0100 makefile: create directories on demand Use makefile dependencies to created needed directories instead of trying to recreate them on each make invocation. Change-Id: Ia06b1042f2a2c4905f5c8277a48ec4b8188f3079 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 41486a9..6603612 100644 --- a/Makefile +++ b/Makefile @@ -161,16 +161,16 @@ $(obj)/version.h: FORCE echo '#define PROGRAM_VERSION_FULL "$(PROGRAM_VERSION) $(BUILD_INFO)"' >> $@ echo '#define BUILD_INFO "$(BUILD_INFO)"' >> $@ -prepare: - mkdir -p $(obj)/util/kconfig/lxdialog - mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash - mkdir -p $(obj)/main/grub +$(obj)/%/: + mkdir -p $@ + +prepare: $(sort $(dir $(OBJS))) $(obj)/util/kconfig/lxdialog/ clean: - rm -rf $(obj)/i386 $(obj)/fs $(obj)/drivers $(obj)/main $(obj)/util + rm -rf $(sort $(dir $(OBJS))) $(obj)/util distclean: clean - rm -rf build + rm -rf $(obj) rm -f .config lib.config .config.old .xcompile ..config.tmp .kconfig.d .tmpconfig* FORCE:

1 0

New patch to review for filo: df119be makefile: rebuild config.h when needed
by Mathias Krause 06 Mar '12

06 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/741 -gerrit commit df119bed3bad665af86209cb41111ccc8754f2f6 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 09:16:29 2012 +0100 makefile: rebuild config.h when needed The dependencies for filo are quite awkward. Fix this by moving them where they belong to be, namely: * object files (not filo) depend on config.h * config.h (not filo) depends on .config to fix build problems when build/ gets removed or .config gets manually edited Change-Id: Ic107ad4d37cb6ce128ee3ad62cb8d271b457f91a Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d880f68..41486a9 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ libpayload: $(src)/$(LIB_CONFIG) $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build DESTDIR=$(src)/build install endif -$(obj)/filo: $(src)/.config $(OBJS) libpayload +$(obj)/filo: $(OBJS) libpayload printf " LD $(subst $(shell pwd)/,,$(@))\n" $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) @@ -141,7 +141,11 @@ $(TARGET): $(obj)/filo libpayload include util/kconfig/Makefile -$(obj)/%.o: $(src)/%.c libpayload +$(KCONFIG_AUTOHEADER): $(src)/.config + $(MAKE) silentoldconfig + +$(OBJS): $(KCONFIG_AUTOHEADER) libpayload +$(obj)/%.o: $(src)/%.c printf " CC $(subst $(shell pwd)/,,$(@))\n" $(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $<

1 0

New patch to review for filo: f1f9d46 makefile: don't evaluate empty input
by Mathias Krause 06 Mar '12

06 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/740 -gerrit commit f1f9d467747176421a793ed0302730ee4b6a4bd2 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Mon Mar 5 11:23:24 2012 +0100 makefile: don't evaluate empty input The output from util/xcompile/xcompile is redirected, so there is nothing left for make to $(eval)uate. Change-Id: I0f482c4b680ca3eded4664c0a57e8525c068feaf Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index debb816..d880f68 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ ifneq ($(Q),) endif endif -$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile))) +$(if $(wildcard .xcompile),,$(shell bash util/xcompile/xcompile > .xcompile)) include .xcompile CROSS_PREFIX =

1 0

New patch to review for coreboot: bdab48d Fix address of IDT in real-mode entry
by Kyösti Mälkki 06 Mar '12

06 Mar '12

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/707 -gerrit commit bdab48d3f13d117bd1100be616837e6d1dbb55fc Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Mar 5 09:25:12 2012 +0200 Fix address of IDT in real-mode entry In a case of CS & 0x0fff != 0x0, lidt memory operand does not point to nullidt, this can raise an exception and shutdown the CPU. When an AP CPU receives 8-bit Start-Up IPI vector yzH, it starts execute at physical address 000yz000H. Seems this translates to either yz00:0000 or y000:z000 (CS:IP), depending of the CPU model. With the change entry16.inc is relocatable as the commentary suggests and can be used as ap_sipi_vector on SMP systems. Change-Id: I885a2888179700ba6e2b11d4f2d6a64ddea4c2dc Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/cpu/x86/16bit/entry16.inc | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/cpu/x86/16bit/entry16.inc b/src/cpu/x86/16bit/entry16.inc index 0fa8c11..e4613bf 100644 --- a/src/cpu/x86/16bit/entry16.inc +++ b/src/cpu/x86/16bit/entry16.inc @@ -57,13 +57,6 @@ _start: * entry16.inc. */ - /* Load an IDT with NULL limit to prevent the 16bit IDT being used - * in protected mode before c_start.S sets up a 32bit IDT when entering - * ram stage. - */ - movw $nullidt_offset, %bx - lidt %cs:(%bx) - /* Note: gas handles memory addresses in 16 bit code very poorly. * In particular it doesn't appear to have a directive allowing you * associate a section or even an absolute offset with a segment register. @@ -98,10 +91,18 @@ _start: * the low 16 bits. This means that the intial segment used * when start is called must be 64K aligned. This should not * restrict the address as the ip address can be anything. + * + * Also load an IDT with NULL limit to prevent the 16bit IDT being used + * in protected mode before c_start.S sets up a 32bit IDT when entering + * ram stage. In practise: CPU will shutdown on any exception. + * See IA32 manual Vol 3A 19.26 Interrupts. */ movw %cs, %ax shlw $4, %ax + movw $nullidt_offset, %bx + subw %ax, %bx + lidt %cs:(%bx) movw $gdtptr16_offset, %bx subw %ax, %bx data32 lgdt %cs:(%bx)

3 2

← Newer
1
...
62
63
64
65
66
67
68
...
72
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot March 2012