From 2fddd44464d02e0f3ade06dabe0e165835fa61f0 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 19 Aug 2009 08:10:08 +0200 Subject: microblaze: Short size of global data and fix malloc size If is full malloc area global, data are rewrite because there was bad size of malloc area. Signed-off-by: Michal Simek --- include/configs/microblaze-generic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/configs/microblaze-generic.h') diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 72715f6..ca071a3 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -136,13 +136,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 -- cgit v1.1 From 3ceba1d45d007144d10368f91ff9e36f3b5f39a1 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 20 Aug 2009 22:36:20 +0200 Subject: net: Remove old Xilinx Emac driver Signed-off-by: Michal Simek --- include/configs/microblaze-generic.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/configs/microblaze-generic.h') diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index ca071a3..4ab8ca3 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 -- cgit v1.1 From 0900bee9ab9818439b2d1298fa8909a88f74ec0d Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 14 Aug 2009 13:41:17 +0200 Subject: microblaze: Enable hush parser With Hush parser is possible to change command line in dtb Signed-off-by: Michal Simek --- include/configs/microblaze-generic.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'include/configs/microblaze-generic.h') diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 4ab8ca3..b486c77 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -288,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"\ @@ -298,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 */ -- cgit v1.1