diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-09 02:24:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-09 02:24:51 +0200 |
| commit | ab00e7a23e088505b22cba7b84145806129b83bf (patch) | |
| tree | 5acdfb4c2b87058d132dc8fe9fb81d394cb034bd /include/configs/CPCI4052.h | |
| parent | 4d2ae70e8c31c22e5710df5ff236b5565ea2cf2c (diff) | |
| parent | 5ff889349d2ace13f10c9335e09365fcec8247cc (diff) | |
| download | u-boot-imx-ab00e7a23e088505b22cba7b84145806129b83bf.zip u-boot-imx-ab00e7a23e088505b22cba7b84145806129b83bf.tar.gz u-boot-imx-ab00e7a23e088505b22cba7b84145806129b83bf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Conflicts:
Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/CPCI4052.h')
| -rw-r--r-- | include/configs/CPCI4052.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index fd49f56..9ec1721 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -146,6 +146,8 @@ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ +#define CONFIG_CMDLINE_EDITING /* add command line history */ + #define CONFIG_LOOPW 1 /* enable loopw command */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ @@ -219,6 +221,10 @@ * the maximum mapped by the Linux kernel during initialization. */ #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ + +#define CONFIG_OF_LIBFDT +#define CONFIG_OF_BOARD_SETUP + /*----------------------------------------------------------------------- * FLASH organization */ |