summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/bootloader.pm22
-rw-r--r--perl-install/detect_devices.pm23
-rw-r--r--perl-install/install/NEWS1
4 files changed, 6 insertions, 42 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index d5e2ded6b..7b5ede4e8 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -251,7 +251,7 @@ sub installBootloader {
my ($in, $b, $all_hds) = @_;
return if detect_devices::is_xbox();
- return 1 if arch() =~ /mips|arm/;
+ return 1 if arch() =~ /arm/;
install_bootloader_pkgs($in->do_pkgs, $b);
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 6ffca6267..f538dcee2 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -248,7 +248,7 @@ sub read {
if (m!/fd\d+$!) {
warn "not checking the method on floppy, assuming $main_method is right\n";
$main_method;
- } elsif (member($main_method, qw(cromwell pmon2000 uboot))) {
+ } elsif (member($main_method, qw(cromwell uboot))) {
#- not checking, there's only one bootloader anyway :)
$main_method;
} elsif (my $type = partition_table::raw::typeOfMBR($_)) {
@@ -546,9 +546,6 @@ sub read_grub_menu_lst {
}
# FIXME: actually read back previous conf
-sub read_pmon2000() {
- +{ method => 'pmon2000' };
-}
sub read_uboot() {
+{ method => 'uboot' };
}
@@ -850,7 +847,7 @@ sub add_kernel {
$v->{append} = pack_append($simple, $dict);
}
- $b_no_initrd //= arch() =~ /mips|arm/ && !detect_devices::is_mips_gdium();
+ $b_no_initrd //= arch() =~ /arm/;
$b_nolink ||= $kernel_str->{use_long_name};
@@ -869,25 +866,11 @@ sub add_kernel {
if (!$b_nolink) {
$v->{kernel_or_dev} = '/boot/' . kernel_str2vmlinuz_short($kernel_str);
- if (arch() =~ /mips/) {
- log::l("link $::prefix/boot/$vmlinuz_long -> $::prefix$v->{kernel_or_dev}");
- linkf("$::prefix/boot/$vmlinuz_long", $::prefix . $v->{kernel_or_dev});
- linkf("$::prefix/boot/$vmlinuz_long", $::prefix . $v->{kernel_or_dev} . ".32");
- } else {
_do_the_symlink($bootloader, $v->{kernel_or_dev}, $vmlinuz_long);
- }
if ($v->{initrd}) {
$v->{initrd} = '/boot/' . kernel_str2initrd_short($kernel_str);
- if (arch() =~ /mips/) {
- log::l("link $::prefix/boot/$initrd_long -> $::prefix$v->{initrd}");
- linkf("$::prefix/boot/$initrd_long", $::prefix . $v->{initrd});
- if ($v->{initrd} =~ s/.img$/.gz/) {
- linkf("$::prefix/boot/$initrd_long", $::prefix . $v->{initrd});
- }
- } else {
_do_the_symlink($bootloader, $v->{initrd}, $initrd_long);
- }
}
}
@@ -1287,7 +1270,6 @@ sub method2text {
sub method_choices_raw {
my ($b_prefix_mounted) = @_;
detect_devices::is_xbox() ? 'cromwell' :
- arch() =~ /mips/ ? 'pmon2000' :
arch() =~ /arm/ ? 'uboot' :
if_(!$b_prefix_mounted || whereis_binary('grub2-reboot', $::prefix),
'grub2-graphic', 'grub2'),
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 9034bff6c..a30b93cfd 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -96,7 +96,7 @@ sub floppies {
state @fds;
state $legacy_already_detected;
- $o_not_detect_legacy_floppies = 1 if arch() =~ /mips|arm/;
+ $o_not_detect_legacy_floppies = 1 if arch() =~ /arm/;
if (!$o_not_detect_legacy_floppies && !$legacy_already_detected) {
$legacy_already_detected = 1;
@@ -687,7 +687,7 @@ sub getSerialModem {
my ($_modules_conf, $o_mouse) = @_;
my $mouse = $o_mouse || {};
$mouse->{device} = readlink "/dev/mouse";
- my $serdev = arch() =~ /mips/ ? "8250" : "serial";
+ my $serdev = "serial";
eval { modules::load($serdev) };
@@ -1426,22 +1426,6 @@ sub is_i586() {
!has_cpu_flag('cmov');
}
-sub is_mips_lemote() {
- to_bool(cat_('/proc/cpuinfo') =~ /lemote/);
-}
-
-sub is_mips_ict() {
- to_bool(cat_('/proc/cpuinfo') =~ /ict/);
-}
-
-sub is_mips_gdium() {
- to_bool(cat_('/proc/cpuinfo') =~ /gdium/);
-}
-
-sub is_mips_st_ls2f() {
- to_bool(cat_('/proc/cpuinfo') =~ /st-ls2f/);
-}
-
sub is_arm_openrd_client() {
to_bool(cat_('/proc/cpuinfo') =~ /OpenRD Client/);
}
@@ -1563,9 +1547,6 @@ sub matching_types() {
'64bit' => to_bool(arch() =~ /64/),
hyperv => is_hyperv(),
laptop => isLaptop(),
- mips_ict => is_mips_ict(),
- mips_lemote => is_mips_lemote(),
- mips_st_ls2f => is_mips_st_ls2f(),
numpa => hasNumpad(),
touchpad => hasTouchpad(),
qemu => is_qemu(),
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 148d89e6c..db38d7937 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- adapt to new brltty
+- drop support for MIPS
- fix detecting running under Qemu
Version 17.27 - 23 April 2016