minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-12 05:25:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

common/{hush, kgdb, serial}.c: build by COBJS-$(...) in Makefile

Browse Source 
Move global '#ifdef CONFIG_xxx .... #endif' out of the .c files and into
the COBJS-$(CONFIG_xxx) in the Makefile.  Also delete unused var in kgdb
code in the process.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2009-02-05 21:04:36 -05:00 committed by Wolfgang Denk
parent ab76e9848a
commit e915f8bb73
4 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/Makefile
View File

@ -35,11 +35,11 @@ COBJS-y += command.o
COBJS-y += devices.o COBJS-y += devices.o
COBJS-y += dlmalloc.o COBJS-y += dlmalloc.o
COBJS-y += exports.o COBJS-y += exports.o
COBJS-y += hush.o COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o
COBJS-y += image.o COBJS-y += image.o
COBJS-y += memsize.o COBJS-y += memsize.o
COBJS-y += s_record.o COBJS-y += s_record.o
COBJS-y += serial.o COBJS-$(CONFIG_SERIAL_MULTI) += serial.o
COBJS-y += xyzModem.o COBJS-y += xyzModem.o
# core command # core command
@ -144,7 +144,7 @@ COBJS-$(CONFIG_DDR_SPD) += ddr_spd.o
COBJS-$(CONFIG_CMD_DOC) += docecc.o COBJS-$(CONFIG_CMD_DOC) += docecc.o
COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o
COBJS-y += flash.o COBJS-y += flash.o
COBJS-y += kgdb.o COBJS-$(CONFIG_CMD_KGDB) += kgdb.o
COBJS-$(CONFIG_LCD) += lcd.o COBJS-$(CONFIG_LCD) += lcd.o
COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o
COBJS-$(CONFIG_UPDATE_TFTP) += update.o COBJS-$(CONFIG_UPDATE_TFTP) += update.o

2
common/hush.c
View File

@ -96,7 +96,6 @@
/*cmd_boot.c*/ /*cmd_boot.c*/
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* do_bootd */ extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* do_bootd */
#endif #endif
#ifdef CONFIG_SYS_HUSH_PARSER
#ifndef __U_BOOT__ #ifndef __U_BOOT__
#include <ctype.h> /* isalpha, isdigit */ #include <ctype.h> /* isalpha, isdigit */
#include <unistd.h> /* getpid */ #include <unistd.h> /* getpid */
@ -3632,5 +3631,4 @@ U_BOOT_CMD(
); );
#endif #endif
#endif /* CONFIG_SYS_HUSH_PARSER */
/****************************************************************************/ /****************************************************************************/

7
common/kgdb.c
View File

@ -92,8 +92,6 @@
#include <kgdb.h> #include <kgdb.h>
#include <command.h> #include <command.h>
#if defined(CONFIG_CMD_KGDB)
#undef KGDB_DEBUG #undef KGDB_DEBUG
/* /*
@ -587,8 +585,3 @@ U_BOOT_CMD(
" program if it is executed (see the \"hello_world\"\n" " program if it is executed (see the \"hello_world\"\n"
" example program in the U-Boot examples directory)." " example program in the U-Boot examples directory)."
); );
#else
int kgdb_not_configured = 1;
#endif

4
common/serial.c
View File

@ -27,8 +27,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_SERIAL_MULTI)
static struct serial_device *serial_devices = NULL; static struct serial_device *serial_devices = NULL;
static struct serial_device *serial_current = NULL; static struct serial_device *serial_current = NULL;
@ -255,5 +253,3 @@ void serial_puts (const char *s)
serial_current->puts (s); serial_current->puts (s);
} }
#endif /* CONFIG_SERIAL_MULTI */