summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2012-03-05 15:49:32 -0800
committerPatrick Georgi <patrick@georgi-clan.de>2012-03-31 12:10:07 +0200
commitb9fa1ed5e80b607df59783cdc406d85bcccf63f5 (patch)
tree67d669f203c532002b697e59119690f6cceaf165
parentcbb648c001167f7762e0f1aa2af906d3a8e34715 (diff)
downloadcoreboot-b9fa1ed5e80b607df59783cdc406d85bcccf63f5.tar.xz
Make libpayload parse the coreboot tables before setting up the consoles
At least one of the console drivers, coreboot fb, uses information in the sysinfo structure to set itself up. If that structure hasn't been populated, the driver decides that there is no framebuffer and disables itself. Reversing the order these are set up fixes that problem. Change-Id: Idd8b5518980dfdd82fd4359dd0133ab7736fc428 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: http://review.coreboot.org/816 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--payloads/libpayload/arch/i386/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/payloads/libpayload/arch/i386/main.c b/payloads/libpayload/arch/i386/main.c
index 378c6f387f..36cfb69bff 100644
--- a/payloads/libpayload/arch/i386/main.c
+++ b/payloads/libpayload/arch/i386/main.c
@@ -46,12 +46,12 @@ void start_main(void)
{
extern int main(int argc, char **argv);
- /* Set up the consoles. */
- console_init();
-
/* Gather system information. */
lib_get_sysinfo();
+ /* Set up the consoles. */
+ console_init();
+
/*
* Any other system init that has to happen before the
* user gets control goes here.