[MIPS] Remove always true ifdef conditions. (eda49eee) · Commits · 戴 / test

arch/mips/Makefile

+2 −6

Original line number	Diff line number	Diff line
		@@ -304,15 +304,11 @@ core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/
		load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000
		cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote

		#
		# For all MIPS, Inc. eval boards
		#
		core-$(CONFIG_MIPS_BOARDS_GEN) += arch/mips/mips-boards/generic/

		#
		# MIPS Malta board
		#
		core-$(CONFIG_MIPS_MALTA) += arch/mips/mips-boards/malta/
		core-$(CONFIG_MIPS_MALTA) += arch/mips/mips-boards/generic/ \
		arch/mips/mips-boards/malta/
		cflags-$(CONFIG_MIPS_MALTA) += -Iinclude/asm-mips/mach-mips
		load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000
		all-$(CONFIG_MIPS_MALTA) := vmlinux.bin

+0 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
		CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
		CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
		CONFIG_IRQ_CPU=y
		CONFIG_MIPS_BOARDS_GEN=y
		CONFIG_PCI_GT64XXX_PCI0=y
		CONFIG_SWAP_IO_SPACE=y
		CONFIG_BOOT_ELF32=y

+0 −6

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
		mdesc[1].base = 0x00001000;
		mdesc[1].size = 0x000ef000;

		#ifdef CONFIG_MIPS_MALTA
		/*
		* The area 0x000f0000-0x000fffff is allocated for BIOS memory by the
		* south bridge and PCI access always forwarded to the ISA Bus and
		@@ -108,11 +107,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
		mdesc[2].type = yamon_dontuse;
		mdesc[2].base = 0x000f0000;
		mdesc[2].size = 0x00010000;
		#else
		mdesc[2].type = yamon_prom;
		mdesc[2].base = 0x000f0000;
		mdesc[2].size = 0x00010000;
		#endif

		mdesc[3].type = yamon_dontuse;
		mdesc[3].base = 0x00100000;

+0 −2

Original line number	Diff line number	Diff line
		@@ -52,7 +52,5 @@ void mips_reboot_setup(void)
		{
		_machine_restart = mips_machine_restart;
		_machine_halt = mips_machine_halt;
		#ifdef CONFIG_MIPS_MALTA
		pm_power_off = mips_machine_halt;
		#endif
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -42,9 +42,7 @@
		#include <asm/mips-boards/generic.h>
		#include <asm/mips-boards/prom.h>

		#ifdef CONFIG_MIPS_MALTA
		#include <asm/mips-boards/maltaint.h>
		#endif

		unsigned long cpu_khz;

		@@ -70,7 +68,6 @@ static unsigned int __init estimate_cpu_frequency(void)
		unsigned int prid = read_c0_prid() & 0xffff00;
		unsigned int count;

		#ifdef CONFIG_MIPS_MALTA
		unsigned long flags;
		unsigned int start;

		@@ -91,7 +88,6 @@ static unsigned int __init estimate_cpu_frequency(void)

		/* restore interrupts */
		local_irq_restore(flags);
		#endif

		mips_hpt_frequency = count;
		if ((prid != (PRID_COMP_MIPS \| PRID_IMP_20KC)) &&