summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--target/config/Config.in.kernelversion11
-rw-r--r--target/linux/config/Config.in.serial3
-rw-r--r--target/nios2/Makefile4
-rw-r--r--target/nios2/kernel/qemu-nios26
5 files changed, 26 insertions, 4 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 0d95b25c9..df54dbfd3 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -19,6 +19,12 @@ endif
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
endif
+ifeq ($(ADK_TARGET_KERNEL_VERSION_4_6_0),y)
+KERNEL_FILE_VER:= 4.6
+KERNEL_RELEASE:= 1
+KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
+KERNEL_HASH:= a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866
+endif
ifeq ($(ADK_TARGET_KERNEL_VERSION_4_5_4),y)
KERNEL_FILE_VER:= 4.5.4
KERNEL_RELEASE:= 1
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 39ed8ad1a..6eea1f6bc 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -10,13 +10,20 @@ default ADK_TARGET_KERNEL_VERSION_4_4_10
config ADK_TARGET_KERNEL_VERSION_GIT
bool "linux-git"
+config ADK_TARGET_KERNEL_VERSION_4_6_0
+ bool "4.6"
+ depends on !ADK_TARGET_BOARD_BCM28XX
+ select ADK_TARGET_KERNEL_VERSION_4_6
+
config ADK_TARGET_KERNEL_VERSION_4_5_4
bool "4.5.4"
+ depends on !ADK_TARGET_ARCH_NIOS2
depends on !ADK_TARGET_BOARD_BCM28XX
select ADK_TARGET_KERNEL_VERSION_4_5
config ADK_TARGET_KERNEL_VERSION_4_4_10
bool "4.4.10"
+ depends on !ADK_TARGET_ARCH_NIOS2
select ADK_TARGET_KERNEL_VERSION_4_4
config ADK_TARGET_KERNEL_VERSION_4_1_24
@@ -24,6 +31,7 @@ config ADK_TARGET_KERNEL_VERSION_4_1_24
depends on !ADK_TARGET_ARCH_ARC
depends on !ADK_TARGET_ARCH_BFIN
depends on !ADK_TARGET_ARCH_H8300
+ depends on !ADK_TARGET_ARCH_NIOS2
depends on !ADK_TARGET_ARCH_SPARC
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
@@ -141,6 +149,9 @@ config ADK_TARGET_KERNEL_HASH
help
GIT hash to use.
+config ADK_TARGET_KERNEL_VERSION_4_6
+ bool
+
config ADK_TARGET_KERNEL_VERSION_4_5
bool
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 3523b15c3..1dc0e13a0 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -77,6 +77,7 @@ config ADK_KERNEL_SERIAL_8250
select ADK_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 \
|| ADK_TARGET_SYSTEM_QEMU_XTENSA \
|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
+ || ADK_TARGET_SYSTEM_QEMU_NIOS2 \
|| ADK_TARGET_SYSTEM_QEMU_OR1K \
|| ADK_TARGET_SYSTEM_OR1K_SIM
select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU
@@ -88,6 +89,7 @@ config ADK_KERNEL_SERIAL_8250
|| ADK_TARGET_SYSTEM_PCENGINES_ALIX \
|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
|| ADK_TARGET_SYSTEM_QEMU_MIPS \
+ || ADK_TARGET_SYSTEM_QEMU_NIOS2 \
|| ADK_TARGET_SYSTEM_QEMU_OR1K \
|| ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
|| ADK_TARGET_SYSTEM_QEMU_X86 \
@@ -106,6 +108,7 @@ config ADK_KERNEL_SERIAL_8250
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX
default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
default y if ADK_TARGET_SYSTEM_QEMU_MIPS
+ default y if ADK_TARGET_SYSTEM_QEMU_NIOS2
default y if ADK_TARGET_SYSTEM_QEMU_OR1K
default y if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
default y if ADK_TARGET_SYSTEM_QEMU_X86
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