Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 33 insertions, 35 deletions

diff --git a/target/lemote/Makefile b/target/lemote/Makefile
index d79f1e270..aa6006f24 100644
--- a/target/lemote/Makefile
+++ b/target/lemote/Makefile
@@ -9,28 +9,40 @@ include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/vmlinuz
 
-kernel-install:
-	@cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk
-
 createinitcrypt:
 	$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config
 	echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
 	echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
 	echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
-		CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) 
+		CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)
 	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
 		CC="$(TARGET_CC)" $(MAKE_TRACE)
-	@cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
 
 ifeq ($(FS),nfsroot)
 imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
 	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
 	@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
 	@echo 'Boot your lemote and type following commands in PMON:'
 	@echo 'PMON> ifaddr rtl0 <ip-address-client>'
 	@echo 'PMON> load tftp://<ip-address-server>/${ADK_TARGET}-${FS}-kernel'
 	@echo 'PMON> g'
-	@echo 'Login as user root with password linux123 via ssh or console'
+endif
+ifeq ($(FS),initramfs)
+imageinstall: $(BIN_DIR)/$(INITRAMFS)
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
+endif
+ifeq ($(FS),initramfs-piggyback)
+imageinstall: $(BUILD_DIR)/$(INITRAMFS_PIGGYBACK) createinitramfs
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+endif
+ifeq ($(FS),archive)
+imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 endif
 ifeq ($(FS),encrypted)
 imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt
@@ -52,29 +64,10 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt
 	@echo 'mount /dev/sda1 /mnt/boot'
 	@echo 'mount /dev/mapper/crypt /mnt/root'
 	@echo 'mkdir /mnt/boot/boot'
-	@echo 
 	@echo 'Copy $(ROOTFSUSERTARBALL) via scp to /mnt/root and extract it'
 	@echo 'cd /mnt/root ; gunzip $(ROOTFSUSERTARBALL); tar xpvf $(ROOTFSUSERTARBALL)'
 	@echo 'Copy ${ADK_TARGET}-${FS}-kernel via scp to /mnt/boot/boot'
 	@echo 'Move boot.cfg to /mnt/boot/boot'
 	@echo 'mv /mnt/root/boot/boot.cfg /mnt/boot/boot'
 	@echo 'cd /mnt/root ; mknod -m 644 console c 5 1'
-	@echo 'Login as user root with password linux123 via ssh or console'
-endif
-ifeq ($(FS),initramfs)
-imageinstall: $(BIN_DIR)/$(INITRAMFS)
-	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
-	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'Login as user root with password linux123 via ssh or console'
-endif
-ifeq ($(FS),initramfs-piggyback)
-imageinstall: $(BUILD_DIR)/$(INITRAMFS_PIGGYBACK) createinitramfs
-	@echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
-	@echo 'Login as user root with password linux123 via ssh or console'
-endif
-ifeq ($(FS),archive)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@echo
-	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
-	@echo 'Login as user root with password linux123 via ssh or console'
 endif
diff --git a/target/lemote/files/etc/inittab b/target/lemote/files/etc/inittab
index 6e32240bd..cedbc93ff 100644
--- a/target/lemote/files/etc/inittab
+++ b/target/lemote/files/etc/inittab
@@ -6,5 +6,4 @@ tty3::respawn:/sbin/getty -i -L tty3 115200 vt100
 tty4::respawn:/sbin/getty -i -L tty4 115200 vt100
 tty5::respawn:/sbin/getty -i -L tty5 115200 vt100
 tty6::respawn:/sbin/getty -i -L tty6 115200 vt100
-tty7::respawn:/sbin/getty -i -L tty7 115200 vt100
 tty11::respawn:/sbin/logread -f
diff --git a/target/lemote/files/etc/network/interfaces b/target/lemote/files/etc/network/interfaces
new file mode 100644
index 000000000..3abd272d8
--- /dev/null
+++ b/target/lemote/files/etc/network/interfaces
@@ -0,0 +1,13 @@
+auto lo
+iface lo inet loopback
+
+# wlan example
+#auto wlan0
+#iface wlan0 inet dhcp
+#       wireless-extension 1
+#       wireless-mode sta
+#       wireless-channel 1
+#       wireless-ssid openadk
+#       wireless-security wpa2
+#       wireless-passphrase openadk123
+
diff --git a/target/lemote/files/etc/tmpfs b/target/lemote/files/etc/tmpfs
new file mode 100644
index 000000000..08558e471
--- /dev/null
+++ b/target/lemote/files/etc/tmpfs
@@ -0,0 +1 @@
+16384
diff --git a/target/lemote/xorg.conf b/target/lemote/xorg.conf
index 95b9dffe1..c9c9388f2 100644
--- a/target/lemote/xorg.conf
+++ b/target/lemote/xorg.conf
@@ -33,18 +33,11 @@ Section "Device"
 	Option      "SWCursor"   	"true"
 	Option      "UseBIOS"    	"false"
 	Option	    "PanelSize"	 	"1024x600"
-#	Option	    "DualHead"	 	"true"
-EndSection
-
-Section "Device"
-	Identifier  "card1"
-	Driver      "fbdev"
-	Option	    "UseFBDev"	 	"true"
 EndSection
 
 Section "Monitor"
 	Identifier   "Generic Monitor"
-	Option       "DPMS"     "false"
+	Option       "DPMS"     "true"
 	HorizSync    30-70
 	VertRefresh  50-80
 EndSection
@@ -56,6 +49,5 @@ Section "Screen"
 	DefaultDepth		16
 	SubSection "Display"
 		Modes		"1024x600"
-	#	Virtual		1824 600
 	EndSubSection
 EndSection