summaryrefslogtreecommitdiff
path: root/target/lemote
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-06-03 17:56:52 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-03 17:56:52 +0200
commit91bf2231a22d817d9ec663d9a76464c220adb88f (patch)
tree4b42e59f6587a5d8d852ae73c884f320e7dfd834 /target/lemote
parent6bbf0a29693f0720d9753e11220e39a71b0454fd (diff)
fix instability problems on my loongson laptop
the latest binutils contains the needed options to build a kernel with the needed workarounds. Activate the work arounds.
Diffstat (limited to 'target/lemote')
-rw-r--r--target/lemote/Makefile7
-rw-r--r--target/lemote/files/boot/boot.cfg6
-rw-r--r--target/lemote/kernel.config8
3 files changed, 12 insertions, 9 deletions
diff --git a/target/lemote/Makefile b/target/lemote/Makefile
index 59e2b84b1..d79f1e270 100644
--- a/target/lemote/Makefile
+++ b/target/lemote/Makefile
@@ -7,8 +7,10 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
+KERNEL:=$(LINUX_DIR)/vmlinuz
+
kernel-install:
- @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+ @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk
createinitcrypt:
$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config
@@ -73,7 +75,6 @@ endif
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
- @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
+ @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/boot/boot.cfg b/target/lemote/files/boot/boot.cfg
index 2f67fe67b..dd386032b 100644
--- a/target/lemote/files/boot/boot.cfg
+++ b/target/lemote/files/boot/boot.cfg
@@ -1,7 +1,7 @@
-timeout 4
+timeout 3
default 0
showmenu 1
title Linux
- kernel /dev/fs/ext2@wd0/boot/lemote-encrypted-kernel
- args no_auto_cmd root=/dev/mapper/root resume=/dev/mapper/swap
+ kernel /dev/fs/ext2@wd0/boot/vmlinuz-adk
+ args no_auto_cmd
diff --git a/target/lemote/kernel.config b/target/lemote/kernel.config
index c109120a0..21df7a57a 100644
--- a/target/lemote/kernel.config
+++ b/target/lemote/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.34
-# Fri May 28 12:08:04 2010
+# Thu Jun 3 15:37:40 2010
#
CONFIG_MIPS=y
@@ -108,7 +108,9 @@ CONFIG_CPU_LOONGSON2F=y
# CONFIG_CPU_RM9000 is not set
# CONFIG_CPU_SB1 is not set
# CONFIG_CPU_CAVIUM_OCTEON is not set
-# CONFIG_CPU_LOONGSON2F_WORKAROUNDS is not set
+CONFIG_CPU_NOP_WORKAROUNDS=y
+CONFIG_CPU_JUMP_WORKAROUNDS=y
+CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y
CONFIG_SYS_SUPPORTS_ZBOOT=y
CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y
CONFIG_CPU_LOONGSON2=y
@@ -1386,7 +1388,7 @@ CONFIG_HAVE_ARCH_KGDB=y
CONFIG_EARLY_PRINTK=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=tty0 init=/init no_auto_cmd"
-CONFIG_CMDLINE_OVERRIDE=y
+# CONFIG_CMDLINE_OVERRIDE is not set
#
# Security options