diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-09-15 21:45:50 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-15 21:45:50 +0200 |
| commit | 041a6a0c2ea8cd4039c34c5eeaf54b188c89b892 (patch) | |
| tree | ef2114d72cbcc94a7fdba50ced79fc660a30f59e /include/configs/microblaze-generic.h | |
| parent | cae26e2fdd9934644086fda9f7cbc336a1fe5ce8 (diff) | |
| parent | 78d19a398778a58d7b40b0c78e026515271b1a84 (diff) | |
| download | u-boot-imx-041a6a0c2ea8cd4039c34c5eeaf54b188c89b892.zip u-boot-imx-041a6a0c2ea8cd4039c34c5eeaf54b188c89b892.tar.gz u-boot-imx-041a6a0c2ea8cd4039c34c5eeaf54b188c89b892.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
Diffstat (limited to 'include/configs/microblaze-generic.h')
| -rw-r--r-- | include/configs/microblaze-generic.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 72715f6..b486c77 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -58,10 +58,7 @@ /*#define CONFIG_SYS_RESET_ADDRESS TEXT_BASE*/ /* ethernet */ -#ifdef XILINX_EMAC_BASEADDR - #define CONFIG_XILINX_EMAC 1 - #define CONFIG_SYS_ENET -#elif XILINX_EMACLITE_BASEADDR +#ifdef XILINX_EMACLITE_BASEADDR #define CONFIG_XILINX_EMACLITE 1 #define CONFIG_SYS_ENET #elif XILINX_LLTEMAC_BASEADDR @@ -136,13 +133,13 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x1000) /* global pointer */ -#define CONFIG_SYS_GBL_DATA_SIZE 0x1000 /* size of global data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size of global data */ /* start of global data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE) /* monitor code */ #define SIZE 0x40000 -#define CONFIG_SYS_MONITOR_LEN SIZE +#define CONFIG_SYS_MONITOR_LEN (SIZE - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_MONITOR_LEN) #define CONFIG_SYS_MONITOR_END (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_SYS_MALLOC_LEN SIZE @@ -291,7 +288,7 @@ #define CONFIG_SYS_USR_EXCEP /* user exception */ #define CONFIG_SYS_HZ 1000 -#define CONFIG_PREBOOT "echo U-BOOT for $(hostname);setenv preboot;echo" +#define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv preboot;echo" #define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" /* hardware flash protection */\ "nor0=ml401-0\0"\ @@ -301,4 +298,10 @@ #define CONFIG_CMDLINE_EDITING +/* Use the HUSH parser */ +#define CONFIG_SYS_HUSH_PARSER +#ifdef CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " +#endif + #endif /* __CONFIG_H */ |