* Use 1-byte-read instead of -write for iprobe() function

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index da70cf25cc322c416d40bddf9cc7bd31c612b2f1..2688fd57e77c1ed736d15f978beeead4c7b11807 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,9 @@ endif
 ifeq ($(ARCH),arm)
 CROSS_COMPILE = arm_920TDI-
 endif
+ifeq ($(ARCH),i386)
+#CROSS_COMPILE = i386-elf-
+endif
 endif
 endif
 
@@ -100,7 +103,10 @@ SUBDIRS    = tools \
 # U-Boot objects....order is important (i.e. start must be first)
 
 OBJS  =        cpu/$(CPU)/start.o
-
+ifeq ($(CPU),i386)
+OBJS +=        cpu/$(CPU)/start16.o
+OBJS +=        cpu/$(CPU)/reset.o
+endif
 ifeq ($(CPU),ppc4xx)
 OBJS +=        cpu/$(CPU)/resetvec.o
 endif
@@ -108,7 +114,7 @@ endif
 LIBS  =        board/$(BOARDDIR)/lib$(BOARD).a
 LIBS += cpu/$(CPU)/lib$(CPU).a
 LIBS += lib_$(ARCH)/lib$(ARCH).a
-LIBS += fs/jffs2/libjffs2.a
+LIBS += fs/jffs2/libjffs2.a fs/fdos/libfdos.a
 LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += rtc/librtc.a
@@ -136,7 +142,9 @@ u-boot.dis: u-boot
                $(OBJDUMP) -d $< > $@
 
 u-boot:                depend subdirs $(OBJS) $(LIBS) $(LDSCRIPT)
-               $(LD) $(LDFLAGS) $(OBJS) $(LIBS) $(LIBS) -Map u-boot.map -o u-boot
+               $(LD) $(LDFLAGS) $(OBJS) \
+                       --start-group $(LIBS) --end-group \
+                       -Map u-boot.map -o u-boot
 
 subdirs:
                @for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir || exit 1 ; done
@@ -264,6 +272,9 @@ IVMS8_config:       unconfig
                 }
        @./mkconfig -a IVMS8 ppc mpc8xx ivm
 
+KUP4K_config   :       unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx kup4k
+
 LANTEC_config  :       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx lantec
 
@@ -555,6 +566,9 @@ TQM8260_300MHz_config:      unconfig
 ## 74xx/7xx Systems
 #########################################################################
 
+AmigaOneG3SE_config:   unconfig
+       @./mkconfig $(@:_config=) ppc 74xx_7xx AmigaOneG3SE MAI
+
 EVB64260_config        \
 EVB64260_750CX_config: unconfig
        @./mkconfig EVB64260 ppc 74xx_7xx evb64260
@@ -624,6 +638,15 @@ cradle_config      :       unconfig
 csb226_config  :       unconfig
        @./mkconfig $(@:_config=) arm xscale csb226
 
+#========================================================================
+# i386
+#========================================================================
+#########################################################################
+## AMD SC520 CDP 
+#########################################################################
+sc520_cdp_config       :       unconfig
+       @./mkconfig $(@:_config=) i386 i386 sc520_cdp
+
 #########################################################################
 
 clean:
@@ -635,6 +658,7 @@ clean:
        rm -f tools/img2srec tools/mkimage tools/envcrc tools/gen_eth_addr
        rm -f tools/easylogo/easylogo tools/bmp_logo
        rm -f tools/gdb/astest tools/gdb/gdbcont tools/gdb/gdbsend
+       rm -f tools/env/fw_printenv tools/env/fw_setenv
 
 clobber:       clean
        find . -type f \
@@ -644,7 +668,7 @@ clobber:    clean
        rm -f $(OBJS) *.bak tags TAGS
        rm -fr *.*~
        rm -f u-boot u-boot.bin u-boot.elf u-boot.srec u-boot.map System.map
-       rm -f tools/crc32.c tools/environment.c
+       rm -f tools/crc32.c tools/environment.c tools/env/crc32.c
        rm -f include/asm/arch include/asm
 
 mrproper \