Package: debian-installer
Version: 20150107
This patch add mips64el support and fix loongson 3 support for mipsel.
as loongson 3 need radeon video driver.
--
YunQiang Su
diff --git a/build/boot/mips64el/loongson.cfg b/build/boot/mips64el/loongson.cfg
new file mode 100644
index 0000000..91b6698
--- /dev/null
+++ b/build/boot/mips64el/loongson.cfg
@@ -0,0 +1,8 @@
+default 0
+timeout 0
+showmenu 0
+
+title Boot d-i
+ kernel (usb0,0)/vmlinux-${KERNELVERSION}
+ initrd (usb0,0)/initrd.gz
+ args nil
diff --git a/build/config/mips64el.cfg b/build/config/mips64el.cfg
new file mode 100644
index 0000000..c8a3149
--- /dev/null
+++ b/build/config/mips64el.cfg
@@ -0,0 +1,14 @@
+SUBARCH_SUPPORTED = sb1-bcm91250a loongson-3 octeon
+
+KERNELMAJOR = 2.6
+# Targets for 3.x kernel images will use this version instead.
+KERNELVERSION = $(LINUX_KERNEL_ABI)
+KERNELNAME = $(foreach ver,${KERNELVERSION}, vmlinux-$(ver))
+
+INITRD_FS = initramfs
+
+VERSIONED_SYSTEM_MAP = t
+
+
+arch_boot_screens:
+arch_tree:
diff --git a/build/config/mips64el/loongson-3.cfg
b/build/config/mips64el/loongson-3.cfg
new file mode 100644
index 0000000..c75580d
--- /dev/null
+++ b/build/config/mips64el/loongson-3.cfg
@@ -0,0 +1,10 @@
+MEDIUM_SUPPORTED = netboot
+MEDIUM_SUPPORTED_EXTRA = monolithic
+
+# The version of the kernel to use.
+KERNELVERSION := $(KERNELVERSION)-loongson-3
+
+boot.cfg:
+ bootvars-subst KERNELVERSION "$(KERNELVERSION)" \
+ <boot/mipsel/loongson.cfg >$(SOME_DEST)/$(EXTRANAME)boot.cfg
+ update-manifest $(SOME_DEST)/$(EXTRANAME)boot.cfg "PMON configuration
file"
diff --git a/build/config/mips64el/loongson-3/monolithic.cfg
b/build/config/mips64el/loongson-3/monolithic.cfg
new file mode 100644
index 0000000..16f1200
--- /dev/null
+++ b/build/config/mips64el/loongson-3/monolithic.cfg
@@ -0,0 +1,9 @@
+MEDIA_TYPE = boot image
+
+TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD)
$(KERNEL) boot.cfg
+TYPE = monolithic
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for Loongson 3A/B systems"
+MANIFEST-KERNEL = "kernel image for Loongson 3A/B systems"
+
diff --git a/build/config/mips64el/loongson-3/netboot.cfg
b/build/config/mips64el/loongson-3/netboot.cfg
new file mode 100644
index 0000000..1013eaa
--- /dev/null
+++ b/build/config/mips64el/loongson-3/netboot.cfg
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL) boot.cfg
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for Loongson 3A/B systems"
+MANIFEST-KERNEL = "kernel image for Loongson 3A/B systems"
+
diff --git a/build/config/mips64el/octeon.cfg b/build/config/mips64el/octeon.cfg
new file mode 100644
index 0000000..0349eeb
--- /dev/null
+++ b/build/config/mips64el/octeon.cfg
@@ -0,0 +1,5 @@
+MEDIUM_SUPPORTED = netboot
+
+# The version of the kernel to use.
+KERNELVERSION := $(KERNELVERSION)-octeon
+
diff --git a/build/config/mips64el/octeon/netboot.cfg
b/build/config/mips64el/octeon/netboot.cfg
new file mode 100644
index 0000000..460e557
--- /dev/null
+++ b/build/config/mips64el/octeon/netboot.cfg
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL)
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for the MIPS Octeon machines"
+MANIFEST-KERNEL = "kernel image for the MIPS Octeon machines"
+
diff --git a/build/config/mips64el/sb1-bcm91250a.cfg
b/build/config/mips64el/sb1-bcm91250a.cfg
new file mode 100644
index 0000000..6979080
--- /dev/null
+++ b/build/config/mips64el/sb1-bcm91250a.cfg
@@ -0,0 +1,6 @@
+MEDIUM_SUPPORTED = netboot
+
+# The version of the kernel to use.
+KERNELVERSION := $(KERNELVERSION)-sb1-bcm91250a
+
+INITRD_FS = initramfs
diff --git a/build/config/mips64el/sb1-bcm91250a/netboot.cfg
b/build/config/mips64el/sb1-bcm91250a/netboot.cfg
new file mode 100644
index 0000000..d582875
--- /dev/null
+++ b/build/config/mips64el/sb1-bcm91250a/netboot.cfg
@@ -0,0 +1,18 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL) $(SOME_DEST)/$(EXTRANAME)sibyl
$(SOME_DEST)/$(EXTRANAME)sibyl.conf
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for the Broadcom BCM91250A (SWARM) evaluation board"
+MANIFEST-KERNEL = "kernel image for the Broadcom BCM91250A (SWARM) evaluation
board"
+
+$(SOME_DEST)/$(EXTRANAME)sibyl:
+ cp /usr/lib/sibyl/sibyl.bin $@
+ update-manifest $@ "SiByl boot loader"
+
+$(SOME_DEST)/$(EXTRANAME)sibyl.conf:
+ ramdisk-size-subst $(TEMP_INITRD) < boot/mips/sibyl.conf | \
+ bootvars-subst KERNELVERSION "$(KERNELVERSION)" > $@
+ update-manifest $@ "SiByl TFTP boot configuration script"
+
diff --git a/build/pkg-lists/cdrom/mips64el.cfg
b/build/pkg-lists/cdrom/mips64el.cfg
new file mode 100644
index 0000000..a6eeca2
--- /dev/null
+++ b/build/pkg-lists/cdrom/mips64el.cfg
@@ -0,0 +1,5 @@
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
+
+fb-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/cdrom/mipsel.cfg b/build/pkg-lists/cdrom/mipsel.cfg
index f7d3f95..a6eeca2 100644
--- a/build/pkg-lists/cdrom/mipsel.cfg
+++ b/build/pkg-lists/cdrom/mipsel.cfg
@@ -1,3 +1,5 @@
console-setup-pc-ekmap
console-setup-udeb
kbd-udeb
+
+fb-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/monolithic/mips64el.cfg
b/build/pkg-lists/monolithic/mips64el.cfg
new file mode 100644
index 0000000..dac2d46
--- /dev/null
+++ b/build/pkg-lists/monolithic/mips64el.cfg
@@ -0,0 +1,7 @@
+console-setup-pc-ekmap
+bogl-bterm-udeb
+console-setup-udeb
+kbd-udeb
+pcmciautils-udeb
+
+fb-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/monolithic/mipsel.cfg
b/build/pkg-lists/monolithic/mipsel.cfg
index cca6293..dac2d46 100644
--- a/build/pkg-lists/monolithic/mipsel.cfg
+++ b/build/pkg-lists/monolithic/mipsel.cfg
@@ -4,3 +4,4 @@ console-setup-udeb
kbd-udeb
pcmciautils-udeb
+fb-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/netboot/mips64el.cfg
b/build/pkg-lists/netboot/mips64el.cfg
new file mode 100644
index 0000000..876c617
--- /dev/null
+++ b/build/pkg-lists/netboot/mips64el.cfg
@@ -0,0 +1,15 @@
+console-setup-udeb
+kbd-udeb
+bogl-bterm-udeb
+hw-detect
+ethdetect
+netcfg
+
+console-setup-pc-ekmap
+
+nic-modules-${kernel:Version}
+nic-usb-modules-${kernel:Version}
+usb-modules-${kernel:Version}
+input-modules-${kernel:Version}
+
+fb-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/netboot/mipsel.cfg
b/build/pkg-lists/netboot/mipsel.cfg
index 7516463..2686a3e 100644
--- a/build/pkg-lists/netboot/mipsel.cfg
+++ b/build/pkg-lists/netboot/mipsel.cfg
@@ -6,3 +6,5 @@ ethdetect
netcfg
console-setup-pc-ekmap
+
+fb-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/netboot/mipsel/loongson-3.cfg
b/build/pkg-lists/netboot/mipsel/loongson-3.cfg
new file mode 100644
index 0000000..876c617
--- /dev/null
+++ b/build/pkg-lists/netboot/mipsel/loongson-3.cfg
@@ -0,0 +1,15 @@
+console-setup-udeb
+kbd-udeb
+bogl-bterm-udeb
+hw-detect
+ethdetect
+netcfg
+
+console-setup-pc-ekmap
+
+nic-modules-${kernel:Version}
+nic-usb-modules-${kernel:Version}
+usb-modules-${kernel:Version}
+input-modules-${kernel:Version}
+
+fb-modules-${kernel:Version} ?
diff --git a/build/util/tftpboot.sh b/build/util/tftpboot.sh
index 1d5dcd7..21f781b 100755
--- a/build/util/tftpboot.sh
+++ b/build/util/tftpboot.sh
@@ -44,7 +44,7 @@ for file in "$kernel" "$rootimage"; do
done
case "$arch" in
- arm* | i386 | mips | mipsel)
+ arm* | i386 | mips | mipsel | mips64el)
cp $kernel $tftpimage.tmp
;;
*)
@@ -68,7 +68,7 @@ case "$arch" in
cat $rootimage >>$tftpimage.tmp
mv $tftpimage.tmp $tftpimage
;;
- mipsel) t-rex -k $tftpimage.tmp -r $rootimage -o $tftpimage ;;
+ mipsel | mips64el) t-rex -k $tftpimage.tmp -r $rootimage -o $tftpimage ;;
mips)
case $tftpimage in
*ip32*) tip=tip32 ;;
