Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
This commit is contained in:
@@ -122,11 +122,9 @@
|
||||
#define CFG_MEMTEST_START 0 /* memtest works on */
|
||||
#define CFG_MEMTEST_END 0x10000
|
||||
|
||||
#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */
|
||||
|
||||
#define CFG_LOAD_ADDR 0 /* default load address */
|
||||
|
||||
#define CFG_HZ 32000
|
||||
#define CFG_HZ 1000
|
||||
|
||||
#define CONFIG_CMDLINE_EDITING 1
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
|
||||
#define CFG_LOAD_ADDR 0 /* default load address */
|
||||
|
||||
#define CFG_HZ 32000
|
||||
#define CFG_HZ 1000
|
||||
|
||||
#define CONFIG_CMDLINE_EDITING 1
|
||||
|
||||
|
||||
@@ -139,11 +139,9 @@
|
||||
#define CFG_MEMTEST_START 0 /* memtest works on */
|
||||
#define CFG_MEMTEST_END 0x10000
|
||||
|
||||
#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */
|
||||
|
||||
#define CFG_LOAD_ADDR CONFIG_LOADADDR
|
||||
|
||||
#define CFG_HZ CONFIG_MX31_CLK32 /* use 32kHz clock as source */
|
||||
#define CFG_HZ 1000
|
||||
|
||||
#define CONFIG_CMDLINE_EDITING 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user