MIPS: powertv: Drop BOOTLOADER_DRIVER Kconfig symbol

The kbldr.h header file required for this was neither committed in the
original submission in a3a0f8c8ed2e2470f4dcd6da95020d41fed84747
"MIPS: PowerTV: Base files for Cisco PowerTV platform"
nor was it ever present in the git tree so this option never worked.
Fixes the following build problem:
arch/mips/powertv/reset.c:25:36: fatal error: asm/mach-powertv/kbldr.h: No such
file or directory
compilation terminated.

Cc: David VomLehn <dvomlehn@cisco.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: David VomLehn <dvomlehn@cisco.com>
Patchwork: https://patchwork.linux-mips.org/patch/5801/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/powertv/Kconfig b/arch/mips/powertv/Kconfig
index 1a1b03ea639800afce418ea6e2d2e8ec1287aaee..dd91fbacbcbaee493b7553f576dc96f7b39d51b0 100644 (file)
--- a/arch/mips/powertv/Kconfig
+++ b/arch/mips/powertv/Kconfig
@@ -1,14 +1,7 @@
-config BOOTLOADER_DRIVER
-       bool "PowerTV Bootloader Driver Support"
-       default n
-       depends on POWERTV
-       help
-         Use this option if you want to load bootloader driver.
-
 config BOOTLOADER_FAMILY
        string "POWERTV Bootloader Family string"
        default "85"
-       depends on POWERTV && !BOOTLOADER_DRIVER
+       depends on POWERTV
        help
          This value should be specified when the bootloader driver is disabled
          and must be exactly two characters long. Families supported are:

diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c
index 0238af1ba50383689138a929c268a1a592a1464d..8380605d597d3082d09801bb9cbba1a82230658a 100644 (file)
--- a/arch/mips/powertv/asic/asic_devices.c
+++ b/arch/mips/powertv/asic/asic_devices.c
@@ -147,20 +147,10 @@ static __init noinline void platform_set_family(void)
        if (check_forcefamily(forced_family) == 0)
                bootldr_family = BOOTLDRFAMILY(forced_family[0],
                        forced_family[1]);
-       else {
-
-#ifdef CONFIG_BOOTLOADER_DRIVER
-               bootldr_family = (unsigned short) kbldr_GetSWFamily();
-#else
-#if defined(CONFIG_BOOTLOADER_FAMILY)
+       else
                bootldr_family = (unsigned short) BOOTLDRFAMILY(
                        CONFIG_BOOTLOADER_FAMILY[0],
                        CONFIG_BOOTLOADER_FAMILY[1]);
-#else
-#error "Unknown Bootloader Family"
-#endif
-#endif
-       }
 
        pr_info("Bootloader Family = 0x%04X\n", bootldr_family);
 

diff --git a/arch/mips/powertv/init.c b/arch/mips/powertv/init.c
index a01baff52cae0ab1ad652574843049c6cf640097..498926377e51e4e53ba6017b1d46ebeb94e322a2 100644 (file)
--- a/arch/mips/powertv/init.c
+++ b/arch/mips/powertv/init.c
@@ -87,8 +87,4 @@ void __init prom_init(void)
 
        configure_platform();
        prom_meminit();
-
-#ifndef CONFIG_BOOTLOADER_DRIVER
-       pr_info("\nBootloader driver isn't loaded...\n");
-#endif
 }

diff --git a/arch/mips/powertv/reset.c b/arch/mips/powertv/reset.c
index 0007652cb774afbaddbe8a494ca08ed76f8999d7..11c32fbf2784657ec2afc47c8f098f00c0f7fa82 100644 (file)
--- a/arch/mips/powertv/reset.c
+++ b/arch/mips/powertv/reset.c
@@ -21,24 +21,12 @@
 #include <linux/io.h>
 #include <asm/reboot.h>                        /* Not included by linux/reboot.h */
 
-#ifdef CONFIG_BOOTLOADER_DRIVER
-#include <asm/mach-powertv/kbldr.h>
-#endif
-
 #include <asm/mach-powertv/asic_regs.h>
 #include "reset.h"
 
 static void mips_machine_restart(char *command)
 {
-#ifdef CONFIG_BOOTLOADER_DRIVER
-       /*
-        * Call the bootloader's reset function to ensure
-        * that persistent data is flushed before hard reset
-        */
-       kbldr_SetCauseAndReset();
-#else
        writel(0x1, asic_reg_addr(watchdog));
-#endif
 }
 
 void mips_reboot_setup(void)