add support for microblaze architecture, tested with qemu-system-microblaze{,el}

4 files changed, 27 insertions, 22 deletions

diff --git a/target/config/Config.in b/target/config/Config.in
index f5cf3e120..e59b86010 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -7,6 +7,9 @@ config ADK_TARGET_KERNEL_VMLINUZ
 config ADK_TARGET_KERNEL_ZIMAGE
 	boolean
 
+config ADK_TARGET_KERNEL_LINUXBIN
+	boolean
+
 config ADK_TARGET_KERNEL_IMAGE
 	boolean
 
@@ -17,6 +20,7 @@ config ADK_TARGET_KERNEL
 	string
 	default "zImage" if ADK_TARGET_KERNEL_ZIMAGE
 	default "Image" if ADK_TARGET_KERNEL_IMAGE
+	default "simpleImage.system" if ADK_TARGET_KERNEL_LINUXBIN
 	default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ
 	default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE
 	default "vmlinux"
@@ -412,6 +416,9 @@ config ADK_CPU_MIPS32
 config ADK_CPU_MIPS64
 	boolean
 
+config ADK_CPU_MICROBLAZE
+	boolean
+
 config ADK_CPU_RASPBERRY_PI
 	boolean
 
@@ -426,6 +433,8 @@ config ADK_TARGET_CPU_ARCH
 	default "i686" if ADK_CPU_PENTIUM_M
 	default "i686" if ADK_CPU_ATOM
 	default "m68k" if ADK_LINUX_M68K
+	default "microblaze" if ADK_LINUX_MICROBLAZE && ADK_big
+	default "microblazeel" if ADK_LINUX_MICROBLAZE && ADK_little
 	default "mips64" if ADK_LINUX_MIPS && ADK_big && ADK_TARGET_KERNEL64
 	default "mips64el" if ADK_LINUX_MIPS && ADK_little && ADK_TARGET_KERNEL64
 	default "mips" if ADK_LINUX_MIPS && ADK_big
@@ -492,6 +501,8 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686
+	default "console=ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
+	default "console=ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE
@@ -537,6 +548,7 @@ config ADK_TARGET_LIB_UCLIBC
 	boolean
 	select ADK_uclibc
 	depends on \
+		   !ADK_LINUX_MICROBLAZE && \
 		   !ADK_LINUX_SPARC64 && \
 		   !ADK_LINUX_PPC64 && \
 		   !ADK_LINUX_NATIVE
@@ -551,10 +563,8 @@ config ADK_TARGET_LIB_EGLIBC
 		ADK_LINUX_ARM || \
 		ADK_LINUX_ARMEB || \
 		ADK_LINUX_M68K || \
+		ADK_LINUX_MICROBLAZE || \
 		ADK_LINUX_MIPS || \
-		ADK_LINUX_MIPSEL || \
-		ADK_LINUX_MIPS64 || \
-		ADK_LINUX_MIPS64EL || \
 		ADK_LINUX_PPC || \
 		ADK_LINUX_PPC64 || \
 		ADK_LINUX_SH || \
@@ -573,10 +583,8 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_LINUX_ARM || \
 		ADK_LINUX_ARMEB || \
 		ADK_LINUX_M68K || \
+		ADK_LINUX_MICROBLAZE || \
 		ADK_LINUX_MIPS || \
-		ADK_LINUX_MIPSEL || \
-		ADK_LINUX_MIPS64 || \
-		ADK_LINUX_MIPS64EL || \
 		ADK_LINUX_PPC || \
 		ADK_LINUX_PPC64 || \
 		ADK_LINUX_SH || \
@@ -593,8 +601,8 @@ config ADK_TARGET_LIB_MUSL
 	select ADK_musl
 	depends on \
 		ADK_LINUX_ARM || \
+		ADK_LINUX_MICROBLAZE || \
 		ADK_LINUX_MIPS || \
-		ADK_LINUX_MIPSEL || \
 		ADK_LINUX_PPC || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64
@@ -633,6 +641,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 		ADK_HARDWARE_QEMU || \
 		ADK_TARGET_SYSTEM_ARANYM_M68K || \
 		ADK_LINUX_ARM || \
+		ADK_LINUX_MICROBLAZE || \
 		ADK_LINUX_MIPS || \
 		ADK_LINUX_PPC || \
 		ADK_LINUX_SPARC || \
@@ -652,6 +661,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	depends on \
 		ADK_HARDWARE_QEMU || \
 		ADK_LINUX_ARM || \
+		ADK_LINUX_MICROBLAZE || \
 		ADK_LINUX_MIPS || \
 		ADK_LINUX_PPC || \
 		ADK_LINUX_SPARC || \
diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice
index 1ab3a4ecc..ce58aa2c1 100644
--- a/target/config/Config.in.arch.choice
+++ b/target/config/Config.in.arch.choice
@@ -38,6 +38,12 @@ config ADK_LINUX_M68K
 	help
 	  Support for m68k systems.
 
+config ADK_LINUX_MICROBLAZE
+	bool "microblaze system"
+	select ADK_microblaze
+	help
+	  Support for Microblaze systems.
+
 config ADK_LINUX_MIPS
 	bool "mips system"
 	select ADK_mips
diff --git a/target/config/Config.in.arch.default b/target/config/Config.in.arch.default
index 1d3453c2b..737ce525c 100644
--- a/target/config/Config.in.arch.default
+++ b/target/config/Config.in.arch.default
@@ -5,9 +5,6 @@ config ADK_native
 config ADK_arm
 	bool
 
-config ADK_armeb
-	bool
-
 config ADK_avr32
 	bool
 
@@ -17,16 +14,10 @@ config ADK_cris
 config ADK_m68k
 	bool
 
-config ADK_mips
-	bool
-
-config ADK_mipsel
-	bool
-
-config ADK_mips64
+config ADK_microblaze
 	bool
 
-config ADK_mips64el
+config ADK_mips
 	bool
 
 config ADK_ppc
@@ -53,14 +44,11 @@ config ADK_x86
 config ADK_TARGET_ARCH
 	string
 	default "arm"  if ADK_arm
-	default "arm"  if ADK_armeb
 	default "avr32"  if ADK_avr32
 	default "cris"  if ADK_cris
 	default "m68k"  if ADK_m68k
+	default "microblaze"  if ADK_microblaze
 	default "mips"  if ADK_mips
-	default "mips"  if ADK_mipsel
-	default "mips"  if ADK_mips64
-	default "mips"  if ADK_mips64el
 	default "ppc"  if ADK_ppc
 	default "ppc64"  if ADK_ppc64
 	default "sparc"  if ADK_sparc
diff --git a/target/config/Config.in.system.choice b/target/config/Config.in.system.choice
index 83f2e4e3d..8f6f7413f 100644
--- a/target/config/Config.in.system.choice
+++ b/target/config/Config.in.system.choice
@@ -2,6 +2,7 @@ source "target/arm/Config.in"
 source "target/avr32/Config.in"
 source "target/cris/Config.in"
 source "target/m68k/Config.in"
+source "target/microblaze/Config.in"
 source "target/mips/Config.in"
 source "target/ppc/Config.in"
 source "target/ppc64/Config.in"