summaryrefslogtreecommitdiff
path: root/include/configs/afeb9260.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-12-16 17:16:34 +0100
committerWolfgang Denk <wd@denx.de>2008-12-16 17:16:34 +0100
commit7f202217356f19e519e6ec57a29de9af73067037 (patch)
tree1c3fe822cc37bf4df09ac9ece94c8a71ab9a25d0 /include/configs/afeb9260.h
parent6cdadcb3f1b6eac4a1c4256acaa1438413f95351 (diff)
parent584eedab66d0828f2d571a24b10526c4e65f547b (diff)
downloadu-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.zip
u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.gz
u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.bz2
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'include/configs/afeb9260.h')
-rw-r--r--include/configs/afeb9260.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index f077ad9..d63a1a0 100644
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -29,7 +29,7 @@
/* ARM asynchronous clock */
#define AT91_MAIN_CLOCK 18429952 /* from 18.432 MHz crystal */
#define AT91_MASTER_CLOCK 89999598 /* peripheral = main / 2 */
-#define CFG_AT91_PLLB 0x107c3e18 /* PLLB settings for USB */
+#define CONFIG_SYS_AT91_PLLB 0x107c3e18 /* PLLB settings for USB */
#define CONFIG_SYS_HZ 1000000 /* 1us resolution */
#define AT91_SLOW_CLOCK 32768 /* slow clock */
@@ -150,7 +150,7 @@
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CFG_LONGHELP 1
+#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
#define ROUND(A, B) (((A) + (B)) & ~((B) - 1))
@@ -167,4 +167,3 @@
#endif
#endif
-