diff options
| author | Tom Rini <trini@konsulko.com> | 2017-12-18 18:39:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-18 18:39:00 -0500 |
| commit | 1a3fc354b50b2a86361964b6d695ce26058248f5 (patch) | |
| tree | d4d6fa80b189ff547e8ec320daecdbe4675e7ffe /arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | |
| parent | 1a1e7072e3f5499c919fadf949ddb5ce654a17a3 (diff) | |
| parent | 1b7910a37ccc889e1b58a5f6e095a39728564bb8 (diff) | |
| download | u-boot-1a3fc354b50b2a86361964b6d695ce26058248f5.tar.gz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S')
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S index fa93096c68..c089ceef32 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S @@ -37,9 +37,8 @@ ENTRY(get_gic_offset) ldr x2, =DCFG_CCSR_SVR ldr w2, [x2] rev w2, w2 - mov w3, w2 - ands w3, w3, #SVR_WO_E << 8 - mov w4, #SVR_LS1043A << 8 + lsr w3, w2, #16 + ldr w4, =SVR_DEV(SVR_LS1043A) cmp w3, w4 b.ne 1f ands w2, w2, #0xff @@ -92,7 +91,7 @@ ENTRY(lowlevel_init) */ bl get_svr lsr w0, w0, #16 - ldr w1, =SVR_DEV_LS2080A + ldr w1, =SVR_DEV(SVR_LS2080A) cmp w0, w1 b.eq 1f @@ -224,7 +223,7 @@ ENTRY(lowlevel_init) */ bl get_svr lsr w0, w0, #16 - ldr w1, =SVR_DEV_LS2080A + ldr w1, =SVR_DEV(SVR_LS2080A) cmp w0, w1 b.eq 1f |