sunxi: Group cpu core related controls together

[oweals/u-boot.git] / arch / arm / include / asm / arch-omap3 / cpu.h

diff --git a/arch/arm/include/asm/arch-omap3/cpu.h b/arch/arm/include/asm/arch-omap3/cpu.h
index 4d06ef83fee31255d41c69834edee5b7dab0c141..e8aa786d2bb33b2c2e10f69f7a7e798b57140694 100644 (file)
--- a/arch/arm/include/asm/arch-omap3/cpu.h
+++ b/arch/arm/include/asm/arch-omap3/cpu.h
@@ -59,13 +59,8 @@ struct ctrl_id {
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL_STRICT_NAMES */
 
-/* device type */
-#define DEVICE_MASK            (0x7 << 8)
+/* boot pin mask */
 #define SYSBOOT_MASK           0x1F
-#define TST_DEVICE             0x0
-#define EMU_DEVICE             0x1
-#define HS_DEVICE              0x2
-#define GP_DEVICE              0x3
 
 /* device speed */
 #define SKUID_CLK_MASK         0xf
@@ -98,7 +93,6 @@ struct ctrl_id {
 #define DEBUG_BASE             0x08000000      /* debug board */
 #define NAND_BASE              0x30000000      /* NAND addr */
                                                /* (actual size small port) */
-#define PISMO2_BASE            0x18000000      /* PISMO2 CS1/2 */
 #define ONENAND_MAP            0x20000000      /* OneNand addr */
                                                /* (actual size small port) */
 /* SMS */