Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7347] branches/1.0
|
From: <abe...@us...> - 2015-11-24 00:24:19
|
Revision: 7347
http://sourceforge.net/p/astlinux/code/7347
Author: abelbeck
Date: 2015-11-24 00:24:16 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Add genx86_64 and genx86_64-serial board types
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
branches/1.0/scripts/master-build
Added Paths:
-----------
branches/1.0/project/astlinux/board/genx86_64/
branches/1.0/project/astlinux/board/genx86_64/runnix.conf
branches/1.0/project/astlinux/board/genx86_64/target_skeleton/
branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/
branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules
branches/1.0/project/astlinux/board/genx86_64-serial/
branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf
branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/
branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/
branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules
Added: branches/1.0/project/astlinux/board/genx86_64/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/runnix.conf (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64/runnix.conf 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=genx86_64 astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Added: branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,15 @@
+#
+# /etc/inittab
+#
+# $Id: inittab 1681 2004-09-01 18:12:49Z $
+#
+
+console::sysinit:/etc/rc sysinit
+console::respawn:/sbin/getty -L 19200 /dev/tty1 linux
+
+# ttyS0::respawn:/sbin/getty -L 19200 /dev/ttyS0 vt100
+# ttyS1::respawn:/sbin/getty -L 19200 /dev/ttyS1 vt100
+
+# Stuff to do before rebooting
+::ctrlaltdel:/sbin/reboot
+::shutdown:/etc/rc shutdown
Added: branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,26 @@
+## These modules get modprobe'd when the system starts up.
+rtc
+## Comment out any modules you don't need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
+3c59x
+typhoon
+tulip
+e100
+natsemi
+forcedeth
+8139too
+via-rhine
+via-velocity
+vmxnet3
+pcnet32
+acenic
+e1000
+e1000e
+igb
+ns83820
+r8168
+r8169
+tg3
+skge
Added: branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=genx86_64 astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3 console=ttyS0,19200n8"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Added: branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,12 @@
+#
+# /etc/inittab
+#
+# $Id: inittab 1681 2004-09-01 18:12:49Z $
+#
+
+console::sysinit:/etc/rc sysinit
+console::respawn:/sbin/getty -L 19200 /dev/ttyS0 vt100
+
+# Stuff to do before rebooting
+::ctrlaltdel:/sbin/reboot
+::shutdown:/etc/rc shutdown
Added: branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,26 @@
+## These modules get modprobe'd when the system starts up.
+rtc
+## Comment out any modules you don't need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
+3c59x
+typhoon
+tulip
+e100
+natsemi
+forcedeth
+8139too
+via-rhine
+via-velocity
+#vmxnet3
+pcnet32
+acenic
+e1000
+e1000e
+igb
+ns83820
+r8168
+r8169
+tg3
+skge
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image 2015-11-23 16:30:24 UTC (rev 7346)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image 2015-11-24 00:24:16 UTC (rev 7347)
@@ -127,7 +127,7 @@
exit $RED
fi
- if [ "$ARCH" = "geni586" ]; then
+ if [ "$ARCH" = "geni586" -o "$ARCH" = "genx86_64" ]; then
if [ -n "$SERIAL" ]; then
IS_SERIAL="-serial"
ARCH="${ARCH}${IS_SERIAL}"
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image 2015-11-23 16:30:24 UTC (rev 7346)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image 2015-11-24 00:24:16 UTC (rev 7347)
@@ -135,6 +135,10 @@
ARCH=`echo $i | sed -e 's/astlinux=//'`
if [ "$ARCH" = "via" -o "$ARCH" = "viac7" ]; then # Redirect deprecated boards
ARCH="geni586"
+ elif [ "$ARCH" = "geni586" -a "$ARCH_BITS" = "64" ]; then
+ ARCH="genx86_64"
+ elif [ "$ARCH" = "genx86_64" -a "$ARCH_BITS" = "32" ]; then
+ ARCH="geni586"
fi
elif echo $i | grep -q "console="; then
SERIAL=`echo $i | sed -e 's/console=//'`
@@ -146,7 +150,7 @@
exit $RED
fi
- if [ "$ARCH" = "geni586" ]; then
+ if [ "$ARCH" = "geni586" -o "$ARCH" = "genx86_64" ]; then
if [ -n "$SERIAL" ]; then
ARCH="${ARCH}-serial"
fi
@@ -345,9 +349,10 @@
if [ -n "$2" ]; then
SRC_URL=$2
else
- echo "Usage: upgrade-run-image check firmware_repository_url"
+ echo "Usage: upgrade-run-image check firmware_repository_url [32|64]"
exit 1
fi
+ ARCH_BITS="$3"
check
echo "Current version is: ${OVER}${AFTER_REBOOT}, Newest available version is: ${VER}"
exit $GREEN
@@ -357,9 +362,10 @@
if [ -n "$2" ]; then
SRC_URL=$2
else
- echo "Usage: upgrade-run-image upgrade firmware_repository_url"
+ echo "Usage: upgrade-run-image upgrade firmware_repository_url [32|64]"
exit 1
fi
+ ARCH_BITS="$3"
check
upgrade
echo "Successful upgrade to: ${VER}${AFTER_REBOOT}"
@@ -379,7 +385,7 @@
;;
*)
- echo "Usage: upgrade-run-image check|upgrade|show|revert firmware_repository_url"
+ echo "Usage: upgrade-run-image check|upgrade|show|revert firmware_repository_url [32|64]"
exit 1
;;
Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build 2015-11-23 16:30:24 UTC (rev 7346)
+++ branches/1.0/scripts/master-build 2015-11-24 00:24:16 UTC (rev 7347)
@@ -9,6 +9,8 @@
FAT_SIZE=256
+BOARDS_SMP64="genx86_64 genx86_64-serial"
+
BOARDS_SMP="geni586 geni586-serial"
BOARDS_NO_SMP="net5501 alix"
@@ -139,6 +141,16 @@
for board in $BOARDS_SMP; do
build_board "$FIRMWARE" "$IMG"
done
+
+ # SMP64 Builds
+ echo "Cleaning out any existing builds..."
+ rm -rf output
+
+ cp "x86_64-configs/$CONFIG" .config
+
+ for board in $BOARDS_SMP64; do
+ build_board "$FIRMWARE" "$IMG"
+ done
done
echo "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
