Merged nios2 branch

From my Wiki reading I'm now in the current "nios2" branch where I should be able to work with MMU and non-MMU projects.

I've got a lot of old non-mmu projects so I wanted to start there before even trying the MMU.

1. I tried using the mmu toolchain and got errors so I figured I needed to use the previous no mmu toolchain.

2. I believe I have a good *.dts file - but followed http://www.alterawiki.com/wiki/Devicetree
And I did "make menuconfig" and set up to point to it.

When I do a make I get the following:

[janet@localhost uClinux-dist]$ make
make -f tools/autotools.mk autotools-cache
make[1]: Entering directory `/home/janet/nios2-linux/uClinux-dist'
make[1]: Nothing to be done for `autotools-cache'.
make[1]: Leaving directory `/home/janet/nios2-linux/uClinux-dist'
chmod +x tools/romfs-inst.sh tools/modules-alias.sh tools/build-udev-perms.sh
. linux-2.6.x/.config; if [ "$CONFIG_INITRAMFS_SOURCE" != "" ]; then \
mkdir -p `dirname $CONFIG_INITRAMFS_SOURCE`; \
touch $CONFIG_INITRAMFS_SOURCE || exit 1; \
fi
rm -f linux-2.6.x/usr/initramfs_data.cpio
make ARCH=nios2 CROSS_COMPILE=nios2-linux-uclibc- O=/home/janet/nios2-linux/uClinux-dist/linux-2.6.x -j4 -C ../linux-2.6 || exit 1
make[1]: Entering directory `/home/janet/nios2-linux/linux-2.6'
CHK include/generated/uapi/linux/version.h
GEN /home/janet/nios2-linux/uClinux-dist/linux-2.6.x/Makefile
Using /home/janet/nios2-linux/linux-2.6 as source for kernel
CHK include/generated/utsrelease.h
CALL /home/janet/nios2-linux/linux-2.6/scripts/checksyscalls.sh
<stdin>:413:2: warning: #warning syscall getrlimit not implemented
<stdin>:1208:2: warning: #warning syscall sendmmsg not implemented
<stdin>:1211:2: warning: #warning syscall setns not implemented
<stdin>:1214:2: warning: #warning syscall process_vm_readv not implemented
<stdin>:1217:2: warning: #warning syscall process_vm_writev not implemented
<stdin>:1220:2: warning: #warning syscall kcmp not implemented
CC arch/nios2/mm/cacheflush-nommu.o
CHK include/generated/compile.h
GEN usr/initramfs_data.cpio
AS usr/initramfs_data.o
DTC arch/nios2/boot/system.dtb
AS arch/nios2/boot/linked_dtb.o
LD usr/built-in.o
LD arch/nios2/boot/built-in.o
{standard input}: Assembler messages:
{standard input}:303: Error: unrecognised instruction initda
make[3]: *** [arch/nios2/mm/cacheflush-nommu.o] Error 1
make[2]: *** [arch/nios2/mm] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [sub-make] Error 2
make[1]: Leaving directory `/home/janet/nios2-linux/linux-2.6'
make: *** [linux] Error 1
[janet@localhost uClinux-dist]$ make menuconfig
find vendors -mindepth 2 '(' -name .svn -prune ')' -o -type f -name Kconfig -print | sed 's:^:source ../:' > vendors/Kconfig
config/mkconfig > Kconfig
KCONFIG_NOTIMESTAMP=1 /home/janet/nios2-linux/uClinux-dist/config/kconfig/mconf Kconfig
#
# configuration written to .config
#


*** End of Linux kernel configuration.
*** Execute 'make' to build the kernel or try 'make help'.

[janet@localhost uClinux-dist]$

************************************************** *********************************************
Figure I'm doing something REALLY STUPID -- can someone make me "less stupid?"

Thanks in advance