diff options
author | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
commit | 6d54868eeb2697c9a905c4d3521efbacc44c5258 (patch) | |
tree | 6ad3ae03a0083d1a50a6152bd6dcad5630ce7823 /arch/x86/cpu/quark/quark.c | |
parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
parent | 8216b11cdd50515fbc423a4b2709a00865b8621d (diff) | |
download | u-boot-imx-6d54868eeb2697c9a905c4d3521efbacc44c5258.zip u-boot-imx-6d54868eeb2697c9a905c4d3521efbacc44c5258.tar.gz u-boot-imx-6d54868eeb2697c9a905c4d3521efbacc44c5258.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/quark/quark.c')
-rw-r--r-- | arch/x86/cpu/quark/quark.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index afb3463..bdd360a 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -7,6 +7,7 @@ #include <common.h> #include <mmc.h> #include <asm/io.h> +#include <asm/ioapic.h> #include <asm/mrccache.h> #include <asm/mtrr.h> #include <asm/pci.h> @@ -338,6 +339,9 @@ int arch_misc_init(void) mrccache_save(); #endif + /* Assign a unique I/O APIC ID */ + io_apic_set_id(1); + return 0; } @@ -360,12 +364,3 @@ void board_final_cleanup(void) return; } - -int reserve_arch(void) -{ -#ifdef CONFIG_ENABLE_MRC_CACHE - return mrccache_reserve(); -#else - return 0; -#endif -} |