mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
common: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD
parent
f5acb9fd9b
commit
d6e9ee92e8
21 changed files with 23 additions and 103 deletions
|
|
@ -28,8 +28,6 @@
|
|||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <ACEX1K.h> /* ACEX device family */
|
||||
|
||||
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_ACEX1K)
|
||||
|
||||
/* Define FPGA_DEBUG to get debug printf's */
|
||||
#ifdef FPGA_DEBUG
|
||||
#define PRINTF(fmt,args...) printf (fmt ,##args)
|
||||
|
|
@ -362,5 +360,3 @@ static int ACEX1K_ps_reloc (Altera_desc * desc, ulong reloc_offset)
|
|||
return ret_val;
|
||||
|
||||
}
|
||||
|
||||
#endif /* CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_ACEX1K */
|
||||
|
|
|
|||
|
|
@ -28,9 +28,7 @@ LIB = $(obj)libcommon.a
|
|||
AOBJS =
|
||||
|
||||
COBJS-y += main.o
|
||||
COBJS-y += ACEX1K.o
|
||||
COBJS-y += altera.o
|
||||
COBJS-y += bedbug.o
|
||||
COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o
|
||||
COBJS-y += circbuf.o
|
||||
COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o
|
||||
COBJS-y += cmd_autoscript.o
|
||||
|
|
@ -64,7 +62,18 @@ COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o
|
|||
COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o
|
||||
COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
|
||||
ifdef CONFIG_FPGA
|
||||
COBJS-y += fpga.o
|
||||
COBJS-$(CONFIG_CMD_FPGA) += cmd_fpga.o
|
||||
COBJS-$(CONFIG_FPGA_SPARTAN2) += spartan2.o
|
||||
COBJS-$(CONFIG_FPGA_SPARTAN3) += spartan3.o
|
||||
COBJS-$(CONFIG_FPGA_VIRTEX2) += virtex2.o
|
||||
COBJS-$(CONFIG_FPGA_XILINX) += xilinx.o
|
||||
ifdef CONFIG_FPGA_ALTERA
|
||||
COBJS-y += altera.o
|
||||
COBJS-$(CONFIG_FPGA_ACEX1K) += ACEX1K.o
|
||||
COBJS-$(CONFIG_FPGA_CYCLON2) += cyclon2.o
|
||||
COBJS-$(CONFIG_FPGA_STRATIX_II) += stratixII.o
|
||||
endif
|
||||
endif
|
||||
COBJS-$(CONFIG_CMD_I2C) += cmd_i2c.o
|
||||
COBJS-$(CONFIG_CMD_IDE) += cmd_ide.o
|
||||
|
|
@ -80,7 +89,7 @@ COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
|
|||
COBJS-y += cmd_nand.o
|
||||
COBJS-$(CONFIG_CMD_NET) += cmd_net.o
|
||||
COBJS-y += cmd_nvedit.o
|
||||
COBJS-y += cmd_onenand.o
|
||||
COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o
|
||||
COBJS-$(CONFIG_CMD_OTP) += cmd_otp.o
|
||||
ifdef CONFIG_PCI
|
||||
COBJS-$(CONFIG_CMD_PCI) += cmd_pci.o
|
||||
|
|
@ -102,11 +111,9 @@ COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o
|
|||
COBJS-y += cmd_vfd.o
|
||||
COBJS-y += command.o
|
||||
COBJS-y += console.o
|
||||
COBJS-y += cyclon2.o
|
||||
COBJS-y += stratixII.o
|
||||
COBJS-y += devices.o
|
||||
COBJS-y += dlmalloc.o
|
||||
COBJS-y += docecc.o
|
||||
COBJS-$(CONFIG_CMD_DOC) += docecc.o
|
||||
COBJS-y += environment.o
|
||||
COBJS-y += env_common.o
|
||||
COBJS-y += env_nand.o
|
||||
|
|
@ -119,26 +126,23 @@ COBJS-y += env_nvram.o
|
|||
COBJS-y += env_nowhere.o
|
||||
COBJS-y += exports.o
|
||||
COBJS-y += flash.o
|
||||
COBJS-y += fpga.o
|
||||
COBJS-y += hush.o
|
||||
COBJS-y += kgdb.o
|
||||
COBJS-y += lcd.o
|
||||
COBJS-$(CONFIG_LCD) += lcd.o
|
||||
COBJS-y += lists.o
|
||||
COBJS-y += lynxkdi.o
|
||||
COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o
|
||||
COBJS-y += memsize.o
|
||||
COBJS-y += miiphybb.o
|
||||
COBJS-$(CONFIG_BITBANGMII) += miiphybb.o
|
||||
COBJS-y += miiphyutil.o
|
||||
COBJS-y += s_record.o
|
||||
COBJS-y += serial.o
|
||||
COBJS-y += soft_i2c.o
|
||||
COBJS-y += soft_spi.o
|
||||
COBJS-y += spartan2.o
|
||||
COBJS-y += spartan3.o
|
||||
COBJS-$(CONFIG_SOFT_I2C) += soft_i2c.o
|
||||
COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o
|
||||
ifdef CONFIG_CMD_USB
|
||||
COBJS-y += usb.o
|
||||
COBJS-y += usb_kbd.o
|
||||
COBJS-y += usb_storage.o
|
||||
COBJS-y += virtex2.o
|
||||
COBJS-y += xilinx.o
|
||||
COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o
|
||||
endif
|
||||
COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
|
||||
COBJS-y += crc16.o
|
||||
COBJS-y += xyzModem.o
|
||||
COBJS-y += cmd_mac.o
|
||||
|
|
|
|||
|
|
@ -41,8 +41,6 @@
|
|||
#define PRINTF(fmt,args...)
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA)
|
||||
|
||||
/* Local Static Functions */
|
||||
static int altera_validate (Altera_desc * desc, const char *fn);
|
||||
|
||||
|
|
@ -283,5 +281,3 @@ static int altera_validate (Altera_desc * desc, const char *fn)
|
|||
}
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
#endif /* CONFIG_FPGA & CONFIG_FPGA_ALTERA */
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
#include <common.h>
|
||||
|
||||
#if defined(CONFIG_CMD_BEDBUG)
|
||||
|
||||
#include <linux/ctype.h>
|
||||
#include <bedbug/bedbug.h>
|
||||
#include <bedbug/ppc.h>
|
||||
|
|
@ -1252,5 +1250,3 @@ int find_next_address (unsigned char *nextaddr, int step_over,
|
|||
* warranties of merchantability and fitness for a particular
|
||||
* purpose.
|
||||
*/
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
#include <common.h>
|
||||
#include <command.h>
|
||||
|
||||
#ifdef CONFIG_CMD_ONENAND
|
||||
|
||||
#include <linux/mtd/compat.h>
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/onenand.h>
|
||||
|
|
@ -159,5 +157,3 @@ U_BOOT_CMD(
|
|||
"onenand block[.oob] addr block [page] [len] - "
|
||||
"read data with (block [, page]) to addr"
|
||||
);
|
||||
|
||||
#endif /* CONFIG_CMD_ONENAND */
|
||||
|
|
|
|||
|
|
@ -27,8 +27,6 @@
|
|||
#include <altera.h>
|
||||
#include <ACEX1K.h> /* ACEX device family */
|
||||
|
||||
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_CYCLON2)
|
||||
|
||||
/* Define FPGA_DEBUG to get debug printf's */
|
||||
#ifdef FPGA_DEBUG
|
||||
#define PRINTF(fmt,args...) printf (fmt ,##args)
|
||||
|
|
@ -301,5 +299,3 @@ static int CYC2_ps_reloc (Altera_desc * desc, ulong reloc_offset)
|
|||
|
||||
return ret_val;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_CYCLON2 */
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@
|
|||
#undef ECC_DEBUG
|
||||
#undef PSYCHO_DEBUG
|
||||
|
||||
#if defined(CONFIG_CMD_DOC)
|
||||
|
||||
#include <linux/mtd/doc2000.h>
|
||||
|
||||
/* need to undef it (from asm/termbits.h) */
|
||||
|
|
@ -513,5 +511,3 @@ int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
|
|||
free(Index_of);
|
||||
return nb_errors;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@
|
|||
#include <xilinx.h> /* xilinx specific definitions */
|
||||
#include <altera.h> /* altera specific definitions */
|
||||
|
||||
#if defined(CONFIG_FPGA)
|
||||
|
||||
#if 0
|
||||
#define FPGA_DEBUG /* define FPGA_DEBUG to get debug messages */
|
||||
#endif
|
||||
|
|
@ -335,5 +333,3 @@ int fpga_info( int devnum )
|
|||
}
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
#endif /* CONFIG_FPGA */
|
||||
|
|
|
|||
|
|
@ -55,8 +55,6 @@
|
|||
#include <nand.h>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LCD
|
||||
|
||||
/************************************************************************/
|
||||
/* ** FONT DATA */
|
||||
/************************************************************************/
|
||||
|
|
@ -867,5 +865,3 @@ static void *lcd_logo (void)
|
|||
|
||||
/************************************************************************/
|
||||
/************************************************************************/
|
||||
|
||||
#endif /* CONFIG_LCD */
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#include <asm/processor.h>
|
||||
#include <image.h>
|
||||
|
||||
#if defined(CONFIG_LYNXKDI)
|
||||
#include <lynxkdi.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
|
@ -66,5 +65,3 @@ void lynxkdi_boot (image_header_t *hdr)
|
|||
#else
|
||||
#error "Lynx KDI support not implemented for configured CPU"
|
||||
#endif
|
||||
|
||||
#endif /* CONFIG_LYNXKDI */
|
||||
|
|
|
|||
|
|
@ -30,9 +30,6 @@
|
|||
#include <ioports.h>
|
||||
#include <ppc_asm.tmpl>
|
||||
|
||||
#ifdef CONFIG_BITBANGMII
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Utility to send the preamble, address, and register (common to read
|
||||
|
|
@ -236,5 +233,3 @@ int bb_miiphy_write (char *devname, unsigned char addr,
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_BITBANGMII */
|
||||
|
|
|
|||
|
|
@ -41,8 +41,6 @@
|
|||
#endif
|
||||
#include <i2c.h>
|
||||
|
||||
#if defined(CONFIG_SOFT_I2C)
|
||||
|
||||
/* #define DEBUG_I2C */
|
||||
|
||||
#ifdef DEBUG_I2C
|
||||
|
|
@ -423,6 +421,3 @@ void i2c_reg_write(uchar i2c_addr, uchar reg, uchar val)
|
|||
{
|
||||
i2c_write(i2c_addr, reg, 1, &val, 1);
|
||||
}
|
||||
|
||||
|
||||
#endif /* CONFIG_SOFT_I2C */
|
||||
|
|
|
|||
|
|
@ -27,8 +27,6 @@
|
|||
#include <common.h>
|
||||
#include <spi.h>
|
||||
|
||||
#if defined(CONFIG_SOFT_SPI)
|
||||
|
||||
#include <malloc.h>
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
|
|
@ -193,5 +191,3 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
|
|||
|
||||
return(0);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_SOFT_SPI */
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <spartan2.h> /* Spartan-II device family */
|
||||
|
||||
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_SPARTAN2)
|
||||
|
||||
/* Define FPGA_DEBUG to get debug printf's */
|
||||
#ifdef FPGA_DEBUG
|
||||
#define PRINTF(fmt,args...) printf (fmt ,##args)
|
||||
|
|
@ -663,5 +661,3 @@ static int Spartan2_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
|
|||
return ret_val;
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@
|
|||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <spartan3.h> /* Spartan-II device family */
|
||||
|
||||
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_SPARTAN3)
|
||||
|
||||
/* Define FPGA_DEBUG to get debug printf's */
|
||||
#ifdef FPGA_DEBUG
|
||||
#define PRINTF(fmt,args...) printf (fmt ,##args)
|
||||
|
|
@ -668,5 +666,3 @@ static int Spartan3_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
|
|||
return ret_val;
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <altera.h>
|
||||
|
||||
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_STRATIX_II)
|
||||
|
||||
int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
|
||||
int isSerial, int isSecure);
|
||||
int StratixII_ps_fpp_dump (Altera_desc * desc, void *buf, size_t bsize);
|
||||
|
|
@ -231,5 +229,3 @@ int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
|
|||
|
||||
return FPGA_SUCCESS;
|
||||
}
|
||||
|
||||
#endif /* defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_STRATIX_II) */
|
||||
|
|
|
|||
|
|
@ -50,8 +50,6 @@
|
|||
#include <linux/ctype.h>
|
||||
#include <asm/byteorder.h>
|
||||
|
||||
#if defined(CONFIG_CMD_USB)
|
||||
|
||||
#include <usb.h>
|
||||
#ifdef CONFIG_4xx
|
||||
#include <asm/4xx_pci.h>
|
||||
|
|
@ -1247,6 +1245,4 @@ int usb_hub_probe(struct usb_device *dev, int ifnum)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* EOF */
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@
|
|||
#include <devices.h>
|
||||
#include <asm/byteorder.h>
|
||||
|
||||
#ifdef CONFIG_USB_KEYBOARD
|
||||
|
||||
#include <usb.h>
|
||||
|
||||
#undef USB_KBD_DEBUG
|
||||
|
|
@ -746,7 +744,4 @@ static int usb_kbd_get_hid_desc(struct usb_device *dev)
|
|||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* CONFIG_USB_KEYBOARD */
|
||||
|
|
|
|||
|
|
@ -55,13 +55,9 @@
|
|||
#include <asm/byteorder.h>
|
||||
#include <asm/processor.h>
|
||||
|
||||
|
||||
#if defined(CONFIG_CMD_USB)
|
||||
#include <part.h>
|
||||
#include <usb.h>
|
||||
|
||||
#ifdef CONFIG_USB_STORAGE
|
||||
|
||||
#undef USB_STOR_DEBUG
|
||||
#undef BBB_COMDAT_TRACE
|
||||
#undef BBB_XPORT_TRACE
|
||||
|
|
@ -1242,6 +1238,3 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
|
|||
USB_STOR_PRINTF("partype: %d\n",dev_desc->part_type);
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_USB_STORAGE */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@
|
|||
#include <common.h>
|
||||
#include <virtex2.h>
|
||||
|
||||
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_VIRTEX2)
|
||||
|
||||
#if 0
|
||||
#define FPGA_DEBUG
|
||||
#endif
|
||||
|
|
@ -552,6 +550,5 @@ static int Virtex2_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
|
|||
}
|
||||
return ret_val;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* vim: set ts=4 tw=78: */
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@
|
|||
#include <spartan2.h>
|
||||
#include <spartan3.h>
|
||||
|
||||
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_XILINX)
|
||||
|
||||
#if 0
|
||||
#define FPGA_DEBUG
|
||||
#endif
|
||||
|
|
@ -307,5 +305,3 @@ static int xilinx_validate (Xilinx_desc * desc, char *fn)
|
|||
|
||||
return ret_val;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_FPGA && CONFIG_FPGA_XILINX */
|
||||
|
|
|
|||
Loading…
Reference in a new issue