Browse Source

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>
Markos Chandras 12 years ago
parent
commit
f7c1285f0e

+ 1 - 8
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
 config BOOTLOADER_FAMILY
 	string "POWERTV Bootloader Family string"
 	string "POWERTV Bootloader Family string"
 	default "85"
 	default "85"
-	depends on POWERTV && !BOOTLOADER_DRIVER
+	depends on POWERTV
 	help
 	help
 	  This value should be specified when the bootloader driver is disabled
 	  This value should be specified when the bootloader driver is disabled
 	  and must be exactly two characters long. Families supported are:
 	  and must be exactly two characters long. Families supported are:

+ 1 - 11
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)
 	if (check_forcefamily(forced_family) == 0)
 		bootldr_family = BOOTLDRFAMILY(forced_family[0],
 		bootldr_family = BOOTLDRFAMILY(forced_family[0],
 			forced_family[1]);
 			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(
 		bootldr_family = (unsigned short) BOOTLDRFAMILY(
 			CONFIG_BOOTLOADER_FAMILY[0],
 			CONFIG_BOOTLOADER_FAMILY[0],
 			CONFIG_BOOTLOADER_FAMILY[1]);
 			CONFIG_BOOTLOADER_FAMILY[1]);
-#else
-#error "Unknown Bootloader Family"
-#endif
-#endif
-	}
 
 
 	pr_info("Bootloader Family = 0x%04X\n", bootldr_family);
 	pr_info("Bootloader Family = 0x%04X\n", bootldr_family);
 
 

+ 0 - 4
arch/mips/powertv/init.c

@@ -87,8 +87,4 @@ void __init prom_init(void)
 
 
 	configure_platform();
 	configure_platform();
 	prom_meminit();
 	prom_meminit();
-
-#ifndef CONFIG_BOOTLOADER_DRIVER
-	pr_info("\nBootloader driver isn't loaded...\n");
-#endif
 }
 }

+ 0 - 12
arch/mips/powertv/reset.c

@@ -21,24 +21,12 @@
 #include <linux/io.h>
 #include <linux/io.h>
 #include <asm/reboot.h>			/* Not included by linux/reboot.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 <asm/mach-powertv/asic_regs.h>
 #include "reset.h"
 #include "reset.h"
 
 
 static void mips_machine_restart(char *command)
 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));
 	writel(0x1, asic_reg_addr(watchdog));
-#endif
 }
 }
 
 
 void mips_reboot_setup(void)
 void mips_reboot_setup(void)