Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --git a/Makefile b/Makefile
index 2a06440249577b5fefae4a6f8dcefa2b010b2f9b..c53de17eccf35d49433fd731388e0c6146349d05 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -352,7 +352,7 @@ GEN_UBOOT = \
 $(obj)u-boot:          depend $(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT)
                $(GEN_UBOOT)
 ifeq ($(CONFIG_KALLSYMS),y)
-               smap=`$(call SYSTEM_MAP,u-boot) | awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\0"}'` ; \
+               smap=`$(call SYSTEM_MAP,u-boot) | awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
                $(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" -c common/system_map.c -o $(obj)common/system_map.o
                $(GEN_UBOOT) $(obj)common/system_map.o
 endif
@@ -3627,7 +3627,6 @@ clobber:  clean
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
        @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
        @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
-       @[ ! -d $(obj)api_examples ] || find $(obj)api_examples -name "*" -type l -print | xargs rm -f
 
 ifeq ($(OBJTREE),$(SRCTREE))
 mrproper \

diff --git a/api_examples/.gitignore b/api_examples/.gitignore
index 272816f70dcb08e92b6daa99e57d1679c90f250b..d7b18dcef5f3154f3048b088e212fcd35fe65297 100644 (file)
--- a/api_examples/.gitignore
+++ b/api_examples/.gitignore
@@ -1,7 +1,2 @@
-crc32.c
-ctype.c
 demo
 demo.bin
-ppcstring.S
-string.c
-vsprintf.c

diff --git a/api_examples/Makefile b/api_examples/Makefile
index 4c0143744348730856033ffc0d4d15283a85aa33..2a30bef69d7d65708f8f6dd80fe9f88c7d0ab7a2 100644 (file)
--- a/api_examples/Makefile
+++ b/api_examples/Makefile
@@ -29,74 +29,56 @@ endif
 
 include $(TOPDIR)/config.mk
 
-ELF-$(CONFIG_API) += demo
-BIN-$(CONFIG_API) += demo.bin
-ELF    := $(ELF-y)
-BIN    := $(BIN-y)
-
-#CFLAGS += -v
-
-COBJS-$(CONFIG_API) += $(ELF:=.o)
-SOBJS-$(CONFIG_API) += crt0.o
+# Resulting ELF and binary exectuables will be named demo and demo.bin
+OUTPUT-$(CONFIG_API) = $(obj)demo
+OUTPUT = $(OUTPUT-y)
+
+# Source files located in the api_examples directory
+SOBJ_FILES-$(CONFIG_API) += crt0.o
+COBJ_FILES-$(CONFIG_API) += demo.o
+COBJ_FILES-$(CONFIG_API) += glue.o
+COBJ_FILES-$(CONFIG_API) += libgenwrap.o
+
+# Source files which exist outside the api_examples directory
+EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/crc32.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/ctype.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o
 ifeq ($(ARCH),ppc)
-SOBJS-$(CONFIG_API) += ppcstring.o
+EXT_SOBJ_FILES-$(CONFIG_API) += lib_ppc/ppcstring.o
 endif
-COBJS  := $(COBJS-y)
-SOBJS  := $(SOBJS-y)
-
-LIB    = $(obj)libglue.a
-LIBCOBJS-$(CONFIG_API) += glue.o crc32.o ctype.o string.o vsprintf.o \
-                               libgenwrap.o
-LIBCOBJS := $(LIBCOBJS-y)
 
-LIBOBJS        = $(addprefix $(obj),$(SOBJS) $(LIBCOBJS))
+# Create a list of source files so their dependencies can be auto-generated
+SRCS   += $(addprefix $(SRCTREE)/,$(EXT_COBJ_FILES-y:.o=.c))
+SRCS   += $(addprefix $(SRCTREE)/,$(EXT_SOBJ_FILES-y:.o=.S))
+SRCS   += $(addprefix $(SRCTREE)/api_examples/,$(COBJ_FILES-y:.o=.c))
+SRCS   += $(addprefix $(SRCTREE)/api_examples/,$(SOBJ_FILES-y:.o=.S))
 
-SRCS   := $(COBJS:.o=.c) $(LIBCOBJS:.o=.c) $(SOBJS:.o=.S)
-OBJS   := $(addprefix $(obj),$(COBJS))
-ELF    := $(addprefix $(obj),$(ELF))
-BIN    := $(addprefix $(obj),$(BIN))
+# Create a list of object files to be compiled
+OBJS   += $(addprefix $(obj),$(SOBJ_FILES-y))
+OBJS   += $(addprefix $(obj),$(COBJ_FILES-y))
+OBJS   += $(addprefix $(obj),$(notdir $(EXT_COBJ_FILES-y)))
+OBJS   += $(addprefix $(obj),$(notdir $(EXT_SOBJ_FILES-y)))
 
 gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
 
 CPPFLAGS += -I..
 
-all:   $(obj).depend $(OBJS) $(LIB) $(ELF) $(BIN)
+all:   $(obj).depend $(OUTPUT)
 
 #########################################################################
-$(LIB):        $(obj).depend $(LIBOBJS)
-               $(AR) $(ARFLAGS) $@ $(LIBOBJS)
-
-$(ELF):
-$(obj)%:       $(obj)%.o $(LIB)
-               $(LD) $(obj)crt0.o -Ttext $(LOAD_ADDR) \
-                       -o $@ $< $(LIB) \
-                       -L$(gcclibdir) -lgcc
-
-$(BIN):
-$(obj)%.bin:   $(obj)%
-               $(OBJCOPY) -O binary $< $@ 2>/dev/null
 
-$(obj)crc32.c:
-       @rm -f $(obj)crc32.c
-       ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
+$(OUTPUT):     $(OBJS)
+               $(LD) -Ttext $(LOAD_ADDR) -o $@ $^ -L$(gcclibdir) -lgcc
+               $(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null
 
-$(obj)ctype.c:
-       @rm -f $(obj)ctype.c
-       ln -s $(src)../lib_generic/ctype.c $(obj)ctype.c
+# Rule to build generic library C files
+$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+       $(CC) -g $(CFLAGS) -c -o $@ $<
 
-$(obj)string.c:
-       @rm -f $(obj)string.c
-       ln -s $(src)../lib_generic/string.c $(obj)string.c
-
-$(obj)vsprintf.c:
-       @rm -f $(obj)vsprintf.c
-       ln -s $(src)../lib_generic/vsprintf.c $(obj)vsprintf.c
-
-ifeq ($(ARCH),ppc)
-$(obj)ppcstring.S:
-       @rm -f $(obj)ppcstring.S
-       ln -s $(src)../lib_ppc/ppcstring.S $(obj)ppcstring.S
-endif
+# Rule to build architecture-specific library assembly files
+$(obj)%.o: $(SRCTREE)/lib_$(ARCH)/%.S
+       $(CC) -g $(CFLAGS) -c -o $@ $<
 
 #########################################################################
 

diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index f6777b9bbaf6cae3dcb383cbb611b012b143c812..251fe6742bb7db21a06fc73d11be2892e742c2cd 100644 (file)
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -103,9 +103,7 @@
 #define PCI_ENET1_MEMADDR      0x81000000
 
 #define CONFIG_RTL8139
-#define _IO_BASE           0x00000000
-/* 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/M5253DEMO.h b/include/configs/M5253DEMO.h
index 50b3a03a012a1f39b44b5ed51eaf08f1d686b729..5e86e4cb90f39dde626b516d44555856480af727 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -85,7 +85,6 @@
 #      define CONFIG_SYS_ATA_REG_OFFSET        0xA0    /* Offset for normal register accesses */
 #      define CONFIG_SYS_ATA_ALT_OFFSET        0xC0    /* Offset for alternate registers */
 #      define CONFIG_SYS_ATA_STRIDE            4       /* Interval between registers */
-#      define _IO_BASE                 0
 #endif
 
 #define CONFIG_NET_MULTI               1

diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index cf8b773c28ea803fcf856e8f05f4589c7faeacc3..df6970cdfac7f821db701d12fafe3b8dfea736f5 100644 (file)
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -91,7 +91,6 @@
 #define CONFIG_SYS_ATA_REG_OFFSET      0xA0    /* Offset for normal register accesses */
 #define CONFIG_SYS_ATA_ALT_OFFSET      0xC0    /* Offset for alternate registers */
 #define CONFIG_SYS_ATA_STRIDE          4       /* Interval between registers */
-#define _IO_BASE               0
 
 #define CONFIG_SYS_PROMPT              "=> "
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 101dcedeed1cb95d596b120b6de95e5979ac17b3..87f3a73ae4a29905b31b7ab052c743ff5d289f2e 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -180,7 +180,6 @@
 #define CONFIG_SYS_ATA_REG_OFFSET      0xA0    /* Offset for normal register accesses */
 #define CONFIG_SYS_ATA_ALT_OFFSET      0xC0    /* Offset for alternate registers           */
 #define CONFIG_SYS_ATA_STRIDE          4       /* Interval between registers                 */
-#define _IO_BASE               0
 
 /* Realtime clock */
 #define CONFIG_MCFRTC

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index f2e574b73751f5dac8d69d1100c5934b554826ef..d4d3256f7579ab5718facb63f3bc5ff18364c4e8 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -360,16 +360,9 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_SYS_PCI2_IO_SIZE        0x01000000      /* 16M */
 #endif
 
-#define _IO_BASE               0x00000000      /* 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   0x00000000
     #define PCI_ENET0_MEMADDR  CONFIG_SYS_PCI2_MEM_BASE

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 9e00b8986216098d4d35fba3a64a26dbdfc29505..7085d287dbad840337bc81f029ae7c95fd05cc90 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -427,12 +427,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #undef CONFIG_TULIP
 #undef CONFIG_RTL8139
 
-#ifdef CONFIG_RTL8139
-/* This macro is used by RTL8139 but not defined in PPC architecture */
-#define KSEG1ADDR(x)           ({u32 _x=le32_to_cpu(*(u32 *)(x)); (&_x);})
-#define _IO_BASE       0x00000000
-#endif
-
 #ifndef CONFIG_PCI_PNP
        #define PCI_ENET0_IOADDR        CONFIG_SYS_PCI1_IO_BUS
        #define PCI_ENET0_MEMADDR       CONFIG_SYS_PCI1_IO_BUS

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 59cfde6284b047f6a79d2c7e8238dc7761b0a556..1d8fecf7945d7efe83265cb22483cdd9a25e2105 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -340,12 +340,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       0x00000000
-#endif
-
 #ifndef CONFIG_PCI_PNP
        #define PCI_ENET0_IOADDR        CONFIG_SYS_PCI1_IO_BUS
        #define PCI_ENET0_MEMADDR       CONFIG_SYS_PCI1_IO_BUS

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 6f1b1a4c83ccf11dd157a343a6cc92e0321ef40d..235be5143dd78f00bba67a60fa28b8b3d85f1728 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -484,12 +484,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #undef CONFIG_TULIP
 #undef CONFIG_RTL8139
 
-#ifdef CONFIG_RTL8139
-/* This macro is used by RTL8139 but not defined in PPC architecture */
-#define KSEG1ADDR(x)           (x)
-#define _IO_BASE       0x00000000
-#endif
-
 #ifndef CONFIG_PCI_PNP
        #define PCI_ENET0_IOADDR        CONFIG_SYS_PCIE3_IO_BUS
        #define PCI_ENET0_MEMADDR       CONFIG_SYS_PCIE3_IO_BUS

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 1091043c0122a5cee740408dbe134745bbb3a52b..2f40ef48c9066a935f34f22a2ba9ee278b1f9421 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -280,10 +280,6 @@
 #define CONFIG_SYS_PCI1_IO_VIRT        0xe1000000
 #define CONFIG_SYS_PCI1_IO_SIZE        0x00100000      /* 1M */
 
-/* For RTL8139 */
-#define KSEG1ADDR(x)   ({u32 _x = le32_to_cpu(*(u32 *)(x)); (&_x); })
-#define _IO_BASE               0x00000000
-
 /* controller 1, Base address 0xa000 */
 #define CONFIG_SYS_PCIE1_MEM_BUS       0xa0000000
 #define CONFIG_SYS_PCIE1_MEM_PHYS      CONFIG_SYS_PCIE1_MEM_BUS

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 035874b31290df8541b4e2f0134732485e6a9eac..60ce0f3aca35bcc47e5abfa136f88f03f9b41cda 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -348,10 +348,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
                                 | CONFIG_SYS_PHYS_ADDR_HIGH)
 #define CONFIG_SYS_PCI1_IO_SIZE        0x00010000      /* 64K */
 
-/* For RTL8139 */
-#define KSEG1ADDR(x)           ({u32 _x=le32_to_cpu(*(u32 *)(x)); (&_x);})
-#define _IO_BASE               0x00000000
-
 #ifdef CONFIG_PHYS_64BIT
 /*
  * Use the same PCI bus address on PCI1 and PCI2 if we have PHYS_64BIT.

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 967520587ac0f1b034bd820ee6f84e97b0c421b4..ac8cb57d08a3fe9c6e34a3a08c5f5c38a869980d 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -193,8 +193,6 @@
 #define CONFIG_SYS_PCI1_IO_PHYS        0xE2000000
 #define CONFIG_SYS_PCI1_IO_SIZE        0x01000000
 
-#define _IO_BASE               0x00000000
-
 #define CONFIG_NET_MULTI       1
 #define CONFIG_NET_RETRY_COUNT 3
 

diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index 93068600adb225f9215a11d0e3147f7cd9805fc3..676f0134fcb65700574603b6a9139bc1aff26fcf 100644 (file)
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -519,12 +519,6 @@ extern unsigned long calculate_board_ddr_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       0x00000000
-#endif
-
 #ifndef CONFIG_PCI_PNP
        #define PCI_ENET0_IOADDR        CONFIG_SYS_PCIE3_IO_BUS
        #define PCI_ENET0_MEMADDR       CONFIG_SYS_PCIE3_IO_BUS

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 7d421556e9eedebbec581f664847ed859dff2ddb..4f98ba41a5d1b2f07fff8c09c839427f697ae2f6 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -124,8 +124,6 @@
 
 /* Networking Configuration */
 
-#define KSEG1ADDR(a)   (a)     /* Needed by the rtl8139 driver */
-
 #define CONFIG_TSI108_ETH
 #define CONFIG_TSI108_ETH_NUM_PORTS    2
 
@@ -303,8 +301,6 @@
 
 #define CONFIG_SYS_PCI_IO_SIZE         0x01000000      /* 16MB */
 
-#define _IO_BASE               0x00000000      /* points to PCI I/O space      */
-
 /* PCI Config Space mapping */
 #define CONFIG_SYS_PCI_CFG_BASE        0xfb000000      /* Changed from FE000000 */
 #define CONFIG_SYS_PCI_CFG_SIZE        0x01000000      /* 16MB */

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 6fa1eafde7ddd054a5d562857196c6b906eeb01b..37d4fff9b1cf67c887068ef0931941aa8b00e436 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -123,7 +123,5 @@
  */
 #define CONFIG_NET_MULTI
 #define CONFIG_RTL8139
-#define _IO_BASE               0x00000000
-#define KSEG1ADDR(x)           (x)
 
 #endif /* __CONFIG_H */

diff --git a/include/pci_ids.h b/include/pci_ids.h
index ae642b1c4ae360d77c20c6a1006d15a130ec61d9..400c540cb236da86c96b0a07d96a1baea5aed961 100644 (file)
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -1519,6 +1519,8 @@
 #define PCI_DEVICE_ID_AUREAL_VORTEX_1  0x0001
 #define PCI_DEVICE_ID_AUREAL_VORTEX_2  0x0002
 
+#define PCI_VENDOR_ID_ESDGMBH          0x12fe
+
 #define PCI_VENDOR_ID_CBOARDS          0x1307
 #define PCI_DEVICE_ID_CBOARDS_DAS1602_16 0x0001