On Fri, Jul 06, 2012 at 02:34:28PM +0400, Antony Pavlov wrote: > Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx> > --- > arch/mips/include/asm/asm.h | 8 -------- > arch/mips/include/asm/mipsregs.h | 32 -------------------------------- > 2 files changed, 40 deletions(-) Applied, thanks Sascha > > diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h > index 608cfcf..12e1758 100644 > --- a/arch/mips/include/asm/asm.h > +++ b/arch/mips/include/asm/asm.h > @@ -398,12 +398,4 @@ symbol = value > > #define SSNOP sll zero, zero, 1 > > -#ifdef CONFIG_SGI_IP28 > -/* Inhibit speculative stores to volatile (e.g.DMA) or invalid addresses. */ > -#include <asm/cacheops.h> > -#define R10KCBARRIER(addr) cache Cache_Barrier, addr; > -#else > -#define R10KCBARRIER(addr) > -#endif > - > #endif /* __ASM_ASM_H */ > diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h > index befccbb..16ba38e 100644 > --- a/arch/mips/include/asm/mipsregs.h > +++ b/arch/mips/include/asm/mipsregs.h > @@ -102,11 +102,6 @@ > #define CP0_S3_SRSMAP $12 /* MIPSR2 */ > > /* > - * TX39 Series > - */ > -#define CP0_TX39_CACHE $7 > - > -/* > * Coprocessor 1 (FPU) register names > */ > #define CP1_REVISION $0 > @@ -387,27 +382,6 @@ > #define R5K_CONF_SE (_ULCAST_(1) << 12) > #define R5K_CONF_SS (_ULCAST_(3) << 20) > > -/* Bits specific to the RM7000. */ > -#define RM7K_CONF_SE (_ULCAST_(1) << 3) > -#define RM7K_CONF_TE (_ULCAST_(1) << 12) > -#define RM7K_CONF_CLK (_ULCAST_(1) << 16) > -#define RM7K_CONF_TC (_ULCAST_(1) << 17) > -#define RM7K_CONF_SI (_ULCAST_(3) << 20) > -#define RM7K_CONF_SC (_ULCAST_(1) << 31) > - > -/* Bits specific to the R10000. */ > -#define R10K_CONF_DN (_ULCAST_(3) << 3) > -#define R10K_CONF_CT (_ULCAST_(1) << 5) > -#define R10K_CONF_PE (_ULCAST_(1) << 6) > -#define R10K_CONF_PM (_ULCAST_(3) << 7) > -#define R10K_CONF_EC (_ULCAST_(15)<< 9) > -#define R10K_CONF_SB (_ULCAST_(1) << 13) > -#define R10K_CONF_SK (_ULCAST_(1) << 14) > -#define R10K_CONF_SS (_ULCAST_(7) << 16) > -#define R10K_CONF_SC (_ULCAST_(7) << 19) > -#define R10K_CONF_DC (_ULCAST_(7) << 26) > -#define R10K_CONF_IC (_ULCAST_(7) << 29) > - > /* Bits specific to the R30xx. */ > #define R30XX_CONF_FDM (_ULCAST_(1) << 19) > #define R30XX_CONF_REV (_ULCAST_(1) << 22) > @@ -419,12 +393,6 @@ > #define R30XX_CONF_SB (_ULCAST_(1) << 30) > #define R30XX_CONF_LOCK (_ULCAST_(1) << 31) > > -/* Bits specific to the TX49. */ > -#define TX49_CONF_DC (_ULCAST_(1) << 16) > -#define TX49_CONF_IC (_ULCAST_(1) << 17) /* conflict with CONF_SC */ > -#define TX49_CONF_HALT (_ULCAST_(1) << 18) > -#define TX49_CONF_CWFON (_ULCAST_(1) << 27) > - > /* Bits specific to the MIPS32/64 PRA. */ > #define MIPS_CONF_MT (_ULCAST_(7) << 7) > #define MIPS_CONF_AR (_ULCAST_(7) << 10) > -- > 1.7.10 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
