Skip to content

Commit

Permalink
MIPS: powertv: Drop BOOTLOADER_DRIVER Kconfig symbol
Browse files Browse the repository at this point in the history
The kbldr.h header file required for this was neither committed in the
original submission in a3a0f8c
"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>
  • Loading branch information
Markos Chandras authored and Ralf Baechle committed Sep 3, 2013
1 parent c5eaff3 commit f7c1285
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 35 deletions.
9 changes: 1 addition & 8 deletions arch/mips/powertv/Kconfig
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
12 changes: 1 addition & 11 deletions arch/mips/powertv/asic/asic_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 0 additions & 4 deletions arch/mips/powertv/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
12 changes: 0 additions & 12 deletions arch/mips/powertv/reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit f7c1285

Please sign in to comment.