[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-263-g3542a79
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-263-g3542a79
|
From: Julien B a. A. <ar...@us...> - 2011-01-27 16:35:37
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3542a79335258159573a42d7a8273f229eb0f0b5 (commit)
via 073f7d64df30594ada0cc3cb2e52f9b4390d5eaa (commit)
from 5993d32c67a6147d7480139ae5590a70beb34593 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3542a79335258159573a42d7a8273f229eb0f0b5
Merge: 073f7d64df30594ada0cc3cb2e52f9b4390d5eaa 5993d32c67a6147d7480139ae5590a70beb34593
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 27 17:27:55 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 073f7d64df30594ada0cc3cb2e52f9b4390d5eaa
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 27 17:27:34 2011 +0100
[BUILDROOT] 2010.11: Activates boot console selection in BR menuconfig
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 39 ++++++++++++++------
buildroot/configs/apf9328_defconfig | 28 +++++++++++++-
buildroot/configs/pps_defconfig | 28 +++++++++++++-
.../armadeus/rootfs/target_skeleton/etc/inittab | 3 +-
4 files changed, 80 insertions(+), 18 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 4d3fea5..ca497c7 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Dec 28 18:08:43 2010
+# Thu Jan 27 17:13:40 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -55,26 +55,41 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
# Preset Devices
#
BR2_TARGET_ARMADEUS=y
-# BR2_TARGET_ARMADEUS_APF9328 is not set
-# BR2_TARGET_ARMADEUS_APF27_DEV is not set
-BR2_TARGET_ARMADEUS_APF51=y
-# BR2_TARGET_ARMADEUS_APF27_PPS is not set
BR2_BOARD_NAME="apf51"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx51"
BR2_TARGET_ARMADEUS_NR_SDRAM="1"
-BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_1=y
-# BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_2 is not set
-# BR2_TARGET_ARMADEUS_APF51_DDR2RAM_32 is not set
-# BR2_TARGET_ARMADEUS_APF51_DDR2RAM_64 is not set
-BR2_TARGET_ARMADEUS_APF51_DDR2RAM_128=y
-# BR2_TARGET_ARMADEUS_APF51_DDR2RAM_256 is not set
+BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
# BR2_TARGET_ARMLTD is not set
# BR2_TARGET_ATMEL is not set
# BR2_TARGET_KWIKBYTE is not set
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
-# BR2_TARGET_GENERIC_GETTY is not set
+BR2_TARGET_GENERIC_GETTY=y
+# BR2_TARGET_GENERIC_GETTY_NONE is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYMXC0 is not set
+BR2_TARGET_GENERIC_GETTY_TTYMXC1=y
+# BR2_TARGET_GENERIC_GETTY_TTYMXC2 is not set
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set
+BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
+BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Build options
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index bb9ef17..46bd0b1 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 19 15:36:56 2010
+# Thu Jan 27 17:13:40 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -65,7 +65,31 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
# BR2_TARGET_KWIKBYTE is not set
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
-# BR2_TARGET_GENERIC_GETTY is not set
+BR2_TARGET_GENERIC_GETTY=y
+# BR2_TARGET_GENERIC_GETTY_NONE is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC3 is not set
+BR2_TARGET_GENERIC_GETTY_TTYMXC0=y
+# BR2_TARGET_GENERIC_GETTY_TTYMXC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYMXC2 is not set
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set
+BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
+BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Build options
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 1028d2b..a7851be 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jan 12 11:33:44 2011
+# Mon Nov 1 17:03:11 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -65,7 +65,31 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="64"
# BR2_TARGET_KWIKBYTE is not set
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
-# BR2_TARGET_GENERIC_GETTY is not set
+BR2_TARGET_GENERIC_GETTY=y
+# BR2_TARGET_GENERIC_GETTY_NONE is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC3 is not set
+BR2_TARGET_GENERIC_GETTY_TTYMXC0=y
+# BR2_TARGET_GENERIC_GETTY_TTYMXC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYMXC2 is not set
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set
+BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
+BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Build options
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab
index 7a940c4..08ca4d4 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab
@@ -35,8 +35,7 @@ tty1::respawn:/sbin/getty 38400 tty1
#tty2::respawn:/sbin/getty 38400 tty2
# Put a getty on the serial port
-#ttyS0::respawn:/sbin/getty -L ttySMX0 115200,57600,38400,230400 vt100
-ttySMX0::respawn:/sbin/getty -L ttySMX0 115200,57600,38400 vt100
+ttySMX0::respawn:/sbin/getty -L ttySMX0 115200,57600,38400 vt100 # GENERIC_SERIAL
#null::respawn:/sbin/getty -L ttygserial 115200 vt100
# Logging junk
hooks/post-receive
--
armadeus
|
