Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
eda49eee
Commit
eda49eee
authored
Jul 15, 2008
by
Ralf Baechle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MIPS] Remove always true ifdef conditions.
Signed-off-by:
Ralf Baechle
<
ralf@linux-mips.org
>
parent
d5deda6f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
19 deletions
+2
-19
arch/mips/Makefile
arch/mips/Makefile
+2
-6
arch/mips/configs/malta_defconfig
arch/mips/configs/malta_defconfig
+0
-1
arch/mips/mips-boards/generic/memory.c
arch/mips/mips-boards/generic/memory.c
+0
-6
arch/mips/mips-boards/generic/reset.c
arch/mips/mips-boards/generic/reset.c
+0
-2
arch/mips/mips-boards/generic/time.c
arch/mips/mips-boards/generic/time.c
+0
-4
No files found.
arch/mips/Makefile
View file @
eda49eee
...
@@ -304,15 +304,11 @@ core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/
...
@@ -304,15 +304,11 @@ core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/
load-$(CONFIG_LEMOTE_FULONG)
+=
0xffffffff80100000
load-$(CONFIG_LEMOTE_FULONG)
+=
0xffffffff80100000
cflags-$(CONFIG_LEMOTE_FULONG)
+=
-Iinclude
/asm-mips/mach-lemote
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
# 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
cflags-$(CONFIG_MIPS_MALTA)
+=
-Iinclude
/asm-mips/mach-mips
load-$(CONFIG_MIPS_MALTA)
+=
0xffffffff80100000
load-$(CONFIG_MIPS_MALTA)
+=
0xffffffff80100000
all-$(CONFIG_MIPS_MALTA)
:=
vmlinux.bin
all-$(CONFIG_MIPS_MALTA)
:=
vmlinux.bin
...
...
arch/mips/configs/malta_defconfig
View file @
eda49eee
...
@@ -66,7 +66,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
...
@@ -66,7 +66,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_IRQ_CPU=y
CONFIG_IRQ_CPU=y
CONFIG_MIPS_BOARDS_GEN=y
CONFIG_PCI_GT64XXX_PCI0=y
CONFIG_PCI_GT64XXX_PCI0=y
CONFIG_SWAP_IO_SPACE=y
CONFIG_SWAP_IO_SPACE=y
CONFIG_BOOT_ELF32=y
CONFIG_BOOT_ELF32=y
...
...
arch/mips/mips-boards/generic/memory.c
View file @
eda49eee
...
@@ -97,7 +97,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
...
@@ -97,7 +97,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
mdesc
[
1
].
base
=
0x00001000
;
mdesc
[
1
].
base
=
0x00001000
;
mdesc
[
1
].
size
=
0x000ef000
;
mdesc
[
1
].
size
=
0x000ef000
;
#ifdef CONFIG_MIPS_MALTA
/*
/*
* The area 0x000f0000-0x000fffff is allocated for BIOS memory by the
* The area 0x000f0000-0x000fffff is allocated for BIOS memory by the
* south bridge and PCI access always forwarded to the ISA Bus and
* south bridge and PCI access always forwarded to the ISA Bus and
...
@@ -108,11 +107,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
...
@@ -108,11 +107,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
mdesc
[
2
].
type
=
yamon_dontuse
;
mdesc
[
2
].
type
=
yamon_dontuse
;
mdesc
[
2
].
base
=
0x000f0000
;
mdesc
[
2
].
base
=
0x000f0000
;
mdesc
[
2
].
size
=
0x00010000
;
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
].
type
=
yamon_dontuse
;
mdesc
[
3
].
base
=
0x00100000
;
mdesc
[
3
].
base
=
0x00100000
;
...
...
arch/mips/mips-boards/generic/reset.c
View file @
eda49eee
...
@@ -52,7 +52,5 @@ void mips_reboot_setup(void)
...
@@ -52,7 +52,5 @@ void mips_reboot_setup(void)
{
{
_machine_restart
=
mips_machine_restart
;
_machine_restart
=
mips_machine_restart
;
_machine_halt
=
mips_machine_halt
;
_machine_halt
=
mips_machine_halt
;
#ifdef CONFIG_MIPS_MALTA
pm_power_off
=
mips_machine_halt
;
pm_power_off
=
mips_machine_halt
;
#endif
}
}
arch/mips/mips-boards/generic/time.c
View file @
eda49eee
...
@@ -42,9 +42,7 @@
...
@@ -42,9 +42,7 @@
#include <asm/mips-boards/generic.h>
#include <asm/mips-boards/generic.h>
#include <asm/mips-boards/prom.h>
#include <asm/mips-boards/prom.h>
#ifdef CONFIG_MIPS_MALTA
#include <asm/mips-boards/maltaint.h>
#include <asm/mips-boards/maltaint.h>
#endif
unsigned
long
cpu_khz
;
unsigned
long
cpu_khz
;
...
@@ -70,7 +68,6 @@ static unsigned int __init estimate_cpu_frequency(void)
...
@@ -70,7 +68,6 @@ static unsigned int __init estimate_cpu_frequency(void)
unsigned
int
prid
=
read_c0_prid
()
&
0xffff00
;
unsigned
int
prid
=
read_c0_prid
()
&
0xffff00
;
unsigned
int
count
;
unsigned
int
count
;
#ifdef CONFIG_MIPS_MALTA
unsigned
long
flags
;
unsigned
long
flags
;
unsigned
int
start
;
unsigned
int
start
;
...
@@ -91,7 +88,6 @@ static unsigned int __init estimate_cpu_frequency(void)
...
@@ -91,7 +88,6 @@ static unsigned int __init estimate_cpu_frequency(void)
/* restore interrupts */
/* restore interrupts */
local_irq_restore
(
flags
);
local_irq_restore
(
flags
);
#endif
mips_hpt_frequency
=
count
;
mips_hpt_frequency
=
count
;
if
((
prid
!=
(
PRID_COMP_MIPS
|
PRID_IMP_20KC
))
&&
if
((
prid
!=
(
PRID_COMP_MIPS
|
PRID_IMP_20KC
))
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment