rk: plat: entry-macro.S use GIC_CPU_BASE macro

diff --git a/arch/arm/mach-rk30/include/mach/entry-macro.S b/arch/arm/mach-rk30/include/mach/entry-macro.S
index 2cebce7a5717ee5e4f32eb4c60d024ecaab0d31d..d5136aa473858cf29858fd075e5ce6f5c28a1b32 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/entry-macro.S
+++ b/arch/arm/mach-rk30/include/mach/entry-macro.S
@@ -1,2 +1 @@
-#define GICC_BASE RK30_GICC_BASE
 #include <plat/entry-macro.S>

diff --git a/arch/arm/plat-rk/include/plat/entry-macro.S b/arch/arm/plat-rk/include/plat/entry-macro.S
index 1a0ede5c84081c840697967dde0973c6e80ff53f..a78e8441c97e0c3eb6bd36e7c1d9010c2b70855b 100644 (file)
--- a/arch/arm/plat-rk/include/plat/entry-macro.S
+++ b/arch/arm/plat-rk/include/plat/entry-macro.S
@@ -7,7 +7,7 @@
         .endm
 
        .macro  get_irqnr_preamble, base, tmp
-       ldr     \base, =GICC_BASE
+       ldr     \base, =GIC_CPU_BASE
        .endm
 
        .macro  arch_ret_to_user, tmp1, tmp2