Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
d6e9ee92
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d6e9ee92
编写于
8月 13, 2008
作者:
J
Jean-Christophe PLAGNIOL-VILLARD
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
common: Move conditional compilation to Makefile
Signed-off-by:
N
Jean-Christophe PLAGNIOL-VILLARD
<
plagnioj@jcrosoft.com
>
上级
f5acb9fd
变更
21
显示空白变更内容
内联
并排
Showing
21 changed file
with
23 addition
and
103 deletion
+23
-103
common/ACEX1K.c
common/ACEX1K.c
+0
-4
common/Makefile
common/Makefile
+23
-19
common/altera.c
common/altera.c
+0
-4
common/bedbug.c
common/bedbug.c
+0
-4
common/cmd_onenand.c
common/cmd_onenand.c
+0
-4
common/cyclon2.c
common/cyclon2.c
+0
-4
common/docecc.c
common/docecc.c
+0
-4
common/fpga.c
common/fpga.c
+0
-4
common/lcd.c
common/lcd.c
+0
-4
common/lynxkdi.c
common/lynxkdi.c
+0
-3
common/miiphybb.c
common/miiphybb.c
+0
-5
common/soft_i2c.c
common/soft_i2c.c
+0
-5
common/soft_spi.c
common/soft_spi.c
+0
-4
common/spartan2.c
common/spartan2.c
+0
-4
common/spartan3.c
common/spartan3.c
+0
-4
common/stratixII.c
common/stratixII.c
+0
-4
common/usb.c
common/usb.c
+0
-4
common/usb_kbd.c
common/usb_kbd.c
+0
-5
common/usb_storage.c
common/usb_storage.c
+0
-7
common/virtex2.c
common/virtex2.c
+0
-3
common/xilinx.c
common/xilinx.c
+0
-4
未找到文件。
common/ACEX1K.c
浏览文件 @
d6e9ee92
...
@@ -28,8 +28,6 @@
...
@@ -28,8 +28,6 @@
#include <common.h>
/* core U-Boot definitions */
#include <common.h>
/* core U-Boot definitions */
#include <ACEX1K.h>
/* ACEX device family */
#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 */
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
#ifdef FPGA_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
#define PRINTF(fmt,args...) printf (fmt ,##args)
...
@@ -362,5 +360,3 @@ static int ACEX1K_ps_reloc (Altera_desc * desc, ulong reloc_offset)
...
@@ -362,5 +360,3 @@ static int ACEX1K_ps_reloc (Altera_desc * desc, ulong reloc_offset)
return
ret_val
;
return
ret_val
;
}
}
#endif
/* CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_ACEX1K */
common/Makefile
浏览文件 @
d6e9ee92
...
@@ -28,9 +28,7 @@ LIB = $(obj)libcommon.a
...
@@ -28,9 +28,7 @@ LIB = $(obj)libcommon.a
AOBJS
=
AOBJS
=
COBJS-y
+=
main.o
COBJS-y
+=
main.o
COBJS-y
+=
ACEX1K.o
COBJS-$(CONFIG_CMD_BEDBUG)
+=
bedbug.o
COBJS-y
+=
altera.o
COBJS-y
+=
bedbug.o
COBJS-y
+=
circbuf.o
COBJS-y
+=
circbuf.o
COBJS-$(CONFIG_CMD_AMBAPP)
+=
cmd_ambapp.o
COBJS-$(CONFIG_CMD_AMBAPP)
+=
cmd_ambapp.o
COBJS-y
+=
cmd_autoscript.o
COBJS-y
+=
cmd_autoscript.o
...
@@ -64,7 +62,18 @@ COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.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_FDOS)
+=
cmd_fdos.o
COBJS-$(CONFIG_CMD_FLASH)
+=
cmd_flash.o
COBJS-$(CONFIG_CMD_FLASH)
+=
cmd_flash.o
ifdef
CONFIG_FPGA
ifdef
CONFIG_FPGA
COBJS-y
+=
fpga.o
COBJS-$(CONFIG_CMD_FPGA)
+=
cmd_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
endif
COBJS-$(CONFIG_CMD_I2C)
+=
cmd_i2c.o
COBJS-$(CONFIG_CMD_I2C)
+=
cmd_i2c.o
COBJS-$(CONFIG_CMD_IDE)
+=
cmd_ide.o
COBJS-$(CONFIG_CMD_IDE)
+=
cmd_ide.o
...
@@ -80,7 +89,7 @@ COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
...
@@ -80,7 +89,7 @@ COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
COBJS-y
+=
cmd_nand.o
COBJS-y
+=
cmd_nand.o
COBJS-$(CONFIG_CMD_NET)
+=
cmd_net.o
COBJS-$(CONFIG_CMD_NET)
+=
cmd_net.o
COBJS-y
+=
cmd_nvedit.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
COBJS-$(CONFIG_CMD_OTP)
+=
cmd_otp.o
ifdef
CONFIG_PCI
ifdef
CONFIG_PCI
COBJS-$(CONFIG_CMD_PCI)
+=
cmd_pci.o
COBJS-$(CONFIG_CMD_PCI)
+=
cmd_pci.o
...
@@ -102,11 +111,9 @@ COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o
...
@@ -102,11 +111,9 @@ COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o
COBJS-y
+=
cmd_vfd.o
COBJS-y
+=
cmd_vfd.o
COBJS-y
+=
command.o
COBJS-y
+=
command.o
COBJS-y
+=
console.o
COBJS-y
+=
console.o
COBJS-y
+=
cyclon2.o
COBJS-y
+=
stratixII.o
COBJS-y
+=
devices.o
COBJS-y
+=
devices.o
COBJS-y
+=
dlmalloc.o
COBJS-y
+=
dlmalloc.o
COBJS-
y
+=
docecc.o
COBJS-
$(CONFIG_CMD_DOC)
+=
docecc.o
COBJS-y
+=
environment.o
COBJS-y
+=
environment.o
COBJS-y
+=
env_common.o
COBJS-y
+=
env_common.o
COBJS-y
+=
env_nand.o
COBJS-y
+=
env_nand.o
...
@@ -119,26 +126,23 @@ COBJS-y += env_nvram.o
...
@@ -119,26 +126,23 @@ COBJS-y += env_nvram.o
COBJS-y
+=
env_nowhere.o
COBJS-y
+=
env_nowhere.o
COBJS-y
+=
exports.o
COBJS-y
+=
exports.o
COBJS-y
+=
flash.o
COBJS-y
+=
flash.o
COBJS-y
+=
fpga.o
COBJS-y
+=
hush.o
COBJS-y
+=
hush.o
COBJS-y
+=
kgdb.o
COBJS-y
+=
kgdb.o
COBJS-
y
+=
lcd.o
COBJS-
$(CONFIG_LCD)
+=
lcd.o
COBJS-y
+=
lists.o
COBJS-y
+=
lists.o
COBJS-
y
+=
lynxkdi.o
COBJS-
$(CONFIG_LYNXKDI)
+=
lynxkdi.o
COBJS-y
+=
memsize.o
COBJS-y
+=
memsize.o
COBJS-
y
+=
miiphybb.o
COBJS-
$(CONFIG_BITBANGMII)
+=
miiphybb.o
COBJS-y
+=
miiphyutil.o
COBJS-y
+=
miiphyutil.o
COBJS-y
+=
s_record.o
COBJS-y
+=
s_record.o
COBJS-y
+=
serial.o
COBJS-y
+=
serial.o
COBJS-y
+=
soft_i2c.o
COBJS-$(CONFIG_SOFT_I2C)
+=
soft_i2c.o
COBJS-y
+=
soft_spi.o
COBJS-$(CONFIG_SOFT_SPI)
+=
soft_spi.o
COBJS-y
+=
spartan2.o
ifdef
CONFIG_CMD_USB
COBJS-y
+=
spartan3.o
COBJS-y
+=
usb.o
COBJS-y
+=
usb.o
COBJS-y
+=
usb_kbd.o
COBJS-$(CONFIG_USB_STORAGE)
+=
usb_storage.o
COBJS-y
+=
usb_storage.o
endif
COBJS-y
+=
virtex2.o
COBJS-$(CONFIG_USB_KEYBOARD)
+=
usb_kbd.o
COBJS-y
+=
xilinx.o
COBJS-y
+=
crc16.o
COBJS-y
+=
crc16.o
COBJS-y
+=
xyzModem.o
COBJS-y
+=
xyzModem.o
COBJS-y
+=
cmd_mac.o
COBJS-y
+=
cmd_mac.o
...
...
common/altera.c
浏览文件 @
d6e9ee92
...
@@ -41,8 +41,6 @@
...
@@ -41,8 +41,6 @@
#define PRINTF(fmt,args...)
#define PRINTF(fmt,args...)
#endif
#endif
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA)
/* Local Static Functions */
/* Local Static Functions */
static
int
altera_validate
(
Altera_desc
*
desc
,
const
char
*
fn
);
static
int
altera_validate
(
Altera_desc
*
desc
,
const
char
*
fn
);
...
@@ -283,5 +281,3 @@ 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 */
common/bedbug.c
浏览文件 @
d6e9ee92
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
#include <common.h>
#include <common.h>
#if defined(CONFIG_CMD_BEDBUG)
#include <linux/ctype.h>
#include <linux/ctype.h>
#include <bedbug/bedbug.h>
#include <bedbug/bedbug.h>
#include <bedbug/ppc.h>
#include <bedbug/ppc.h>
...
@@ -1252,5 +1250,3 @@ int find_next_address (unsigned char *nextaddr, int step_over,
...
@@ -1252,5 +1250,3 @@ int find_next_address (unsigned char *nextaddr, int step_over,
* warranties of merchantability and fitness for a particular
* warranties of merchantability and fitness for a particular
* purpose.
* purpose.
*/
*/
#endif
common/cmd_onenand.c
浏览文件 @
d6e9ee92
...
@@ -12,8 +12,6 @@
...
@@ -12,8 +12,6 @@
#include <common.h>
#include <common.h>
#include <command.h>
#include <command.h>
#ifdef CONFIG_CMD_ONENAND
#include <linux/mtd/compat.h>
#include <linux/mtd/compat.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/onenand.h>
#include <linux/mtd/onenand.h>
...
@@ -159,5 +157,3 @@ U_BOOT_CMD(
...
@@ -159,5 +157,3 @@ U_BOOT_CMD(
"onenand block[.oob] addr block [page] [len] - "
"onenand block[.oob] addr block [page] [len] - "
"read data with (block [, page]) to addr"
"read data with (block [, page]) to addr"
);
);
#endif
/* CONFIG_CMD_ONENAND */
common/cyclon2.c
浏览文件 @
d6e9ee92
...
@@ -27,8 +27,6 @@
...
@@ -27,8 +27,6 @@
#include <altera.h>
#include <altera.h>
#include <ACEX1K.h>
/* ACEX device family */
#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 */
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
#ifdef FPGA_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
#define PRINTF(fmt,args...) printf (fmt ,##args)
...
@@ -301,5 +299,3 @@ static int CYC2_ps_reloc (Altera_desc * desc, ulong reloc_offset)
...
@@ -301,5 +299,3 @@ static int CYC2_ps_reloc (Altera_desc * desc, ulong reloc_offset)
return
ret_val
;
return
ret_val
;
}
}
#endif
/* CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_CYCLON2 */
common/docecc.c
浏览文件 @
d6e9ee92
...
@@ -31,8 +31,6 @@
...
@@ -31,8 +31,6 @@
#undef ECC_DEBUG
#undef ECC_DEBUG
#undef PSYCHO_DEBUG
#undef PSYCHO_DEBUG
#if defined(CONFIG_CMD_DOC)
#include <linux/mtd/doc2000.h>
#include <linux/mtd/doc2000.h>
/* need to undef it (from asm/termbits.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])
...
@@ -513,5 +511,3 @@ int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
free
(
Index_of
);
free
(
Index_of
);
return
nb_errors
;
return
nb_errors
;
}
}
#endif
common/fpga.c
浏览文件 @
d6e9ee92
...
@@ -29,8 +29,6 @@
...
@@ -29,8 +29,6 @@
#include <xilinx.h>
/* xilinx specific definitions */
#include <xilinx.h>
/* xilinx specific definitions */
#include <altera.h>
/* altera specific definitions */
#include <altera.h>
/* altera specific definitions */
#if defined(CONFIG_FPGA)
#if 0
#if 0
#define FPGA_DEBUG /* define FPGA_DEBUG to get debug messages */
#define FPGA_DEBUG /* define FPGA_DEBUG to get debug messages */
#endif
#endif
...
@@ -335,5 +333,3 @@ int fpga_info( int devnum )
...
@@ -335,5 +333,3 @@ int fpga_info( int devnum )
}
}
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
#endif
/* CONFIG_FPGA */
common/lcd.c
浏览文件 @
d6e9ee92
...
@@ -55,8 +55,6 @@
...
@@ -55,8 +55,6 @@
#include <nand.h>
#include <nand.h>
#endif
#endif
#ifdef CONFIG_LCD
/************************************************************************/
/************************************************************************/
/* ** FONT DATA */
/* ** FONT DATA */
/************************************************************************/
/************************************************************************/
...
@@ -867,5 +865,3 @@ static void *lcd_logo (void)
...
@@ -867,5 +865,3 @@ static void *lcd_logo (void)
/************************************************************************/
/************************************************************************/
/************************************************************************/
/************************************************************************/
#endif
/* CONFIG_LCD */
common/lynxkdi.c
浏览文件 @
d6e9ee92
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
#include <asm/processor.h>
#include <asm/processor.h>
#include <image.h>
#include <image.h>
#if defined(CONFIG_LYNXKDI)
#include <lynxkdi.h>
#include <lynxkdi.h>
DECLARE_GLOBAL_DATA_PTR
;
DECLARE_GLOBAL_DATA_PTR
;
...
@@ -66,5 +65,3 @@ void lynxkdi_boot (image_header_t *hdr)
...
@@ -66,5 +65,3 @@ void lynxkdi_boot (image_header_t *hdr)
#else
#else
#error "Lynx KDI support not implemented for configured CPU"
#error "Lynx KDI support not implemented for configured CPU"
#endif
#endif
#endif
/* CONFIG_LYNXKDI */
common/miiphybb.c
浏览文件 @
d6e9ee92
...
@@ -30,9 +30,6 @@
...
@@ -30,9 +30,6 @@
#include <ioports.h>
#include <ioports.h>
#include <ppc_asm.tmpl>
#include <ppc_asm.tmpl>
#ifdef CONFIG_BITBANGMII
/*****************************************************************************
/*****************************************************************************
*
*
* Utility to send the preamble, address, and register (common to read
* Utility to send the preamble, address, and register (common to read
...
@@ -236,5 +233,3 @@ int bb_miiphy_write (char *devname, unsigned char addr,
...
@@ -236,5 +233,3 @@ int bb_miiphy_write (char *devname, unsigned char addr,
return
0
;
return
0
;
}
}
#endif
/* CONFIG_BITBANGMII */
common/soft_i2c.c
浏览文件 @
d6e9ee92
...
@@ -41,8 +41,6 @@
...
@@ -41,8 +41,6 @@
#endif
#endif
#include <i2c.h>
#include <i2c.h>
#if defined(CONFIG_SOFT_I2C)
/* #define DEBUG_I2C */
/* #define DEBUG_I2C */
#ifdef DEBUG_I2C
#ifdef DEBUG_I2C
...
@@ -423,6 +421,3 @@ void i2c_reg_write(uchar i2c_addr, uchar reg, uchar val)
...
@@ -423,6 +421,3 @@ void i2c_reg_write(uchar i2c_addr, uchar reg, uchar val)
{
{
i2c_write
(
i2c_addr
,
reg
,
1
,
&
val
,
1
);
i2c_write
(
i2c_addr
,
reg
,
1
,
&
val
,
1
);
}
}
#endif
/* CONFIG_SOFT_I2C */
common/soft_spi.c
浏览文件 @
d6e9ee92
...
@@ -27,8 +27,6 @@
...
@@ -27,8 +27,6 @@
#include <common.h>
#include <common.h>
#include <spi.h>
#include <spi.h>
#if defined(CONFIG_SOFT_SPI)
#include <malloc.h>
#include <malloc.h>
/*-----------------------------------------------------------------------
/*-----------------------------------------------------------------------
...
@@ -193,5 +191,3 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
...
@@ -193,5 +191,3 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
return
(
0
);
return
(
0
);
}
}
#endif
/* CONFIG_SOFT_SPI */
common/spartan2.c
浏览文件 @
d6e9ee92
...
@@ -25,8 +25,6 @@
...
@@ -25,8 +25,6 @@
#include <common.h>
/* core U-Boot definitions */
#include <common.h>
/* core U-Boot definitions */
#include <spartan2.h>
/* Spartan-II device family */
#include <spartan2.h>
/* Spartan-II device family */
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_SPARTAN2)
/* Define FPGA_DEBUG to get debug printf's */
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
#ifdef FPGA_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
#define PRINTF(fmt,args...) printf (fmt ,##args)
...
@@ -663,5 +661,3 @@ static int Spartan2_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
...
@@ -663,5 +661,3 @@ static int Spartan2_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
return
ret_val
;
return
ret_val
;
}
}
#endif
common/spartan3.c
浏览文件 @
d6e9ee92
...
@@ -30,8 +30,6 @@
...
@@ -30,8 +30,6 @@
#include <common.h>
/* core U-Boot definitions */
#include <common.h>
/* core U-Boot definitions */
#include <spartan3.h>
/* Spartan-II device family */
#include <spartan3.h>
/* Spartan-II device family */
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_SPARTAN3)
/* Define FPGA_DEBUG to get debug printf's */
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
#ifdef FPGA_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
#define PRINTF(fmt,args...) printf (fmt ,##args)
...
@@ -668,5 +666,3 @@ static int Spartan3_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
...
@@ -668,5 +666,3 @@ static int Spartan3_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
return
ret_val
;
return
ret_val
;
}
}
#endif
common/stratixII.c
浏览文件 @
d6e9ee92
...
@@ -25,8 +25,6 @@
...
@@ -25,8 +25,6 @@
#include <common.h>
/* core U-Boot definitions */
#include <common.h>
/* core U-Boot definitions */
#include <altera.h>
#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
StratixII_ps_fpp_load
(
Altera_desc
*
desc
,
void
*
buf
,
size_t
bsize
,
int
isSerial
,
int
isSecure
);
int
isSerial
,
int
isSecure
);
int
StratixII_ps_fpp_dump
(
Altera_desc
*
desc
,
void
*
buf
,
size_t
bsize
);
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,
...
@@ -231,5 +229,3 @@ int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
return
FPGA_SUCCESS
;
return
FPGA_SUCCESS
;
}
}
#endif
/* defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_STRATIX_II) */
common/usb.c
浏览文件 @
d6e9ee92
...
@@ -50,8 +50,6 @@
...
@@ -50,8 +50,6 @@
#include <linux/ctype.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include <asm/byteorder.h>
#if defined(CONFIG_CMD_USB)
#include <usb.h>
#include <usb.h>
#ifdef CONFIG_4xx
#ifdef CONFIG_4xx
#include <asm/4xx_pci.h>
#include <asm/4xx_pci.h>
...
@@ -1247,6 +1245,4 @@ int usb_hub_probe(struct usb_device *dev, int ifnum)
...
@@ -1247,6 +1245,4 @@ int usb_hub_probe(struct usb_device *dev, int ifnum)
return
ret
;
return
ret
;
}
}
#endif
/* EOF */
/* EOF */
common/usb_kbd.c
浏览文件 @
d6e9ee92
...
@@ -28,8 +28,6 @@
...
@@ -28,8 +28,6 @@
#include <devices.h>
#include <devices.h>
#include <asm/byteorder.h>
#include <asm/byteorder.h>
#ifdef CONFIG_USB_KEYBOARD
#include <usb.h>
#include <usb.h>
#undef USB_KBD_DEBUG
#undef USB_KBD_DEBUG
...
@@ -746,7 +744,4 @@ static int usb_kbd_get_hid_desc(struct usb_device *dev)
...
@@ -746,7 +744,4 @@ static int usb_kbd_get_hid_desc(struct usb_device *dev)
}
}
#endif
#endif
#endif
/* CONFIG_USB_KEYBOARD */
common/usb_storage.c
浏览文件 @
d6e9ee92
...
@@ -55,13 +55,9 @@
...
@@ -55,13 +55,9 @@
#include <asm/byteorder.h>
#include <asm/byteorder.h>
#include <asm/processor.h>
#include <asm/processor.h>
#if defined(CONFIG_CMD_USB)
#include <part.h>
#include <part.h>
#include <usb.h>
#include <usb.h>
#ifdef CONFIG_USB_STORAGE
#undef USB_STOR_DEBUG
#undef USB_STOR_DEBUG
#undef BBB_COMDAT_TRACE
#undef BBB_COMDAT_TRACE
#undef BBB_XPORT_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
...
@@ -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
);
USB_STOR_PRINTF
(
"partype: %d
\n
"
,
dev_desc
->
part_type
);
return
1
;
return
1
;
}
}
#endif
/* CONFIG_USB_STORAGE */
#endif
common/virtex2.c
浏览文件 @
d6e9ee92
...
@@ -31,8 +31,6 @@
...
@@ -31,8 +31,6 @@
#include <common.h>
#include <common.h>
#include <virtex2.h>
#include <virtex2.h>
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_VIRTEX2)
#if 0
#if 0
#define FPGA_DEBUG
#define FPGA_DEBUG
#endif
#endif
...
@@ -552,6 +550,5 @@ static int Virtex2_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
...
@@ -552,6 +550,5 @@ static int Virtex2_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
}
}
return
ret_val
;
return
ret_val
;
}
}
#endif
/* vim: set ts=4 tw=78: */
/* vim: set ts=4 tw=78: */
common/xilinx.c
浏览文件 @
d6e9ee92
...
@@ -32,8 +32,6 @@
...
@@ -32,8 +32,6 @@
#include <spartan2.h>
#include <spartan2.h>
#include <spartan3.h>
#include <spartan3.h>
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_XILINX)
#if 0
#if 0
#define FPGA_DEBUG
#define FPGA_DEBUG
#endif
#endif
...
@@ -307,5 +305,3 @@ static int xilinx_validate (Xilinx_desc * desc, char *fn)
...
@@ -307,5 +305,3 @@ static int xilinx_validate (Xilinx_desc * desc, char *fn)
return
ret_val
;
return
ret_val
;
}
}
#endif
/* CONFIG_FPGA && CONFIG_FPGA_XILINX */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录