summaryrefslogtreecommitdiff
path: root/target/nios2
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-05-27 04:27:15 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-05-27 04:27:15 +0200
commit1001eb01bfda448d47ab1a330ee11925b3469e1c (patch)
tree8977365daf5a643126c8f71d9f488c3eb6bad882 /target/nios2
parent2c08065857e0bba314e23e45769630bc3d32d4f9 (diff)
add linux 4.6 support, finally with appended DTB qemu-system-nios2 boots
Diffstat (limited to 'target/nios2')
-rw-r--r--target/nios2/Makefile4
-rw-r--r--target/nios2/kernel/qemu-nios26
2 files changed, 6 insertions, 4 deletions
diff --git a/target/nios2/Makefile b/target/nios2/Makefile
index 6e11c30ba..ca418392d 100644
--- a/target/nios2/Makefile
+++ b/target/nios2/Makefile
@@ -8,7 +8,7 @@ include $(ADK_TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/vmlinux
OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
-QEMU_ARGS+=-M 10m50-ghrd -dtb $(FW_DIR)/10m50_devboard.dtb
+QEMU_ARGS+=-M 10m50-ghrd
QEMU_ARGS+=${ADK_QEMU_ARGS}
# target helper text
@@ -53,7 +53,7 @@ endif
# image creation and kernel install
kernel-strip:
- $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
+ @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
kernel-install: kernel-strip
@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
diff --git a/target/nios2/kernel/qemu-nios2 b/target/nios2/kernel/qemu-nios2
index a02954b48..8de73edf3 100644
--- a/target/nios2/kernel/qemu-nios2
+++ b/target/nios2/kernel/qemu-nios2
@@ -5,5 +5,7 @@ CONFIG_NIOS2_HW_DIV_SUPPORT=y
CONFIG_CUSTOM_CACHE_SETTINGS=y
CONFIG_NIOS2_DCACHE_SIZE=0x8000
CONFIG_NIOS2_ICACHE_SIZE=0x8000
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_ALTERA_JTAGUART=y
+CONFIG_NIOS2_DTB_SOURCE_BOOL=y
+CONFIG_NIOS2_DTB_SOURCE="arch/nios2/boot/dts/10m50_devboard.dts"
+CONFIG_CMDLINE_BOOL=y
+CONFIG_NIOS2_PASS_CMDLINE=y