Kernel - Slight reworks to timer code

[tpg/acess2.git] / Kernel / arch / armv7 / include / options.h

diff --git a/Kernel/arch/armv7/include/options.h b/Kernel/arch/armv7/include/options.h
index fad529e..95345ed 100644 (file)
--- a/Kernel/arch/armv7/include/options.h
+++ b/Kernel/arch/armv7/include/options.h
@@ -12,7 +12,7 @@
 
 //#define PCI_PADDR    0x60000000      // Realview (Non-PB)
 
-#if CONFIG_is_realview_pb
+#if PLATFORM_is_realview_pb
 # define UART0_PADDR   0x10009000      // Realview
 # define GICI_PADDR    0x1e000000
 # define GICD_PADDR    0x1e001000
@@ -20,10 +20,10 @@
 
 #endif
 
-#if CONFIG_is_trimslice        // Tegra2
+#if PLATFORM_is_tegra2 // Tegra2
 # define UART0_PADDR   0x70006000
 # define GICD_PADDR    0x50041000
-# define GICI_PADDR    0x60004000      // TODO: Is this actually a GIC-I?
+# define GICI_PADDR    0x50040100
 //# define PL110_BASE  0x10020000      // Integrator
 #endif