svn_rev_009

add autogenerated links

6 files changed, 110 insertions, 91 deletions

diff --git a/Makefile b/Makefile
index 99236f1e71..0a0b223690 100644
--- a/Makefile
+++ b/Makefile
@@ -555,12 +555,12 @@ export mod_strip_cmd
 ifeq ($(KBUILD_EXTMOD),)
 #core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
 
-vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(common-y) $(common-m) \
 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
 		     $(net-y) $(net-m) $(libs-y) $(libs-m)))
 
 vmlinux-alldirs	:= $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
-		     $(init-n) $(init-) \
+		     $(common-n) $(common-) \
 		     $(core-n) $(core-) $(drivers-n) $(drivers-) \
 		     $(net-n)  $(net-)  $(libs-n)    $(libs-))))
 
@@ -599,18 +599,18 @@ vmlinux-alldirs	:= $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
 #
 # System.map is generated to document addresses of all kernel symbols
 
-vmlinux-init := $(head-y) $(init-y)
+vmlinux-common := $(head-y) $(common-y)
 vmlinux-main := $(core-y) $(libs-y) $(drivers-y) $(net-y)
-vmlinux-all  := $(vmlinux-init) $(vmlinux-main)
+vmlinux-all  := $(vmlinux-common) $(vmlinux-main)
 vmlinux-lds  := arch/$(ARCH)/kernel/vmlinux.lds
 
 # Rule to link vmlinux - also used during CONFIG_KALLSYMS
 # May be overridden by arch/$(ARCH)/Makefile
 quiet_cmd_vmlinux__ ?= LD      $@
       cmd_vmlinux__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) -o $@ \
-      -T $(vmlinux-lds) $(vmlinux-init)                          \
+      -T $(vmlinux-lds) $(vmlinux-common)                          \
       --start-group $(vmlinux-main) --end-group                  \
-      $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE ,$^)
+      $(filter-out $(vmlinux-lds) $(vmlinux-common) $(vmlinux-main) FORCE ,$^)
 
 # Generate new vmlinux version
 quiet_cmd_vmlinux_version = GEN     .version
@@ -622,7 +622,7 @@ quiet_cmd_vmlinux_version = GEN     .version
 	  mv .version .old_version;			\
 	  expr 0$$(cat .old_version) + 1 >.version;	\
 	fi;						\
-	$(MAKE) $(build)=init
+	$(MAKE) $(build)=common
 
 # Generate System.map
 quiet_cmd_sysmap = SYSMAP
@@ -735,7 +735,7 @@ debug_kallsyms: .tmp_map$(last_kallsyms)
 endif # ifdef CONFIG_KALLSYMS
 
 # vmlinux image - including updated kernel symbols
-vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
+vmlinux: $(vmlinux-lds) $(vmlinux-common) $(vmlinux-main) $(kallsyms.o) FORCE
 ifdef CONFIG_HEADERS_CHECK
 	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
 endif
@@ -745,7 +745,7 @@ endif
 
 # The actual objects are generated when descending,
 # make sure no implicit rule kicks in
