diff options
| author | Tom Rini <trini@ti.com> | 2015-01-26 17:44:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-26 17:44:49 -0500 |
| commit | ab92da9f47d51d363c7de42e2a7bd807e2c1bd54 (patch) | |
| tree | dfabc29929e39a1ecc47edf5a4cf839ead062acd /arch/x86/lib | |
| parent | aed03faa064cca56847571b13cbd4c849c6116aa (diff) | |
| parent | e43ade3749ff10bc313f33bf23705465e4163896 (diff) | |
| download | u-boot-imx-ab92da9f47d51d363c7de42e2a7bd807e2c1bd54.zip u-boot-imx-ab92da9f47d51d363c7de42e2a7bd807e2c1bd54.tar.gz u-boot-imx-ab92da9f47d51d363c7de42e2a7bd807e2c1bd54.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/init_helpers.c | 4 | ||||
| -rw-r--r-- | arch/x86/lib/interrupts.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index fc211d9..5097ca2 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -7,6 +7,7 @@ #include <common.h> #include <fdtdec.h> #include <spi.h> +#include <asm/errno.h> #include <asm/mtrr.h> #include <asm/sections.h> @@ -71,7 +72,8 @@ int init_cache_f_r(void) int ret; ret = mtrr_commit(false); - if (ret) + /* If MTRR MSR is not implemented by the processor, just ignore it */ + if (ret && ret != -ENOSYS) return ret; #endif /* Initialise the CPU cache(s) */ diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index 6bb22d2..146ad11 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -130,7 +130,7 @@ int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("Interrupt-Information:\n"); printf("Nr Routine Arg Count\n"); - for (irq = 0; irq <= CONFIG_SYS_NUM_IRQS; irq++) { + for (irq = 0; irq < CONFIG_SYS_NUM_IRQS; irq++) { if (irq_handlers[irq].handler != NULL) { printf("%02d %08lx %08lx %d\n", irq, |