From 50bb1b01292ebe8c9a02717027d2ba7f17fc0f3e Mon Sep 17 00:00:00 2001 From: Maxime Bizon Date: Mon, 29 Oct 2012 14:40:19 +0100 Subject: [PATCH] --- yaml --- r: 335995 b: refs/heads/master c: d7959916026aaae60e1878ae33c7503b2cc4471d h: refs/heads/master i: 335993: 2269d742232159335c036ccbfa448e12fdcccf79 335991: 5df623f37932752f5914cb3e3f7a0566018ad86e v: v3 --- [refs] | 2 +- trunk/arch/x86/platform/ce4100/ce4100.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index eee0d7f094b0..a8d57097d96a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f49f4ab95c301dbccad0efe85296d908b8ae7ad4 +refs/heads/master: d7959916026aaae60e1878ae33c7503b2cc4471d diff --git a/trunk/arch/x86/platform/ce4100/ce4100.c b/trunk/arch/x86/platform/ce4100/ce4100.c index 5de16e359fe6..92525cb8e54c 100644 --- a/trunk/arch/x86/platform/ce4100/ce4100.c +++ b/trunk/arch/x86/platform/ce4100/ce4100.c @@ -21,6 +21,7 @@ #include #include #include +#include static int ce4100_i8042_detect(void) { @@ -151,6 +152,15 @@ void __init x86_ce4100_early_setup(void) x86_init.mpparse.find_smp_config = x86_init_noop; x86_init.pci.init = ce4100_pci_init; + /* + * By default, the reboot method is ACPI which is supported by the + * CE4100 bootloader CEFDK using FADT.ResetReg Address and ResetValue + * the bootloader will however issue a system power off instead of + * reboot. By using BOOT_KBD we ensure proper system reboot as + * expected. + */ + reboot_type = BOOT_KBD; + #ifdef CONFIG_X86_IO_APIC x86_init.pci.init_irq = sdv_pci_init; x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc_nocheck;