[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [microblaze-uclinux] cvs update on uClinux-dev break almost all
Hi John,
I prepared a patch for vendors/Xilinx/uclinux-auto. This patch apply to
the CVS version (not your current file, sorry).
These are the changes:
1) Add etc/hosts (it was in the parent directory). This fix the problem
I reported in my previous e-mail
2) Avoid to ifconfig the eth if no network adapter is configured. To do
so I add ifconfig.lo and ifconfig.eth
and check for the CONFIG_NETDEVICES or CONFIG_XILINX_ENET in the
makefile
3) Add ttyS1, ttyS2 and ttyS3 (I already sent a patch to fix this some
time ago).
4) Add /dev/rtc and /dev/nvram. My board mounts the RTC device FM31256,
I'm writing a driver for it, when will be ready
I'll post it to this mailing list.
5) Fix ifdef CONFIG_XILINX_SYSACE (the line started with # chararcter!)
6) Fix to work even if CONFIG_USER_FLATFSD_FLATFSD is not configured in.
7) Fix i2c dev node generation. CONFIG_I2C instead of
CONFIG_XILINX_IIC_0_INSTANCE and add @ character to dev name. (it
needs this patch to genromfs:
http://sourceforge.net/tracker/index.php?func=detail&aid=1254846&group_id=2320&atid=302320).
Regards,
Claudio Lanconelli
*** etc/hosts Wed Dec 31 14:00:00 1969
--- etc/hosts 2004-12-22 13:00:47.000000000 +0100
***************
*** 0 ****
--- 1,3 ----
+ 127.0.0.1 localhost.localdomain localhost
+
+
*** etc/rc/ifconfig.eth Wed Dec 31 14:00:00 1969
--- etc/rc/ifconfig.eth 2004-12-22 13:00:47.000000000 +0100
***************
*** 0 ****
--- 1,12 ----
+ #!/bin/sh
+
+ IP_ADDRESS=192.168.10.54
+
+ PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
+ echo "Setting up interface lo: "
+ ifconfig lo up 127.0.0.1
+
+ echo "Setting up interface eth0: "
+ ifconfig eth0 $IP_ADDRESS
+
*** etc/rc/ifconfig.lo Wed Dec 31 14:00:00 1969
--- etc/rc/ifconfig.lo 2005-08-16 16:06:17.567527000 +0200
***************
*** 0 ****
--- 1,6 ----
+ #!/bin/sh
+
+ PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
+ echo "Setting up interface lo: "
+ ifconfig lo up 127.0.0.1
*** Makefile 10 Aug 2005 00:28:17 -0000 1.1.1.2
--- Makefile 16 Aug 2005 15:59:11 -0000
***************
*** 40,46 ****
DEVICES = \
tty,c,5,0 console,c,5,1 mem,c,1,1 kmem,c,1,2 null,c,1,3 \
\
! ttyS0,c,4,64 \
\
zero,c,1,5 random,c,1,8 urandom,c,1,9 \
\
--- 40,47 ----
DEVICES = \
tty,c,5,0 console,c,5,1 mem,c,1,1 kmem,c,1,2 null,c,1,3 \
\
! ttyS0,c,4,64 ttyS1,c,4,65 ttyS2,c,4,66 ttyS3,c,4,67 \
! rtc,c,10,135 nvram,c,10,144 \
\
zero,c,1,5 random,c,1,8 urandom,c,1,9 \
\
***************
*** 73,78 ****
--- 74,89 ----
fslfifo6,c,10,198 fslfifo7,c,10,199
endif
+ ifdef CONFIG_XILINX_SYSACE
+ DEVICES += \
+ xsysacea,b,254,0 xsysacea1,b,254,1 xsysacea2,b,254,2 \
+ xsysacea3,b,254,3 xsysacea4,b,254,4 xsysacea5,b,254,5 \
+ xsysacea6,b,254,6 xsysacea7,b,254,7 xsysacea8,b,254,8 \
+ xsysacea9,b,254,9 xsysacea10,b,254,10 xsysacea11,b,254,11 \
+ xsysacea12,b,254,12 xsysacea12,b,254,13 xsysacea14,b,254,14 \
+ xsysacea15,b,254,15
+ endif
+
I2C_MAJOR = 89
FLASH_DEVICES = \
***************
*** 116,122 ****
$(ROMFSINST) -e CONFIG_USER_FLATFSD_FLATFSD \
-s /etc/config/fstab /etc/fstab
! $(ROMFSINST) -s /etc/config/passwd /etc/passwd
$(ROMFSINST) -s /bin /sbin
--- 127,134 ----
$(ROMFSINST) -e CONFIG_USER_FLATFSD_FLATFSD \
-s /etc/config/fstab /etc/fstab
! $(ROMFSINST) -e CONFIG_USER_FLATFSD_FLATFSD \
! -s /etc/config/passwd /etc/passwd
$(ROMFSINST) -s /bin /sbin
***************
*** 133,141 ****
$(ROMFSINST) -s /var/tmp /tmp
# make I2C nodes if necessary
! ifdef CONFIG_XILINX_IIC_0_INSTANCE
for i in 0 1 2 3 4 5 6 7; do \
! touch $(ROMFSDIR)/dev/i2c-$$i,c,$(I2C_MAJOR),$$i; \
done
endif #IIC
--- 145,153 ----
$(ROMFSINST) -s /var/tmp /tmp
# make I2C nodes if necessary
! ifdef CONFIG_I2C
for i in 0 1 2 3 4 5 6 7; do \
! touch $(ROMFSDIR)/dev/@i2c-$$i,c,$(I2C_MAJOR),$$i; \
done
endif #IIC
***************
*** 199,205 ****
else
[ -f etc/resolv.conf ] && $(ROMFSINST) etc/resolv.conf $(ETCDIR)/resolv.conf
[ -f etc/hosts ] && $(ROMFSINST) etc/hosts $(ETCDIR)/hosts
! $(ROMFSINST) -s /etc/config/hosts /etc/hosts
endif
# this is the special case, overwrite /etc/init.d/network
--- 211,218 ----
else
[ -f etc/resolv.conf ] && $(ROMFSINST) etc/resolv.conf $(ETCDIR)/resolv.conf
[ -f etc/hosts ] && $(ROMFSINST) etc/hosts $(ETCDIR)/hosts
! $(ROMFSINST) -e CONFIG_USER_FLATFSD_FLATFSD \
! -s /etc/config/hosts /etc/hosts
endif
# this is the special case, overwrite /etc/init.d/network
***************
*** 212,218 ****
mkdir -p $(ROMFSDIR)/etc/dhcpc
endif
else
! $(ROMFSINST) etc/rc/ifconfig /etc/init.d/network
endif
ifdef CONFIG_USER_PORTMAP_PORTMAP
--- 225,237 ----
mkdir -p $(ROMFSDIR)/etc/dhcpc
endif
else
! $(ROMFSINST) etc/rc/ifconfig.lo /etc/init.d/network
! ifdef CONFIG_NETDEVICES
! $(ROMFSINST) etc/rc/ifconfig.eth /etc/init.d/network
! endif
! ifdef CONFIG_XILINX_ENET
! $(ROMFSINST) etc/rc/ifconfig.eth /etc/init.d/network
! endif
endif
ifdef CONFIG_USER_PORTMAP_PORTMAP