diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 10 | ||||
| -rw-r--r-- | arch/arm/lib/interrupts_64.c | 13 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 10 | ||||
| -rw-r--r-- | arch/xtensa/cpu/start.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/cpu/u-boot.lds | 4 |
5 files changed, 19 insertions, 20 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 77cb20090c..2c52ff025a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1190,6 +1190,16 @@ config ARCH_ASPEED endchoice +config TI_SECURE_DEVICE + bool "HS Device Type Support" + depends on ARCH_KEYSTONE || ARCH_OMAP2PLUS + help + If a high secure (HS) device type is being used, this config + must be set. This option impacts various aspects of the + build system (to create signed boot images that can be + authenticated) and the code. See the doc/README.ti-secure + file for further details. + source "arch/arm/mach-aspeed/Kconfig" source "arch/arm/mach-at91/Kconfig" diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c index cbcfeec2b0..8a5d82468b 100644 --- a/arch/arm/lib/interrupts_64.c +++ b/arch/arm/lib/interrupts_64.c @@ -30,13 +30,12 @@ void show_regs(struct pt_regs *regs) { int i; - if (gd->flags & GD_FLG_RELOC) { - printf("ELR: %lx\n", regs->elr - gd->reloc_off); - printf("LR: %lx\n", regs->regs[30] - gd->reloc_off); - } else { - printf("ELR: %lx\n", regs->elr); - printf("LR: %lx\n", regs->regs[30]); - } + if (gd->flags & GD_FLG_RELOC) + printf("elr: %016lx lr : %016lx (reloc)\n", + regs->elr - gd->reloc_off, + regs->regs[30] - gd->reloc_off); + printf("elr: %016lx lr : %016lx\n", regs->elr, regs->regs[30]); + for (i = 0; i < 29; i += 2) printf("x%-2d: %016lx x%-2d: %016lx\n", i, regs->regs[i], i+1, regs->regs[i+1]); diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index abd1aa7fe1..62c25c4044 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -133,16 +133,6 @@ config SYS_MPUCLK help Defines the MPU clock speed (in MHz). -config TI_SECURE_DEVICE - bool "HS Device Type Support" - depends on OMAP54XX || AM43XX || AM33XX || ARCH_KEYSTONE - help - If a high secure (HS) device type is being used, this config - must be set. This option impacts various aspects of the - build system (to create signed boot images that can be - authenticated) and the code. See the doc/README.ti-secure - file for further details. - config TI_SECURE_EMIF_REGION_START hex "Reserved EMIF region start address" depends on TI_SECURE_DEVICE diff --git a/arch/xtensa/cpu/start.S b/arch/xtensa/cpu/start.S index 8e4bc99e42..cdb875da53 100644 --- a/arch/xtensa/cpu/start.S +++ b/arch/xtensa/cpu/start.S @@ -226,7 +226,7 @@ _start: #endif movi a0, 0 - movi sp, (CONFIG_SYS_TEXT_ADDR - 16) & 0xfffffff0 + movi sp, (XTENSA_SYS_TEXT_ADDR - 16) & 0xfffffff0 #ifdef CONFIG_DEBUG_UART movi a4, debug_uart_init diff --git a/arch/xtensa/cpu/u-boot.lds b/arch/xtensa/cpu/u-boot.lds index 853ae5a948..7200bc59fb 100644 --- a/arch/xtensa/cpu/u-boot.lds +++ b/arch/xtensa/cpu/u-boot.lds @@ -74,9 +74,9 @@ SECTIONS SECTION_VECTOR(DoubleExceptionVector,text,XCHAL_DOUBLEEXC_VECTOR_VADDR, FOLLOWING(.DoubleExceptionVector.literal)) - __monitor_start = CONFIG_SYS_TEXT_ADDR; + __monitor_start = XTENSA_SYS_TEXT_ADDR; - SECTION_text(CONFIG_SYS_TEXT_ADDR, FOLLOWING(.DoubleExceptionVector.text)) + SECTION_text(XTENSA_SYS_TEXT_ADDR, FOLLOWING(.DoubleExceptionVector.text)) SECTION_rodata(ALIGN(16), FOLLOWING(.text)) SECTION_u_boot_list(ALIGN(16), FOLLOWING(.rodata)) SECTION_data(ALIGN(16), FOLLOWING(.u_boot_list)) |