Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
638dd145
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,发现更多精彩内容 >>
提交
638dd145
编写于
2月 27, 2007
作者:
S
Sergei Poselenov
提交者:
Wolfgang Denk
2月 27, 2007
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MCC200 update - add LCD Progress Indicator
上级
6c7cac8c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
98 addition
and
9 deletion
+98
-9
board/mcc200/auto_update.c
board/mcc200/auto_update.c
+69
-6
board/mcc200/lcd.c
board/mcc200/lcd.c
+28
-3
include/configs/mcc200.h
include/configs/mcc200.h
+1
-0
未找到文件。
board/mcc200/auto_update.c
浏览文件 @
638dd145
...
@@ -106,6 +106,8 @@ struct flash_layout aufl_layout[AU_MAXFILES] = {
...
@@ -106,6 +106,8 @@ struct flash_layout aufl_layout[AU_MAXFILES] = {
{
AU_FL_ROOTFS_ST
,
AU_FL_ROOTFS_ND
,
},
{
AU_FL_ROOTFS_ST
,
AU_FL_ROOTFS_ND
,
},
};
};
ulong
totsize
;
/* where to load files into memory */
/* where to load files into memory */
#define LOAD_ADDR ((unsigned char *)0x00200000)
#define LOAD_ADDR ((unsigned char *)0x00200000)
...
@@ -130,6 +132,11 @@ extern int flash_sect_erase(ulong, ulong);
...
@@ -130,6 +132,11 @@ extern int flash_sect_erase(ulong, ulong);
extern
int
flash_sect_protect
(
int
,
ulong
,
ulong
);
extern
int
flash_sect_protect
(
int
,
ulong
,
ulong
);
extern
int
flash_write
(
char
*
,
ulong
,
ulong
);
extern
int
flash_write
(
char
*
,
ulong
,
ulong
);
extern
int
u_boot_hush_start
(
void
);
extern
int
u_boot_hush_start
(
void
);
#ifdef CONFIG_PROGRESSBAR
extern
void
show_progress
(
int
,
int
);
extern
void
lcd_puts
(
char
*
);
extern
void
lcd_enable
(
void
);
#endif
int
au_check_cksum_valid
(
int
idx
,
long
nbytes
)
int
au_check_cksum_valid
(
int
idx
,
long
nbytes
)
{
{
...
@@ -168,10 +175,12 @@ int au_check_header_valid(int idx, long nbytes)
...
@@ -168,10 +175,12 @@ int au_check_header_valid(int idx, long nbytes)
#endif
#endif
if
(
nbytes
<
sizeof
(
*
hdr
))
{
if
(
nbytes
<
sizeof
(
*
hdr
))
{
printf
(
"Image %s bad header SIZE
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s bad header SIZE
\n
"
,
aufile
[
idx
]);
ausize
[
idx
]
=
0
;
return
-
1
;
return
-
1
;
}
}
if
(
ntohl
(
hdr
->
ih_magic
)
!=
IH_MAGIC
||
hdr
->
ih_arch
!=
IH_CPU_PPC
)
{
if
(
ntohl
(
hdr
->
ih_magic
)
!=
IH_MAGIC
||
hdr
->
ih_arch
!=
IH_CPU_PPC
)
{
printf
(
"Image %s bad MAGIC or ARCH
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s bad MAGIC or ARCH
\n
"
,
aufile
[
idx
]);
ausize
[
idx
]
=
0
;
return
-
1
;
return
-
1
;
}
}
/* check the hdr CRC */
/* check the hdr CRC */
...
@@ -180,22 +189,26 @@ int au_check_header_valid(int idx, long nbytes)
...
@@ -180,22 +189,26 @@ int au_check_header_valid(int idx, long nbytes)
if
(
crc32
(
0
,
(
uchar
*
)
hdr
,
sizeof
(
*
hdr
))
!=
checksum
)
{
if
(
crc32
(
0
,
(
uchar
*
)
hdr
,
sizeof
(
*
hdr
))
!=
checksum
)
{
printf
(
"Image %s bad header checksum
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s bad header checksum
\n
"
,
aufile
[
idx
]);
ausize
[
idx
]
=
0
;
return
-
1
;
return
-
1
;
}
}
hdr
->
ih_hcrc
=
htonl
(
checksum
);
hdr
->
ih_hcrc
=
htonl
(
checksum
);
/* check the type - could do this all in one gigantic if() */
/* check the type - could do this all in one gigantic if() */
if
((
idx
==
IDX_FIRMWARE
)
&&
(
hdr
->
ih_type
!=
IH_TYPE_FIRMWARE
))
{
if
((
idx
==
IDX_FIRMWARE
)
&&
(
hdr
->
ih_type
!=
IH_TYPE_FIRMWARE
))
{
printf
(
"Image %s wrong type
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s wrong type
\n
"
,
aufile
[
idx
]);
ausize
[
idx
]
=
0
;
return
-
1
;
return
-
1
;
}
}
if
((
idx
==
IDX_KERNEL
)
&&
(
hdr
->
ih_type
!=
IH_TYPE_KERNEL
))
{
if
((
idx
==
IDX_KERNEL
)
&&
(
hdr
->
ih_type
!=
IH_TYPE_KERNEL
))
{
printf
(
"Image %s wrong type
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s wrong type
\n
"
,
aufile
[
idx
]);
ausize
[
idx
]
=
0
;
return
-
1
;
return
-
1
;
}
}
if
((
idx
==
IDX_ROOTFS
)
&&
if
((
idx
==
IDX_ROOTFS
)
&&
(
(
hdr
->
ih_type
!=
IH_TYPE_RAMDISK
)
||
(
hdr
->
ih_type
!=
IH_TYPE_FILESYSTEM
)
)
(
(
hdr
->
ih_type
!=
IH_TYPE_RAMDISK
)
||
(
hdr
->
ih_type
!=
IH_TYPE_FILESYSTEM
)
)
)
{
)
{
printf
(
"Image %s wrong type
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s wrong type
\n
"
,
aufile
[
idx
]);
ausize
[
idx
]
=
0
;
return
-
1
;
return
-
1
;
}
}
/* recycle checksum */
/* recycle checksum */
...
@@ -203,13 +216,17 @@ int au_check_header_valid(int idx, long nbytes)
...
@@ -203,13 +216,17 @@ int au_check_header_valid(int idx, long nbytes)
/* for kernel and app the image header must also fit into flash */
/* for kernel and app the image header must also fit into flash */
if
(
idx
!=
IDX_FIRMWARE
)
if
(
idx
!=
IDX_FIRMWARE
)
checksum
+=
sizeof
(
*
hdr
);
checksum
+=
sizeof
(
*
hdr
);
/* check the size does not exceed space in flash. HUSH scripts */
/* check the size does not exceed space in flash. HUSH scripts */
/* all have ausize[] set to 0 */
if
((
ausize
[
idx
]
!=
0
)
&&
(
ausize
[
idx
]
<
checksum
))
{
if
((
ausize
[
idx
]
!=
0
)
&&
(
ausize
[
idx
]
<
checksum
))
{
printf
(
"Image %s is bigger than FLASH
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s is bigger than FLASH
\n
"
,
aufile
[
idx
]);
ausize
[
idx
]
=
0
;
return
-
1
;
return
-
1
;
}
}
return
0
;
/* Update with the real filesize */
ausize
[
idx
]
=
(
idx
==
IDX_FIRMWARE
?
checksum
+
sizeof
(
*
hdr
)
:
checksum
);
return
checksum
;
/* return size to be written to flash */
}
}
int
au_do_update
(
int
idx
,
long
sz
)
int
au_do_update
(
int
idx
,
long
sz
)
...
@@ -254,6 +271,10 @@ int au_do_update(int idx, long sz)
...
@@ -254,6 +271,10 @@ int au_do_update(int idx, long sz)
debug
(
"flash_sect_erase(%lx, %lx);
\n
"
,
start
,
end
);
debug
(
"flash_sect_erase(%lx, %lx);
\n
"
,
start
,
end
);
flash_sect_erase
(
start
,
end
);
flash_sect_erase
(
start
,
end
);
wait_ms
(
100
);
wait_ms
(
100
);
#ifdef CONFIG_PROGRESSBAR
show_progress
(
end
-
start
,
totsize
);
#endif
/* strip the header - except for the kernel and ramdisk */
/* strip the header - except for the kernel and ramdisk */
if
(
hdr
->
ih_type
==
IH_TYPE_KERNEL
||
hdr
->
ih_type
==
IH_TYPE_RAMDISK
)
{
if
(
hdr
->
ih_type
==
IH_TYPE_KERNEL
||
hdr
->
ih_type
==
IH_TYPE_RAMDISK
)
{
addr
=
(
char
*
)
hdr
;
addr
=
(
char
*
)
hdr
;
...
@@ -278,6 +299,10 @@ int au_do_update(int idx, long sz)
...
@@ -278,6 +299,10 @@ int au_do_update(int idx, long sz)
return
-
1
;
return
-
1
;
}
}
#ifdef CONFIG_PROGRESSBAR
show_progress
(
nbytes
,
totsize
);
#endif
/* check the data CRC of the copy */
/* check the data CRC of the copy */
if
(
crc32
(
0
,
(
uchar
*
)(
start
+
off
),
ntohl
(
hdr
->
ih_size
))
!=
ntohl
(
hdr
->
ih_dcrc
))
{
if
(
crc32
(
0
,
(
uchar
*
)(
start
+
off
),
ntohl
(
hdr
->
ih_size
))
!=
ntohl
(
hdr
->
ih_dcrc
))
{
printf
(
"Image %s Bad Data Checksum after COPY
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s Bad Data Checksum after COPY
\n
"
,
aufile
[
idx
]);
...
@@ -300,7 +325,7 @@ int do_auto_update(void)
...
@@ -300,7 +325,7 @@ int do_auto_update(void)
{
{
block_dev_desc_t
*
stor_dev
;
block_dev_desc_t
*
stor_dev
;
long
sz
;
long
sz
;
int
i
,
res
,
bitmap_first
,
cnt
,
old_ctrlc
,
got_ctrlc
;
int
i
,
res
=
0
,
bitmap_first
,
cnt
,
old_ctrlc
,
got_ctrlc
;
char
*
env
;
char
*
env
;
long
start
,
end
;
long
start
,
end
;
uchar
keypad_status1
[
2
]
=
{
0
,
0
},
keypad_status2
[
2
]
=
{
0
,
0
};
uchar
keypad_status1
[
2
]
=
{
0
,
0
},
keypad_status2
[
2
]
=
{
0
,
0
};
...
@@ -319,6 +344,7 @@ int do_auto_update(void)
...
@@ -319,6 +344,7 @@ int do_auto_update(void)
(
keypad_status1
[
1
]
!=
keypad_status2
[
1
]))
{
(
keypad_status1
[
1
]
!=
keypad_status2
[
1
]))
{
return
0
;
return
0
;
}
}
au_usb_stor_curr_dev
=
-
1
;
au_usb_stor_curr_dev
=
-
1
;
/* start USB */
/* start USB */
if
(
usb_stop
()
<
0
)
{
if
(
usb_stop
()
<
0
)
{
...
@@ -403,23 +429,50 @@ int do_auto_update(void)
...
@@ -403,23 +429,50 @@ int do_auto_update(void)
old_ctrlc
=
disable_ctrlc
(
0
);
old_ctrlc
=
disable_ctrlc
(
0
);
bitmap_first
=
0
;
bitmap_first
=
0
;
/* just loop thru all the possible files */
/* validate the images first */
for
(
i
=
0
;
i
<
AU_MAXFILES
;
i
++
)
{
for
(
i
=
0
;
i
<
AU_MAXFILES
;
i
++
)
{
ulong
imsize
;
/* just read the header */
/* just read the header */
sz
=
file_fat_read
(
aufile
[
i
],
LOAD_ADDR
,
sizeof
(
image_header_t
));
sz
=
file_fat_read
(
aufile
[
i
],
LOAD_ADDR
,
sizeof
(
image_header_t
));
debug
(
"read %s sz %ld hdr %d
\n
"
,
debug
(
"read %s sz %ld hdr %d
\n
"
,
aufile
[
i
],
sz
,
sizeof
(
image_header_t
));
aufile
[
i
],
sz
,
sizeof
(
image_header_t
));
if
(
sz
<=
0
||
sz
<
sizeof
(
image_header_t
))
{
if
(
sz
<=
0
||
sz
<
sizeof
(
image_header_t
))
{
debug
(
"%s not found
\n
"
,
aufile
[
i
]);
debug
(
"%s not found
\n
"
,
aufile
[
i
]);
ausize
[
i
]
=
0
;
continue
;
continue
;
}
}
if
(
au_check_header_valid
(
i
,
sz
)
<
0
)
{
/* au_check_header_valid() updates ausize[] */
if
((
imsize
=
au_check_header_valid
(
i
,
sz
))
<
0
)
{
debug
(
"%s header not valid
\n
"
,
aufile
[
i
]);
debug
(
"%s header not valid
\n
"
,
aufile
[
i
]);
continue
;
continue
;
}
}
sz
=
file_fat_read
(
aufile
[
i
],
LOAD_ADDR
,
MAX_LOADSZ
);
/* totsize accounts for image size and flash erase size */
totsize
+=
(
imsize
+
(
aufl_layout
[
i
].
end
-
aufl_layout
[
i
].
start
));
}
#ifdef CONFIG_PROGRESSBAR
if
(
totsize
)
{
lcd_puts
(
" Update in progress
\n
"
);
lcd_enable
();
}
#endif
/* just loop thru all the possible files */
for
(
i
=
0
;
i
<
AU_MAXFILES
&&
totsize
;
i
++
)
{
if
(
!
ausize
[
i
])
{
continue
;
}
sz
=
file_fat_read
(
aufile
[
i
],
LOAD_ADDR
,
ausize
[
i
]);
debug
(
"read %s sz %ld hdr %d
\n
"
,
debug
(
"read %s sz %ld hdr %d
\n
"
,
aufile
[
i
],
sz
,
sizeof
(
image_header_t
));
aufile
[
i
],
sz
,
sizeof
(
image_header_t
));
if
(
sz
!=
ausize
[
i
])
{
printf
(
"%s: size %d read %d?
\n
"
,
aufile
[
i
],
ausize
[
i
],
sz
);
continue
;
}
if
(
sz
<=
0
||
sz
<=
sizeof
(
image_header_t
))
{
if
(
sz
<=
0
||
sz
<=
sizeof
(
image_header_t
))
{
debug
(
"%s not found
\n
"
,
aufile
[
i
]);
debug
(
"%s not found
\n
"
,
aufile
[
i
]);
continue
;
continue
;
...
@@ -452,6 +505,16 @@ int do_auto_update(void)
...
@@ -452,6 +505,16 @@ int do_auto_update(void)
usb_stop
();
usb_stop
();
/* restore the old state */
/* restore the old state */
disable_ctrlc
(
old_ctrlc
);
disable_ctrlc
(
old_ctrlc
);
#ifdef CONFIG_PROGRESSBAR
if
(
totsize
)
{
if
(
!
res
)
{
lcd_puts
(
"
\n
Update completed
\n
"
);
}
else
{
lcd_puts
(
"
\n
Update error
\n
"
);
}
lcd_enable
();
}
#endif
return
0
;
return
0
;
}
}
#endif
/* CONFIG_AUTO_UPDATE */
#endif
/* CONFIG_AUTO_UPDATE */
board/mcc200/lcd.c
浏览文件 @
638dd145
...
@@ -24,13 +24,13 @@
...
@@ -24,13 +24,13 @@
#ifdef CONFIG_LCD
#ifdef CONFIG_LCD
#
define SWAPPED_LCD
#
undef SWAPPED_LCD
/* For the previous h/w version */
/*
/*
* The name of the device used for communication
* The name of the device used for communication
* with the PSoC.
* with the PSoC.
*/
*/
#define PSOC_PSC MPC5XXX_PSC2
#define PSOC_PSC MPC5XXX_PSC2
#define PSOC_BAUD
5000
00UL
#define PSOC_BAUD
2304
00UL
#define RTS_ASSERT 1
#define RTS_ASSERT 1
#define RTS_NEGATE 0
#define RTS_NEGATE 0
...
@@ -181,10 +181,35 @@ void lcd_enable (void)
...
@@ -181,10 +181,35 @@ void lcd_enable (void)
udelay
(
PSOC_WAIT_TIME
);
udelay
(
PSOC_WAIT_TIME
);
}
}
if
(
!
retries
)
{
if
(
!
retries
)
{
printf
(
"%s
Error
: PSoC doesn't respond on "
printf
(
"%s
Warning
: PSoC doesn't respond on "
"RTS NEGATE
\n
"
,
__FUNCTION__
);
"RTS NEGATE
\n
"
,
__FUNCTION__
);
}
}
return
;
return
;
}
}
#ifdef CONFIG_PROGRESSBAR
#define FONT_WIDTH 8
/* the same as VIDEO_FONT_WIDTH in video_font.h */
void
show_progress
(
int
size
,
int
tot
)
{
int
cnt
;
int
i
;
static
int
rc
=
0
;
rc
+=
size
;
cnt
=
((
LCD_WIDTH
/
FONT_WIDTH
)
*
rc
)
/
tot
;
rc
-=
(
cnt
*
tot
)
/
(
LCD_WIDTH
/
FONT_WIDTH
);
for
(
i
=
0
;
i
<
cnt
;
i
++
)
{
lcd_putc
(
0xdc
);
}
if
(
cnt
)
{
lcd_enable
();
/* MCC200-specific - send the framebuffer to PSoC */
}
}
#endif
#endif
/* CONFIG_LCD */
#endif
/* CONFIG_LCD */
include/configs/mcc200.h
浏览文件 @
638dd145
...
@@ -265,6 +265,7 @@
...
@@ -265,6 +265,7 @@
*/
*/
#if !defined(CONFIG_PRS200)
#if !defined(CONFIG_PRS200)
#define CONFIG_LCD 1
#define CONFIG_LCD 1
#define CONFIG_PROGRESSBAR 1
#endif
#endif
#if defined(CONFIG_LCD)
#if defined(CONFIG_LCD)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录