the following patch was just integrated into master:
commit eeabb75e8c5a72fb01c1966fd91ea398818f15b3
Author: Elyes HAOUAS <ehaouas(a)noos.fr>
Date: Tue Sep 27 21:56:36 2016 +0200
mainboard/amd/rumba: Use tabs for indents
Change-Id: I005e607faa2a6c527584ba9cdcad92f4517a15e6
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/16778
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See https://review.coreboot.org/16778 for details.
-gerrit
the following patch was just integrated into master:
commit 39aa6309ba2c356c3e51640ce454ef37d5976f31
Author: Elyes HAOUAS <ehaouas(a)noos.fr>
Date: Tue Sep 27 21:22:54 2016 +0200
mainboard/supermicro/h8dmr/romstage.c: Use tabs for indents
Change-Id: I008ccc5fa9d96e52ee59a4562d81e4f7c1d1a6ac
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/16775
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See https://review.coreboot.org/16775 for details.
-gerrit
the following patch was just integrated into master:
commit 6da74da345dadce4ad0775c37a8f4a7ac9b3abf5
Author: Elyes HAOUAS <ehaouas(a)noos.fr>
Date: Tue Sep 27 21:28:57 2016 +0200
mainboard/sunw/ultra40/romstage.c: Use tabs for indents
Change-Id: I9b7be74625dfcb6317a1cdb61d0dc77d7f359462
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/16776
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See https://review.coreboot.org/16776 for details.
-gerrit
the following patch was just integrated into master:
commit 8f372d031b6b76405d6267e90b30829c1e8f9e2b
Author: Elyes HAOUAS <ehaouas(a)noos.fr>
Date: Tue Sep 27 21:36:55 2016 +0200
mainboard/technexion/tim5690: Use tabs for indents
Change-Id: Icd1f145b3575c6d95dacceb9c0426fbdedcdd686
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/16777
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See https://review.coreboot.org/16777 for details.
-gerrit
Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16781
-gerrit
commit 3bbc2819791a094ae172bd33eed5bbd711ab8e6f
Author: Ronald G. Minnich <rminnich(a)google.com>
Date: Wed Sep 28 10:43:12 2016 -0700
cbfstool: set init_size for linux payloads.
We were not setting the init_size for linux payloads.
A proper value of init_size is required if the kernel
is x86_64.
This is tested in qemu and fixes the observed problem
that 974f221c84b05b1dc2f5ea50dc16d2a9d1e95eda and later would not
boot, and would in fact fail in head_64.S.
Change-Id: I254c13d16b1e014a6f1d4fd7c39b1cfe005cd9b0
Signed-off-by: Ronald G. Minnich <rminnich(a)google.com>
---
util/cbfstool/cbfs-payload-linux.c | 9 +++++++++
util/cbfstool/linux.h | 12 ++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c
index 03a41cd..afb0f3a 100644
--- a/util/cbfstool/cbfs-payload-linux.c
+++ b/util/cbfstool/cbfs-payload-linux.c
@@ -220,14 +220,19 @@ int parse_bzImage_to_payload(const struct buffer *input,
if (hdr->setup_sects != 0) {
setup_size = (hdr->setup_sects + 1) * 512;
+ } else {
+ WARN("hdr->setup_sects is 0, which could cause boot problems.\n");
}
/* Setup parameter block. Imitate FILO. */
struct linux_params params;
memset(¶ms, 0, sizeof(struct linux_params));
+
params.mount_root_rdonly = hdr->root_flags;
params.orig_root_dev = hdr->root_dev;
+ params.init_size = hdr->init_size;
+
/* Sensible video defaults. Might be overridden on runtime by coreboot tables. */
params.orig_video_mode = 3;
params.orig_video_cols = 80;
@@ -262,6 +267,10 @@ int parse_bzImage_to_payload(const struct buffer *input,
* so if possible (relocatable kernel) use that to
* avoid a trampoline copy. */
kernel_base = ALIGN(16*1024*1024, params.kernel_alignment);
+ if (hdr->init_size == 0) {
+ ERROR("init_size 0 for relocatable kernel\n");
+ return -1;
+ }
}
}
diff --git a/util/cbfstool/linux.h b/util/cbfstool/linux.h
index b96f447..42763b5 100644
--- a/util/cbfstool/linux.h
+++ b/util/cbfstool/linux.h
@@ -139,7 +139,13 @@ struct linux_params {
u32 alt_mem_k; /* 0x1e0 */
u8 reserved5[4]; /* 0x1e4 */
u8 e820_map_nr; /* 0x1e8 */
- u8 reserved6[9]; /* 0x1e9 */
+ u8 reserved6[8]; /* 0x1e9 */
+ /* This next variable is to show where
+ * in this struct the Linux setup_hdr
+ * is located. It does not get filled in.
+ * We may someday find it useful to use
+ * its address.
+ u8 setup_hdr; * 0x1f1 */
u16 mount_root_rdonly; /* 0x1f2 */
u8 reserved7[4]; /* 0x1f4 */
u16 ramdisk_flags; /* 0x1f8 */
@@ -170,7 +176,9 @@ struct linux_params {
u32 initrd_addr_max; /* 0x22c */
u32 kernel_alignment; /* 0x230 */
u8 relocatable_kernel; /* 0x234 */
- u8 reserved13[155]; /* 0x22c */
+ u8 reserved13[0x2b]; /* 0x235 */
+ u32 init_size; /* 0x260 */
+ u8 reserved14[0x6c]; /* 0x264 */
struct e820entry e820_map[E820MAX]; /* 0x2d0 */
u8 reserved16[688]; /* 0x550 */
#define COMMAND_LINE_SIZE 256
the following patch was just integrated into master:
commit c6317e0c954506126eca8d28ef9f354020b81aa5
Author: Elyes HAOUAS <ehaouas(a)noos.fr>
Date: Tue Sep 27 21:11:57 2016 +0200
mainboard/supermicro/h8qme_fam10/romstage.c: Use tabs for indents
Change-Id: I6ca564294ff3d8eaeae21c0e2c008401aa3f32ff
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/16774
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See https://review.coreboot.org/16774 for details.
-gerrit
the following patch was just integrated into master:
commit 497b5fe87a54862e75652befed3f23d1c0e37dac
Author: Elyes HAOUAS <ehaouas(a)noos.fr>
Date: Tue Sep 27 20:59:00 2016 +0200
mainboard/asus/dsbf/romstage.c: Use tabs for indents
Change-Id: I74d4ef76b8166c8567b1b855c6bc963b4312df77
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/16773
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
Tested-by: build bot (Jenkins)
See https://review.coreboot.org/16773 for details.
-gerrit
the following patch was just integrated into master:
commit 499ccbe41c1d9cf9846a707fbab04f280e0f950a
Author: Elyes HAOUAS <ehaouas(a)noos.fr>
Date: Tue Sep 27 20:52:06 2016 +0200
mainboard/intel/emeraldlake2/gpio.c: Use tabs for indents
Change-Id: I369c2063a5e57d1fd33d3c6bf7c715c22970fc32
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/16772
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See https://review.coreboot.org/16772 for details.
-gerrit
the following patch was just integrated into master:
commit 1a657e93344de43bb3f30dd7785b4a503307105b
Author: Elyes HAOUAS <ehaouas(a)noos.fr>
Date: Tue Sep 27 20:40:06 2016 +0200
mainboard/intel/eagleheights/debug.c: Use tabs for indents
Change-Id: I4d2d876d48e018c247e7f365f7c237a4d8ced332
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/16771
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See https://review.coreboot.org/16771 for details.
-gerrit
the following patch was just integrated into master:
commit d9ceae5f205574020a280edd6917f5689f94423d
Author: Elyes HAOUAS <ehaouas(a)noos.fr>
Date: Mon Sep 26 21:11:58 2016 +0200
mainboard/broadcom/blast: Use tabs for indents
Change-Id: I61bef70ec572c12518cd3763a6a860e56bfdb716
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/16745
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See https://review.coreboot.org/16745 for details.
-gerrit