coreboot September 2011

coreboot@coreboot.org

40 participants
224 discussions

New patch to review: 7d680c9 append to the last patch.
by QingPei Wang 06 Sep '11

06 Sep '11

QingPei Wang (wangqingpei(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/203 -gerrit commit 7d680c9ca12758ca72f27c6810bbc99714dd015e Author: QingPei Wang <wangqingpei(a)gmail.com> Date: Tue Sep 6 09:22:38 2011 +0800 append to the last patch. make coreboot could loop up the CPU table to find the PH-E0. Change-Id: Ie1892168254e507404b0de8196f35778e22f3b26 Signed-off-by: QingPei Wang <wangqingpei(a)gmail.com> --- src/cpu/amd/model_10xxx/model_10xxx_init.c | 1 + src/cpu/amd/model_10xxx/update_microcode.c | 2 ++ src/northbridge/amd/amdmct/amddefs.h | 3 ++- 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/cpu/amd/model_10xxx/model_10xxx_init.c b/src/cpu/amd/model_10xxx/model_10xxx_init.c index 2e8bbfe..cf11135 100644 --- a/src/cpu/amd/model_10xxx/model_10xxx_init.c +++ b/src/cpu/amd/model_10xxx/model_10xxx_init.c @@ -157,6 +157,7 @@ static struct cpu_device_id cpu_table[] = { { X86_VENDOR_AMD, 0x100F63 }, /* DA-C3 */ { X86_VENDOR_AMD, 0x100F80 }, /* HY-D0 */ { X86_VENDOR_AMD, 0x100F81 }, /* HY-D1 */ + { X86_VENDOR_AMD, 0x100FA0 }, /* PH-E0 */ { 0, 0 }, }; diff --git a/src/cpu/amd/model_10xxx/update_microcode.c b/src/cpu/amd/model_10xxx/update_microcode.c index fa3b4f8..a9faafa 100644 --- a/src/cpu/amd/model_10xxx/update_microcode.c +++ b/src/cpu/amd/model_10xxx/update_microcode.c @@ -51,6 +51,7 @@ static const u8 microcode_updates[] __attribute__ ((aligned(16))) = { * 00100F62h (DA-C2) 1062h 0100009Fh * 00100F63h (DA-C3) 1043h 010000b6h * 00100F81h (HY-D1) 1081h 010000c4h + * 00100FA0h (PH-E0) 10A0h 010000bfh */ #include CONFIG_AMD_UCODE_PATCH_FILE @@ -78,6 +79,7 @@ static u32 get_equivalent_processor_rev_id(u32 orig_id) { 0x100f62, 0x1062, 0x100f63, 0x1043, 0x100f81, 0x1081, + 0x100fa0, 0x10A0, }; u32 new_id; diff --git a/src/northbridge/amd/amdmct/amddefs.h b/src/northbridge/amd/amdmct/amddefs.h index 7852668..d302085 100644 --- a/src/northbridge/amd/amdmct/amddefs.h +++ b/src/northbridge/amd/amdmct/amddefs.h @@ -46,6 +46,7 @@ #define AMD_RB_C3 0x08000000 /* ??? C3 */ #define AMD_DA_C3 0x10000000 /* XXXX C3 */ #define AMD_HY_D1 0x20000000 /* Istanbul D1 */ +#define AMD_PH_E0 0x40000000 /* Phenom II X4 X6 */ /* * Groups - Create as many as you wish, from the above public values @@ -64,7 +65,7 @@ #define AMD_DR_GT_B0 (AMD_DR_ALL & ~(AMD_DR_B0)) #define AMD_DR_GT_Bx (AMD_DR_ALL & ~(AMD_DR_Ax | AMD_DR_Bx)) #define AMD_DR_ALL (AMD_DR_Bx) -#define AMD_FAM10_ALL (AMD_DR_ALL | AMD_RB_C2 | AMD_HY_D0 | AMD_DA_C3 | AMD_DA_C2 | AMD_RB_C3 | AMD_HY_D1) +#define AMD_FAM10_ALL (AMD_DR_ALL | AMD_RB_C2 | AMD_HY_D0 | AMD_DA_C3 | AMD_DA_C2 | AMD_RB_C3 | AMD_HY_D1 | AMD_PH_E0) #define AMD_FAM10_LT_D (AMD_FAM10_ALL & ~(AMD_HY_D0)) #define AMD_FAM10_GT_B0 (AMD_FAM10_ALL & ~(AMD_DR_B0)) #define AMD_DA_Cx (AMD_DA_C2 | AMD_DA_C3)

1 0

Re: [coreboot] POST code error "EE"
by Abhinav Hardikar 05 Sep '11

05 Sep '11

ok. I did as you said. Created the irq_tables.c file and added it. I even created some more files. ./src/mainboard/jetway/ | -> j7bxan | ->chip.h ->devicetree.cb ->irq_tables.c ->Kconfig ->mainboard.c ->romstage.c I did the changes in the respective Kconfig files too. I know I could have made some patches too but I don't know how to make them. :P But the keyb and all other Input devices are not working. I checked the IRQ tables of my mobo and they seem to be fine. Once the PC boot into the Linux Kernel on the HDD the Keyb starts working. Without the Keyb I can't boot into windows(dual boot). I have attached the mobo manual also. It has the memory, I/O maps and IRQ tables. And yes It is using the correct SuperIO Winbond W3977TF. Although on the Mobo it is EF, technically it should work since the vendor BIOS was using TF driver. Thanx for all the help Abhinav

4 10

New patch to review: 854cd94 Add AMD Family 10h PH-EO support
by QingPei Wang 05 Sep '11

05 Sep '11

QingPei Wang (wangqingpei(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/202 -gerrit commit 854cd94c4feba4304a09063727f7c2562b87af85 Author: QingPei Wang <wangqingpei(a)gmail.com> Date: Tue Sep 6 00:01:57 2011 +0800 Add AMD Family 10h PH-EO support Change-Id: If701c8a908edf1c486665d3ce4df65da0f65c802 Signed-off-by: QingPei Wang <wangqingpei(a)gmail.com> --- src/cpu/amd/model_10xxx/mc_patch_010000bf.h | 165 +++++++++++++++++++++++++++ 1 files changed, 165 insertions(+), 0 deletions(-) diff --git a/src/cpu/amd/model_10xxx/mc_patch_010000bf.h b/src/cpu/amd/model_10xxx/mc_patch_010000bf.h new file mode 100644 index 0000000..ea971bc --- /dev/null +++ b/src/cpu/amd/model_10xxx/mc_patch_010000bf.h @@ -0,0 +1,165 @@ +/* + ============================================================ + Copyright (c) Advanced Micro Devices, Inc., 2004-2008 + Copyright QingPei Wang <wangqingpei(a)gmail.com> + + The enclosed microcode is intended to be used with AMD + Microprocessors. You may copy, view and install the + enclosed microcode only for development and deployment of + firmware, BIOS, or operating system code for computer + systems that contain AMD processors. You are not + authorized to use the enclosed microcode for any other + purpose. + + THE MICROCODE IS PROVIDED "AS IS" WITHOUT ANY EXPRESS OR + IMPLIED WARRANTY OF ANY KIND, INCLUDING BUT NOT LIMITED TO + WARRANTIES OF MERCHANTABILITY, NON- INFRINGEMENT, + TITLE,FITNESS FOR ANY PARTICULAR PURPOSE, OR WARRANTIES + ARISING FROM CONDUCT, COURSE OF DEALING, OR USAGE OF TRADE. + AMD does not assume any responsibility for any errors which + may appear in this microcode or any other related + information provided to you by AMD, or result from use of + this microcode. AMD is not obligated to furnish, support, + or make any further information, software, technical + information, know-how, or show-how available related to this + microcode. + + The microcode is provided with "RESTRICTED RIGHTS." Use, + duplication, or disclosure by the U.S. Government is subject + to the restrictions as set forth in FAR 52.227-14 and + DFAR252.227-7013, et seq., or its successor. Use of the + microcode by the U.S. Government constitutes + acknowledgement of AMD's proprietary rights in them. + ============================================================ +*/ + + +0x10, 0x20, 0x17, 0x02, 0xbf, 0x00, 0x00, 0x01, 0x00, 0x80, 0x20, 0x00, +0x42, 0x82, 0x02, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0xa0, 0x10, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x74, 0x0f, 0x00, 0x00, +0xbe, 0x01, 0x00, 0x00, 0x33, 0x0e, 0x00, 0x00, 0xa9, 0x01, 0x00, 0x00, +0x75, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, +0xff, 0xff, 0xff, 0xff, 0xa0, 0xfd, 0xff, 0x28, 0xc3, 0x3f, 0xc0, 0xcf, +0xff, 0x07, 0xe2, 0x01, 0x0f, 0xde, 0x50, 0xfe, 0xf2, 0xdf, 0xff, 0x0f, +0x3b, 0xfc, 0x01, 0xc5, 0x40, 0x03, 0xd4, 0x00, 0x80, 0xff, 0xfe, 0x7f, +0xfe, 0xe1, 0x1b, 0xc8, 0x5b, 0xf6, 0xff, 0xff, 0x7b, 0x87, 0x5f, 0xad, +0x6b, 0xf9, 0x6f, 0xfe, 0xfa, 0x1f, 0xfe, 0xb5, 0x00, 0x40, 0x11, 0x6a, +0x0e, 0xc0, 0x9b, 0x56, 0xe8, 0x75, 0xe0, 0x0f, 0x38, 0x00, 0xcf, 0xcc, +0xa0, 0xd7, 0x83, 0x3f, 0xff, 0x7b, 0xfc, 0xbf, 0x00, 0x3f, 0x0f, 0xff, +0x35, 0x00, 0x80, 0xd0, 0x18, 0x07, 0x60, 0x19, 0x07, 0xf4, 0x7a, 0xf0, +0xa6, 0x1c, 0x00, 0x38, 0x1f, 0xc0, 0xe7, 0xa0, 0xff, 0xff, 0x51, 0x9e, +0x7f, 0x80, 0x9f, 0x87, 0x80, 0x0a, 0x00, 0x60, 0xd3, 0xe0, 0x4f, 0x10, +0xfc, 0x32, 0xd8, 0x3a, 0x49, 0xff, 0x7f, 0xcb, 0xf0, 0x0f, 0xf0, 0xf3, +0x8c, 0xff, 0xff, 0x00, 0xc3, 0x31, 0x17, 0xfd, 0x2c, 0x47, 0x0d, 0x00, +0xd0, 0x32, 0xf0, 0x27, 0x1d, 0x7e, 0x19, 0x6c, 0x60, 0xf1, 0xff, 0x1f, +0x7f, 0x38, 0xe6, 0xa2, 0x16, 0x35, 0xff, 0xff, 0xe7, 0xe1, 0x1f, 0xe0, +0x00, 0xfe, 0xbf, 0x07, 0xbb, 0x9c, 0xf4, 0xff, 0x3f, 0x0f, 0xff, 0x00, +0x07, 0xf8, 0xdf, 0x8d, 0x0b, 0x3e, 0x78, 0x73, 0x3f, 0x8b, 0xff, 0xff, +0x70, 0xe5, 0xf0, 0x0b, 0x03, 0x00, 0x0f, 0x50, 0xff, 0x52, 0xfe, 0xbb, +0xaf, 0xfa, 0x87, 0x7f, 0xff, 0x07, 0xc0, 0xff, 0xa5, 0x14, 0x1f, 0xbe, +0xff, 0x9f, 0xc5, 0xff, 0xc4, 0xaa, 0x72, 0xf8, 0xef, 0x01, 0x80, 0xff, +0xeb, 0xff, 0x00, 0x43, 0x37, 0x96, 0xfd, 0xc3, 0xf6, 0xff, 0xab, 0x80, +0xff, 0x00, 0x3f, 0x0f, 0xff, 0xff, 0x8f, 0xe2, 0xfc, 0x02, 0x54, 0x39, +0xda, 0xd5, 0x00, 0x80, 0xff, 0x68, 0x3c, 0xe0, 0xc1, 0x9b, 0xca, 0xfe, +0xe4, 0xff, 0xff, 0x09, 0x87, 0x5f, 0x06, 0x5b, 0xfe, 0x0f, 0xc4, 0x03, +0x1e, 0xfa, 0xa9, 0x7c, 0xe0, 0xff, 0x7b, 0x00, 0xc0, 0x7f, 0xe0, 0x1f, +0xdf, 0xf0, 0x0f, 0xe0, 0x00, 0xff, 0x81, 0x7f, 0x7f, 0xc3, 0x3f, 0x80, +0x01, 0xfc, 0x07, 0xfe, 0xfe, 0x0d, 0xff, 0x00, 0x00, 0xf0, 0xff, 0x3d, +0x0f, 0xe0, 0x3f, 0xf0, 0xf0, 0x6f, 0xf8, 0x07, 0x3f, 0x80, 0xff, 0xc0, +0xc0, 0xbf, 0xe1, 0x1f, 0xff, 0x00, 0xfe, 0x03, 0x00, 0xff, 0x86, 0x7f, +0x1e, 0x00, 0xf8, 0xff, 0xf8, 0x07, 0xf0, 0x1f, 0x03, 0xf8, 0x37, 0xfc, +0xe0, 0x1f, 0xc0, 0x7f, 0x0f, 0xe0, 0xdf, 0xf0, 0x81, 0x7f, 0x00, 0xff, +0x3f, 0x80, 0x7f, 0xc3, 0x7f, 0x0f, 0x00, 0xfc, 0x0f, 0xfc, 0x03, 0xf8, +0xfe, 0x01, 0xfc, 0x1b, 0x3f, 0xf0, 0x0f, 0xe0, 0xf8, 0x07, 0xf0, 0x6f, +0xff, 0xc0, 0x3f, 0x80, 0xe1, 0x1f, 0xc0, 0xbf, 0xfe, 0xbf, 0x07, 0x00, +0xfc, 0x07, 0xfe, 0x01, 0x0d, 0xff, 0x00, 0xfe, 0xf0, 0x1f, 0xf8, 0x07, +0x37, 0xfc, 0x03, 0xf8, 0xc0, 0x7f, 0xe0, 0x1f, 0xdf, 0xf0, 0x0f, 0xe0, +0x00, 0xff, 0xdf, 0x03, 0x00, 0xfe, 0x03, 0xff, 0xff, 0x86, 0x7f, 0x00, +0x03, 0xf8, 0x0f, 0xfc, 0xfc, 0x1b, 0xfe, 0x01, 0x0f, 0xe0, 0x3f, 0xf0, +0xf0, 0x6f, 0xf8, 0x07, 0x01, 0x80, 0xff, 0xef, 0x7f, 0xbf, 0xff, 0x81, +0xdf, 0x95, 0xc1, 0xaf, 0xff, 0x91, 0xfc, 0x2f, 0x48, 0x57, 0x06, 0xbf, +0xff, 0x4f, 0xb0, 0xff, 0x32, 0xd8, 0x3a, 0xfc, 0xd7, 0x00, 0x40, 0x95, +0x81, 0xff, 0x94, 0x01, 0x1f, 0xe0, 0xe7, 0xe1, 0xff, 0xff, 0x53, 0xce, +0x7f, 0xa9, 0xeb, 0x83, 0xff, 0xef, 0x4b, 0xfd, 0xfc, 0xbd, 0xbd, 0x0e, +0xff, 0x7b, 0x00, 0xe0, 0x9c, 0x56, 0x0e, 0x00, 0xd0, 0x0f, 0xe0, 0x73, +0xff, 0x81, 0x7f, 0x00, 0xc3, 0x3f, 0x80, 0x7f, 0xfc, 0x07, 0xfe, 0x01, +0x0d, 0xff, 0x00, 0xfe, 0xe0, 0xfd, 0x35, 0x00, 0xe0, 0x0d, 0x2b, 0x07, +0x3a, 0xf0, 0x07, 0xf4, 0x96, 0xff, 0xed, 0x3f, 0xff, 0xe1, 0x1f, 0xab, +0x5b, 0x02, 0x00, 0xfe, 0xfb, 0x87, 0x7f, 0xac, 0x00, 0xa8, 0xcd, 0x1a, +0x6f, 0x72, 0xc0, 0xff, 0xfc, 0x3c, 0xfc, 0x03, 0x1f, 0xc0, 0x7f, 0xe0, +0xe0, 0xdf, 0xf0, 0x0f, 0x7f, 0x00, 0xff, 0x81, 0x80, 0x7f, 0xc3, 0x3f, +0x0f, 0x00, 0xfc, 0x7f, 0xff, 0x7f, 0x79, 0xfc, 0x01, 0x7e, 0x1e, 0xfe, +0x2b, 0x07, 0xe0, 0xfe, 0x07, 0xf0, 0x39, 0xe8, 0xc0, 0x3f, 0x80, 0xff, +0x1f, 0xc0, 0xbf, 0xe1, 0xb9, 0x06, 0x00, 0x78, 0xf6, 0xff, 0xbf, 0x80, +0xff, 0x00, 0x3f, 0x0f, 0xff, 0xff, 0x8f, 0xe2, 0xfc, 0x03, 0xfc, 0x3c, +0x7f, 0x34, 0x1e, 0xf0, 0xd0, 0xef, 0xe5, 0xf3, 0xff, 0xdf, 0x03, 0x00, +0xee, 0xa3, 0x72, 0x00, 0x83, 0x7e, 0x00, 0x9f, 0xf8, 0xfd, 0xff, 0x07, +0x1f, 0xbe, 0xb1, 0xec, 0x65, 0x97, 0xff, 0x1f, 0x79, 0xf8, 0x07, 0xf8, +0x80, 0xc4, 0x97, 0x01, 0x00, 0xff, 0x81, 0x7f, 0x7f, 0xc3, 0x3f, 0x80, +0x01, 0xfc, 0x07, 0xfe, 0xfe, 0x0d, 0xff, 0x00, 0x07, 0xf0, 0x1f, 0xf8, +0xf8, 0x37, 0xfc, 0x03, 0x00, 0xc0, 0xff, 0xf7, 0x3f, 0x80, 0xff, 0xc0, +0xc0, 0xbf, 0xe1, 0x1f, 0xff, 0x00, 0xfe, 0x03, 0x00, 0xff, 0x86, 0x7f, +0xfc, 0x03, 0xf8, 0x0f, 0x01, 0xfc, 0x1b, 0xfe, 0x7b, 0x00, 0xe0, 0xff, +0xe0, 0x1f, 0xc0, 0x7f, 0x0f, 0xe0, 0xdf, 0xf0, 0x81, 0x7f, 0x00, 0xff, +0x3f, 0x80, 0x7f, 0xc3, 0x07, 0xfe, 0x01, 0xfc, 0xff, 0x00, 0xfe, 0x0d, +0xff, 0x3d, 0x00, 0xf0, 0x3f, 0xf0, 0x0f, 0xe0, 0xf8, 0x07, 0xf0, 0x6f, +0xff, 0xc0, 0x3f, 0x80, 0xe1, 0x1f, 0xc0, 0xbf, 0xfe, 0x03, 0xff, 0x00, +0x86, 0x7f, 0x00, 0xff, 0xf8, 0xff, 0x1e, 0x00, 0xf0, 0x1f, 0xf8, 0x07, +0x37, 0xfc, 0x03, 0xf8, 0xc0, 0x7f, 0xe0, 0x1f, 0xdf, 0xf0, 0x0f, 0xe0, +0x00, 0xff, 0x81, 0x7f, 0x7f, 0xc3, 0x3f, 0x80, 0x00, 0xfc, 0x7f, 0x0f, +0x03, 0xf8, 0x0f, 0xfc, 0xfc, 0x1b, 0xfe, 0x01, 0x0f, 0xe0, 0x3f, 0xf0, +0xf0, 0x6f, 0xf8, 0x07, 0x3f, 0x80, 0xff, 0xc0, 0xc0, 0xbf, 0xe1, 0x1f, +0x07, 0x00, 0xfe, 0xbf, 0xfe, 0x01, 0xfc, 0x07, 0x00, 0xfe, 0x0d, 0xff, +0xf8, 0x07, 0xf0, 0x1f, 0x03, 0xf8, 0x37, 0xfc, 0xe0, 0x1f, 0xc0, 0x7f, +0x0f, 0xe0, 0xdf, 0xf0, 0xdf, 0x03, 0x00, 0xff, 0x03, 0xff, 0x00, 0xfe, +0x7f, 0x00, 0xff, 0x86, 0x0f, 0xfc, 0x03, 0xf8, 0xfe, 0x01, 0xfc, 0x1b, +0x3f, 0xf0, 0x0f, 0xe0, 0xf8, 0x07, 0xf0, 0x6f, 0xff, 0xef, 0x01, 0x80, + + +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1 0

Trac reminder: list of new ticket(s)
by coreboot tracker 05 Sep '11

05 Sep '11

1 0

New patch to review: e4f93b2 Show root device we're booted from in header.
by Patrick Georgi 05 Sep '11

05 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/201 -gerrit commit e4f93b2957a293efea945dac6566547ede17b591 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Mon Mar 8 12:05:40 2010 +0100 Show root device we're booted from in header. Change-Id: I9288f88f6673fafa41d13f2035ea3b9b6550dbb2 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- main/grub/char_io.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/main/grub/char_io.c b/main/grub/char_io.c index d2d9f6f..f37cc23 100644 --- a/main/grub/char_io.c +++ b/main/grub/char_io.c @@ -24,6 +24,8 @@ #include <version.h> #include <grub/shared.h> +extern char root_device[]; + char *err_list[] = { [ERR_NONE] = 0, [ERR_BAD_ARGUMENT] = "Invalid argument", @@ -98,8 +100,10 @@ void init_page(void) { color_set(1, NULL); cls(); - grub_printf("\n %s %s\n\n", + grub_printf("\n %s %s\n", PROGRAM_NAME, PROGRAM_VERSION); + grub_printf(" root_dev = %s\n", + root_device[0] ? root_device : "unset"); } /* The number of the history entries. */

1 0

New patch to review: 181d45d Set root device while probing boot_devices list
by Patrick Georgi 05 Sep '11

05 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/200 -gerrit commit 181d45d266a3e4627c82690a745c0f08018f8cf5 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Mon Mar 8 11:43:32 2010 +0100 Set root device while probing boot_devices list This way we don't need to have absolute paths in the config file itself. Change-Id: Id1f27a08bd86bc9a872dd52347f19a55532a82e6 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- main/grub/grub.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/main/grub/grub.c b/main/grub/grub.c index 1afdadd..0e8970c 100644 --- a/main/grub/grub.c +++ b/main/grub/grub.c @@ -139,11 +139,22 @@ void manual_grub_menulst(void) int probe_menulst(char *bootdevice, char *filename) { char menulst[256]; - - strcpy(menulst, bootdevice); + struct builtin *root; + int use_root; + + memset(menulst, 0, sizeof(menulst)); + root = find_command("root"); + if (root != NULL) { + (root->func)(bootdevice, BUILTIN_SCRIPT); + use_root = 1; + } else { + strcpy(menulst, bootdevice); + use_root = 0; + } strncat(menulst, filename, 256); + /* Set string to zero: */ - copy_path_to_filo_bootline(menulst, config_file, 0, 0); + copy_path_to_filo_bootline(menulst, config_file, use_root, 0); if (file_open(config_file)) { /* We found a config file. Bail out */ /* The valid config file name stays in config_file[] */

1 0

New patch to review: fd737d2 ide: driver message pretty printing
by Patrick Georgi 05 Sep '11

05 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/199 -gerrit commit fd737d2ab180782fcb87f6bc48fdf50226199427 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Thu Jun 9 16:30:31 2011 +0200 ide: driver message pretty printing This patch reduces the amount of debug messages generated by the IDE driver and changes some of them to be less technical, but more informative to the user. Change-Id: I49ee83b57084c621adca2cb76fd868eaa0f6b436 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- drivers/ide_new.c | 51 +++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/ide_new.c b/drivers/ide_new.c index a2870b8..3e24b9a 100644 --- a/drivers/ide_new.c +++ b/drivers/ide_new.c @@ -123,7 +123,7 @@ ob_ide_pio_insw(struct ide_drive *drive, unsigned int offset, struct ide_channel *chan = drive->channel; if (len & 1) { - printf("%d: command not word aligned\n", drive->nr); + debug("hd%c: command not word aligned\n", drive->nr + 'a'); return; } @@ -137,7 +137,7 @@ ob_ide_pio_outsw(struct ide_drive *drive, unsigned int offset, struct ide_channel *chan = drive->channel; if (len & 1) { - printf("%d: command not word aligned\n", drive->nr); + debug("hd%c: command not word aligned\n", drive->nr + 'a'); return; } @@ -165,7 +165,7 @@ ob_ide_error(struct ide_drive *drive, unsigned char stat, char *msg) stat = ob_ide_pio_readb(drive, IDEREG_STATUS); debug("ob_ide_error "); - printf("drive<%d>: %s:\n", drive->nr, msg); + printf("hd%c: %s:\n", drive->nr + 'a', msg); debug(" cmd=%x, stat=%x", chan->ata_cmd.command, stat); if ((stat & (BUSY_STAT | ERR_STAT)) == ERR_STAT) { @@ -239,7 +239,7 @@ ob_ide_select_drive(struct ide_drive *drive) unsigned char control = IDEHEAD_DEV0; if (ob_ide_wait_stat(drive, 0, BUSY_STAT, NULL)) { - printf("select_drive: timed out\n"); + debug("select_drive: timed out\n"); return 1; } @@ -257,7 +257,7 @@ ob_ide_select_drive(struct ide_drive *drive) ob_ide_400ns_delay(drive); if (ob_ide_wait_stat(drive, 0, BUSY_STAT, NULL)) { - printf("select_drive: timed out\n"); + debug("select_drive: timed out\n"); return 1; } @@ -403,7 +403,7 @@ ob_ide_pio_data_in(struct ide_drive *drive, struct ata_command *cmd) } while (bytes); if (bytes) - printf("bytes=%d, stat=%x\n", bytes, stat); + debug("bytes=%d, stat=%x\n", bytes, stat); return bytes ? 1 : 0; } @@ -423,7 +423,7 @@ ob_ide_pio_packet(struct ide_drive *drive, struct atapi_command *cmd) return 1; if (cmd->buflen && cmd->data_direction == atapi_ddir_none) - printf("non-zero buflen but no data direction\n"); + debug("non-zero buflen but no data direction\n"); memset(acmd, 0, sizeof(*acmd)); acmd->lcyl = cmd->buflen & 0xff; @@ -455,7 +455,7 @@ ob_ide_pio_packet(struct ide_drive *drive, struct atapi_command *cmd) * we are doing a sense, ERR_STAT == CHECK_CONDITION */ if (cmd->cdb[0] != ATAPI_REQ_SENSE) { - printf("odd, drive didn't want to transfer %x\n", stat); + debug("odd, drive didn't want to transfer %x\n", stat); return 1; } } @@ -524,7 +524,7 @@ ob_ide_pio_packet(struct ide_drive *drive, struct atapi_command *cmd) (void) ob_ide_wait_stat(drive, 0, BUSY_STAT, &stat); if (bytes) - printf("cdb failed, bytes=%d, stat=%x\n", bytes, stat); + debug("cdb failed, bytes=%d, stat=%x\n", bytes, stat); return (stat & ERR_STAT) || bytes; } @@ -640,7 +640,7 @@ ob_ide_atapi_drive_ready(struct ide_drive *drive) cmd->cdb[0] = ATAPI_TUR; if (ob_ide_atapi_packet(drive, cmd)) { - printf("%d: TUR failed\n", drive->nr); + printf("hd%c: TUR failed\n", drive->nr + 'a'); return 1; } @@ -654,7 +654,7 @@ ob_ide_atapi_drive_ready(struct ide_drive *drive) cmd->cdb[4] = 0x01; if (ob_ide_atapi_packet(drive, cmd)) { - printf("%d: START_STOP unit failed\n", drive->nr); + printf("hd%c: START_STOP unit failed\n", drive->nr + 'a'); return 1; } @@ -663,13 +663,13 @@ ob_ide_atapi_drive_ready(struct ide_drive *drive) cmd->cdb[0] = ATAPI_PREVENT_ALLOW_MEDIUM_REMOVAL; cmd->cdb[2] = 2; if (ob_ide_atapi_packet(drive, cmd)) - printf("could not persistently unlock device\n"); + printf("hd%c: could not persistently unlock device\n", drive->nr + 'a'); /* clear Prevent State */ memset (cmd, 0, sizeof(*cmd)); cmd->cdb[0] = ATAPI_PREVENT_ALLOW_MEDIUM_REMOVAL; if (ob_ide_atapi_packet(drive, cmd)) - printf("could not unlock device\n"); + printf("hd%c: could not unlock device\n", drive->nr + 'a'); /* * finally, get capacity and block size @@ -707,7 +707,7 @@ ob_ide_read_atapi(struct ide_drive *drive, unsigned long long block, unsigned ch if (drive->bs == 2048) { if (((block & 3) != 0) || ((sectors & 3) != 0)) { - printf("ob_ide_read_atapi: unaligned atapi access: %x blocks, starting from %x\n", sectors, block); + debug("ob_ide_read_atapi: unaligned atapi access: %x blocks, starting from %x\n", sectors, block); } block >>= 2; sectors >>= 2; @@ -854,9 +854,7 @@ ob_ide_read_sectors(struct ide_drive *drive, unsigned long long block, if (block + sectors > (drive->sectors * (drive->bs / 512))) return 1; -#ifdef CONFIG_DEBUG_IDE - printf("ob_ide_read_sectors: block=%ld sectors=%u\n", (unsigned long) block, sectors); -#endif + debug("ob_ide_read_sectors: block=%ld sectors=%u\n", (unsigned long) block, sectors); if (drive->type == ide_type_ata) return ob_ide_read_ata(drive, block, buf, sectors); @@ -924,7 +922,7 @@ ob_ide_identify_drive(struct ide_drive *drive) else if (drive->type == ide_type_atapi) cmd->command = WIN_IDENTIFY_PACKET; else { - printf("%s: called with bad device type %d\n", __FUNCTION__, drive->type); + debug("%s: called with bad device type %d\n", __FUNCTION__, drive->type); return 1; } @@ -1348,7 +1346,7 @@ int ob_ide_init(int driveno) int chan_index; if (driveno >= IDE_MAX_DRIVES) { - printf("Unsupported drive number\n"); + debug("Unsupported drive number\n"); return -1; } @@ -1392,28 +1390,29 @@ int ob_ide_init(int driveno) ob_ide_identify_drives(chan); - printf("ata-%d: [io ports 0x%x-0x%x,0x%x]\n", chan_index, + printf("ATA-%d: [io ports 0x%x-0x%x,0x%x]\n", chan_index, chan->io_regs[0], chan->io_regs[0] + 7, chan->io_regs[8]); for (j = 0; j < 2; j++) { struct ide_drive *drive = &chan->drives[j]; - char *media = "UNKNOWN"; + const char *media = "UNKNOWN"; if (!drive->present) continue; - printf(" drive%d [ATA%s ", j, drive->type == ide_type_atapi ? "PI" : ""); + printf("* hd%c [ATA%s ", chan_index * 2 + j + 'a', + drive->type == ide_type_atapi ? "PI" : ""); switch (drive->media) { case ide_media_floppy: - media = "floppy"; + media = "Floppy"; break; case ide_media_cdrom: - media = "cdrom"; + media = "CD-ROM"; break; case ide_media_optical: - media = "mo"; + media = "MO"; break; case ide_media_disk: - media = "disk"; + media = "Disk"; break; } printf("%s]: %s\n", media, drive->model);

1 0

New patch to review: 8d17f66 Allow switching between partitions on the current device
by Patrick Georgi 05 Sep '11

05 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/198 -gerrit commit 8d17f66e7e581c765ba92b7bc6f9448877d0dff4 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Thu Mar 24 09:13:54 2011 +0100 Allow switching between partitions on the current device root (,1) or configfile 2:/filo.lst work now and change the active partition on the current device (as defined by "root"). Change-Id: I271f5f407297c072f35ac8410c278b1c9442d654 Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- include/grub/shared.h | 2 +- main/grub/builtins.c | 184 +++++++++++++++++++++++++++---------------------- main/grub/grub.c | 5 +- 3 files changed, 104 insertions(+), 87 deletions(-) diff --git a/include/grub/shared.h b/include/grub/shared.h index 127b74f..9e74d7c 100644 --- a/include/grub/shared.h +++ b/include/grub/shared.h @@ -304,6 +304,6 @@ int print_completions (int is_filename, int is_completion); int check_password(char *entered, char* expected, password_t type); /* FILO specific stuff */ -void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev); +void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev, int append); #endif /* ! GRUB_SHARED_HEADER */ diff --git a/main/grub/builtins.c b/main/grub/builtins.c index df14cf1..fc216eb 100644 --- a/main/grub/builtins.c +++ b/main/grub/builtins.c @@ -303,8 +303,7 @@ static int configfile_func(char *arg, int flags) extern int is_opened, keep_cmdline_running; /* Check if the file ARG is present. */ - temp_space[0]=0; - copy_path_to_filo_bootline(arg, temp_space, 1); + copy_path_to_filo_bootline(arg, temp_space, 1, 0); if (temp_space[0]==0) { return help_func("configfile",0); } @@ -316,8 +315,7 @@ static int configfile_func(char *arg, int flags) file_close(); /* Copy ARG to CONFIG_FILE. */ - memset(config_file, 0, 128); - copy_path_to_filo_bootline(arg, config_file, 1); + copy_path_to_filo_bootline(arg, config_file, 1, 0); /* Force to load the configuration file. */ is_opened = 0; @@ -632,114 +630,140 @@ static struct builtin builtin_hiddenmenu = { }; /** + * @param arg linux style driver specifier + * @param drivername driver name (out) + * @param disk disk number (out) + * @return length of parsed string + */ +static +int parse_linux_style_driver(char *arg, char *drivername, int *disk) +{ + int i = 0; + + *disk = -1; + drivername[0] = '\0'; + while ((i < 16) && (isalpha(arg[i]))) { + drivername[i] = arg[i]; + i++; + } + + if (i > 0) { + drivername[--i] = '\0'; + *disk = arg[i]-'a'; + i++; + } + return i; +} + +/** * @param arg source pointer with grub device names * @param path destination pointer (will be filled with filo device names) * @param use_rootdev values other than zero mean the root device set by the "root" * command is taken into regard here. This has to be zero when calling from root_func. */ -void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev) +void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev, int append) { char devicename[16]; char drivername[16]; int disk, part; + unsigned long addr; int i, len; - - /* Clean up */ memset(devicename, 0, 16); memset(drivername, 0, 16); + disk = -1; + part = -1; + addr = -1; - /* Copy over the driver name: "hd", "ud", "sd" ... */ if (arg[0] == '(') { + // grub style device specifier i = 1; /* Read until we encounter a number, a comma or a closing * bracket */ - while ((i <= 16) && (arg[i]) && (!isdigit(arg[i])) && (arg[i] != ',') - && (arg[i] != ')')) { + while ((i <= 16) && (isalpha(arg[i]))) { drivername[i - 1] = arg[i]; i++; } - } - disk = -1; - part = -1; - - len = strlen(drivername); - if (len) { /* We have a driver. No idea if it exists though */ - // The driver should decide this: - len++; // skip driver name + opening bracket - - // XXX put @ handling in here, too for flash@addr and mem@addr - - if (isdigit(arg[len])) { - disk = arg[len] - '0'; - len++; - if (isdigit(arg[len])) { /* More than 9 drives? */ - /* ok, get one more number. No more than 99 drives */ - disk *= 10; - disk += arg[len] - '0'; - len++; - } + if (isdigit(arg[i])) { + char *postnum; + disk = strtoul(arg+i, &postnum, 10); + i = postnum - arg; } - if (arg[len] == ',') { - len++; - part = arg[len] - '0'; - len++; - if (isdigit(arg[len])) { /* More than 9 partitions? */ - /* ok, get one more number. No more than 99 - * partitions */ - part *= 10; - part += arg[len] - '0'; - len++; - } + + if (arg[i] == ',') { + char *postnum; + part = strtoul(arg+i+1, &postnum, 10) + 1; + i = postnum - arg; } - if (arg[len] != ')') { - grub_printf("Drive Error.\n"); - // set len = 0 --> just copy the drive name - len = 0; - } else { - len++; // skip closing bracket + + if (arg[i] == '@') { + char *postnum; + addr = strtoul(arg+i+1, &postnum, 0); + i = postnum - arg; } - } - if (disk == -1) { - int cnt = 0; - len = 0; - while ((arg[cnt] != 0) && (arg[cnt+1] != 0)) { - if (arg[cnt] == ':' && arg[cnt+1] == '/') { - /* The user did specify a FILO name already */ - len = cnt; - break; - } - cnt++; + if (arg[i] == ')') i++; + + arg += i; + } else if ((use_rootdev == 0) || (strchr(arg, ':') != NULL)) { + // linux-style device specifier or + // leading device name required (assume it's linux-style then) + i = parse_linux_style_driver(arg, drivername, &disk); + + if (isdigit(arg[i])) { + char *postnum; + part = strtoul(arg+i, &postnum, 10); + i = postnum - arg; } - } else { - if (part == -1) { // No partition - sprintf(devicename, "%s%c:", drivername, disk + 'a'); - } else { // both disk and partition - sprintf(devicename, "%s%c%d:", drivername, disk + 'a', part + 1); + + if (arg[i] == '@') { + char *postnum; + addr = strtoul(arg+i+1, &postnum, 0); + i = postnum - arg; } - strncat(path, devicename, BOOT_LINE_LENGTH); - arg += len; // skip original drive name + + if (arg[i] == ':') i++; + arg += i; } - if (use_rootdev && !len) { // No drive was explicitly specified - if (strlen(root_device)) { // But someone set a root device - strncat(path, root_device, BOOT_LINE_LENGTH); - } + if ((disk == -1) && (part != -1) && (strlen(drivername) == 0)) { + // special case for partition-only identifiers: + // take driver and disk number from root_device + i = parse_linux_style_driver(root_device, drivername, &disk); } - /* Copy the rest over */ - strncat(path, arg, BOOT_LINE_LENGTH); + if (!append) path[0] = 0; + if ((use_rootdev == 1) && (strlen(drivername) == 0)) { + strlcat(path, root_device, BOOT_LINE_LENGTH); + } else { + char buffer[32]; + strlcat(path, drivername, BOOT_LINE_LENGTH); + if (disk != -1) { + snprintf(buffer, 31, "%c", 'a'+disk); + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + if (part != -1) { + snprintf(buffer, 31, "%d", part); + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + if (addr != -1) { + snprintf(buffer, 31, "@0x%x", addr); + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + buffer[0]=':'; + buffer[1]='\0'; + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + strlcat(path, arg, BOOT_LINE_LENGTH); } /* initrd */ static int initrd_func(char *arg, int flags) { - initrd_space[0]=0; // Erase string - copy_path_to_filo_bootline(arg, initrd_space, 1); + copy_path_to_filo_bootline(arg, initrd_space, 1, 0); if (!file_open(initrd_space)) { initrd_space[0]=0; // Erase string errnum = ERR_FILE_NOT_FOUND; @@ -877,12 +901,8 @@ static int kernel_func(char *arg, int flags) kernel_type = KERNEL_TYPE_NONE; - /* clear out boot_line. Kernel is the first thing */ - boot_line[0] = 0; // Erase string - /* Get the real boot line and extract the kernel name */ - temp_space[0] = 0; // Erase string - copy_path_to_filo_bootline(arg, temp_space, 1); + copy_path_to_filo_bootline(arg, temp_space, 1, 0); i=0; while ((temp_space[i] != 0) && (temp_space[i]!=' ')) i++; temp_space[i] = 0; @@ -897,7 +917,7 @@ static int kernel_func(char *arg, int flags) /* Needed to pass grub checks */ kernel_type = KERNEL_TYPE_LINUX; - copy_path_to_filo_bootline(arg, boot_line, 1); + copy_path_to_filo_bootline(arg, boot_line, 1, 0); return 0; } @@ -1319,8 +1339,7 @@ static int root_func(char *arg, int flags) { int len; - root_device[0] = 0; /* Clear root device */ - copy_path_to_filo_bootline(arg, root_device, 0); + copy_path_to_filo_bootline(arg, root_device, 0, 0); /* The following code handles an extra case * where the user specifies "root hde1" without @@ -1790,8 +1809,7 @@ static int cat_func(char *arg, int flags) char buf[4096]; int len; - temp_space[0]=0; - copy_path_to_filo_bootline(arg, temp_space, 1); + copy_path_to_filo_bootline(arg, temp_space, 1, 0); if (temp_space[0]==0) { return help_func("cat",0); } diff --git a/main/grub/grub.c b/main/grub/grub.c index b1fcdd1..1afdadd 100644 --- a/main/grub/grub.c +++ b/main/grub/grub.c @@ -127,7 +127,7 @@ void manual_grub_menulst(void) break; if (line[0]) { - copy_path_to_filo_bootline(line, config_file, 0); + copy_path_to_filo_bootline(line, config_file, 0, 1); break; } } @@ -143,8 +143,7 @@ int probe_menulst(char *bootdevice, char *filename) strcpy(menulst, bootdevice); strncat(menulst, filename, 256); /* Set string to zero: */ - config_file[0] = 0; - copy_path_to_filo_bootline(menulst, config_file, 0); + copy_path_to_filo_bootline(menulst, config_file, 0, 0); if (file_open(config_file)) { /* We found a config file. Bail out */ /* The valid config file name stays in config_file[] */

1 0

New patch to review: 0966f88 Add multiboot header
by Patrick Georgi 05 Sep '11

05 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/197 -gerrit commit 0966f88267d3723b22d8a5c088cb7daeab21e953 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Jun 7 13:53:31 2011 +0200 Add multiboot header Change-Id: Ibe8e879a3a6f533f97aa8381697afb1f14d1f87d Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- Config.in | 7 +++++++ i386/ldscript | 2 +- main/Makefile.inc | 1 + main/mb_hdr.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletions(-) diff --git a/Config.in b/Config.in index b1da531..251bd2a 100644 --- a/Config.in +++ b/Config.in @@ -9,6 +9,13 @@ config TARGET_I386 bool default y +config MULTIBOOT_IMAGE + bool "Include a MultiBoot header" + default y + help + Including a MultiBoot header makes FILO chainloadable by MultiBoot + compliant boot loaders like GRUB. + menu "Interface Options" config USE_GRUB diff --git a/i386/ldscript b/i386/ldscript index 7fba856..b260c51 100644 --- a/i386/ldscript +++ b/i386/ldscript @@ -40,7 +40,7 @@ SECTIONS /* Start of the program. * Now the version string is in the note, we must include it * in the program. Otherwise we lose the string after relocation. */ - . = ALIGN(16); + . = ALIGN(4096); _start = .; /* Putting ELF notes near beginning of file might help bootloaders. diff --git a/main/Makefile.inc b/main/Makefile.inc index c7290cf..e2fab04 100644 --- a/main/Makefile.inc +++ b/main/Makefile.inc @@ -16,6 +16,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # +TARGETS-$(CONFIG_MULTIBOOT_IMAGE) += main/mb_hdr.o TARGETS-y += main/filo.o main/strtox.o TARGETS-y += main/elfload.o main/ipchecksum.o TARGETS-$(CONFIG_SUPPORT_SOUND) += main/sound.o diff --git a/main/mb_hdr.c b/main/mb_hdr.c new file mode 100644 index 0000000..bb01427 --- /dev/null +++ b/main/mb_hdr.c @@ -0,0 +1,32 @@ +/* + * This file is part of FILO. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* Support for MultiBoot */ +#define MB_HEADER_MAGIC 0x1BADB002 +#define MB_RQ_FLAGS_4K 1 +#define MB_REQUESTED_FLAGS (MB_RQ_FLAGS_4K) + +/* this header is parsed by the boot loader that loads FILO, e.g. GRUB */ +struct mb_header { + long magic; /* multiboot magic */ + long features; /* requested features */ + long chksum; /* chksum for whole structure */ +} mb_header __attribute__((section(".hdr.mb"))) = { + .magic = MB_HEADER_MAGIC, + .features = MB_REQUESTED_FLAGS, + .chksum = -(MB_HEADER_MAGIC + MB_REQUESTED_FLAGS), +};

1 0

New patch to review: acf0475 Add nvram command
by Patrick Georgi 05 Sep '11

05 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/196 -gerrit commit acf04759bf35be686f264011154f562df813a228 Author: Stefan Reinauer <stefan.reinauer(a)coresystems.de> Date: Fri Jun 4 09:25:50 2010 +0200 Add nvram command Change-Id: Ib95ee0d4fa8dcaf002ffe2b18d4975e301d00a6a Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- main/grub/builtins.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/main/grub/builtins.c b/main/grub/builtins.c index 79d237e..df14cf1 100644 --- a/main/grub/builtins.c +++ b/main/grub/builtins.c @@ -1098,6 +1098,70 @@ static struct builtin builtin_md5crypt = { }; #endif /* CONFIG_USE_MD5_PASSWORDS */ +#if CONFIG_DEVELOPER_TOOLS +/* nvram */ +static int nvram_func(char *arg, int flags) +{ +#define RTC_BOOT_BYTE 48 // Hard coded in coreboot + u8 rtc_boot_byte; + // bit len name + // 0 1 boot_option + // 1 1 last_boot + // 4 4 reboot_bits + + rtc_boot_byte = nvram_read(RTC_BOOT_BYTE); + + if (memcmp(arg, "normal", 6) == 0) { + rtc_boot_byte &= 0x03; // drop reboot_bits + rtc_boot_byte |= 1; // normal + nvram_write(rtc_boot_byte, RTC_BOOT_BYTE); + return 0; + } + + if (memcmp(arg, "fallback", 8) == 0) { + rtc_boot_byte &= 0x03; // drop reboot_bits + rtc_boot_byte &= ~1; // fallback + nvram_write(rtc_boot_byte, RTC_BOOT_BYTE); + return 0; + } + + // TODO not really default, but rather "null everything out and fix the + // checksum" + if (memcmp(arg, "default", 7) == 0) { + int i; + int range_start = lib_sysinfo.cmos_range_start / 8; + int range_end = lib_sysinfo.cmos_range_end / 8; + for (i= range_start; i<range_end; i++) + nvram_write(0, i); + fix_options_checksum(); + return 0; + } + + + if (!strlen(arg)) { + grub_printf("NVRAM Settings:\n"); + grub_printf(" boot option: %s\n", + (rtc_boot_byte & (1 << 0)) ? "Normal" : "Fallback"); + grub_printf(" last boot: %s\n", + (rtc_boot_byte & (1 << 1)) ? "Normal" : "Fallback"); + grub_printf(" reboot_bits: %d\n", (rtc_boot_byte >> 4)); + return 0; + } + + errnum = ERR_BAD_ARGUMENT; + return 1; +} + +static struct builtin builtin_nvram = { + "nvram", + nvram_func, + BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_NO_ECHO, + "nvram [normal|fallback]", + "Change the coreboot nvram to boot the normal or fallback" + "image on the next boot." +}; +#endif + /* password */ static int password_func(char *arg, int flags) { @@ -1786,6 +1850,9 @@ struct builtin *builtin_table[] = { #ifdef CONFIG_USE_MD5_PASSWORDS &builtin_md5crypt, #endif +#ifdef CONFIG_DEVELOPER_TOOLS + &builtin_nvram, +#endif &builtin_password, &builtin_pause, &builtin_poweroff,

1 0

← Newer
1
...
15
16
17
18
19
20
21
22
23
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 September 2011