Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
a538ae99
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,发现更多精彩内容 >>
提交
a538ae99
编写于
3月 18, 2015
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://www.denx.de/git/u-boot-imx
上级
8c8dc4c6
d5eb6dcf
变更
20
隐藏空白更改
内联
并排
Showing
20 changed file
with
88 addition
and
44 deletion
+88
-44
arch/arm/cpu/armv7/mx6/soc.c
arch/arm/cpu/armv7/mx6/soc.c
+18
-1
board/warp/README
board/warp/README
+56
-0
common/board_f.c
common/board_f.c
+2
-1
include/configs/hummingboard.h
include/configs/hummingboard.h
+0
-3
include/configs/mx25pdk.h
include/configs/mx25pdk.h
+0
-2
include/configs/mx31pdk.h
include/configs/mx31pdk.h
+0
-3
include/configs/mx35pdk.h
include/configs/mx35pdk.h
+0
-2
include/configs/mx51evk.h
include/configs/mx51evk.h
+0
-2
include/configs/mx53ard.h
include/configs/mx53ard.h
+0
-1
include/configs/mx53loco.h
include/configs/mx53loco.h
+0
-2
include/configs/mx6_common.h
include/configs/mx6_common.h
+0
-2
include/configs/mx6qarm2.h
include/configs/mx6qarm2.h
+0
-2
include/configs/mx6sabre_common.h
include/configs/mx6sabre_common.h
+3
-3
include/configs/mx6slevk.h
include/configs/mx6slevk.h
+0
-2
include/configs/mx6sxsabresd.h
include/configs/mx6sxsabresd.h
+0
-2
include/configs/mxs.h
include/configs/mxs.h
+0
-3
include/configs/nitrogen6x.h
include/configs/nitrogen6x.h
+0
-3
include/configs/novena.h
include/configs/novena.h
+0
-3
include/configs/wandboard.h
include/configs/wandboard.h
+0
-3
include/configs/warp.h
include/configs/warp.h
+9
-4
未找到文件。
arch/arm/cpu/armv7/mx6/soc.c
浏览文件 @
a538ae99
...
...
@@ -21,7 +21,6 @@
#include <stdbool.h>
#include <asm/arch/mxc_hdmi.h>
#include <asm/arch/crm_regs.h>
#include <asm/bootm.h>
#include <dm.h>
#include <imx_thermal.h>
...
...
@@ -289,6 +288,22 @@ static void set_preclk_from_osc(void)
}
#endif
#define SRC_SCR_WARM_RESET_ENABLE 0
static
void
init_src
(
void
)
{
struct
src
*
src_regs
=
(
struct
src
*
)
SRC_BASE_ADDR
;
u32
val
;
/*
* force warm reset sources to generate cold reset
* for a more reliable restart
*/
val
=
readl
(
&
src_regs
->
scr
);
val
&=
~
(
1
<<
SRC_SCR_WARM_RESET_ENABLE
);
writel
(
val
,
&
src_regs
->
scr
);
}
int
arch_cpu_init
(
void
)
{
init_aips
();
...
...
@@ -323,6 +338,8 @@ int arch_cpu_init(void)
mxs_dma_init
();
#endif
init_src
();
return
0
;
}
...
...
board/warp/README
0 → 100644
浏览文件 @
a538ae99
How to Update U-boot on Warp board
----------------------------------
Required software on the host PC:
- imx_usb_loader: https://github.com/boundarydevices/imx_usb_loader
- dfu-util: http://dfu-util.sourceforge.net/releases/
Build U-boot for Warp:
$ make mrproper
$ make warp_config
$ make
This will generate the U-boot binary called u-boot.imx.
Put warp board in USB download mode
Connect a USB to serial adapter between the host PC and warp
Connect a USB cable between the OTG warp port and the host PC
Open a terminal program such as minicom
Copy u-boot.imx to the imx_usb_loader folder.
Load u-boot.imx via USB:
$ sudo ./imx_usb u-boot.imx
Then U-boot should start and its messages will appear in the console program.
Use the default environment variables:
=> env default -f -a
=> save
Run the DFU command:
=> dfu 0 mmc 0
Transfer u-boot.imx that will be flashed into the eMMC:
$ sudo dfu-util -D u-boot.imx -a boot
Then on the U-boot prompt the following message should be seen after a succesful
upgrade:
#DOWNLOAD ... OK
Ctrl+C to exit ...
Remove power from the warp board.
Put warp board into normal boot mode
Power up the board and the new updated U-boot should boot from eMMC
common/board_f.c
浏览文件 @
a538ae99
...
...
@@ -111,7 +111,8 @@ static int init_func_watchdog_init(void)
{
# if defined(CONFIG_HW_WATCHDOG) && (defined(CONFIG_BLACKFIN) || \
defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \
defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG))
defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG) || \
defined(CONFIG_IMX_WATCHDOG))
hw_watchdog_init
();
# endif
puts
(
" Watchdog enabled
\n
"
);
...
...
include/configs/hummingboard.h
浏览文件 @
a538ae99
...
...
@@ -185,9 +185,6 @@
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
...
...
include/configs/mx25pdk.h
浏览文件 @
a538ae99
...
...
@@ -229,8 +229,6 @@
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_AUTO_COMPLETE
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
...
...
include/configs/mx31pdk.h
浏览文件 @
a538ae99
...
...
@@ -121,9 +121,6 @@
*/
#define CONFIG_SYS_LONGHELP
/* undef to save memory */
#define CONFIG_SYS_CBSIZE 256
/* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT)+16)
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
/* Boot Argument Buffer Size */
...
...
include/configs/mx35pdk.h
浏览文件 @
a538ae99
...
...
@@ -139,8 +139,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256
/* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
/* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot Argument Buffer Size */
...
...
include/configs/mx51evk.h
浏览文件 @
a538ae99
...
...
@@ -222,8 +222,6 @@
#define CONFIG_SYS_HUSH_PARSER
/* use "hush" command parser */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256
/* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
/* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot Argument Buffer Size */
...
...
include/configs/mx53ard.h
浏览文件 @
a538ae99
...
...
@@ -186,7 +186,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP
/* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER
/* use "hush" command parser */
#define CONFIG_SYS_PROMPT "MX53ARD U-Boot > "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256
/* Console I/O Buffer Size */
...
...
include/configs/mx53loco.h
浏览文件 @
a538ae99
...
...
@@ -184,8 +184,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512
/* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
/* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot Argument Buffer Size */
...
...
include/configs/mx6_common.h
浏览文件 @
a538ae99
...
...
@@ -28,8 +28,6 @@
#define CONFIG_SYS_PL310_BASE L2_PL310_BASE
#endif
#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
#define CONFIG_MP
#define CONFIG_MXC_GPT_HCLK
...
...
include/configs/mx6qarm2.h
浏览文件 @
a538ae99
...
...
@@ -153,8 +153,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
...
...
include/configs/mx6sabre_common.h
浏览文件 @
a538ae99
...
...
@@ -111,12 +111,10 @@
"setenv get_cmd tftp; " \
"fi; " \
"if ${get_cmd} ${update_sd_firmware_filename}; then " \
"if mmc dev ${emmcdev} && " \
"mmc open ${emmcdev} 1; then " \
"if mmc dev ${emmcdev} 1; then " \
"setexpr fw_sz ${filesize} / 0x200; " \
"setexpr fw_sz ${fw_sz} + 1; " \
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
"mmc close ${emmcdev} 1; " \
"fi; " \
"fi\0"
#else
...
...
@@ -278,6 +276,7 @@
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
#ifndef CONFIG_SPL
#define CONFIG_CI_UDC
#define CONFIG_USBD_HS
#define CONFIG_USB_GADGET_DUALSPEED
...
...
@@ -291,5 +290,6 @@
#define CONFIG_G_DNL_VENDOR_NUM 0x0525
#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
#define CONFIG_G_DNL_MANUFACTURER "FSL"
#endif
#endif
/* __MX6QSABRE_COMMON_CONFIG_H */
include/configs/mx6slevk.h
浏览文件 @
a538ae99
...
...
@@ -169,8 +169,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
...
...
include/configs/mx6sxsabresd.h
浏览文件 @
a538ae99
...
...
@@ -134,8 +134,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 256
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
...
...
include/configs/mxs.h
浏览文件 @
a538ae99
...
...
@@ -94,9 +94,6 @@
/* U-Boot general configuration */
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
/* Console I/O buffer size */
#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
/* Print buffer size */
#define CONFIG_SYS_MAXARGS 32
/* Max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
...
...
include/configs/nitrogen6x.h
浏览文件 @
a538ae99
...
...
@@ -325,9 +325,6 @@
#define CONFIG_SYS_PROMPT "U-Boot > "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 48
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
...
...
include/configs/novena.h
浏览文件 @
a538ae99
...
...
@@ -58,9 +58,6 @@
/* U-Boot general configurations */
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
/* Console I/O buffer size */
#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
/* Print buffer size */
#define CONFIG_SYS_MAXARGS 32
/* Max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
...
...
include/configs/wandboard.h
浏览文件 @
a538ae99
...
...
@@ -249,9 +249,6 @@
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
...
...
include/configs/warp.h
浏览文件 @
a538ae99
...
...
@@ -28,7 +28,7 @@
#define CONFIG_REVISION_TAG
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (3
* SZ_1M)
#define CONFIG_SYS_MALLOC_LEN (3
5 * SZ_1M)
/* Increase due to DFU */
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_LATE_INIT
...
...
@@ -42,6 +42,7 @@
#define CONFIG_FSL_USDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT
#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
#define CONFIG_MMC
#define CONFIG_CMD_MMC
...
...
@@ -81,9 +82,6 @@
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000
/* 30s */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
...
...
@@ -150,6 +148,12 @@
#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
#define CONFIG_G_DNL_MANUFACTURER "FSL"
#define CONFIG_CMD_DFU
#define CONFIG_DFU_FUNCTION
#define CONFIG_DFU_MMC
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M
#define DFU_DEFAULT_POLL_TIMEOUT 300
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
...
...
@@ -164,6 +168,7 @@
"mmcdev=0\0" \
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"loadbootscript=" \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录