Date: Tue, 2 Feb 2016 07:47:52 +0000 From: "adrian (Adrian Chadd)" <phabric-noreply@FreeBSD.org> To: freebsd-mips@freebsd.org Subject: [Differential] [Closed] D5077: Rename some CPU_MIPSxxx options and add new CPU_MIPSxxx options Message-ID: <0c5039cd7b9030b281816e6feb26724f@localhost.localdomain> In-Reply-To: <differential-rev-PHID-DREV-5cnvllzxxw5m2qjr3fes-req@FreeBSD.org> References: <differential-rev-PHID-DREV-5cnvllzxxw5m2qjr3fes-req@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--b1_0c5039cd7b9030b281816e6feb26724f Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit This revision was automatically updated to reflect the committed changes. Closed by commit rS295138: Rename some CPU_MIPSxxx options and add new CPU_MIPSxxx options (authored by adrian). CHANGED PRIOR TO COMMIT https://reviews.freebsd.org/D5077?vs=12745&id=12944#toc REPOSITORY rS FreeBSD src repository CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D5077?vs=12745&id=12944 REVISION DETAIL https://reviews.freebsd.org/D5077 AFFECTED FILES head/sys/conf/options.mips head/sys/mips/conf/AR934X_BASE head/sys/mips/conf/QCA955X_BASE head/sys/mips/include/asm.h head/sys/mips/include/cpufunc.h head/sys/mips/include/cpuregs.h CHANGE DETAILS diff --git a/head/sys/mips/include/cpuregs.h b/head/sys/mips/include/cpuregs.h --- a/head/sys/mips/include/cpuregs.h +++ b/head/sys/mips/include/cpuregs.h @@ -149,12 +149,12 @@ #define MIPS_CCA_CC 0x05 /* Cacheable Coherent. */ #endif -#if defined(CPU_MIPS74KC) +#if defined(CPU_MIPS74K) #define MIPS_CCA_UNCACHED 0x02 #define MIPS_CCA_CACHED 0x03 #endif -#if defined(CPU_MIPS1004KC) +#if defined(CPU_MIPS1004K) #define MIPS_CCA_UNCACHED 0x02 #define MIPS_CCA_CACHED 0x05 #endif @@ -214,7 +214,7 @@ #define COP0_SYNC .word 0xc0 /* ehb */ #elif defined(CPU_SB1) #define COP0_SYNC ssnop; ssnop; ssnop; ssnop; ssnop; ssnop; ssnop; ssnop; ssnop -#elif defined(CPU_MIPS74KC) || defined(CPU_MIPS1004KC) +#elif defined(CPU_MIPS74K) || defined(CPU_MIPS1004K) #define COP0_SYNC .word 0xc0 /* ehb */ #else /* diff --git a/head/sys/mips/include/cpufunc.h b/head/sys/mips/include/cpufunc.h --- a/head/sys/mips/include/cpufunc.h +++ b/head/sys/mips/include/cpufunc.h @@ -248,7 +248,7 @@ #if defined(CPU_NLM) || defined(BERI_LARGE_TLB) MIPS_RW32_COP0_SEL(config6, MIPS_COP_0_CONFIG, 6); #endif -#if defined(CPU_NLM) || defined(CPU_MIPS1004KC) +#if defined(CPU_NLM) || defined(CPU_MIPS1004K) MIPS_RW32_COP0_SEL(config7, MIPS_COP_0_CONFIG, 7); #endif MIPS_RW32_COP0(count, MIPS_COP_0_COUNT); diff --git a/head/sys/mips/include/asm.h b/head/sys/mips/include/asm.h --- a/head/sys/mips/include/asm.h +++ b/head/sys/mips/include/asm.h @@ -700,7 +700,7 @@ #elif defined(CPU_RMI) #define HAZARD_DELAY #define ITLBNOPFIX -#elif defined(CPU_MIPS74KC) +#elif defined(CPU_MIPS74K) #define HAZARD_DELAY sll $0,$0,3 #define ITLBNOPFIX sll $0,$0,3 #else diff --git a/head/sys/mips/conf/QCA955X_BASE b/head/sys/mips/conf/QCA955X_BASE --- a/head/sys/mips/conf/QCA955X_BASE +++ b/head/sys/mips/conf/QCA955X_BASE @@ -13,7 +13,7 @@ machine mips mips ident QCA955X_BASE -cpu CPU_MIPS74KC +cpu CPU_MIPS74K makeoptions KERNLOADADDR=0x80050000 options HZ=1000 diff --git a/head/sys/mips/conf/AR934X_BASE b/head/sys/mips/conf/AR934X_BASE --- a/head/sys/mips/conf/AR934X_BASE +++ b/head/sys/mips/conf/AR934X_BASE @@ -12,7 +12,7 @@ machine mips mips ident AR934X_BASE -cpu CPU_MIPS74KC +cpu CPU_MIPS74K makeoptions KERNLOADADDR=0x80050000 options HZ=1000 diff --git a/head/sys/conf/options.mips b/head/sys/conf/options.mips --- a/head/sys/conf/options.mips +++ b/head/sys/conf/options.mips @@ -29,9 +29,13 @@ # $FreeBSD$ CPU_MIPS4KC opt_global.h -CPU_MIPS24KC opt_global.h -CPU_MIPS74KC opt_global.h -CPU_MIPS1004KC opt_global.h +CPU_MIPS24K opt_global.h +CPU_MIPS34K opt_global.h +CPU_MIPS74K opt_global.h +CPU_MIPS1004K opt_global.h +CPU_MIPS1074K opt_global.h +CPU_INTERAPTIV opt_global.h +CPU_PROAPTIV opt_global.h CPU_MIPS32 opt_global.h CPU_MIPS64 opt_global.h CPU_SENTRY5 opt_global.h EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: Sgalabov_gmail.com, MIPS, imp, adrian Cc: imp, freebsd-mips-list --b1_0c5039cd7b9030b281816e6feb26724f Content-Type: text/x-patch; charset=utf-8; name="D5077.12944.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D5077.12944.patch" ZGlmZiAtLWdpdCBhL2hlYWQvc3lzL21pcHMvaW5jbHVkZS9jcHVyZWdzLmggYi9oZWFkL3N5cy9t aXBzL2luY2x1ZGUvY3B1cmVncy5oCi0tLSBhL2hlYWQvc3lzL21pcHMvaW5jbHVkZS9jcHVyZWdz LmgKKysrIGIvaGVhZC9zeXMvbWlwcy9pbmNsdWRlL2NwdXJlZ3MuaApAQCAtMTQ5LDEyICsxNDks MTIgQEAKICNkZWZpbmUJTUlQU19DQ0FfQ0MJMHgwNQkvKiBDYWNoZWFibGUgQ29oZXJlbnQuICov CiAjZW5kaWYKIAotI2lmIGRlZmluZWQoQ1BVX01JUFM3NEtDKQorI2lmIGRlZmluZWQoQ1BVX01J UFM3NEspCiAjZGVmaW5lCU1JUFNfQ0NBX1VOQ0FDSEVECTB4MDIKICNkZWZpbmUJTUlQU19DQ0Ff Q0FDSEVECQkweDAzCiAjZW5kaWYKIAotI2lmIGRlZmluZWQoQ1BVX01JUFMxMDA0S0MpCisjaWYg ZGVmaW5lZChDUFVfTUlQUzEwMDRLKQogI2RlZmluZQlNSVBTX0NDQV9VTkNBQ0hFRAkweDAyCiAj ZGVmaW5lCU1JUFNfQ0NBX0NBQ0hFRAkJMHgwNQogI2VuZGlmCkBAIC0yMTQsNyArMjE0LDcgQEAK ICNkZWZpbmUJQ09QMF9TWU5DCS53b3JkIDB4YzAJLyogZWhiICovCiAjZWxpZiBkZWZpbmVkKENQ VV9TQjEpCiAjZGVmaW5lIENPUDBfU1lOQyAgc3Nub3A7IHNzbm9wOyBzc25vcDsgc3Nub3A7IHNz bm9wOyBzc25vcDsgc3Nub3A7IHNzbm9wOyBzc25vcAotI2VsaWYgZGVmaW5lZChDUFVfTUlQUzc0 S0MpIHx8IGRlZmluZWQoQ1BVX01JUFMxMDA0S0MpCisjZWxpZiBkZWZpbmVkKENQVV9NSVBTNzRL KSB8fCBkZWZpbmVkKENQVV9NSVBTMTAwNEspCiAjZGVmaW5lCUNPUDBfU1lOQwkgLndvcmQgMHhj MAkvKiBlaGIgKi8KICNlbHNlCiAvKgpkaWZmIC0tZ2l0IGEvaGVhZC9zeXMvbWlwcy9pbmNsdWRl L2NwdWZ1bmMuaCBiL2hlYWQvc3lzL21pcHMvaW5jbHVkZS9jcHVmdW5jLmgKLS0tIGEvaGVhZC9z eXMvbWlwcy9pbmNsdWRlL2NwdWZ1bmMuaAorKysgYi9oZWFkL3N5cy9taXBzL2luY2x1ZGUvY3B1 ZnVuYy5oCkBAIC0yNDgsNyArMjQ4LDcgQEAKICNpZiBkZWZpbmVkKENQVV9OTE0pIHx8IGRlZmlu ZWQoQkVSSV9MQVJHRV9UTEIpCiBNSVBTX1JXMzJfQ09QMF9TRUwoY29uZmlnNiwgTUlQU19DT1Bf MF9DT05GSUcsIDYpOwogI2VuZGlmCi0jaWYgZGVmaW5lZChDUFVfTkxNKSB8fCBkZWZpbmVkKENQ VV9NSVBTMTAwNEtDKQorI2lmIGRlZmluZWQoQ1BVX05MTSkgfHwgZGVmaW5lZChDUFVfTUlQUzEw MDRLKQogTUlQU19SVzMyX0NPUDBfU0VMKGNvbmZpZzcsIE1JUFNfQ09QXzBfQ09ORklHLCA3KTsK ICNlbmRpZgogTUlQU19SVzMyX0NPUDAoY291bnQsIE1JUFNfQ09QXzBfQ09VTlQpOwpkaWZmIC0t Z2l0IGEvaGVhZC9zeXMvbWlwcy9pbmNsdWRlL2FzbS5oIGIvaGVhZC9zeXMvbWlwcy9pbmNsdWRl L2FzbS5oCi0tLSBhL2hlYWQvc3lzL21pcHMvaW5jbHVkZS9hc20uaAorKysgYi9oZWFkL3N5cy9t aXBzL2luY2x1ZGUvYXNtLmgKQEAgLTcwMCw3ICs3MDAsNyBAQAogI2VsaWYgZGVmaW5lZChDUFVf Uk1JKQogI2RlZmluZQlIQVpBUkRfREVMQVkKICNkZWZpbmUJSVRMQk5PUEZJWAotI2VsaWYgZGVm aW5lZChDUFVfTUlQUzc0S0MpCisjZWxpZiBkZWZpbmVkKENQVV9NSVBTNzRLKQogI2RlZmluZQlI QVpBUkRfREVMQVkJc2xsICQwLCQwLDMKICNkZWZpbmUJSVRMQk5PUEZJWAlzbGwgJDAsJDAsMwog I2Vsc2UKZGlmZiAtLWdpdCBhL2hlYWQvc3lzL21pcHMvY29uZi9RQ0E5NTVYX0JBU0UgYi9oZWFk L3N5cy9taXBzL2NvbmYvUUNBOTU1WF9CQVNFCi0tLSBhL2hlYWQvc3lzL21pcHMvY29uZi9RQ0E5 NTVYX0JBU0UKKysrIGIvaGVhZC9zeXMvbWlwcy9jb25mL1FDQTk1NVhfQkFTRQpAQCAtMTMsNyAr MTMsNyBAQAogCiBtYWNoaW5lICAgICAgICAgbWlwcyBtaXBzCiBpZGVudAkJUUNBOTU1WF9CQVNF Ci1jcHUJCUNQVV9NSVBTNzRLQworY3B1CQlDUFVfTUlQUzc0SwogbWFrZW9wdGlvbnMJS0VSTkxP QURBRERSPTB4ODAwNTAwMDAKIG9wdGlvbnMgCUhaPTEwMDAKIApkaWZmIC0tZ2l0IGEvaGVhZC9z eXMvbWlwcy9jb25mL0FSOTM0WF9CQVNFIGIvaGVhZC9zeXMvbWlwcy9jb25mL0FSOTM0WF9CQVNF Ci0tLSBhL2hlYWQvc3lzL21pcHMvY29uZi9BUjkzNFhfQkFTRQorKysgYi9oZWFkL3N5cy9taXBz L2NvbmYvQVI5MzRYX0JBU0UKQEAgLTEyLDcgKzEyLDcgQEAKIAogbWFjaGluZSAgICAgICAgIG1p cHMgbWlwcwogaWRlbnQJCUFSOTM0WF9CQVNFCi1jcHUJCUNQVV9NSVBTNzRLQworY3B1CQlDUFVf TUlQUzc0SwogbWFrZW9wdGlvbnMJS0VSTkxPQURBRERSPTB4ODAwNTAwMDAKIG9wdGlvbnMgCUha PTEwMDAKIApkaWZmIC0tZ2l0IGEvaGVhZC9zeXMvY29uZi9vcHRpb25zLm1pcHMgYi9oZWFkL3N5 cy9jb25mL29wdGlvbnMubWlwcwotLS0gYS9oZWFkL3N5cy9jb25mL29wdGlvbnMubWlwcworKysg Yi9oZWFkL3N5cy9jb25mL29wdGlvbnMubWlwcwpAQCAtMjksOSArMjksMTMgQEAKICMgJEZyZWVC U0QkCiAKIENQVV9NSVBTNEtDCW9wdF9nbG9iYWwuaAotQ1BVX01JUFMyNEtDCW9wdF9nbG9iYWwu aAotQ1BVX01JUFM3NEtDCW9wdF9nbG9iYWwuaAotQ1BVX01JUFMxMDA0S0MJb3B0X2dsb2JhbC5o CitDUFVfTUlQUzI0SwlvcHRfZ2xvYmFsLmgKK0NQVV9NSVBTMzRLCW9wdF9nbG9iYWwuaAorQ1BV X01JUFM3NEsJb3B0X2dsb2JhbC5oCitDUFVfTUlQUzEwMDRLCW9wdF9nbG9iYWwuaAorQ1BVX01J UFMxMDc0SwlvcHRfZ2xvYmFsLmgKK0NQVV9JTlRFUkFQVElWCW9wdF9nbG9iYWwuaAorQ1BVX1BS T0FQVElWCW9wdF9nbG9iYWwuaAogQ1BVX01JUFMzMglvcHRfZ2xvYmFsLmgKIENQVV9NSVBTNjQJ b3B0X2dsb2JhbC5oCiBDUFVfU0VOVFJZNQlvcHRfZ2xvYmFsLmgKCg== --b1_0c5039cd7b9030b281816e6feb26724f--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0c5039cd7b9030b281816e6feb26724f>