Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
b79a11cc
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b79a11cc
编写于
3月 25, 2004
作者:
W
wdenk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Code cleanup
上级
518e2e1a
变更
24
隐藏空白更改
内联
并排
Showing
24 changed file
with
69 addition
and
74 deletion
+69
-74
Makefile
Makefile
+3
-3
README
README
+4
-4
board/eXalion/Makefile
board/eXalion/Makefile
+1
-1
common/cmd_bdinfo.c
common/cmd_bdinfo.c
+1
-1
drivers/smc91111.c
drivers/smc91111.c
+3
-3
drivers/smiLynxEM.c
drivers/smiLynxEM.c
+17
-17
drivers/videomodes.c
drivers/videomodes.c
+0
-2
drivers/videomodes.h
drivers/videomodes.h
+0
-1
fs/reiserfs/dev.c
fs/reiserfs/dev.c
+1
-1
fs/reiserfs/mode_string.c
fs/reiserfs/mode_string.c
+0
-1
fs/reiserfs/reiserfs_private.h
fs/reiserfs/reiserfs_private.h
+5
-6
include/configs/LANTEC.h
include/configs/LANTEC.h
+2
-1
include/configs/MPC8260ADS.h
include/configs/MPC8260ADS.h
+1
-0
include/configs/MPC8266ADS.h
include/configs/MPC8266ADS.h
+3
-2
include/configs/PPChameleonEVB.h
include/configs/PPChameleonEVB.h
+0
-2
include/configs/RBC823.h
include/configs/RBC823.h
+18
-21
include/configs/TOP5200.h
include/configs/TOP5200.h
+1
-1
include/configs/ZPC1900.h
include/configs/ZPC1900.h
+1
-0
include/configs/ep8260.h
include/configs/ep8260.h
+1
-0
include/configs/hymod.h
include/configs/hymod.h
+1
-0
include/configs/ppmc8260.h
include/configs/ppmc8260.h
+2
-2
include/configs/sacsng.h
include/configs/sacsng.h
+2
-2
include/configs/sbc8260.h
include/configs/sbc8260.h
+2
-2
include/reiserfs.h
include/reiserfs.h
+0
-1
未找到文件。
Makefile
浏览文件 @
b79a11cc
...
@@ -100,7 +100,7 @@ LIBS += board/$(BOARDDIR)/lib$(BOARD).a
...
@@ -100,7 +100,7 @@ LIBS += board/$(BOARDDIR)/lib$(BOARD).a
LIBS
+=
cpu/
$(CPU)
/lib
$(CPU)
.a
LIBS
+=
cpu/
$(CPU)
/lib
$(CPU)
.a
LIBS
+=
lib_
$(ARCH)
/lib
$(ARCH)
.a
LIBS
+=
lib_
$(ARCH)
/lib
$(ARCH)
.a
LIBS
+=
fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a
\
LIBS
+=
fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a
\
fs/reiserfs/libreiserfs.a
fs/reiserfs/libreiserfs.a
LIBS
+=
net/libnet.a
LIBS
+=
net/libnet.a
LIBS
+=
disk/libdisk.a
LIBS
+=
disk/libdisk.a
LIBS
+=
rtc/librtc.a
LIBS
+=
rtc/librtc.a
...
@@ -976,10 +976,10 @@ omap1610h2_cs0boot_config \
...
@@ -976,10 +976,10 @@ omap1610h2_cs0boot_config \
omap1610h2_cs3boot_config
:
unconfig
omap1610h2_cs3boot_config
:
unconfig
@
if
[
"
$(
findstring
_cs0boot_,
$@
)
"
]
;
then
\
@
if
[
"
$(
findstring
_cs0boot_,
$@
)
"
]
;
then
\
echo
"#define CONFIG_CS0_BOOT"
>>
./include/config.h
;
\
echo
"#define CONFIG_CS0_BOOT"
>>
./include/config.h
;
\
echo
"
C
onfigured for CS0 boot"
;
\
echo
"
... c
onfigured for CS0 boot"
;
\
else
\
else
\
echo
"#define CONFIG_CS3_BOOT"
>>
./include/config.h
;
\
echo
"#define CONFIG_CS3_BOOT"
>>
./include/config.h
;
\
echo
"
C
onfigured for CS3 boot"
;
\
echo
"
... c
onfigured for CS3 boot"
;
\
fi
;
fi
;
@
./mkconfig
-a
$(
call
xtract_omap1610xxx,
$@
)
arm arm926ejs omap1610inn
@
./mkconfig
-a
$(
call
xtract_omap1610xxx,
$@
)
arm arm926ejs omap1610inn
...
...
README
浏览文件 @
b79a11cc
...
@@ -778,13 +778,13 @@ The following options need to be configured:
...
@@ -778,13 +778,13 @@ The following options need to be configured:
Enable Chips & Technologies 69000 Video chip
Enable Chips & Technologies 69000 Video chip
CONFIG_VIDEO_SMI_LYNXEM
CONFIG_VIDEO_SMI_LYNXEM
Enable Silicon Motion SMI 712/710/810 Video chip. The
Enable Silicon Motion SMI 712/710/810 Video chip. The
video output is selected via environment 'videoout'
video output is selected via environment 'videoout'
(1 = LCD and 2 = CRT). If videoout is undefined, CRT is
(1 = LCD and 2 = CRT). If videoout is undefined, CRT is
assumed.
assumed.
For the CT69000 and SMI_LYNXEM drivers, videomode is
For the CT69000 and SMI_LYNXEM drivers, videomode is
selected via environment 'videomode'. Two diferent ways
selected via environment 'videomode'. Two diferent ways
are possible:
are possible:
- "videomode=num" 'num' is a standard LiLo mode numbers.
- "videomode=num" 'num' is a standard LiLo mode numbers.
Following standard modes are supported (* is default):
Following standard modes are supported (* is default):
...
@@ -798,7 +798,7 @@ The following options need to be configured:
...
@@ -798,7 +798,7 @@ The following options need to be configured:
-------------+---------------------------------------------
-------------+---------------------------------------------
(i.e. setenv videomode 317; saveenv; reset;)
(i.e. setenv videomode 317; saveenv; reset;)
- "videomode=bootargs" all the video parameters are parsed
- "videomode=bootargs" all the video parameters are parsed
from the bootargs. (See drivers/videomodes.c)
from the bootargs. (See drivers/videomodes.c)
...
...
board/eXalion/Makefile
浏览文件 @
b79a11cc
...
@@ -29,7 +29,7 @@ OBJS = $(BOARD).o
...
@@ -29,7 +29,7 @@ OBJS = $(BOARD).o
SOBJS
=
SOBJS
=
$(LIB)
:
.depend $(OBJS) $(SOBJS)
$(LIB)
:
.depend $(OBJS) $(SOBJS)
$(AR)
crv
$@
$
^
$(AR)
crv
$@
$
(OBJS)
$(SOBJS)
#########################################################################
#########################################################################
...
...
common/cmd_bdinfo.c
浏览文件 @
b79a11cc
...
@@ -183,7 +183,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
...
@@ -183,7 +183,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
puts
(
"
\n
"
puts
(
"
\n
"
"ip_addr = "
);
"ip_addr = "
);
print_IPaddr
(
bd
->
bi_ip_addr
);
print_IPaddr
(
bd
->
bi_ip_addr
);
p
uts
(
"
\n
"
p
rintf
(
"
\n
"
"baudrate = %d bps
\n
"
,
bd
->
bi_baudrate
);
"baudrate = %d bps
\n
"
,
bd
->
bi_baudrate
);
return
0
;
return
0
;
...
...
drivers/smc91111.c
浏览文件 @
b79a11cc
...
@@ -485,7 +485,7 @@ static int smc_send_packet (volatile void *packet, int packet_length)
...
@@ -485,7 +485,7 @@ static int smc_send_packet (volatile void *packet, int packet_length)
word
saved_ptr
;
word
saved_ptr
;
/* save PTR and PNR registers before manipulation */
/* save PTR and PNR registers before manipulation */
SMC_SELECT_BANK
(
2
);
SMC_SELECT_BANK
(
2
);
saved_pnr
=
SMC_inb
(
PN_REG
);
saved_pnr
=
SMC_inb
(
PN_REG
);
saved_ptr
=
SMC_inw
(
PTR_REG
);
saved_ptr
=
SMC_inw
(
PTR_REG
);
...
@@ -565,8 +565,8 @@ again:
...
@@ -565,8 +565,8 @@ again:
/* we have a packet address, so tell the card to use it */
/* we have a packet address, so tell the card to use it */
SMC_outb
(
packet_no
,
PN_REG
);
SMC_outb
(
packet_no
,
PN_REG
);
/* do not write new ptr value if Write data fifo not empty */
/* do not write new ptr value if Write data fifo not empty */
while
(
saved_ptr
&
PTR_NOTEMPTY
)
while
(
saved_ptr
&
PTR_NOTEMPTY
)
printf
(
"Write data fifo not empty!
\n
"
);
printf
(
"Write data fifo not empty!
\n
"
);
/* point to the beginning of the packet */
/* point to the beginning of the packet */
...
...
drivers/smiLynxEM.c
浏览文件 @
b79a11cc
...
@@ -148,7 +148,7 @@ static char SMI_PCR [] = {
...
@@ -148,7 +148,7 @@ static char SMI_PCR [] = {
0x20
,
0x04
,
0x21
,
0x30
,
0x22
,
0x00
,
0x23
,
0x00
,
0x24
,
0x00
0x20
,
0x04
,
0x21
,
0x30
,
0x22
,
0x00
,
0x23
,
0x00
,
0x24
,
0x00
};
};
static
char
SMI_MCR
[]
=
{
static
char
SMI_MCR
[]
=
{
0x60
,
0x01
,
0x61
,
0x00
,
0x60
,
0x01
,
0x61
,
0x00
,
};
};
static
char
SMI_HCR
[]
=
{
static
char
SMI_HCR
[]
=
{
...
@@ -400,7 +400,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
...
@@ -400,7 +400,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
he
=
(
var
->
xres
+
var
->
right_margin
+
var
->
hsync_len
)
/
8
;
/* HsEnd */
he
=
(
var
->
xres
+
var
->
right_margin
+
var
->
hsync_len
)
/
8
;
/* HsEnd */
ht
=
(
var
->
left_margin
+
var
->
xres
+
var
->
right_margin
+
var
->
hsync_len
)
/
8
;
/* HTotal */
ht
=
(
var
->
left_margin
+
var
->
xres
+
var
->
right_margin
+
var
->
hsync_len
)
/
8
;
/* HTotal */
/* Blank */
/* Blank */
hbs
=
hd
;
hbs
=
hd
;
hbe
=
0
;
/* Blank end at 0 */
hbe
=
0
;
/* Blank end at 0 */
/* Vertical */
/* Vertical */
...
@@ -410,7 +410,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
...
@@ -410,7 +410,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
vt
=
var
->
upper_margin
+
var
->
yres
+
var
->
lower_margin
+
var
->
vsync_len
;
/* VTotal */
vt
=
var
->
upper_margin
+
var
->
yres
+
var
->
lower_margin
+
var
->
vsync_len
;
/* VTotal */
vbs
=
vd
;
vbs
=
vd
;
vbe
=
0
;
vbe
=
0
;
bpp
=
bits_per_pixel
;
bpp
=
bits_per_pixel
;
dblscan
=
(
var
->
vmode
&
FB_VMODE_DOUBLE
)
?
1
:
0
;
dblscan
=
(
var
->
vmode
&
FB_VMODE_DOUBLE
)
?
1
:
0
;
interlaced
=
var
->
vmode
&
FB_VMODE_INTERLACED
;
interlaced
=
var
->
vmode
&
FB_VMODE_INTERLACED
;
...
@@ -433,7 +433,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
...
@@ -433,7 +433,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
cr
[
0x03
]
=
(
hbe
&
0x1F
);
cr
[
0x03
]
=
(
hbe
&
0x1F
);
cr
[
0x04
]
=
hs
;
cr
[
0x04
]
=
hs
;
cr
[
0x05
]
=
((
hbe
&
0x20
)
<<
2
)
|
(
he
&
0x1f
);
cr
[
0x05
]
=
((
hbe
&
0x20
)
<<
2
)
|
(
he
&
0x1f
);
cr
[
0x06
]
=
(
vt
-
2
)
&
0xFF
;
cr
[
0x06
]
=
(
vt
-
2
)
&
0xFF
;
cr
[
0x07
]
=
(((
vt
-
2
)
&
0x100
)
>>
8
)
cr
[
0x07
]
=
(((
vt
-
2
)
&
0x100
)
>>
8
)
|
(((
vd
-
1
)
&
0x100
)
>>
7
)
|
(((
vd
-
1
)
&
0x100
)
>>
7
)
...
@@ -449,7 +449,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
...
@@ -449,7 +449,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
|
(((
vbs
-
1
)
&
0x400
)
>>
9
)
|
(((
vbs
-
1
)
&
0x400
)
>>
9
)
|
((
vs
&
0x400
)
>>
10
)
|
((
vs
&
0x400
)
>>
10
)
|
(
interlaced
)
?
0x80
:
0
;
|
(
interlaced
)
?
0x80
:
0
;
cr
[
0x08
]
=
0x00
;
cr
[
0x08
]
=
0x00
;
cr
[
0x09
]
=
(
dblscan
<<
7
)
cr
[
0x09
]
=
(
dblscan
<<
7
)
...
@@ -458,7 +458,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
...
@@ -458,7 +458,7 @@ static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
|
(
TextScanLines
-
1
);
|
(
TextScanLines
-
1
);
cr
[
0x10
]
=
vs
&
0xff
;
/* VSyncPulseStart */
cr
[
0x10
]
=
vs
&
0xff
;
/* VSyncPulseStart */
cr
[
0x11
]
=
(
ve
&
0x0f
);
cr
[
0x11
]
=
(
ve
&
0x0f
);
cr
[
0x12
]
=
(
vd
-
1
)
&
0xff
;
/* LineCount */
cr
[
0x12
]
=
(
vd
-
1
)
&
0xff
;
/* LineCount */
cr
[
0x13
]
=
wd
&
0xff
;
cr
[
0x13
]
=
wd
&
0xff
;
cr
[
0x14
]
=
0x40
;
cr
[
0x14
]
=
0x40
;
...
@@ -494,7 +494,7 @@ static unsigned int FindPQ (unsigned int freq, unsigned int *pp, unsigned int *p
...
@@ -494,7 +494,7 @@ static unsigned int FindPQ (unsigned int freq, unsigned int *pp, unsigned int *p
for
(
n
=
QMIN
;
n
<=
QMAX
;
n
++
)
{
for
(
n
=
QMIN
;
n
<=
QMAX
;
n
++
)
{
m
=
PMIN
;
/* p/q ~ freq/ref -> p*ref-freq*q ~ 0 */
m
=
PMIN
;
/* p/q ~ freq/ref -> p*ref-freq*q ~ 0 */
L
=
P
*
n
-
m
*
Q
;
L
=
P
*
n
-
m
*
Q
;
while
(
L
>
0
&&
m
<
PMAX
)
{
while
(
L
>
0
&&
m
<
PMAX
)
{
L
-=
REF_FREQ
;
/* difference is greater as 0 subtract fref */
L
-=
REF_FREQ
;
/* difference is greater as 0 subtract fref */
m
++
;
/* and increment m */
m
++
;
/* and increment m */
...
@@ -548,12 +548,12 @@ static void smiLoadCcr (struct ctfb_res_modes *var, unsigned short device_id)
...
@@ -548,12 +548,12 @@ static void smiLoadCcr (struct ctfb_res_modes *var, unsigned short device_id)
break
;
break
;
}
}
smiWrite
(
SMI_INDX_C4
,
0x6b
,
0x15
);
smiWrite
(
SMI_INDX_C4
,
0x6b
,
0x15
);
/* VCLK */
/* VCLK */
freq
=
1000000000000L
/
var
->
pixclock
;
freq
=
1000000000000L
/
var
->
pixclock
;
FindPQ
((
unsigned
int
)
freq
,
&
p
,
&
q
);
FindPQ
((
unsigned
int
)
freq
,
&
p
,
&
q
);
smiWrite
(
SMI_INDX_C4
,
0x6c
,
p
);
smiWrite
(
SMI_INDX_C4
,
0x6c
,
p
);
smiWrite
(
SMI_INDX_C4
,
0x6d
,
q
);
smiWrite
(
SMI_INDX_C4
,
0x6d
,
q
);
...
@@ -576,7 +576,7 @@ void *video_hw_init (void)
...
@@ -576,7 +576,7 @@ void *video_hw_init (void)
struct
ctfb_res_modes
*
res_mode
;
struct
ctfb_res_modes
*
res_mode
;
struct
ctfb_res_modes
var_mode
;
struct
ctfb_res_modes
var_mode
;
unsigned
char
videoout
;
unsigned
char
videoout
;
/* Search for video chip */
/* Search for video chip */
printf
(
"Video: "
);
printf
(
"Video: "
);
...
@@ -593,7 +593,7 @@ void *video_hw_init (void)
...
@@ -593,7 +593,7 @@ void *video_hw_init (void)
pci_mem_base
=
pci_mem_to_phys
(
devbusfn
,
pci_mem_base
);
pci_mem_base
=
pci_mem_to_phys
(
devbusfn
,
pci_mem_base
);
tmp
=
0
;
tmp
=
0
;
videomode
=
CFG_DEFAULT_VIDEO_MODE
;
videomode
=
CFG_DEFAULT_VIDEO_MODE
;
/* get video mode via environment */
/* get video mode via environment */
if
((
penv
=
getenv
(
"videomode"
))
!=
NULL
)
{
if
((
penv
=
getenv
(
"videomode"
))
!=
NULL
)
{
...
@@ -621,7 +621,7 @@ void *video_hw_init (void)
...
@@ -621,7 +621,7 @@ void *video_hw_init (void)
resindex
];
resindex
];
bits_per_pixel
=
vesa_modes
[
i
].
bits_per_pixel
;
bits_per_pixel
=
vesa_modes
[
i
].
bits_per_pixel
;
}
else
{
}
else
{
res_mode
=
(
struct
ctfb_res_modes
*
)
&
var_mode
;
res_mode
=
(
struct
ctfb_res_modes
*
)
&
var_mode
;
bits_per_pixel
=
video_get_params
(
res_mode
,
penv
);
bits_per_pixel
=
video_get_params
(
res_mode
,
penv
);
}
}
...
@@ -638,7 +638,7 @@ void *video_hw_init (void)
...
@@ -638,7 +638,7 @@ void *video_hw_init (void)
res_mode
->
lower_margin
+
res_mode
->
vsync_len
);
res_mode
->
lower_margin
+
res_mode
->
vsync_len
);
t1
/=
1000
;
t1
/=
1000
;
vsynch
=
1000000000L
/
t1
;
vsynch
=
1000000000L
/
t1
;
/* fill in Graphic device struct */
/* fill in Graphic device struct */
sprintf
(
pGD
->
modeIdent
,
"%dx%dx%d %ldkHz %ldHz"
,
res_mode
->
xres
,
sprintf
(
pGD
->
modeIdent
,
"%dx%dx%d %ldkHz %ldHz"
,
res_mode
->
xres
,
res_mode
->
yres
,
bits_per_pixel
,
(
hsynch
/
1000
),
res_mode
->
yres
,
bits_per_pixel
,
(
hsynch
/
1000
),
...
@@ -696,7 +696,7 @@ void *video_hw_init (void)
...
@@ -696,7 +696,7 @@ void *video_hw_init (void)
/* Attributes controller registers */
/* Attributes controller registers */
smiLoadRegs
(
SMI_INDX_ATTR
,
SMI_INDX_ATTR
,
SMI_ATTR
,
sizeof
(
SMI_ATTR
));
smiLoadRegs
(
SMI_INDX_ATTR
,
SMI_INDX_ATTR
,
SMI_ATTR
,
sizeof
(
SMI_ATTR
));
/* Graphics Controller Register */
/* Graphics Controller Register */
smiLoadRegs
(
SMI_INDX_CE
,
SMI_DATA_CF
,
SMI_GCR
,
sizeof
(
SMI_GCR
));
smiLoadRegs
(
SMI_INDX_CE
,
SMI_DATA_CF
,
SMI_GCR
,
sizeof
(
SMI_GCR
));
...
@@ -713,10 +713,10 @@ void *video_hw_init (void)
...
@@ -713,10 +713,10 @@ void *video_hw_init (void)
/* Set misc output register */
/* Set misc output register */
smiLoadMsr
(
res_mode
);
smiLoadMsr
(
res_mode
);
/* Set CRT and Clock control registers */
/* Set CRT and Clock control registers */
smiLoadCrt
(
res_mode
,
bits_per_pixel
);
smiLoadCrt
(
res_mode
,
bits_per_pixel
);
smiLoadCcr
(
res_mode
,
device_id
);
smiLoadCcr
(
res_mode
,
device_id
);
/* Hardware Cusor Register */
/* Hardware Cusor Register */
...
...
drivers/videomodes.c
浏览文件 @
b79a11cc
...
@@ -206,5 +206,3 @@ int video_get_params (struct ctfb_res_modes *pPar, char *penv)
...
@@ -206,5 +206,3 @@ int video_get_params (struct ctfb_res_modes *pPar, char *penv)
}
}
return
bpp
;
return
bpp
;
}
}
drivers/videomodes.h
浏览文件 @
b79a11cc
...
@@ -86,4 +86,3 @@ extern const struct ctfb_vesa_modes vesa_modes[];
...
@@ -86,4 +86,3 @@ extern const struct ctfb_vesa_modes vesa_modes[];
extern
const
struct
ctfb_res_modes
res_mode_init
[];
extern
const
struct
ctfb_res_modes
res_mode_init
[];
int
video_get_params
(
struct
ctfb_res_modes
*
pPar
,
char
*
penv
);
int
video_get_params
(
struct
ctfb_res_modes
*
pPar
,
char
*
penv
);
fs/reiserfs/dev.c
浏览文件 @
b79a11cc
...
@@ -62,7 +62,7 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
...
@@ -62,7 +62,7 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
if
(
sector
<
0
if
(
sector
<
0
||
((
sector
+
((
byte_offset
+
byte_len
-
1
)
>>
SECTOR_BITS
))
||
((
sector
+
((
byte_offset
+
byte_len
-
1
)
>>
SECTOR_BITS
))
>=
part_info
.
size
))
{
>=
part_info
.
size
))
{
/
/ errnum = ERR_OUTSIDE_PART;
/
* errnum = ERR_OUTSIDE_PART; */
printf
(
" ** reiserfs_devread() read outside partition
\n
"
);
printf
(
" ** reiserfs_devread() read outside partition
\n
"
);
return
0
;
return
0
;
}
}
...
...
fs/reiserfs/mode_string.c
浏览文件 @
b79a11cc
...
@@ -99,7 +99,6 @@ const char *bb_mode_string(int mode)
...
@@ -99,7 +99,6 @@ const char *bb_mode_string(int mode)
/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
* and 'B' types don't appear to be available on linux. So I removed them. */
* and 'B' types don't appear to be available on linux. So I removed them. */
//static const char type_chars[16] = "?pc?d?b?-?l?s???";
static
const
char
type_chars
[
16
]
=
"?pc?d?b?-?l?s???"
;
static
const
char
type_chars
[
16
]
=
"?pc?d?b?-?l?s???"
;
/* 0123456789abcdef */
/* 0123456789abcdef */
static
const
char
mode_chars
[
7
]
=
"rwxSTst"
;
static
const
char
mode_chars
[
7
]
=
"rwxSTst"
;
...
...
fs/reiserfs/reiserfs_private.h
浏览文件 @
b79a11cc
...
@@ -285,10 +285,10 @@ struct disk_child {
...
@@ -285,10 +285,10 @@ struct disk_child {
#define dc_block_number(dc_p) (__le32_to_cpu((dc_p)->dc_block_number))
#define dc_block_number(dc_p) (__le32_to_cpu((dc_p)->dc_block_number))
/
/
/
*
//
old stat data is 32 bytes long. We are going to distinguish new one by
*
old stat data is 32 bytes long. We are going to distinguish new one by
//
different size
*
different size
/
/
*
/
struct
stat_data_v1
struct
stat_data_v1
{
{
__u16
sd_mode
;
/* file type, permissions */
__u16
sd_mode
;
/* file type, permissions */
...
@@ -315,7 +315,6 @@ struct stat_data_v1
...
@@ -315,7 +315,6 @@ struct stat_data_v1
}
__attribute__
((
__packed__
));
}
__attribute__
((
__packed__
));
#define stat_data_v1(ih) (ih_version(ih) == ITEM_VERSION_1)
#define stat_data_v1(ih) (ih_version(ih) == ITEM_VERSION_1)
//#define sd_v1_mode(sdp) (__le16_to_cpu((sdp)->sd_mode))
#define sd_v1_mode(sdp) ((sdp)->sd_mode)
#define sd_v1_mode(sdp) ((sdp)->sd_mode)
#define sd_v1_nlink(sdp) (__le16_to_cpu((sdp)->sd_nlink))
#define sd_v1_nlink(sdp) (__le16_to_cpu((sdp)->sd_nlink))
#define sd_v1_uid(sdp) (__le16_to_cpu((sdp)->sd_uid))
#define sd_v1_uid(sdp) (__le16_to_cpu((sdp)->sd_uid))
...
@@ -339,7 +338,7 @@ struct stat_data {
...
@@ -339,7 +338,7 @@ struct stat_data {
union
{
union
{
__u32
sd_rdev
;
__u32
sd_rdev
;
__u32
sd_generation
;
__u32
sd_generation
;
/
/__u32 sd_first_direct_byte;
/
*__u32 sd_first_direct_byte; */
/* first byte of file which is stored in a
/* first byte of file which is stored in a
direct item: except that if it equals 1
direct item: except that if it equals 1
it is a symlink and if it equals
it is a symlink and if it equals
...
...
include/configs/LANTEC.h
浏览文件 @
b79a11cc
...
@@ -81,7 +81,7 @@
...
@@ -81,7 +81,7 @@
CFG_CMD_MEMORY | \
CFG_CMD_MEMORY | \
CFG_CMD_LOADS | \
CFG_CMD_LOADS | \
CFG_CMD_LOADB)
CFG_CMD_LOADB)
#define CONFIG_CMD_NORMAL (CONFIG_CMD_DFL & ~CFG_CMD_BOOTD)
#define CONFIG_CMD_NORMAL (CONFIG_CMD_DFL & ~CFG_CMD_BOOTD
& ~CFG_CMD_REISER
)
#define CONFIG_CMD_GDB (CONFIG_CMD_NORMAL | CFG_CMD_KGDB)
#define CONFIG_CMD_GDB (CONFIG_CMD_NORMAL | CFG_CMD_KGDB)
#define CONFIG_CMD_FULL (CFG_CMD_ALL & ~CFG_CMD_BEDBUG \
#define CONFIG_CMD_FULL (CFG_CMD_ALL & ~CFG_CMD_BEDBUG \
& ~CFG_CMD_BMP \
& ~CFG_CMD_BMP \
...
@@ -103,6 +103,7 @@
...
@@ -103,6 +103,7 @@
& ~CFG_CMD_NAND \
& ~CFG_CMD_NAND \
& ~CFG_CMD_PCI \
& ~CFG_CMD_PCI \
& ~CFG_CMD_PCMCIA \
& ~CFG_CMD_PCMCIA \
& ~CFG_CMD_REISER \
& ~CFG_CMD_SCSI \
& ~CFG_CMD_SCSI \
& ~CFG_CMD_SPI \
& ~CFG_CMD_SPI \
& ~CFG_CMD_USB \
& ~CFG_CMD_USB \
...
...
include/configs/MPC8260ADS.h
浏览文件 @
b79a11cc
...
@@ -170,6 +170,7 @@
...
@@ -170,6 +170,7 @@
CFG_CMD_NAND | \
CFG_CMD_NAND | \
CFG_CMD_PCI | \
CFG_CMD_PCI | \
CFG_CMD_PCMCIA | \
CFG_CMD_PCMCIA | \
CFG_CMD_REISER | \
CFG_CMD_SCSI | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_SPI | \
CFG_CMD_USB | \
CFG_CMD_USB | \
...
...
include/configs/MPC8266ADS.h
浏览文件 @
b79a11cc
...
@@ -164,6 +164,7 @@
...
@@ -164,6 +164,7 @@
CFG_CMD_MMC | \
CFG_CMD_MMC | \
CFG_CMD_NAND | \
CFG_CMD_NAND | \
CFG_CMD_PCMCIA | \
CFG_CMD_PCMCIA | \
CFG_CMD_REISER | \
CFG_CMD_SCSI | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_SPI | \
CFG_CMD_VFD | \
CFG_CMD_VFD | \
...
@@ -172,8 +173,8 @@
...
@@ -172,8 +173,8 @@
/* Define a command string that is automatically executed when no character
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
* is read on the console interface withing "Boot Delay" after reset.
*/
*/
#
define CONFIG_BOOT_ROOT_INITRD 0
/* Use ram disk for the root file system */
#
undef CONFIG_BOOT_ROOT_INITRD
/* Use ram disk for the root file system */
#define
CONFIG_BOOT_ROOT_NFS 1
/* Use a NFS mounted root file system */
#define
CONFIG_BOOT_ROOT_NFS
/* Use a NFS mounted root file system */
#ifdef CONFIG_BOOT_ROOT_INITRD
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
#define CONFIG_BOOTCOMMAND \
...
...
include/configs/PPChameleonEVB.h
浏览文件 @
b79a11cc
...
@@ -694,6 +694,4 @@
...
@@ -694,6 +694,4 @@
#endif
/* CONFIG_NO_SERIAL_EEPROM */
#endif
/* CONFIG_NO_SERIAL_EEPROM */
#define CFG_OPB_FREQ 50000000
#endif
/* __CONFIG_H */
#endif
/* __CONFIG_H */
include/configs/RBC823.h
浏览文件 @
b79a11cc
...
@@ -89,35 +89,32 @@
...
@@ -89,35 +89,32 @@
#define CONFIG_HARD_I2C
#define CONFIG_HARD_I2C
#define CFG_I2C_SPEED 40000
#define CFG_I2C_SPEED 40000
#define CFG_I2C_SLAVE 0xfe
#define CFG_I2C_SLAVE 0xfe
#define CFG_I2C_EEPROM_ADDR
0x50
#define CFG_I2C_EEPROM_ADDR
0x50
#define CFG_I2C_EEPROM_ADDR_LEN
1
#define CFG_I2C_EEPROM_ADDR_LEN
1
#define CFG_EEPROM_WRITE_BITS
4
#define CFG_EEPROM_WRITE_BITS
4
#define CFG_EEPROM_WRITE_DELAY_MS
10
#define CFG_EEPROM_WRITE_DELAY_MS
10
#define CONFIG_COMMANDS ( CFG_CMD_ALL & \
#define CONFIG_COMMANDS ( CFG_CMD_ALL & \
~CFG_CMD_
PCMCIA
& \
~CFG_CMD_
BSP
& \
~CFG_CMD_
ID
E & \
~CFG_CMD_
DAT
E & \
~CFG_CMD_
PCI
& \
~CFG_CMD_
DTT
& \
~CFG_CMD_FDC & \
~CFG_CMD_FDC & \
~CFG_CMD_HWFLOW & \
~CFG_CMD_FDOS & \
~CFG_CMD_FDOS & \
~CFG_CMD_SCSI & \
~CFG_CMD_HWFLOW & \
~CFG_CMD_SETGETDCR & \
~CFG_CMD_IDE & \
~CFG_CMD_BSP & \
~CFG_CMD_USB & \
~CFG_CMD_VFD & \
~CFG_CMD_SPI & \
/* ~CFG_CMD_I2C & */
\
~CFG_CMD_IRQ & \
~CFG_CMD_IRQ & \
~CFG_CMD_NAND & \
~CFG_CMD_JFFS2 & \
~CFG_CMD_JFFS2 & \
~CFG_CMD_DTT & \
~CFG_CMD_MII & \
~CFG_CMD_MII & \
~CFG_CMD_MMC & \
~CFG_CMD_MMC & \
/*~CFG_CMD_NET &*/
\
~CFG_CMD_NAND & \
/*~CFG_CMD_ELF &*/
\
~CFG_CMD_PCI & \
/* ~CFG_CMD_EEPROM & */
\
~CFG_CMD_PCMCIA & \
~CFG_CMD_DATE )
~CFG_CMD_REISER & \
~CFG_CMD_SCSI & \
~CFG_CMD_SETGETDCR & \
~CFG_CMD_SPI & \
~CFG_CMD_USB & \
~CFG_CMD_VFD )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
#include <cmd_confdefs.h>
...
...
include/configs/TOP5200.h
浏览文件 @
b79a11cc
...
@@ -123,7 +123,7 @@
...
@@ -123,7 +123,7 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
ADD_PCI_CMD | \
ADD_PCI_CMD | \
ADD_USB_CMD | \
ADD_USB_CMD | \
ADD_IDE_CMD
| \
ADD_IDE_CMD
| \
CFG_CMD_ASKENV | \
CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_DHCP | \
...
...
include/configs/ZPC1900.h
浏览文件 @
b79a11cc
...
@@ -130,6 +130,7 @@
...
@@ -130,6 +130,7 @@
CFG_CMD_NAND | \
CFG_CMD_NAND | \
CFG_CMD_PCI | \
CFG_CMD_PCI | \
CFG_CMD_PCMCIA | \
CFG_CMD_PCMCIA | \
CFG_CMD_REISER | \
CFG_CMD_SCSI | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_SPI | \
CFG_CMD_USB | \
CFG_CMD_USB | \
...
...
include/configs/ep8260.h
浏览文件 @
b79a11cc
...
@@ -288,6 +288,7 @@
...
@@ -288,6 +288,7 @@
~CFG_CMD_PCI & \
~CFG_CMD_PCI & \
~CFG_CMD_PCMCIA & \
~CFG_CMD_PCMCIA & \
~CFG_CMD_SCSI & \
~CFG_CMD_SCSI & \
~CFG_CMD_REISER & \
~CFG_CMD_SPI & \
~CFG_CMD_SPI & \
~CFG_CMD_USB & \
~CFG_CMD_USB & \
~CFG_CMD_VFD & \
~CFG_CMD_VFD & \
...
...
include/configs/hymod.h
浏览文件 @
b79a11cc
...
@@ -188,6 +188,7 @@
...
@@ -188,6 +188,7 @@
CFG_CMD_PCMCIA | \
CFG_CMD_PCMCIA | \
CFG_CMD_PCI | \
CFG_CMD_PCI | \
CFG_CMD_USB | \
CFG_CMD_USB | \
CFG_CMD_REISER | \
CFG_CMD_SCSI | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_SPI | \
CFG_CMD_VFD ) )
CFG_CMD_VFD ) )
...
...
include/configs/ppmc8260.h
浏览文件 @
b79a11cc
...
@@ -238,8 +238,8 @@
...
@@ -238,8 +238,8 @@
/* Define a command string that is automatically executed when no character
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
* is read on the console interface withing "Boot Delay" after reset.
*/
*/
#
define CONFIG_BOOT_ROOT_INITRD 0
/* Use ram disk for the root file system */
#
undef CONFIG_BOOT_ROOT_INITRD
/* Use ram disk for the root file system */
#define
CONFIG_BOOT_ROOT_NFS 1
/* Use a NFS mounted root file system */
#define
CONFIG_BOOT_ROOT_NFS
/* Use a NFS mounted root file system */
#ifdef CONFIG_BOOT_ROOT_INITRD
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
#define CONFIG_BOOTCOMMAND \
...
...
include/configs/sacsng.h
浏览文件 @
b79a11cc
...
@@ -443,8 +443,8 @@
...
@@ -443,8 +443,8 @@
/* Define a command string that is automatically executed when no character
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
* is read on the console interface withing "Boot Delay" after reset.
*/
*/
#
define CONFIG_BOOT_ROOT_INITRD 0
/* Use ram disk for the root file system */
#
undef CONFIG_BOOT_ROOT_INITRD
/* Use ram disk for the root file system */
#define
CONFIG_BOOT_ROOT_NFS 1
/* Use a NFS mounted root file system */
#define
CONFIG_BOOT_ROOT_NFS
/* Use a NFS mounted root file system */
#ifdef CONFIG_BOOT_ROOT_INITRD
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
#define CONFIG_BOOTCOMMAND \
...
...
include/configs/sbc8260.h
浏览文件 @
b79a11cc
...
@@ -389,8 +389,8 @@
...
@@ -389,8 +389,8 @@
/* Define a command string that is automatically executed when no character
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
* is read on the console interface withing "Boot Delay" after reset.
*/
*/
#
define CONFIG_BOOT_ROOT_INITRD 0
/* Use ram disk for the root file system */
#
undef CONFIG_BOOT_ROOT_INITRD
/* Use ram disk for the root file system */
#define
CONFIG_BOOT_ROOT_NFS 1
/* Use a NFS mounted root file system */
#define
CONFIG_BOOT_ROOT_NFS
/* Use a NFS mounted root file system */
#ifdef CONFIG_BOOT_ROOT_INITRD
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
#define CONFIG_BOOTCOMMAND \
...
...
include/reiserfs.h
浏览文件 @
b79a11cc
...
@@ -80,4 +80,3 @@ extern int reiserfs_ls (char *dirname);
...
@@ -80,4 +80,3 @@ extern int reiserfs_ls (char *dirname);
extern
int
reiserfs_open
(
char
*
filename
);
extern
int
reiserfs_open
(
char
*
filename
);
extern
int
reiserfs_read
(
char
*
buf
,
unsigned
len
);
extern
int
reiserfs_read
(
char
*
buf
,
unsigned
len
);
extern
int
reiserfs_mount
(
unsigned
part_length
);
extern
int
reiserfs_mount
(
unsigned
part_length
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录