-$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
+$(sort $(vmlinux-common) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
 
 # Handle descending into subdirectories listed in $(vmlinux-dirs)
 # Preset locale variables to speed up the build process. Limit locale
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index fdffa2a0fd..2cf5b29f45 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -1 +1,3 @@
-# placeholder
+
+CPPFLAGS += -fno-builtin -ffreestanding -nostdinc 	\
+	-isystem $(gccincdir) -pipe -D __ARM__
diff --git a/common/Kconfig b/common/Kconfig
new file mode 100644
index 0000000000..b9f8c43e95
--- /dev/null
+++ b/common/Kconfig
@@ -0,0 +1,3 @@
+config COMMON_ENV_FLASH
+	bool
+	prompt "Environment in flash"
diff --git a/common/Makefile b/common/Makefile
index 0106088e24..a18f93db02 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -1,81 +1,93 @@
-#
-# (C) Copyright 2004-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# 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 $(TOPDIR)/config.mk
-
-LIB	= $(obj)libcommon.a
-
-AOBJS	=
-
-COBJS	= main.o ACEX1K.o altera.o bedbug.o circbuf.o \
-	  cmd_ace.o cmd_autoscript.o \
-	  cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \
-	  cmd_cache.o cmd_console.o \
-	  cmd_date.o cmd_dcr.o cmd_diag.o cmd_display.o cmd_doc.o cmd_dtt.o \
-	  cmd_eeprom.o cmd_elf.o cmd_ext2.o \
-	  cmd_fat.o cmd_fdc.o cmd_fdos.o cmd_flash.o cmd_fpga.o \
-	  cmd_i2c.o cmd_ide.o cmd_immap.o cmd_itest.o cmd_jffs2.o \
-	  cmd_load.o cmd_log.o \
-	  cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \
-	  cmd_nand.o cmd_net.o cmd_nvedit.o \
-	  cmd_pci.o cmd_pcmcia.o cmd_portio.o \
-	  cmd_reginfo.o cmd_reiser.o cmd_scsi.o cmd_spi.o cmd_universe.o \
-	  cmd_usb.o cmd_vfd.o \
-	  command.o console.o cyclon2.o devices.o dlmalloc.o docecc.o \
-	  environment.o env_common.o \
-	  env_nand.o env_dataflash.o env_flash.o env_eeprom.o \
-	  env_nvram.o env_nowhere.o \
-	  exports.o \
-	  flash.o fpga.o ft_build.o \
-	  hush.o kgdb.o lcd.o lists.o lynxkdi.o \
-	  memsize.o miiphybb.o miiphyutil.o \
-	  s_record.o serial.o soft_i2c.o soft_spi.o spartan2.o spartan3.o \
-	  usb.o usb_kbd.o usb_storage.o \
-	  virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o
-
-SRCS	:= $(AOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(AOBJS) $(COBJS))
-
-CPPFLAGS += -I..
-
-all:	$(LIB) $(AOBJS)
-
-$(LIB): $(obj).depend $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
-
-$(obj)environment.o: $(src)environment.c $(obj)../tools/envcrc
-	$(CC) $(AFLAGS) -Wa,--no-warn \
-		-DENV_CRC=$(shell $(obj)../tools/envcrc) \
-		-c -o $@ $(src)environment.c
-
-$(obj)../tools/envcrc:
-	$(MAKE) -C ../tools
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-y += ACEX1K.o
+obj-y += cmd_bootm.o
+obj-y += cmd_elf.o
+obj-y += cmd_itest.o
+obj-y += cmd_net.o
+obj-y += cmd_usb.o
+obj-y += docecc.o
+obj-y += flash.o
+obj-y += usb.o
+obj-y += altera.o
+obj-y += cmd_cache.o
+obj-y += cmd_ext2.o
+obj-y += cmd_jffs2.o
+obj-y += cmd_nvedit.o
+obj-y += cmd_vfd.o
+obj-y += env_common.o
+obj-y += fpga.o
+obj-y += memsize.o
+obj-y += usb_kbd.o
+obj-y += bedbug.o
+obj-y += cmd_console.o
+obj-y += cmd_fat.o
+obj-y += cmd_load.o
+obj-y += cmd_pci.o
+obj-y += cmd_ximg.o
+obj-y += env_dataflash.o
+obj-y += ft_build.o
+obj-y += miiphybb.o
+obj-y += usb_storage.o
+obj-y += circbuf.o
+obj-y += cmd_date.o
+obj-y += cmd_fdc.o
+obj-y += cmd_log.o
+obj-y += cmd_pcmcia.o
+obj-y += command.o
+obj-y += env_eeprom.o
+obj-y += hush.o
+obj-y += miiphyutil.o
+obj-y += virtex2.o
+obj-y += cmd_ace.o
+obj-y += cmd_dcr.o
+obj-y += cmd_fdos.o
+obj-y += cmd_mac.o
+obj-y += cmd_portio.o
+obj-y += console.o
+obj-y += env_flash.o
+obj-y += serial.o
+obj-y += xilinx.o
+obj-y += cmd_autoscript.o
+obj-y += cmd_diag.o
+obj-y += cmd_flash.o
+obj-y += cmd_mem.o
+obj-y += cmd_reginfo.o
+obj-y += crc16.o
+obj-y += environment.o
+obj-y += kgdb.o
+obj-y += soft_i2c.o
+obj-y += xyzModem.o
+obj-y += cmd_bdinfo.o
+obj-y += cmd_display.o
+obj-y += cmd_fpga.o
+obj-y += cmd_mii.o
+obj-y += cmd_reiser.o
+obj-y += cyclon2.o
+obj-y += env_nand.o
+obj-y += lcd.o
+obj-y += soft_spi.o
+obj-y += cmd_bedbug.o
+obj-y += cmd_doc.o
+obj-y += cmd_i2c.o
+obj-y += cmd_misc.o
+obj-y += cmd_scsi.o
+obj-y += devices.o
+obj-y += env_nowhere.o
+obj-y += lists.o
+obj-y += spartan2.o
+obj-y += cmd_bmp.o
+obj-y += cmd_dtt.o
+obj-y += cmd_ide.o
+obj-y += cmd_mmc.o
+obj-y += cmd_spi.o
+obj-y += dlmalloc.o
+obj-y += env_nvram.o
+obj-y += lynxkdi.o
+obj-y += spartan3.o
+obj-y += cmd_boot.o
+obj-y += cmd_eeprom.o
+obj-y += cmd_immap.o
+obj-y += cmd_nand.o
+obj-y += cmd_universe.o
+obj-y += exports.o
+obj-y += main.o
+obj-y += s_record.o
diff --git a/include/asm-arm/proc b/include/asm-arm/proc
new file mode 100644
index 0000000000..49216a2a79
--- /dev/null
+++ b/include/asm-arm/proc
@@ -0,0 +1 @@
+link proc-armv/
\ No newline at end of file
diff --git a/include/config.h b/include/config.h
new file mode 100644
index 0000000000..bcb486ccff
--- /dev/null
+++ b/include/config.h
@@ -0,0 +1 @@
+link configs/mx1ads.h
\ No newline at end of file