From 2ae41107d95a6c0d65962cc46fc9a0575133ee34 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 25 Dec 2013 06:35:10 +0100
Subject: [PATCH] Kernel 2.6 is long gone, remove any reference to it for MIPS

---
 build/config/mips.cfg                                     | 8 +++-----
 build/config/mips/malta.cfg                               | 4 ++--
 build/config/mips/malta/{netboot-2.6.cfg => netboot.cfg}  | 3 ---
 build/config/mips/miniiso.cfg                             | 7 +++----
 build/config/mips/r4k-ip22.cfg                            | 6 ++----
 build/config/mips/r4k-ip22/{cdrom-2.6.cfg => cdrom.cfg}   | 3 ---
 .../config/mips/r4k-ip22/{netboot-2.6.cfg => netboot.cfg} | 3 ---
 build/config/mips/r5k-ip32.cfg                            | 4 ++--
 .../config/mips/r5k-ip32/{netboot-2.6.cfg => netboot.cfg} | 3 ---
 build/config/mips/sb1-bcm91250a.cfg                       | 4 ++--
 .../mips/sb1-bcm91250a/{netboot-2.6.cfg => netboot.cfg}   | 3 ---
 11 files changed, 14 insertions(+), 34 deletions(-)
 rename build/config/mips/malta/{netboot-2.6.cfg => netboot.cfg} (78%)
 rename build/config/mips/r4k-ip22/{cdrom-2.6.cfg => cdrom.cfg} (83%)
 rename build/config/mips/r4k-ip22/{netboot-2.6.cfg => netboot.cfg} (83%)
 rename build/config/mips/r5k-ip32/{netboot-2.6.cfg => netboot.cfg} (83%)
 rename build/config/mips/sb1-bcm91250a/{netboot-2.6.cfg => netboot.cfg} (92%)

diff --git a/build/config/mips.cfg b/build/config/mips.cfg
index e992142b0..8d0b0ca0c 100644
--- a/build/config/mips.cfg
+++ b/build/config/mips.cfg
@@ -1,13 +1,11 @@
 SUBARCH_SUPPORTED = malta r4k-ip22 r5k-ip32 sb1-bcm91250a miniiso
 
-KERNELMAJOR = 2.4
-KERNELMINOR = 27
-# Targets for 2.6 kernel images will use this version instead.
-KERNELVERSION_2.6 = 3.12-1
+KERNELMAJOR = 2.6
+# Targets for 3.x kernel images will use this version instead.
+KERNELVERSION = 3.12-1
 KERNEL_FLAVOUR = di
 KERNELIMAGEVERSION = $(KERNELVERSION)
 KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinux-$(ver))
-KERNELNAME_2.6 = $(foreach ver,${KERNELVERSION_2.6}, vmlinuz-$(ver))
 
 VERSIONED_SYSTEM_MAP = t
 
diff --git a/build/config/mips/malta.cfg b/build/config/mips/malta.cfg
index 28146f84a..c56b54715 100644
--- a/build/config/mips/malta.cfg
+++ b/build/config/mips/malta.cfg
@@ -1,5 +1,5 @@
-MEDIUM_SUPPORTED = netboot-2.6
+MEDIUM_SUPPORTED = netboot
 
 # The version of the kernel to use.
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-4kc-malta
+KERNELVERSION := $(KERNELVERSION)-4kc-malta
 
diff --git a/build/config/mips/malta/netboot-2.6.cfg b/build/config/mips/malta/netboot.cfg
similarity index 78%
rename from build/config/mips/malta/netboot-2.6.cfg
rename to build/config/mips/malta/netboot.cfg
index 6dd19b157..1862312c5 100644
--- a/build/config/mips/malta/netboot-2.6.cfg
+++ b/build/config/mips/malta/netboot.cfg
@@ -1,8 +1,5 @@
 MEDIA_TYPE = netboot image
 
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
 TARGET = $(INITRD) $(KERNEL)
 TYPE = netboot
 EXTRANAME = $(TYPE)/
diff --git a/build/config/mips/miniiso.cfg b/build/config/mips/miniiso.cfg
index 61478f3bc..4a056ddcc 100644
--- a/build/config/mips/miniiso.cfg
+++ b/build/config/mips/miniiso.cfg
@@ -1,14 +1,13 @@
 # This is completely meaningless, since the mini-ISO uses prebuilt
 # boot images, but some Makefile magic depends on those definitions.
-KERNELVERSION = $(KERNELMAJOR).$(KERNELMINOR)-r4k-ip22
+KERNELVERSION := $(KERNELVERSION)-r4k-ip22
 KERNELNAME =
-KERNELMAJOR = 2.6
 
 MEDIA_TYPE = CD-ROM
 
 # Hack, hack!
 TARGET = 
-EXTRATARGETS = build_r4k-ip22_netboot-2.6 $(MINIISO)
+EXTRATARGETS = build_r4k-ip22_netboot $(MINIISO)
 EXTRANAME = cdrom-
 
 MANIFEST-MINIISO = "tiny bootable CD image for pure network install"
