Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7c1285f authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle
Browse files

MIPS: powertv: Drop BOOTLOADER_DRIVER Kconfig symbol 



The kbldr.h header file required for this was neither committed in the
original submission in a3a0f8c8
"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: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Acked-by: default avatarSteven 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent c5eaff3e

arch/mips/powertv/Kconfig

+1 −8
Original line number Diff line number Diff line 
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:

arch/mips/powertv/asic/asic_devices.c

+1 −11
Original line number Diff line number Diff line
@@ -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);

arch/mips/powertv/init.c

+0 −4
Original line number Diff line number Diff line
@@ -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

}

arch/mips/powertv/reset.c

+0 −12
Original line number Diff line number Diff line
@@ -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)