diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /lib_ppc/extable.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'lib_ppc/extable.c')
| -rw-r--r-- | lib_ppc/extable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib_ppc/extable.c b/lib_ppc/extable.c index 2d995fa30..91e2b3d24 100644 --- a/lib_ppc/extable.c +++ b/lib_ppc/extable.c @@ -53,7 +53,7 @@ search_one_table(const struct exception_table_entry *first, unsigned long value) { long diff; - if ((ulong) first > CFG_MONITOR_BASE) { + if ((ulong) first > CONFIG_SYS_MONITOR_BASE) { /* exception occurs in FLASH, before u-boot relocation. * No relocation offset is needed. */ @@ -87,7 +87,7 @@ search_exception_table(unsigned long addr) /* There is only the kernel to search. */ ret = search_one_table(__start___ex_table, __stop___ex_table-1, addr); /* if the serial port does not hang in exception, printf can be used */ -#if !defined(CFG_SERIAL_HANG_IN_EXCEPTION) +#if !defined(CONFIG_SYS_SERIAL_HANG_IN_EXCEPTION) if (ex_tab_message) debug("Bus Fault @ 0x%08lx, fixup 0x%08lx\n", addr, ret); #endif |