[U-Boot-Users] [PATCH] Remove the obsolete cfg definition
From: Dave Liu [EMAIL PROTECTED]
The rtl8139 driver doesn't need KSEG again, remove
it. the _IO_BASE has default value as 0, so also
remove it.
Signed-off-by: Dave Liu [EMAIL PROTECTED]
---
include/configs/HIDDEN_DRAGON.h |3 ---
include/configs/MPC8349ITX.h|6 --
include/configs/MPC8544DS.h |6 --
include/configs/MPC8610HPCD.h |4
include/configs/MPC8641HPCN.h |4
include/configs/mpc7448hpc2.h |3 ---
6 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 26dd954..33e5939 100644
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -103,9 +103,6 @@
#define PCI_ENET1_MEMADDR 0x8100
#define CONFIG_RTL8139
-#define _IO_BASE 0x
-/* This macro is used by RTL8139 but not defined in PPC architecture */
-#define KSEG1ADDR(x) (x)
/* Make sure the ethaddr can be overwritten
TODO: Remove this on final product
*/
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 38410a1..dfacbe1 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -347,16 +347,10 @@ boards, we say we have two, but don't display a message
if we find only one. */
#define CFG_PCI2_IO_SIZE 0x0100 /* 16M */
#endif
-#define _IO_BASE 0x /* points to PCI I/O space */
#define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */
-#ifdef CONFIG_RTL8139
-/* This macro is used by RTL8139 but not defined in PPC architecture */
-#define KSEG1ADDR(x) (x)
-#endif
-
#ifndef CONFIG_PCI_PNP
#define PCI_ENET0_IOADDR 0x
#define PCI_ENET0_MEMADDR CFG_PCI2_MEM_BASE
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index ffe9e00..1e77808 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -325,12 +325,6 @@ extern unsigned long get_board_sys_clk(unsigned long
dummy);
#undef CONFIG_TULIP
#define CONFIG_RTL8139
-#ifdef CONFIG_RTL8139
-/* This macro is used by RTL8139 but not defined in PPC architecture */
-#define KSEG1ADDR(x) (x)
-#define _IO_BASE 0x
-#endif
-
#ifndef CONFIG_PCI_PNP
#define PCI_ENET0_IOADDRCFG_PCI1_IO_BASE
#define PCI_ENET0_MEMADDR CFG_PCI1_IO_BASE
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index a051b6d..a0ad515 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -288,10 +288,6 @@
#define CFG_PCI_MEMORY_PHYS0x
#define CFG_PCI_MEMORY_SIZE0x8000
-/* For RTL8139 */
-#define KSEG1ADDR(x) ({u32 _x = le32_to_cpu(*(u32 *)(x)); (_x); })
-#define _IO_BASE 0x
-
/* controller 1, Base address 0xa000 */
#define CFG_PCIE1_MEM_BASE 0xa000
#define CFG_PCIE1_MEM_PHYS CFG_PCIE1_MEM_BASE
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 49ee7ff..f959367 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -313,10 +313,6 @@ extern unsigned long get_board_sys_clk(unsigned long
dummy);
#define CFG_PCI_MEMORY_PHYS0x
#define CFG_PCI_MEMORY_SIZE0x8000
-/* For RTL8139 */
-#define KSEG1ADDR(x) ({u32 _x=le32_to_cpu(*(u32 *)(x)); (_x);})
-#define _IO_BASE 0x
-
#define CFG_PCI2_MEM_BASE 0xa000
#define CFG_PCI2_MEM_PHYS CFG_PCI2_MEM_BASE
#define CFG_PCI2_MEM_SIZE 0x2000 /* 512M */
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index a218f75..e426f41 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -123,8 +123,6 @@
/* Networking Configuration */
-#define KSEG1ADDR(a) (a) /* Needed by the rtl8139 driver */
-
#define CONFIG_TSI108_ETH
#define CONFIG_TSI108_ETH_NUM_PORTS2
@@ -301,7 +299,6 @@
#define CFG_PCI_IO_SIZE0x0100 /* 16MB */
-#define _IO_BASE 0x /* points to PCI I/O space
*/
/* PCI Config Space mapping */
#define CFG_PCI_CFG_BASE 0xfb00 /* Changed from FE00 */
--
1.5.5
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] add SHA256 support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED]
Signed-off-by: Francesco Albanese [EMAIL PROTECTED]
---
include/sha256.h | 16 +++
lib_generic/Makefile |1 +
lib_generic/sha256.c | 262 ++
3 files changed, 279 insertions(+), 0 deletions(-)
create mode 100755 include/sha256.h
create mode 100644 lib_generic/sha256.c
diff --git a/include/sha256.h b/include/sha256.h
new file mode 100755
index 000..e38ea89
--- /dev/null
+++ b/include/sha256.h
@@ -0,0 +1,16 @@
+#ifndef _SHA256_H
+#define _SHA256_H
+
+#define SHA256_SUM_LEN 32
+
+typedef struct {
+ uint32_t total[2];
+ uint32_t state[8];
+ uint8_t buffer[64];
+} sha256_context;
+
+void sha256_starts(sha256_context * ctx);
+void sha256_update(sha256_context * ctx, uint8_t * input, uint32_t length);
+void sha256_finish(sha256_context * ctx, uint8_t digest[SHA256_SUM_LEN]);
+
+#endif /* _SHA256_H */
diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index dca3a6c..4f6ce73 100644
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -38,6 +38,7 @@ COBJS-y += lmb.o
COBJS-y += ldiv.o
COBJS-$(CONFIG_MD5) += md5.o
COBJS-y += sha1.o
+COBJS-$(CONFIG_SHA256) += sha256.o
COBJS-y += string.o
COBJS-y += vsprintf.o
COBJS-y += zlib.o
diff --git a/lib_generic/sha256.c b/lib_generic/sha256.c
new file mode 100644
index 000..deb63a4
--- /dev/null
+++ b/lib_generic/sha256.c
@@ -0,0 +1,262 @@
+/*
+ * FIPS-180-2 compliant SHA-256 implementation
+ *
+ * Copyright (C) 2001-2003 Christophe Devine
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef USE_HOSTCC
+#include common.h
+#endif /* USE_HOSTCC */
+#include watchdog.h
+#include linux/string.h
+#include sha256.h
+
+/*
+ * 32-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_UINT32_BE
+#define GET_UINT32_BE(n,b,i) { \
+ (n) = ( (unsigned long) (b)[(i)] 24 )\
+ | ( (unsigned long) (b)[(i) + 1] 16 )\
+ | ( (unsigned long) (b)[(i) + 2] 8 )\
+ | ( (unsigned long) (b)[(i) + 3] ); \
+}
+#endif
+#ifndef PUT_UINT32_BE
+#define PUT_UINT32_BE(n,b,i) { \
+ (b)[(i)] = (unsigned char) ( (n) 24 ); \
+ (b)[(i) + 1] = (unsigned char) ( (n) 16 ); \
+ (b)[(i) + 2] = (unsigned char) ( (n) 8 ); \
+ (b)[(i) + 3] = (unsigned char) ( (n) ); \
+}
+#endif
+
+void sha256_starts(sha256_context * ctx)
+{
+ ctx-total[0] = 0;
+ ctx-total[1] = 0;
+
+ ctx-state[0] = 0x6A09E667;
+ ctx-state[1] = 0xBB67AE85;
+ ctx-state[2] = 0x3C6EF372;
+ ctx-state[3] = 0xA54FF53A;
+ ctx-state[4] = 0x510E527F;
+ ctx-state[5] = 0x9B05688C;
+ ctx-state[6] = 0x1F83D9AB;
+ ctx-state[7] = 0x5BE0CD19;
+}
+
+void sha256_process(sha256_context * ctx, uint8_t data[64])
+{
+ uint32_t temp1, temp2;
+ uint32_t W[64];
+ uint32_t A, B, C, D, E, F, G, H;
+
+ GET_UINT32_BE(W[0], data, 0);
+ GET_UINT32_BE(W[1], data, 4);
+ GET_UINT32_BE(W[2], data, 8);
+ GET_UINT32_BE(W[3], data, 12);
+ GET_UINT32_BE(W[4], data, 16);
+ GET_UINT32_BE(W[5], data, 20);
+ GET_UINT32_BE(W[6], data, 24);
+ GET_UINT32_BE(W[7], data, 28);
+ GET_UINT32_BE(W[8], data, 32);
+ GET_UINT32_BE(W[9], data, 36);
+ GET_UINT32_BE(W[10], data, 40);
+ GET_UINT32_BE(W[11], data, 44);
+ GET_UINT32_BE(W[12], data, 48);
+ GET_UINT32_BE(W[13], data, 52);
+ GET_UINT32_BE(W[14], data, 56);
+ GET_UINT32_BE(W[15], data, 60);
+
+#define SHR(x,n) ((x 0x) n)
+#define ROTR(x,n) (SHR(x,n) | (x (32 - n)))
+
+#define S0(x) (ROTR(x, 7) ^ ROTR(x,18) ^ SHR(x, 3))
+#define S1(x) (ROTR(x,17) ^ ROTR(x,19) ^ SHR(x,10))
+
+#define S2(x) (ROTR(x, 2) ^ ROTR(x,13) ^ ROTR(x,22))
+#define S3(x) (ROTR(x, 6) ^ ROTR(x,11) ^ ROTR(x,25))
+
+#define F0(x,y,z) ((x y) | (z (x | y)))
+#define F1(x,y,z) (z ^ (x (y ^ z)))
+
+#define R(t) \
+( \
+ W[t] = S1(W[t - 2]) + W[t - 7] +\
+ S0(W[t - 15]) + W[t - 16] \
+)
+
+#define P(a,b,c,d,e,f,g,h,x,K) { \
+ temp1 = h + S3(e) + F1(e,f,g) + K + x; \
+
Re: [U-Boot-Users] [PATCH 07/08] Socrates: NAND support added. Changed the U-Boot base address and
Hi On Fri, Jun 6, 2008 at 3:42 PM, Wolfgang Denk [EMAIL PROTECTED] wrote: From: Sergei Poselenov [EMAIL PROTECTED] Signed-off-by: Sergei Poselenov [EMAIL PROTECTED] --- board/socrates/Makefile|2 +- board/socrates/config.mk |3 +- board/socrates/nand.c | 218 include/configs/socrates.h |8 ++- 4 files changed, 227 insertions(+), 4 deletions(-) create mode 100644 board/socrates/nand.c diff --git a/board/socrates/Makefile b/board/socrates/Makefile index 6453f24..11503eb 100644 --- a/board/socrates/Makefile +++ b/board/socrates/Makefile @@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(BOARD).a # -COBJS := $(BOARD).o law.o tlb.o sdram.o +COBJS := $(BOARD).o law.o tlb.o sdram.o nand.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/socrates/config.mk b/board/socrates/config.mk index 1cf5d38..4f17294 100644 --- a/board/socrates/config.mk +++ b/board/socrates/config.mk @@ -25,6 +25,5 @@ # # socrates board # default CCARBAR is at 0xff70 -# assume U-Boot is less than 256k # -TEXT_BASE = 0xfffc +TEXT_BASE = 0xfffa diff --git a/board/socrates/nand.c b/board/socrates/nand.c new file mode 100644 index 000..960f847 --- /dev/null +++ b/board/socrates/nand.c @@ -0,0 +1,218 @@ +/* + * (C) Copyright 2008 + * Sergei Poselenov, Emcraft Systems, [EMAIL PROTECTED] + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include common.h + +#if defined(CFG_NAND_BASE) +#include nand.h +#include asm/errno.h +#include asm/io.h + +int state; Can that variable be made static? Regards, Magnus - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] FDT memory and pci node fixes for MPC8260ADS
From 3c7a1b900ab7b473fed62398fc76a16fa9c5940a Mon Sep 17 00:00:00 2001
From: Matvejchikov Ilya [EMAIL PROTECTED](none)
Date: Sat, 7 Jun 2008 16:57:14 +0400
Subject: [PATCH] FDT memory and pci fixes for MPC8260ADS
Signed-off-by: Matvejchikov Ilya [EMAIL PROTECTED](none)
---
board/freescale/mpc8260ads/mpc8260ads.c | 27 +++
cpu/mpc8260/pci.c | 12
include/configs/MPC8260ADS.h|7 +++
3 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/board/freescale/mpc8260ads/mpc8260ads.c
b/board/freescale/mpc8260ads/mpc8260ads.c
index 93550e2..44a68fe 100644
--- a/board/freescale/mpc8260ads/mpc8260ads.c
+++ b/board/freescale/mpc8260ads/mpc8260ads.c
@@ -46,6 +46,10 @@
#ifdef CONFIG_PCI
#include pci.h
#endif
+#ifdef CONFIG_OF_LIBFDT
+#include libfdt.h
+#include fdt_support.h
+#endif
/*
* I/O Port configuration table
@@ -544,3 +548,26 @@ void pci_init_board(void)
pci_mpc8250_init(hose);
}
#endif
+
+#if defined(CONFIG_OF_LIBFDT) defined(CONFIG_OF_BOARD_SETUP)
+void ft_blob_update(void *blob, bd_t *bd)
+{
+ int ret;
+
+ ret = fdt_fixup_memory(blob, (u64)bd-bi_memstart, (u64)bd-bi_memsize);
+
+ if (ret 0) {
+ printf(ft_blob_update(): cannot set /memory/reg
+ property err:%s\n, fdt_strerror(ret));
+ }
+}
+
+void ft_board_setup(void *blob, bd_t *bd)
+{
+ ft_cpu_setup(blob, bd);
+#ifdef CONFIG_PCI
+ ft_pci_setup(blob, bd);
+#endif
+ ft_blob_update(blob, bd);
+}
+#endif
diff --git a/cpu/mpc8260/pci.c b/cpu/mpc8260/pci.c
index 75c6ab2..940f5c0 100644
--- a/cpu/mpc8260/pci.c
+++ b/cpu/mpc8260/pci.c
@@ -33,6 +33,10 @@
#include mpc8260.h
#include asm/m8260_pci.h
#include asm/io.h
+#ifdef CONFIG_OF_LIBFDT
+#include libfdt.h
+#include fdt_support.h
+#endif
#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272 || defined CONFIG_PM826
DECLARE_GLOBAL_DATA_PTR;
@@ -449,4 +453,12 @@ void pci_mpc8250_init (struct pci_controller *hose)
immap-im_pci.pci_emr |= cpu_to_le32 (PCI_ERROR_PCI_NO_RSP);
}
+#if defined(CONFIG_OF_LIBFDT)
+void ft_pci_setup(void *blob, bd_t *bd)
+{
+ do_fixup_by_prop_u32(blob, device_type, pci, 4,
+ clock-frequency, bd-pci_clk, 1);
+}
+#endif
+
#endif /* CONFIG_PCI */
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 23508f9..59d0bdb 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -197,6 +197,13 @@
#define CONFIG_BAUDRATE115200
+#define CONFIG_OF_LIBFDT 1
+#define CONFIG_OF_BOARD_SETUP 1
+#if defined(CONFIG_OF_LIBFDT)
+#define OF_CPU [EMAIL PROTECTED]
+#define OF_TBCLK (bd-bi_busfreq / 4)
+#endif
+
/*
* BOOTP options
*/
--
1.5.3.7
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] Some copy-n-paste fixes in printf usage
From 9bdd14533d7c6f0af336b59a2a026093be84eff9 Mon Sep 17 00:00:00 2001
From: Matvejchikov Ilya [EMAIL PROTECTED](none)
Date: Sat, 7 Jun 2008 17:01:42 +0400
Subject: [PATCH] Some copy-n-paste fixes in printf usage
Signed-off-by: Matvejchikov Ilya [EMAIL PROTECTED](none)
---
board/cm5200/cm5200.c |2 +-
board/ids8247/ids8247.c |2 +-
board/mgcoge/mgcoge.c |6 +++---
board/mgsuvd/mgsuvd.c |8
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c
index 79fb71d..9548619 100644
--- a/board/cm5200/cm5200.c
+++ b/board/cm5200/cm5200.c
@@ -275,7 +275,7 @@ static void ft_blob_update(void *blob, bd_t *bd)
ret = fdt_fixup_memory(blob, (u64)bd-bi_memstart, (u64)bd-bi_memsize);
if (ret 0) {
- printf(ft_blob_update): cannot set /memory/reg
+ printf(ft_blob_update(): cannot set /memory/reg
property err:%s\n, fdt_strerror(ret));
}
}
diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c
index 7176770..c4eddfa 100644
--- a/board/ids8247/ids8247.c
+++ b/board/ids8247/ids8247.c
@@ -334,7 +334,7 @@ void ft_blob_update(void *blob, bd_t *bd)
ret = fdt_fixup_memory(blob, (u64)bd-bi_memstart, (u64)bd-bi_memsize);
if (ret 0) {
- printf(ft_blob_update): cannot set /memory/reg
+ printf(ft_blob_update(): cannot set /memory/reg
property err:%s\n, fdt_strerror(ret));
}
}
diff --git a/board/mgcoge/mgcoge.c b/board/mgcoge/mgcoge.c
index e7c3fa0..4945a99 100644
--- a/board/mgcoge/mgcoge.c
+++ b/board/mgcoge/mgcoge.c
@@ -307,7 +307,7 @@ void ft_blob_update(void *blob, bd_t *bd)
ret = fdt_setprop(blob, nodeoffset, reg, memory_data,
sizeof(memory_data));
if (ret 0)
- printf(ft_blob_update): cannot set /memory/reg
+ printf(ft_blob_update(): cannot set /memory/reg
property err:%s\n, fdt_strerror(ret));
}
else {
@@ -327,7 +327,7 @@ void ft_blob_update(void *blob, bd_t *bd)
ret = fdt_setprop(blob, nodeoffset, ranges, flash_data,
sizeof(flash_data));
if (ret 0)
- printf(ft_blob_update): cannot set /localbus/ranges
+ printf(ft_blob_update(): cannot set /localbus/ranges
property err:%s\n, fdt_strerror(ret));
}
else {
@@ -341,7 +341,7 @@ void ft_blob_update(void *blob, bd_t *bd)
ret = fdt_setprop(blob, nodeoffset, mac-address,
bd-bi_enetaddr,
sizeof(uchar) * 6);
if (ret 0)
- printf(ft_blob_update): cannot set
/soc/cpm/ethernet/mac-address
+ printf(ft_blob_update(): cannot set
/soc/cpm/ethernet/mac-address
property err:%s\n, fdt_strerror(ret));
}
else {
diff --git a/board/mgsuvd/mgsuvd.c b/board/mgsuvd/mgsuvd.c
index e0123bf..944a5f8 100644
--- a/board/mgsuvd/mgsuvd.c
+++ b/board/mgsuvd/mgsuvd.c
@@ -164,7 +164,7 @@ void ft_blob_update(void *blob, bd_t *bd)
ret = fdt_setprop(blob, nodeoffset, reg, memory_data,
sizeof(memory_data));
if (ret 0)
- printf(ft_blob_update): cannot set /memory/reg
+ printf(ft_blob_update(): cannot set /memory/reg
property err:%s\n, fdt_strerror(ret));
}
else {
@@ -180,7 +180,7 @@ void ft_blob_update(void *blob, bd_t *bd)
ret = fdt_setprop(blob, nodeoffset, ranges, flash_data,
sizeof(flash_data));
if (ret 0)
- printf(ft_blob_update): cannot set /localbus/ranges
+ printf(ft_blob_update(): cannot set /localbus/ranges
property err:%s\n, fdt_strerror(ret));
}
else {
@@ -195,7 +195,7 @@ void ft_blob_update(void *blob, bd_t *bd)
ret = fdt_setprop(blob, nodeoffset, brg-frequency, brg_data,
sizeof(brg_data));
if (ret 0)
- printf(ft_blob_update): cannot set /soc/cpm/brg-frequency
+ printf(ft_blob_update(): cannot set /soc/cpm/brg-frequency
property err:%s\n, fdt_strerror(ret));
}
else {
@@ -209,7 +209,7 @@ void ft_blob_update(void *blob, bd_t *bd)
ret = fdt_setprop(blob, nodeoffset, mac-address,
bd-bi_enetaddr,
sizeof(uchar) * 6);
if (ret 0)
- printf(ft_blob_update): cannot set /soc/cpm/scc/mac-address
+ printf(ft_blob_update(): cannot set /soc/cpm/scc/mac-address
property err:%s\n, fdt_strerror(ret));
[U-Boot-Users] 一口饭
--感谢您在百忙之中查阅我公司信息。(谢谢!) 首先祝您：身体健康、心想事成、生意兴隆。 我公司现有部份多余发/票，以优惠点数向外代开服务！欢迎您来电咨询与合作！ 至于双方合作绝对保密！李先生：13824404409 也可通过QQ咨询：527496042 - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 07/08] Socrates: NAND support added. Changed the U-Boot base address and
Hello, +#include asm/io.h + +int state; Can that variable be made static? Regards, Magnus Yes, it can. Wolfgang, what is the best way to handle this? Should I re-do the patch? Regards, Sergei - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] drivers/net/Makefile: Conditional COBJS inclusion cleanups
Signed-off-by: Shinya Kuribayashi [EMAIL PROTECTED]
---
This mail contains the whole patch and diffstat.
Separated patches will follow for easy review.
drivers/net/3c589.c|5 ---
drivers/net/Makefile | 66 ++--
drivers/net/bcm570x.c |5 ---
drivers/net/cs8900.c |8 -
drivers/net/dc2114x.c |6
drivers/net/dm9000x.c |3 --
drivers/net/e1000.c|5 ---
drivers/net/eepro100.c |5 ---
drivers/net/enc28j60.c |3 --
drivers/net/fsl_mcdmafec.c |2 -
drivers/net/inca-ip_sw.c |5 ---
drivers/net/ks8695eth.c|4 --
drivers/net/lan91c96.c |9 --
drivers/net/macb.c |5 ---
drivers/net/mcffec.c |3 --
drivers/net/natsemi.c |5 ---
drivers/net/netarm_eth.c |4 --
drivers/net/netconsole.c |5 ---
drivers/net/ns7520_eth.c |5 ---
drivers/net/ns8382x.c |5 ---
drivers/net/ns9750_eth.c |4 --
drivers/net/pcnet.c|4 --
drivers/net/plb2800_eth.c |6
drivers/net/rtl8019.c |8 -
drivers/net/rtl8139.c |4 --
drivers/net/rtl8169.c |5 ---
drivers/net/s3c4510b_eth.c |5 ---
drivers/net/smc9.c |3 --
drivers/net/smc911x.c |5 ---
drivers/net/tigon3.c |5 +--
drivers/net/tsec.c |3 --
drivers/net/tsi108_eth.c |5 ---
drivers/net/uli526x.c |4 --
drivers/net/vsc7385.c |5 ---
34 files changed, 34 insertions(+), 190 deletions(-)
diff --git a/drivers/net/3c589.c b/drivers/net/3c589.c
index 3f1e770..0cf8dff 100644
--- a/drivers/net/3c589.c
+++ b/drivers/net/3c589.c
@@ -26,8 +26,6 @@
#include command.h
#include net.h
-#ifdef CONFIG_DRIVER_3C589
-
#include 3c589.h
@@ -514,6 +512,3 @@ int eth_send(volatile void *packet, int length) {
return length;
}
-
-
-#endif /* CONFIG_DRIVER_3C589 */
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 5b031c9..84be288 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -25,45 +25,45 @@ include $(TOPDIR)/config.mk
LIB:= $(obj)libnet.a
-COBJS-y += 3c589.o
-COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o
+COBJS-$(CONFIG_DRIVER_3C589) += 3c589.o
+COBJS-$(CONFIG_BCM570x) += bcm570x.o bcm570x_autoneg.o 5701rls.o
COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o
-COBJS-y += cs8900.o
-COBJS-y += dc2114x.o
-COBJS-y += dm9000x.o
-COBJS-y += e1000.o
-COBJS-y += eepro100.o
-COBJS-y += enc28j60.o
-COBJS-y += fsl_mcdmafec.o
+COBJS-$(CONFIG_DRIVER_CS8900) += cs8900.o
+COBJS-$(CONFIG_TULIP) += dc2114x.o
+COBJS-$(CONFIG_DRIVER_DM9000) += dm9000x.o
+COBJS-$(CONFIG_E1000) += e1000.o
+COBJS-$(CONFIG_EEPRO100) += eepro100.o
+COBJS-$(CONFIG_ENC28J60) += enc28j60.o
+COBJS-$(CONFIG_FSLDMAFEC) += fsl_mcdmafec.o
COBJS-$(CONFIG_GRETH) += greth.o
-COBJS-y += inca-ip_sw.o
-COBJS-y += ks8695eth.o
-COBJS-y += lan91c96.o
-COBJS-y += macb.o
-COBJS-y += mcffec.o
-COBJS-y += natsemi.o
+COBJS-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o
+COBJS-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o
+COBJS-$(CONFIG_DRIVER_LAN91C96) += lan91c96.o
+COBJS-$(CONFIG_MACB) += macb.o
+COBJS-$(CONFIG_MCFFEC) += mcffec.o
+COBJS-$(CONFIG_NATSEMI) += natsemi.o
ifeq ($(CONFIG_DRIVER_NE2000),y)
COBJS-y += ne2000.o
COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o
endif
-COBJS-y += netarm_eth.o
-COBJS-y += netconsole.o
-COBJS-y += ns7520_eth.o
-COBJS-y += ns8382x.o
-COBJS-y += ns9750_eth.o
-COBJS-y += pcnet.o
-COBJS-y += plb2800_eth.o
-COBJS-y += rtl8019.o
-COBJS-y += rtl8139.o
-COBJS-y += rtl8169.o
-COBJS-y += s3c4510b_eth.o
-COBJS-y += smc9.o
-COBJS-y += smc911x.o
-COBJS-y += tigon3.o
-COBJS-y += tsec.o
-COBJS-y += tsi108_eth.o
-COBJS-y += uli526x.o
-COBJS-y += vsc7385.o
+COBJS-$(CONFIG_DRIVER_NETARMETH) += netarm_eth.o
+COBJS-$(CONFIG_NETCONSOLE) += netconsole.o
+COBJS-$(CONFIG_DRIVER_NS7520_ETHERNET) += ns7520_eth.o
+COBJS-$(CONFIG_NS8382X) += ns8382x.o
+COBJS-$(CONFIG_DRIVER_NS9750_ETHERNET) += ns9750_eth.o
+COBJS-$(CONFIG_PCNET) += pcnet.o
+COBJS-$(CONFIG_PLB2800_ETHER) += plb2800_eth.o
+COBJS-$(CONFIG_DRIVER_RTL8019) += rtl8019.o
+COBJS-$(CONFIG_RTL8139) += rtl8139.o
+COBJS-$(CONFIG_RTL8169) += rtl8169.o
+COBJS-$(CONFIG_DRIVER_S3C4510_ETH) += s3c4510b_eth.o
+COBJS-$(CONFIG_DRIVER_SMC9) += smc9.o
+COBJS-$(CONFIG_DRIVER_SMC911X) += smc911x.o
+COBJS-$(CONFIG_TIGON3) += tigon3.o bcm570x_autoneg.o 5701rls.o
+COBJS-$(CONFIG_TSEC_ENET) += tsec.o
+COBJS-$(CONFIG_TSI108_ETH) += tsi108_eth.o
+COBJS-$(CONFIG_ULI526X) += uli526x.o
+COBJS-$(CONFIG_VSC7385_ENET) += vsc7385.o
COBJS-$(CONFIG_XILINX_EMAC) += xilinx_emac.o
COBJS-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
diff --git a/drivers/net/bcm570x.c b/drivers/net/bcm570x.c
index 5ad31d1..6b28b95 100644
--- a/drivers/net/bcm570x.c
+++ b/drivers/net/bcm570x.c
@@ -6,9 +6,6 @@
#include common.h
-#if defined(CONFIG_CMD_NET) \
-(!defined(CONFIG_NET_MULTI)) defined(CONFIG_BCM570x)
-
#ifdef CONFIG_BMW
[U-Boot-Users] [PATCH] libfdt: Several cleanups to parameter checking
This patch makes a couple of small cleanups to parameter checking of
libfdt functions.
- In several functions which take a node offset, we use an
idiom involving fdt_next_tag() first to check that we have indeed been
given a node offset. This patch adds a helper function
_fdt_check_node_offset() to encapsulate this usage of fdt_next_tag().
- In fdt_rw.c in several places we have the expanded version
of the RW_CHECK_HEADER() macro for no particular reason. This patch
replaces those instances with an invocation of the macro; that's what
it's for.
- In fdt_sw.c we rename the check_header_sw() function to
sw_check_header() to match the analgous function in fdt_rw.c, and we
provide an SW_CHECK_HEADER() wrapper macro as RW_CHECK_HEADER()
functions in fdt_rw.c
Signed-off-by: David Gibson [EMAIL PROTECTED]
---
These are improvements pulled in from the DTC/libfdt project.
The original patch was published:
Date: Tue, 20 May 2008 17:19:11 +1000
Best regards,
gvb
libfdt/fdt.c | 17 -
libfdt/fdt_ro.c | 26 --
libfdt/fdt_rw.c | 24
libfdt/fdt_sw.c | 31 +++
libfdt/libfdt_internal.h |1 +
5 files changed, 44 insertions(+), 55 deletions(-)
diff --git a/libfdt/fdt.c b/libfdt/fdt.c
index bd91712..0d16427 100644
--- a/libfdt/fdt.c
+++ b/libfdt/fdt.c
@@ -129,16 +129,23 @@ uint32_t fdt_next_tag(const void *fdt, int offset, int
*nextoffset)
return tag;
}
+int _fdt_check_node_offset(const void *fdt, int offset)
+{
+ if ((offset 0) || (offset % FDT_TAGSIZE)
+ || (fdt_next_tag(fdt, offset, offset) != FDT_BEGIN_NODE))
+ return -FDT_ERR_BADOFFSET;
+
+ return offset;
+}
+
int fdt_next_node(const void *fdt, int offset, int *depth)
{
int nextoffset = 0;
uint32_t tag;
- if (offset = 0) {
- tag = fdt_next_tag(fdt, offset, nextoffset);
- if (tag != FDT_BEGIN_NODE)
- return -FDT_ERR_BADOFFSET;
- }
+ if (offset = 0)
+ if ((nextoffset = _fdt_check_node_offset(fdt, offset)) 0)
+ return nextoffset;
do {
offset = nextoffset;
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
index 63fa129..e55872f 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -157,16 +157,12 @@ int fdt_path_offset(const void *fdt, const char *path)
const char *fdt_get_name(const void *fdt, int nodeoffset, int *len)
{
- const struct fdt_node_header *nh;
+ const struct fdt_node_header *nh = _fdt_offset_ptr(fdt, nodeoffset);
int err;
- if ((err = fdt_check_header(fdt)) != 0)
- goto fail;
-
- err = -FDT_ERR_BADOFFSET;
- nh = fdt_offset_ptr(fdt, nodeoffset, sizeof(*nh));
- if (!nh || (fdt32_to_cpu(nh-tag) != FDT_BEGIN_NODE))
- goto fail;
+ if (((err = fdt_check_header(fdt)) != 0)
+ || ((err = _fdt_check_node_offset(fdt, nodeoffset)) 0))
+ goto fail;
if (len)
*len = strlen(nh-name);
@@ -189,17 +185,11 @@ const struct fdt_property *fdt_get_property(const void
*fdt,
int offset, nextoffset;
int err;
- if ((err = fdt_check_header(fdt)) != 0)
- goto fail;
-
- err = -FDT_ERR_BADOFFSET;
- if (nodeoffset % FDT_TAGSIZE)
- goto fail;
-
- tag = fdt_next_tag(fdt, nodeoffset, nextoffset);
- if (tag != FDT_BEGIN_NODE)
- goto fail;
+ if (((err = fdt_check_header(fdt)) != 0)
+ || ((err = _fdt_check_node_offset(fdt, nodeoffset)) 0))
+ goto fail;
+ nextoffset = err;
do {
offset = nextoffset;
diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c
index 0df472b..ec0738c 100644
--- a/libfdt/fdt_rw.c
+++ b/libfdt/fdt_rw.c
@@ -172,8 +172,7 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t
size)
struct fdt_reserve_entry *re;
int err;
- if ((err = rw_check_header(fdt)))
- return err;
+ RW_CHECK_HEADER(fdt);
re = _fdt_mem_rsv_w(fdt, fdt_num_mem_rsv(fdt));
err = _blob_splice_mem_rsv(fdt, re, 0, 1);
@@ -190,8 +189,8 @@ int fdt_del_mem_rsv(void *fdt, int n)
struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n);
int err;
- if ((err = rw_check_header(fdt)))
- return err;
+ RW_CHECK_HEADER(fdt);
+
if (n = fdt_num_mem_rsv(fdt))
return -FDT_ERR_NOTFOUND;
@@ -223,15 +222,13 @@ static int _resize_property(void *fdt, int nodeoffset,
const char *name, int len
static int _add_property(void *fdt, int nodeoffset, const char *name, int len,
struct fdt_property **prop)
{
- uint32_t tag;
int proplen;
int nextoffset;
int namestroff;
int err;
-
[U-Boot-Users] [PATCH 1/10] net: Conditional COBJS inclusion of bcm570x and tigon3 modules
net: Conditional COBJS inclusion of bcm570x and tigon3 modules From: Shinya Kuribayashi [EMAIL PROTECTED] Signed-off-by: Shinya Kuribayashi [EMAIL PROTECTED] --- drivers/net/Makefile |4 ++-- drivers/net/bcm570x.c |5 - drivers/net/tigon3.c |5 + 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 5b031c9..4274f79 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libnet.a COBJS-y += 3c589.o -COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o +COBJS-$(CONFIG_BCM570x) += bcm570x.o bcm570x_autoneg.o 5701rls.o COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o COBJS-y += cs8900.o COBJS-y += dc2114x.o @@ -59,7 +59,7 @@ COBJS-y += rtl8169.o COBJS-y += s3c4510b_eth.o COBJS-y += smc9.o COBJS-y += smc911x.o -COBJS-y += tigon3.o +COBJS-$(CONFIG_TIGON3) += tigon3.o bcm570x_autoneg.o 5701rls.o COBJS-y += tsec.o COBJS-y += tsi108_eth.o COBJS-y += uli526x.o diff --git a/drivers/net/bcm570x.c b/drivers/net/bcm570x.c index 5ad31d1..6b28b95 100644 --- a/drivers/net/bcm570x.c +++ b/drivers/net/bcm570x.c @@ -6,9 +6,6 @@ #include common.h -#if defined(CONFIG_CMD_NET) \ -(!defined(CONFIG_NET_MULTI)) defined(CONFIG_BCM570x) - #ifdef CONFIG_BMW #include mpc824x.h #endif @@ -1599,5 +1596,3 @@ PQQ_ENTRY QQ_GetTail (PQQ_CONTAINER pQueue, unsigned int Idx) return pQueue-Array[Idx]; } - -#endif diff --git a/drivers/net/tigon3.c b/drivers/net/tigon3.c index 5f6a4ec..ab448b0 100644 --- a/drivers/net/tigon3.c +++ b/drivers/net/tigon3.c @@ -12,8 +12,7 @@ /**/ #include common.h #include asm/types.h -#if defined(CONFIG_CMD_NET) !defined(CONFIG_NET_MULTI) \ - defined(CONFIG_TIGON3) + #ifdef CONFIG_BMW #include mpc824x.h #endif @@ -5695,5 +5694,3 @@ LM_DmaTest (PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt, } return LM_STATUS_SUCCESS; } - -#endif - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 2/10] net: Conditional COBJS inclusion of Realtek modules
net: Conditional COBJS inclusion of Realtek modules From: Shinya Kuribayashi [EMAIL PROTECTED] Signed-off-by: Shinya Kuribayashi [EMAIL PROTECTED] --- drivers/net/Makefile |6 +++--- drivers/net/rtl8019.c |8 drivers/net/rtl8139.c |4 drivers/net/rtl8169.c |5 - 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 4274f79..6413bb1 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -53,9 +53,9 @@ COBJS-y += ns8382x.o COBJS-y += ns9750_eth.o COBJS-y += pcnet.o COBJS-y += plb2800_eth.o -COBJS-y += rtl8019.o -COBJS-y += rtl8139.o -COBJS-y += rtl8169.o +COBJS-$(CONFIG_DRIVER_RTL8019) += rtl8019.o +COBJS-$(CONFIG_RTL8139) += rtl8139.o +COBJS-$(CONFIG_RTL8169) += rtl8169.o COBJS-y += s3c4510b_eth.o COBJS-y += smc9.o COBJS-y += smc911x.o diff --git a/drivers/net/rtl8019.c b/drivers/net/rtl8019.c index 9d62cab..3ddf917 100644 --- a/drivers/net/rtl8019.c +++ b/drivers/net/rtl8019.c @@ -32,10 +32,6 @@ #include rtl8019.h #include net.h -#ifdef CONFIG_DRIVER_RTL8019 - -#if defined(CONFIG_CMD_NET) - /* packet page register access functions */ static unsigned char get_reg (unsigned int regno) @@ -271,7 +267,3 @@ extern int eth_send (volatile void *packet, int length) return 0; } - -#endif /* CONFIG_CMD_NET */ - -#endif /* CONFIG_DRIVER_RTL8019 */ diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index 097f684..4fd20ac 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -77,9 +77,6 @@ #include asm/io.h #include pci.h -#if defined(CONFIG_CMD_NET) defined(CONFIG_NET_MULTI) \ - defined(CONFIG_RTL8139) - #define RTL_TIMEOUT10 #define ETH_FRAME_LEN 1514 @@ -545,4 +542,3 @@ static void rtl_disable(struct eth_device *dev) udelay (100); /* wait 100us */ } } -#endif diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 6c4c9ff..7423bc0 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -58,9 +58,6 @@ #include asm/io.h #include pci.h -#if defined(CONFIG_CMD_NET) defined(CONFIG_NET_MULTI) \ - defined(CONFIG_RTL8169) - #undef DEBUG_RTL8169 #undef DEBUG_RTL8169_TX #undef DEBUG_RTL8169_RX @@ -887,5 +884,3 @@ int rtl8169_initialize(bd_t *bis) } return card_number; } - -#endif - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 3/10] net: Conditional COBJS inclusion of Intel modules
net: Conditional COBJS inclusion of Intel modules From: Shinya Kuribayashi [EMAIL PROTECTED] Signed-off-by: Shinya Kuribayashi [EMAIL PROTECTED] --- drivers/net/Makefile |4 ++-- drivers/net/e1000.c|5 - drivers/net/eepro100.c |5 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 6413bb1..432fc10 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -31,8 +31,8 @@ COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o COBJS-y += cs8900.o COBJS-y += dc2114x.o COBJS-y += dm9000x.o -COBJS-y += e1000.o -COBJS-y += eepro100.o +COBJS-$(CONFIG_E1000) += e1000.o +COBJS-$(CONFIG_EEPRO100) += eepro100.o COBJS-y += enc28j60.o COBJS-y += fsl_mcdmafec.o COBJS-$(CONFIG_GRETH) += greth.o diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index c53c226..8f0e7d5 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -44,9 +44,6 @@ tested on both gig copper and gig fiber boards #include e1000.h -#if defined(CONFIG_CMD_NET) \ -defined(CONFIG_NET_MULTI) defined(CONFIG_E1000) - #define TOUT_LOOP 10 #undef virt_to_bus @@ -3059,5 +3056,3 @@ e1000_initialize(bd_t * bis) } return 1; } - -#endif diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 96ed271..9de0fb5 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -30,9 +30,6 @@ #undef DEBUG -#if defined(CONFIG_CMD_NET) \ -defined(CONFIG_NET_MULTI) defined(CONFIG_EEPRO100) - /* Ethernet chip registers. */ #define SCBStatus 0 /* Rx/Command Unit Status *Word* */ @@ -944,5 +941,3 @@ static void read_hw_addr (struct eth_device *dev, bd_t * bis) #endif } } - -#endif - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 4/10] net: Conditional COBJS inclusion of INCA-IP switch
net: Conditional COBJS inclusion of INCA-IP switch From: Shinya Kuribayashi [EMAIL PROTECTED] Signed-off-by: Shinya Kuribayashi [EMAIL PROTECTED] --- drivers/net/Makefile |2 +- drivers/net/inca-ip_sw.c |5 - 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 432fc10..35c1490 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -36,7 +36,7 @@ COBJS-$(CONFIG_EEPRO100) += eepro100.o COBJS-y += enc28j60.o COBJS-y += fsl_mcdmafec.o COBJS-$(CONFIG_GRETH) += greth.o -COBJS-y += inca-ip_sw.o +COBJS-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o COBJS-y += ks8695eth.o COBJS-y += lan91c96.o COBJS-y += macb.o diff --git a/drivers/net/inca-ip_sw.c b/drivers/net/inca-ip_sw.c index a079b60..d852a15 100644 --- a/drivers/net/inca-ip_sw.c +++ b/drivers/net/inca-ip_sw.c @@ -26,9 +26,6 @@ #include common.h -#if defined(CONFIG_CMD_NET) \ -defined(CONFIG_NET_MULTI) defined(CONFIG_INCA_IP_SWITCH) - #include malloc.h #include net.h #include asm/inca-ip.h @@ -813,5 +810,3 @@ Fail: return -1; } #endif /* CONFIG_INCA_IP_SWITCH_AMDIX */ - -#endif - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 5/10] net: Conditional COBJS inclusion of National Semiconductor modules
net: Conditional COBJS inclusion of National Semiconductor modules From: Shinya Kuribayashi [EMAIL PROTECTED] Signed-off-by: Shinya Kuribayashi [EMAIL PROTECTED] --- drivers/net/Makefile |4 ++-- drivers/net/natsemi.c |5 - drivers/net/ns8382x.c |5 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 35c1490..57c31cb 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -41,7 +41,7 @@ COBJS-y += ks8695eth.o COBJS-y += lan91c96.o COBJS-y += macb.o COBJS-y += mcffec.o -COBJS-y += natsemi.o +COBJS-$(CONFIG_NATSEMI) += natsemi.o ifeq ($(CONFIG_DRIVER_NE2000),y) COBJS-y += ne2000.o COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o @@ -49,7 +49,7 @@ endif COBJS-y += netarm_eth.o COBJS-y += netconsole.o COBJS-y += ns7520_eth.o -COBJS-y += ns8382x.o +COBJS-$(CONFIG_NS8382X) += ns8382x.o COBJS-y += ns9750_eth.o COBJS-y += pcnet.o COBJS-y += plb2800_eth.o diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index a523959..4aee048 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c @@ -56,9 +56,6 @@ #include asm/io.h #include pci.h -#if defined(CONFIG_CMD_NET) \ -defined(CONFIG_NET_MULTI) defined(CONFIG_NATSEMI) - /* defines */ #define EEPROM_SIZE 0xb /*12 16-bit chunks, or 24 bytes*/ @@ -878,5 +875,3 @@ natsemi_disable(struct eth_device *dev) /* Restore PME enable bit */ OUTL(dev, SavedClkRun, ClkRun); } - -#endif diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c index c807dd4..0b9a3ae 100644 --- a/drivers/net/ns8382x.c +++ b/drivers/net/ns8382x.c @@ -56,9 +56,6 @@ #include asm/io.h #include pci.h -#if defined(CONFIG_CMD_NET) \ -defined(CONFIG_NET_MULTI) defined(CONFIG_NS8382X) - /* defines */ #define DSIZE 0x0FFF #define ETH_ALEN 6 @@ -859,5 +856,3 @@ ns8382x_disable(struct eth_device *dev) /* Restore PME enable bit */ OUTL(dev, SavedClkRun, ClkRun); } - -#endif - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 6/10] net: Conditional COBJS inclusion of NET+ARM modules
net: Conditional COBJS inclusion of NET+ARM modules
From: Shinya Kuribayashi [EMAIL PROTECTED]
Signed-off-by: Shinya Kuribayashi [EMAIL PROTECTED]
---
drivers/net/Makefile |6 +++---
drivers/net/netarm_eth.c |4
drivers/net/ns7520_eth.c |5 -
drivers/net/ns9750_eth.c |4
4 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 57c31cb..70a6dde 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -46,11 +46,11 @@ ifeq ($(CONFIG_DRIVER_NE2000),y)
COBJS-y += ne2000.o
COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o
endif
-COBJS-y += netarm_eth.o
+COBJS-$(CONFIG_DRIVER_NETARMETH) += netarm_eth.o
COBJS-y += netconsole.o
-COBJS-y += ns7520_eth.o
+COBJS-$(CONFIG_DRIVER_NS7520_ETHERNET) += ns7520_eth.o
COBJS-$(CONFIG_NS8382X) += ns8382x.o
-COBJS-y += ns9750_eth.o
+COBJS-$(CONFIG_DRIVER_NS9750_ETHERNET) += ns9750_eth.o
COBJS-y += pcnet.o
COBJS-y += plb2800_eth.o
COBJS-$(CONFIG_DRIVER_RTL8019) += rtl8019.o
diff --git a/drivers/net/netarm_eth.c b/drivers/net/netarm_eth.c
index ecf45dc..6b635bb 100644
--- a/drivers/net/netarm_eth.c
+++ b/drivers/net/netarm_eth.c
@@ -22,8 +22,6 @@
#include common.h
-
-#ifdef CONFIG_DRIVER_NETARMETH
#include command.h
#include net.h
#include netarm_eth.h
@@ -354,5 +352,3 @@ extern int eth_send (volatile void *packet, int length)
}
#endif /* CONFIG_CMD_NET */
-
-#endif /* CONFIG_DRIVER_NETARMETH */
diff --git a/drivers/net/ns7520_eth.c b/drivers/net/ns7520_eth.c
index a5a20df..37411df 100644
--- a/drivers/net/ns7520_eth.c
+++ b/drivers/net/ns7520_eth.c
@@ -15,8 +15,6 @@
#include common.h
-#if defined(CONFIG_DRIVER_NS7520_ETHERNET)
-
#include net.h /* NetSendPacket */
#include asm/arch/netarm_registers.h
#include asm/arch/netarm_dma_module.h
@@ -846,14 +844,11 @@ extern int ns7520_miiphy_write(char *devname, unsigned
char const addr,
return (ret);
}
#endif /* defined(CONFIG_MII) */
-#endif /* CONFIG_DRIVER_NS7520_ETHERNET */
int ns7520_miiphy_initialize(bd_t *bis)
{
-#if defined(CONFIG_DRIVER_NS7520_ETHERNET)
#if defined(CONFIG_MII)
miiphy_register(ns7520phy, ns7520_miiphy_read, ns7520_miiphy_write);
#endif
-#endif
return 0;
}
diff --git a/drivers/net/ns9750_eth.c b/drivers/net/ns9750_eth.c
index 067ff8e..0559710 100644
--- a/drivers/net/ns9750_eth.c
+++ b/drivers/net/ns9750_eth.c
@@ -37,8 +37,6 @@
#include ns9750_eth.h/* for Ethernet and PHY */
-#ifdef CONFIG_DRIVER_NS9750_ETHERNET
-
/* some definition to make transistion to linux easier */
#define NS9750_DRIVER_NAME eth
@@ -793,5 +791,3 @@ static unsigned int ns9750_mii_poll_busy (void)
return unTimeout;
}
-
-#endif /* CONFIG_DRIVER_NS9750_ETHERNET */
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] (no subject)
各位老总：您们好！ 诚祝：您们在2008年里；有鼠不尽的快乐！鼠不尽的收获！鼠不尽的钞票！ 鼠不尽的幸福！鼠不尽的美满生活！愿： 您们阖家欢乐！幸福安康！ 我公司可以长期提供：出口报关单，核销单，等等一系列手续；代理：出口 报关，商检，境内外运输..等等；还可以代办：出口欧盟许可证，欧盟产地证； 并且还有（广州国际贸易交易会）的摊位可以转让；价格特别优惠；有意者请来邮件 或来电联系。谢谢合作！ 电话：0755-81153047。 传真：0755-81172940。 手机：15817477278。 联系人：钟文辉。 电子邮箱:[EMAIL PROTECTED] 此致： 敬礼！ - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] (no subject)
各位老总：您们好！ 诚祝：您们在2008年里；有鼠不尽的快乐！鼠不尽的收获！鼠不尽的钞票！ 鼠不尽的幸福！鼠不尽的美满生活！愿： 您们阖家欢乐！幸福安康！ 我公司可以长期提供：出口报关单，核销单，等等一系列手续；代理：出口 报关，商检，境内外运输..等等；还可以代办：出口欧盟许可证，欧盟产地证； 并且还有（广州国际贸易交易会）的摊位可以转让；价格特别优惠；有意者请来邮件 或来电联系。谢谢合作！ 电话：0755-81153047。 传真：0755-81172940。 手机：15817477278。 联系人：钟文辉。 电子邮箱:[EMAIL PROTECTED] 此致： 敬礼！ - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