@@ -16,7 +15,7 @@ MANIFEST-MINIISO = "tiny bootable CD image for pure network install"
 .PHONY: arch_miniiso
 arch_miniiso:
 	-rm -rf $(TEMP_CD_TREE)/*
-	install -m 644 -D $(BASE_TMP)r4k-ip22_netboot-2.6/boot.img $(TEMP_CD_TREE)/install/r4k-ip22-boot.img
+	install -m 644 -D $(BASE_TMP)r4k-ip22_netboot/boot.img $(TEMP_CD_TREE)/install/r4k-ip22-boot.img
 	genisoimage -r -J -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
 	set -e; \
 	ISOVH_BOOTFILES= ; \
diff --git a/build/config/mips/r4k-ip22.cfg b/build/config/mips/r4k-ip22.cfg
index ac10496ca..876cfe862 100644
--- a/build/config/mips/r4k-ip22.cfg
+++ b/build/config/mips/r4k-ip22.cfg
@@ -1,7 +1,5 @@
-MEDIUM_SUPPORTED = cdrom-2.6 netboot-2.6
+MEDIUM_SUPPORTED = cdrom netboot
 MEDIUM_SUPPORTED_EXTRA = monolithic
 
 # The version of the kernel to use.
-KERNELVERSION = $(KERNELMAJOR).$(KERNELMINOR)-r4k-ip22
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-r4k-ip22
-
+KERNELVERSION := $(KERNELVERSION)-r4k-ip22
diff --git a/build/config/mips/r4k-ip22/cdrom-2.6.cfg b/build/config/mips/r4k-ip22/cdrom.cfg
similarity index 83%
rename from build/config/mips/r4k-ip22/cdrom-2.6.cfg
rename to build/config/mips/r4k-ip22/cdrom.cfg
index eb33f3331..7fa9b3c6e 100644
--- a/build/config/mips/r4k-ip22/cdrom-2.6.cfg
+++ b/build/config/mips/r4k-ip22/cdrom.cfg
@@ -1,8 +1,5 @@
 MEDIA_TYPE = CD-ROM
 
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
 TARGET = $(BOOT)
 TYPE = cdrom
 EXTRANAME = $(TYPE)-
diff --git a/build/config/mips/r4k-ip22/netboot-2.6.cfg b/build/config/mips/r4k-ip22/netboot.cfg
similarity index 83%
rename from build/config/mips/r4k-ip22/netboot-2.6.cfg
rename to build/config/mips/r4k-ip22/netboot.cfg
index 67d061c27..1f0d164d9 100644
--- a/build/config/mips/r4k-ip22/netboot-2.6.cfg
+++ b/build/config/mips/r4k-ip22/netboot.cfg
@@ -1,8 +1,5 @@
 MEDIA_TYPE = netboot image
 
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
 TARGET = $(BOOT)
 TYPE = netboot
 EXTRANAME = $(TYPE)-
diff --git a/build/config/mips/r5k-ip32.cfg b/build/config/mips/r5k-ip32.cfg
index 91cc5c0a3..a5ef9fe2a 100644
--- a/build/config/mips/r5k-ip32.cfg
+++ b/build/config/mips/r5k-ip32.cfg
@@ -1,5 +1,5 @@
-MEDIUM_SUPPORTED = netboot-2.6
+MEDIUM_SUPPORTED = netboot
 
 # The version of the kernel to use.
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-r5k-ip32
+KERNELVERSION := $(KERNELVERSION)-r5k-ip32
 
diff --git a/build/config/mips/r5k-ip32/netboot-2.6.cfg b/build/config/mips/r5k-ip32/netboot.cfg
similarity index 83%
rename from build/config/mips/r5k-ip32/netboot-2.6.cfg
rename to build/config/mips/r5k-ip32/netboot.cfg
index 5b15a577b..457628941 100644
--- a/build/config/mips/r5k-ip32/netboot-2.6.cfg
+++ b/build/config/mips/r5k-ip32/netboot.cfg
@@ -1,8 +1,5 @@
 MEDIA_TYPE = netboot image
 
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
 TARGET = $(BOOT)
 TYPE = netboot
 EXTRANAME = $(TYPE)-
diff --git a/build/config/mips/sb1-bcm91250a.cfg b/build/config/mips/sb1-bcm91250a.cfg
index 5f6e9bbae..a624febe6 100644
--- a/build/config/mips/sb1-bcm91250a.cfg
+++ b/build/config/mips/sb1-bcm91250a.cfg
@@ -1,5 +1,5 @@
-MEDIUM_SUPPORTED = netboot-2.6
+MEDIUM_SUPPORTED = netboot
 
 # The version of the kernel to use.
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-sb1-bcm91250a
+KERNELVERSION := $(KERNELVERSION)-sb1-bcm91250a
 
diff --git a/build/config/mips/sb1-bcm91250a/netboot-2.6.cfg b/build/config/mips/sb1-bcm91250a/netboot.cfg
similarity index 92%
rename from build/config/mips/sb1-bcm91250a/netboot-2.6.cfg
rename to build/config/mips/sb1-bcm91250a/netboot.cfg
index b9376e47c..d582875db 100644
--- a/build/config/mips/sb1-bcm91250a/netboot-2.6.cfg
+++ b/build/config/mips/sb1-bcm91250a/netboot.cfg
@@ -1,8 +1,5 @@
 MEDIA_TYPE = netboot image
 
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
 TARGET = $(INITRD) $(KERNEL) $(SOME_DEST)/$(EXTRANAME)sibyl $(SOME_DEST)/$(EXTRANAME)sibyl.conf
 TYPE = netboot
 EXTRANAME = $(TYPE)/