From 71324ae1c916e141cf89586d5e9a0e897c4fe283 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 24 May 2016 14:03:56 +0100 Subject: [PATCH] [mips*] Rename CPU type config files to be independent of Malta Although the choice of CPU type currently only applies to Malta flavours, there's nothing in these config files that prevents them being used with other platforms (that we don't currently support). --- .../kernelarch-mips/{config.4kc-malta-r1 => config.mips32r1} | 0 .../kernelarch-mips/{config.4kc-malta-r2 => config.mips32r2} | 0 .../kernelarch-mips/{config.4kc-malta-r6 => config.mips32r6} | 0 .../kernelarch-mips/{config.5kc-malta-r1 => config.mips64r1} | 0 .../kernelarch-mips/{config.5kc-malta-r2 => config.mips64r2} | 0 .../kernelarch-mips/{config.5kc-malta-r6 => config.mips64r6} | 0 debian/config/mips/defines | 4 ++-- debian/config/mips64/defines | 2 +- debian/config/mips64el/defines | 2 +- debian/config/mips64r6/defines | 2 +- debian/config/mips64r6el/defines | 2 +- debian/config/mipsel/defines | 4 ++-- debian/config/mipsr6/defines | 4 ++-- debian/config/mipsr6el/defines | 4 ++-- 14 files changed, 12 insertions(+), 12 deletions(-) rename debian/config/kernelarch-mips/{config.4kc-malta-r1 => config.mips32r1} (100%) rename debian/config/kernelarch-mips/{config.4kc-malta-r2 => config.mips32r2} (100%) rename debian/config/kernelarch-mips/{config.4kc-malta-r6 => config.mips32r6} (100%) rename debian/config/kernelarch-mips/{config.5kc-malta-r1 => config.mips64r1} (100%) rename debian/config/kernelarch-mips/{config.5kc-malta-r2 => config.mips64r2} (100%) rename debian/config/kernelarch-mips/{config.5kc-malta-r6 => config.mips64r6} (100%) diff --git a/debian/config/kernelarch-mips/config.4kc-malta-r1 b/debian/config/kernelarch-mips/config.mips32r1 similarity index 100% rename from debian/config/kernelarch-mips/config.4kc-malta-r1 rename to debian/config/kernelarch-mips/config.mips32r1 diff --git a/debian/config/kernelarch-mips/config.4kc-malta-r2 b/debian/config/kernelarch-mips/config.mips32r2 similarity index 100% rename from debian/config/kernelarch-mips/config.4kc-malta-r2 rename to debian/config/kernelarch-mips/config.mips32r2 diff --git a/debian/config/kernelarch-mips/config.4kc-malta-r6 b/debian/config/kernelarch-mips/config.mips32r6 similarity index 100% rename from debian/config/kernelarch-mips/config.4kc-malta-r6 rename to debian/config/kernelarch-mips/config.mips32r6 diff --git a/debian/config/kernelarch-mips/config.5kc-malta-r1 b/debian/config/kernelarch-mips/config.mips64r1 similarity index 100% rename from debian/config/kernelarch-mips/config.5kc-malta-r1 rename to debian/config/kernelarch-mips/config.mips64r1 diff --git a/debian/config/kernelarch-mips/config.5kc-malta-r2 b/debian/config/kernelarch-mips/config.mips64r2 similarity index 100% rename from debian/config/kernelarch-mips/config.5kc-malta-r2 rename to debian/config/kernelarch-mips/config.mips64r2 diff --git a/debian/config/kernelarch-mips/config.5kc-malta-r6 b/debian/config/kernelarch-mips/config.mips64r6 similarity index 100% rename from debian/config/kernelarch-mips/config.5kc-malta-r6 rename to debian/config/kernelarch-mips/config.mips64r6 diff --git a/debian/config/mips/defines b/debian/config/mips/defines index ba2a89540..720a05112 100644 --- a/debian/config/mips/defines +++ b/debian/config/mips/defines @@ -20,7 +20,7 @@ hardware-long: MIPS Malta boards [4kc-malta_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.4kc-malta-r2 + kernelarch-mips/config.mips32r2 [5kc-malta_description] hardware: MIPS Malta (64-bit) @@ -29,7 +29,7 @@ hardware-long: MIPS Malta boards (64-bit) [5kc-malta_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.5kc-malta-r2 + kernelarch-mips/config.mips64r2 [octeon_description] hardware: Octeon diff --git a/debian/config/mips64/defines b/debian/config/mips64/defines index 1a1d453c2..93e55f9e1 100644 --- a/debian/config/mips64/defines +++ b/debian/config/mips64/defines @@ -19,7 +19,7 @@ hardware-long: MIPS Malta boards [5kc-malta_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.5kc-malta-r1 + kernelarch-mips/config.mips64r1 [octeon_description] hardware: Octeon diff --git a/debian/config/mips64el/defines b/debian/config/mips64el/defines index 37ed9439c..ec3b0eb48 100644 --- a/debian/config/mips64el/defines +++ b/debian/config/mips64el/defines @@ -20,7 +20,7 @@ hardware-long: MIPS Malta boards [5kc-malta_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.5kc-malta-r2 + kernelarch-mips/config.mips64r2 [loongson-3_description] hardware: Loongson 3A/3B diff --git a/debian/config/mips64r6/defines b/debian/config/mips64r6/defines index 5505030b9..1952e1562 100644 --- a/debian/config/mips64r6/defines +++ b/debian/config/mips64r6/defines @@ -16,5 +16,5 @@ hardware-long: MIPS R6 (64 bit, big endian) [mips64r6_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.5kc-malta-r6 + kernelarch-mips/config.mips64r6 diff --git a/debian/config/mips64r6el/defines b/debian/config/mips64r6el/defines index f6a2616e5..ac92b9b6d 100644 --- a/debian/config/mips64r6el/defines +++ b/debian/config/mips64r6el/defines @@ -16,5 +16,5 @@ hardware-long: MIPS R6 (64 bit, little endian) [mips64r6el_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.5kc-malta-r6 + kernelarch-mips/config.mips64r6 diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines index 826abfab9..77cca86fe 100644 --- a/debian/config/mipsel/defines +++ b/debian/config/mipsel/defines @@ -23,7 +23,7 @@ hardware-long: MIPS Malta boards [4kc-malta_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.4kc-malta-r1 + kernelarch-mips/config.mips32r1 [5kc-malta_description] hardware: MIPS Malta (64-bit) @@ -32,7 +32,7 @@ hardware-long: MIPS Malta boards (64-bit) [5kc-malta_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.5kc-malta-r1 + kernelarch-mips/config.mips64r1 [loongson-2e_description] hardware: Loongson 2E diff --git a/debian/config/mipsr6/defines b/debian/config/mipsr6/defines index 9cd695d44..9f5a11dbb 100644 --- a/debian/config/mipsr6/defines +++ b/debian/config/mipsr6/defines @@ -17,7 +17,7 @@ hardware-long: MIPS R6 (32 bit, big endian) [mips32r6_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.4kc-malta-r6 + kernelarch-mips/config.mips32r6 [mips64r6_description] hardware: MIPS R6 (64 bit, big endian) @@ -26,5 +26,5 @@ hardware-long: MIPS R6 (64 bit, big endian) [mips64r6_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.5kc-malta-r6 + kernelarch-mips/config.mips64r6 diff --git a/debian/config/mipsr6el/defines b/debian/config/mipsr6el/defines index 4ad5f1a42..257bc06ed 100644 --- a/debian/config/mipsr6el/defines +++ b/debian/config/mipsr6el/defines @@ -17,7 +17,7 @@ hardware-long: MIPS R6 (32 bit, little endian) [mips32r6el_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.4kc-malta-r6 + kernelarch-mips/config.mips32r6 [mips64r6el_description] hardware: MIPS R6 (64 bit, little endian) @@ -26,5 +26,5 @@ hardware-long: MIPS R6 (64 bit, little endian) [mips64r6el_image] configs: kernelarch-mips/config.malta - kernelarch-mips/config.5kc-malta-r6 + kernelarch-mips/config.mips64r6