Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
927c258a
Commit
927c258a
authored
May 20, 2008
by
Paul Mackerras
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
parents
d3d3d3cd
8939700e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
13 deletions
+22
-13
arch/powerpc/boot/.gitignore
arch/powerpc/boot/.gitignore
+3
-5
arch/powerpc/boot/Makefile
arch/powerpc/boot/Makefile
+4
-2
arch/powerpc/boot/dts/mpc8377_mds.dts
arch/powerpc/boot/dts/mpc8377_mds.dts
+13
-5
lib/lmb.c
lib/lmb.c
+2
-1
No files found.
arch/powerpc/boot/.gitignore
View file @
927c258a
...
...
@@ -20,21 +20,19 @@ kernel-vmlinux.strip.gz
mktree
uImage
cuImage.*
dtbImage.*
treeImage.*
zImage
zImage.initrd
zImage.bin.*
zImage.chrp
zImage.coff
zImage.coff.lds
zImage.ep*
zImage.holly
zImage.iseries
zImage.*lds
zImage.miboot
zImage.pmac
zImage.pseries
zImage.redboot*
zImage.sandpoint
zImage.vmode
zconf.h
zlib.h
zutil.h
arch/powerpc/boot/Makefile
View file @
927c258a
...
...
@@ -99,7 +99,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srct
@
cp
$<
$@
clean-files
:=
$(zlib)
$(zlibheader)
$(zliblinuxheader)
\
empty.c zImage
zImage
.coff.lds zImage.ps3.lds zImage.lds
empty.c zImage.coff.lds zImage.ps3.lds zImage.lds
quiet_cmd_bootcc
=
BOOTCC
$@
cmd_bootcc
=
$(CROSS32CC)
-Wp
,-MD,
$(depfile)
$(BOOTCFLAGS)
-c
-o
$@
$<
...
...
@@ -339,7 +339,9 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
sh
-x
$(srctree)
/
$(src)
/install.sh
"
$(KERNELRELEASE)
"
vmlinux System.map
"
$(INSTALL_PATH)
"
$<
# anything not in $(targets)
clean-files
+=
$
(
image-
)
$
(
initrd-
)
zImage zImage.initrd cuImage.
*
treeImage.
*
\
clean-files
+=
$
(
image-
)
$
(
initrd-
)
cuImage.
*
dtbImage.
*
treeImage.
*
\
zImage zImage.initrd zImage.chrp zImage.coff zImage.holly
\
zImage.iseries zImage.miboot zImage.pmac zImage.pseries
\
otheros.bld
*
.dtb
# clean up files cached by wrapper
...
...
arch/powerpc/boot/dts/mpc8377_mds.dts
View file @
927c258a
...
...
@@ -271,27 +271,35 @@
dma
@
82
a8
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
compatible
=
"fsl,mpc83
49
-dma"
;
compatible
=
"fsl,mpc83
77-dma"
,
"fsl,elo
-dma"
;
reg
=
<
0x82a8
4
>;
ranges
=
<
0
0x8100
0x1a8
>;
interrupt
-
parent
=
<&
ipic
>;
interrupts
=
<
0x47
8
>;
cell
-
index
=
<
0
>;
dma
-
channel
@
0
{
compatible
=
"fsl,mpc83
49
-dma-channel"
;
compatible
=
"fsl,mpc83
77-dma-channel"
,
"fsl,elo
-dma-channel"
;
reg
=
<
0
0x80
>;
interrupt
-
parent
=
<&
ipic
>;
interrupts
=
<
0x47
8
>;
};
dma
-
channel
@
80
{
compatible
=
"fsl,mpc83
49
-dma-channel"
;
compatible
=
"fsl,mpc83
77-dma-channel"
,
"fsl,elo
-dma-channel"
;
reg
=
<
0x80
0x80
>;
interrupt
-
parent
=
<&
ipic
>;
interrupts
=
<
0x47
8
>;
};
dma
-
channel
@
100
{
compatible
=
"fsl,mpc83
49
-dma-channel"
;
compatible
=
"fsl,mpc83
77-dma-channel"
,
"fsl,elo
-dma-channel"
;
reg
=
<
0x100
0x80
>;
interrupt
-
parent
=
<&
ipic
>;
interrupts
=
<
0x47
8
>;
};
dma
-
channel
@
180
{
compatible
=
"fsl,mpc83
49
-dma-channel"
;
compatible
=
"fsl,mpc83
77-dma-channel"
,
"fsl,elo
-dma-channel"
;
reg
=
<
0x180
0x28
>;
interrupt
-
parent
=
<&
ipic
>;
interrupts
=
<
0x47
8
>;
};
};
...
...
lib/lmb.c
View file @
927c258a
...
...
@@ -48,7 +48,8 @@ void lmb_dump_all(void)
}
pr_info
(
" reserved.cnt = 0x%lx
\n
"
,
lmb
.
reserved
.
cnt
);
pr_info
(
" reserved.size = 0x%lx
\n
"
,
lmb
.
reserved
.
size
);
pr_info
(
" reserved.size = 0x%llx
\n
"
,
(
unsigned
long
long
)
lmb
.
memory
.
size
);
for
(
i
=
0
;
i
<
lmb
.
reserved
.
cnt
;
i
++
)
{
pr_info
(
" reserved.region[0x%lx].base = 0x%llx
\n
"
,
i
,
(
unsigned
long
long
)
lmb
.
reserved
.
region
[
i
].
base
);
...
...
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