From 6f2c1e1ed1d9ac59e8dda23d151d0085888498e8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 8 Dec 2013 19:07:22 +0100 Subject: add support for microblaze architecture, tested with qemu-system-microblaze{,el} --- target/config/Config.in | 24 +++++++++++++++++------- target/config/Config.in.arch.choice | 6 ++++++ target/config/Config.in.arch.default | 18 +++--------------- target/config/Config.in.system.choice | 1 + 4 files changed, 27 insertions(+), 22 deletions(-) (limited to 'target/config') 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" -- cgit v1.2.3 From cdbf5beb73ddfc1992b2ac453eb123d7db3aca2c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 12 Dec 2013 15:46:53 +0100 Subject: allow piggyback for raspberry --- target/config/Config.in | 1 - 1 file changed, 1 deletion(-) (limited to 'target/config') diff --git a/target/config/Config.in b/target/config/Config.in index e59b86010..f551e21a0 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -669,7 +669,6 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK ADK_LINUX_X86_64 || \ ADK_LINUX_NATIVE depends on !ADK_HARDWARE_VBOX - depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_KERNEL_EXT2_FS help create an read-only initramfs system. -- cgit v1.2.3 From 0e14700702f06f09f25bc861e2642a6d42da982b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Dec 2013 14:09:00 +0100 Subject: need to merge third patch from Phil manually. disable on non Linux hosts --- target/config/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'target/config') diff --git a/target/config/Config.in b/target/config/Config.in index f551e21a0..7ddc7b83c 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -748,6 +748,16 @@ config ADK_TARGET_ROOTFS_MMC Use this option if you have a MMC/SDCARD based system. (ext2 filesystem is used.) +config ADK_TARGET_ROOTFS_ISO + bool "ISO image" + select ADK_KERNEL_ISO9660_FS + select ADK_KERNEL_JOLIET + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV_SR + depends on ADK_HOST_LINUX + help + Use this option to create a bootable ISO image. + config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU -- cgit v1.2.3 From f377248abda877e2a945f4152e3e57bbaaeec1ca Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Dec 2013 14:11:52 +0100 Subject: use linux.bin without included dtb, dtb is already provided by qemu. no need to patch kernel dts. --- target/config/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/config') diff --git a/target/config/Config.in b/target/config/Config.in index e59b86010..c02461819 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -20,7 +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 "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE default "vmlinux" -- cgit v1.2.3 From 422fe42ea4a4f5c5f868736e17a0462e1e5c1c6b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 16 Dec 2013 13:11:33 +0100 Subject: small fixes for iso target --- target/config/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'target/config') diff --git a/target/config/Config.in b/target/config/Config.in index db04414de..99b056546 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -755,6 +755,7 @@ config ADK_TARGET_ROOTFS_ISO select ADK_KERNEL_SCSI select ADK_KERNEL_BLK_DEV_SR depends on ADK_HOST_LINUX + depends on ADK_LINUX_X86 help Use this option to create a bootable ISO image. -- cgit v1.2.3