From: Georg Schardt Date: Sat, 6 Sep 2008 12:25:51 +0200 Subject: [U-Boot] [PATCH 3/3] fix some other patch errors In-Reply-To: <12206967521471-git-send-email-schardt@team-ctech.de> References: <12206967514047-git-send-email-schardt@team-ctech.de> <12206967521515-git-send-email-schardt@team-ctech.de> <12206967521471-git-send-email-schardt@team-ctech.de> Message-ID: <12206967523300-git-send-email-schardt@team-ctech.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de --- Makefile | 3 +++ board/xilinx/fx12mm/fx12mm.c | 4 ---- board/xilinx/fx12mm/serial.c | 2 +- include/configs/FX12MM.h | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 8d82ef5..1fc476d 100644 --- a/Makefile +++ b/Makefile @@ -1282,6 +1282,9 @@ ERIC_config: unconfig EXBITGEN_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx exbitgen +FX12MM_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx fx12mm xilinx + G2000_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000 diff --git a/board/xilinx/fx12mm/fx12mm.c b/board/xilinx/fx12mm/fx12mm.c index 0f2dd76..a58a3dc 100644 --- a/board/xilinx/fx12mm/fx12mm.c +++ b/board/xilinx/fx12mm/fx12mm.c @@ -42,10 +42,6 @@ #include #include -#ifdef CFG_ENV_IS_IN_EEPROM -extern void convert_env(void); -#endif - int board_pre_init(void) { diff --git a/board/xilinx/fx12mm/serial.c b/board/xilinx/fx12mm/serial.c index 0c3e868..3af589b 100644 --- a/board/xilinx/fx12mm/serial.c +++ b/board/xilinx/fx12mm/serial.c @@ -36,6 +36,7 @@ * */ +#include #include #include #include @@ -119,7 +120,6 @@ serial_puts(const char *s) { while (*s) serial_putc(*s++); - } #if defined(CONFIG_CMD_KGDB) diff --git a/include/configs/FX12MM.h b/include/configs/FX12MM.h index 8b8d41c..88ceee8 100644 --- a/include/configs/FX12MM.h +++ b/include/configs/FX12MM.h @@ -82,17 +82,17 @@ #define CFG_HZ 2000 /* decrementer freq: 1 ms ticks */ #define CFG_SDRAM_BASE 0x00000000 -#define CFG_MONITOR_LEN (192 * 1024) /* Reserve 196 kB for Monitor */ -#define CFG_MALLOC_LEN (1024 * 1024) /* Reserve 128 kB for malloc() */ +#define CFG_MONITOR_LEN (192 * 1024) +#define CFG_MALLOC_LEN (1024 * 1024) #define CFG_CACHELINE_SIZE 32 /* ... */ #define CFG_CACHELINE_SHIFT 2 -#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ +#define CFG_BOOTMAPSZ (8 << 20) #define CFG_INIT_RAM_ADDR 0x800000 /* inside of SDRAM */ #define CFG_INIT_RAM_END 0x2000 /* End of used area in RAM */ -#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ +#define CFG_GBL_DATA_SIZE 128 #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET -- 1.4.4.4