use linux.bin without included dtb, dtb is already provided by qemu. no need to patch kernel dts.

2 files changed, 1 insertions, 476 deletions

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"
diff --git a/target/linux/patches/3.11.10/microblaze-dts.patch b/target/linux/patches/3.11.10/microblaze-dts.patch
deleted file mode 100644
index e73959a73..000000000
--- a/target/linux/patches/3.11.10/microblaze-dts.patch
+++ /dev/null
@@ -1,475 +0,0 @@
-diff -Nur linux-3.11.10.orig/arch/microblaze/platform/generic/system.dts linux-3.11.10/arch/microblaze/platform/generic/system.dts
---- linux-3.11.10.orig/arch/microblaze/platform/generic/system.dts	2013-11-29 19:42:37.000000000 +0100
-+++ linux-3.11.10/arch/microblaze/platform/generic/system.dts	2013-12-08 13:01:59.000000000 +0100
-@@ -1,102 +1,72 @@
--/*
-- * Device Tree Generator version: 1.1
-- *
-- * (C) Copyright 2007-2008 Xilinx, Inc.
-- * (C) Copyright 2007-2009 Michal Simek
-- *
-- * Michal SIMEK <monstr@monstr.eu>
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2 of
-- * the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307 USA
-- *
-- * CAUTION: This file is automatically generated by libgen.
-- * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6
-- *
-- * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101
-- */
--
- /dts-v1/;
-+
- / {
--	#address-cells = <1>;
--	#size-cells = <1>;
-+	#address-cells = <0x1>;
-+	#size-cells = <0x1>;
- 	compatible = "xlnx,microblaze";
--	hard-reset-gpios = <&LEDs_8Bit 2 1>;
- 	model = "testing";
--	DDR2_SDRAM: memory@90000000 {
-+
-+	memory@90000000 {
- 		device_type = "memory";
--		reg = < 0x90000000 0x10000000 >;
--	} ;
--	aliases {
--		ethernet0 = &Hard_Ethernet_MAC;
--		serial0 = &RS232_Uart_1;
--	} ;
-+		reg = <0x90000000 0x8000000>;
-+	};
-+
- 	chosen {
--		bootargs = "console=ttyUL0,115200 highres=on";
-+		bootargs = "console=ttyUL0,115200";
- 		linux,stdout-path = "/plb@0/serial@84000000";
--	} ;
-+	};
-+
- 	cpus {
--		#address-cells = <1>;
-+		#address-cells = <0x1>;
- 		#cpus = <0x1>;
--		#size-cells = <0>;
--		microblaze_0: cpu@0 {
--			clock-frequency = <125000000>;
-+		#size-cells = <0x0>;
-+
-+		cpu@0 {
-+			clock-frequency = <0x3b9aca0>;
- 			compatible = "xlnx,microblaze-7.10.d";
- 			d-cache-baseaddr = <0x90000000>;
--			d-cache-highaddr = <0x9fffffff>;
-+			d-cache-highaddr = <0x97ffffff>;
- 			d-cache-line-size = <0x10>;
--			d-cache-size = <0x2000>;
-+			d-cache-size = <0x800>;
- 			device_type = "cpu";
- 			i-cache-baseaddr = <0x90000000>;
--			i-cache-highaddr = <0x9fffffff>;
-+			i-cache-highaddr = <0x97ffffff>;
- 			i-cache-line-size = <0x10>;
--			i-cache-size = <0x2000>;
-+			i-cache-size = <0x800>;
- 			model = "microblaze,7.10.d";
--			reg = <0>;
--			timebase-frequency = <125000000>;
--			xlnx,addr-tag-bits = <0xf>;
-+			reg = <0x0>;
-+			timebase-frequency = <0x3b9aca0>;
-+			xlnx,addr-tag-bits = <0x10>;
- 			xlnx,allow-dcache-wr = <0x1>;
- 			xlnx,allow-icache-wr = <0x1>;
- 			xlnx,area-optimized = <0x0>;
--			xlnx,cache-byte-size = <0x2000>;
-+			xlnx,cache-byte-size = <0x800>;
- 			xlnx,d-lmb = <0x1>;
- 			xlnx,d-opb = <0x0>;
- 			xlnx,d-plb = <0x1>;
- 			xlnx,data-size = <0x20>;
--			xlnx,dcache-addr-tag = <0xf>;
--			xlnx,dcache-always-used = <0x1>;
--			xlnx,dcache-byte-size = <0x2000>;
-+			xlnx,dcache-addr-tag = <0x10>;
-+			xlnx,dcache-always-used = <0x0>;
-+			xlnx,dcache-byte-size = <0x800>;
- 			xlnx,dcache-line-len = <0x4>;
- 			xlnx,dcache-use-fsl = <0x1>;
- 			xlnx,debug-enabled = <0x1>;
--			xlnx,div-zero-exception = <0x1>;
-+			xlnx,div-zero-exception = <0x0>;
- 			xlnx,dopb-bus-exception = <0x0>;
- 			xlnx,dynamic-bus-sizing = <0x1>;
- 			xlnx,edge-is-positive = <0x1>;
--			xlnx,family = "virtex5";
--			xlnx,endianness = <0x1>;
--			xlnx,fpu-exception = <0x1>;
-+			xlnx,family = "spartan3adsp";
-+			xlnx,fpu-exception = <0x0>;
- 			xlnx,fsl-data-size = <0x20>;
- 			xlnx,fsl-exception = <0x0>;
- 			xlnx,fsl-links = <0x0>;
- 			xlnx,i-lmb = <0x1>;
- 			xlnx,i-opb = <0x0>;
- 			xlnx,i-plb = <0x1>;
--			xlnx,icache-always-used = <0x1>;
-+			xlnx,icache-always-used = <0x0>;
- 			xlnx,icache-line-len = <0x4>;
- 			xlnx,icache-use-fsl = <0x1>;
--			xlnx,ill-opcode-exception = <0x1>;
-+			xlnx,ill-opcode-exception = <0x0>;
- 			xlnx,instance = "microblaze_0";
- 			xlnx,interconnect = <0x1>;
- 			xlnx,interrupt-is-edge = <0x0>;
-@@ -105,11 +75,11 @@
- 			xlnx,mmu-itlb-size = <0x2>;
- 			xlnx,mmu-tlb-access = <0x3>;
- 			xlnx,mmu-zones = <0x10>;
--			xlnx,number-of-pc-brk = <0x1>;
--			xlnx,number-of-rd-addr-brk = <0x0>;
--			xlnx,number-of-wr-addr-brk = <0x0>;
--			xlnx,opcode-0x0-illegal = <0x1>;
--			xlnx,pvr = <0x2>;
-+			xlnx,number-of-pc-brk = <0x3>;
-+			xlnx,number-of-rd-addr-brk = <0x2>;
-+			xlnx,number-of-wr-addr-brk = <0x2>;
-+			xlnx,opcode-0x0-illegal = <0x0>;
-+			xlnx,pvr = <0x1>;
- 			xlnx,pvr-user1 = <0x0>;
- 			xlnx,pvr-user2 = <0x0>;
- 			xlnx,reset-msr = <0x0>;
-@@ -117,29 +87,44 @@
- 			xlnx,unaligned-exceptions = <0x1>;
- 			xlnx,use-barrel = <0x1>;
- 			xlnx,use-dcache = <0x1>;
--			xlnx,use-div = <0x1>;
-+			xlnx,use-div = <0x0>;
- 			xlnx,use-ext-brk = <0x1>;
- 			xlnx,use-ext-nm-brk = <0x1>;
- 			xlnx,use-extended-fsl-instr = <0x0>;
--			xlnx,use-fpu = <0x2>;
--			xlnx,use-hw-mul = <0x2>;
-+			xlnx,use-fpu = <0x0>;
-+			xlnx,use-hw-mul = <0x1>;
- 			xlnx,use-icache = <0x1>;
- 			xlnx,use-interrupt = <0x1>;
- 			xlnx,use-mmu = <0x3>;
- 			xlnx,use-msr-instr = <0x1>;
- 			xlnx,use-pcmp-instr = <0x1>;
--		} ;
--	} ;
--	mb_plb: plb@0 {
--		#address-cells = <1>;
--		#size-cells = <1>;
--		compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus";
--		ranges ;
--		FLASH: flash@a0000000 {
--			bank-width = <2>;
-+		};
-+	};
-+
-+	plb@0 {
-+		#address-cells = <0x1>;
-+		#size-cells = <0x1>;
-+		compatible = "xlnx,plb-v46-1.03.a", "simple-bus";
-+		ranges;
-+
-+		ethernet@81000000 {
-+			compatible = "xlnx,xps-ethernetlite-2.00.b";
-+			device_type = "network";
-+			interrupt-parent = <0x1>;
-+			interrupts = <0x1 0x0>;
-+			local-mac-address = [02 00 00 00 00 00];
-+			reg = <0x81000000 0x10000>;
-+			xlnx,duplex = <0x1>;
-+			xlnx,family = "spartan3adsp";
-+			xlnx,rx-ping-pong = <0x0>;
-+			xlnx,tx-ping-pong = <0x0>;
-+		};
-+
-+		flash@a0000000 {
-+			bank-width = <0x1>;
- 			compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";
--			reg = < 0xa0000000 0x2000000 >;
--			xlnx,family = "virtex5";
-+			reg = <0xa0000000 0x1000000>;
-+			xlnx,family = "spartan3adsp";
- 			xlnx,include-datawidth-matching-0 = <0x1>;
- 			xlnx,include-datawidth-matching-1 = <0x0>;
- 			xlnx,include-datawidth-matching-2 = <0x0>;
-@@ -147,9 +132,9 @@
- 			xlnx,include-negedge-ioregs = <0x0>;
- 			xlnx,include-plb-ipif = <0x1>;
- 			xlnx,include-wrbuf = <0x1>;
--			xlnx,max-mem-width = <0x10>;
-+			xlnx,max-mem-width = <0x8>;
- 			xlnx,mch-native-dwidth = <0x20>;
--			xlnx,mch-plb-clk-period-ps = <0x1f40>;
-+			xlnx,mch-plb-clk-period-ps = <0x3e80>;
- 			xlnx,mch-splb-awidth = <0x20>;
- 			xlnx,mch0-accessbuf-depth = <0x10>;
- 			xlnx,mch0-protocol = <0x0>;
-@@ -163,7 +148,7 @@
- 			xlnx,mch3-accessbuf-depth = <0x10>;
- 			xlnx,mch3-protocol = <0x0>;
- 			xlnx,mch3-rddatabuf-depth = <0x10>;
--			xlnx,mem0-width = <0x10>;
-+			xlnx,mem0-width = <0x8>;
- 			xlnx,mem1-width = <0x20>;
- 			xlnx,mem2-width = <0x20>;
- 			xlnx,mem3-width = <0x20>;
-@@ -178,31 +163,31 @@
- 			xlnx,synch-pipedelay-1 = <0x2>;
- 			xlnx,synch-pipedelay-2 = <0x2>;
- 			xlnx,synch-pipedelay-3 = <0x2>;
--			xlnx,tavdv-ps-mem-0 = <0x1adb0>;
-+			xlnx,tavdv-ps-mem-0 = <0x11170>;
- 			xlnx,tavdv-ps-mem-1 = <0x3a98>;
- 			xlnx,tavdv-ps-mem-2 = <0x3a98>;
- 			xlnx,tavdv-ps-mem-3 = <0x3a98>;
--			xlnx,tcedv-ps-mem-0 = <0x1adb0>;
-+			xlnx,tcedv-ps-mem-0 = <0x11170>;
- 			xlnx,tcedv-ps-mem-1 = <0x3a98>;
- 			xlnx,tcedv-ps-mem-2 = <0x3a98>;
- 			xlnx,tcedv-ps-mem-3 = <0x3a98>;
--			xlnx,thzce-ps-mem-0 = <0x88b8>;
-+			xlnx,thzce-ps-mem-0 = <0x61a8>;
- 			xlnx,thzce-ps-mem-1 = <0x1b58>;
- 			xlnx,thzce-ps-mem-2 = <0x1b58>;
- 			xlnx,thzce-ps-mem-3 = <0x1b58>;
--			xlnx,thzoe-ps-mem-0 = <0x1b58>;
-+			xlnx,thzoe-ps-mem-0 = <0x61a8>;
- 			xlnx,thzoe-ps-mem-1 = <0x1b58>;
- 			xlnx,thzoe-ps-mem-2 = <0x1b58>;
- 			xlnx,thzoe-ps-mem-3 = <0x1b58>;
--			xlnx,tlzwe-ps-mem-0 = <0x88b8>;
-+			xlnx,tlzwe-ps-mem-0 = <0x1388>;
- 			xlnx,tlzwe-ps-mem-1 = <0x0>;
- 			xlnx,tlzwe-ps-mem-2 = <0x0>;
- 			xlnx,tlzwe-ps-mem-3 = <0x0>;
--			xlnx,twc-ps-mem-0 = <0x2af8>;
-+			xlnx,twc-ps-mem-0 = <0x11170>;
- 			xlnx,twc-ps-mem-1 = <0x3a98>;
- 			xlnx,twc-ps-mem-2 = <0x3a98>;
- 			xlnx,twc-ps-mem-3 = <0x3a98>;
--			xlnx,twp-ps-mem-0 = <0x11170>;
-+			xlnx,twp-ps-mem-0 = <0xafc8>;
- 			xlnx,twp-ps-mem-1 = <0x2ee0>;
- 			xlnx,twp-ps-mem-2 = <0x2ee0>;
- 			xlnx,twp-ps-mem-3 = <0x2ee0>;
-@@ -214,154 +199,83 @@
- 			xlnx,xcl2-writexfer = <0x1>;
- 			xlnx,xcl3-linesize = <0x4>;
- 			xlnx,xcl3-writexfer = <0x1>;
--		} ;
--		Hard_Ethernet_MAC: xps-ll-temac@81c00000 {
--			#address-cells = <1>;
--			#size-cells = <1>;
--			compatible = "xlnx,compound";
--			ranges ;
--			ethernet@81c00000 {
--				compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
--				device_type = "network";
--				interrupt-parent = <&xps_intc_0>;
--				interrupts = < 5 2 >;
--				llink-connected = <&PIM3>;
--				local-mac-address = [ 00 0a 35 00 00 00 ];
--				reg = < 0x81c00000 0x40 >;
--				xlnx,bus2core-clk-ratio = <0x1>;
--				xlnx,phy-type = <0x1>;
--				xlnx,phyaddr = <0x1>;
--				xlnx,rxcsum = <0x0>;
--				xlnx,rxfifo = <0x1000>;
--				xlnx,temac-type = <0x0>;
--				xlnx,txcsum = <0x0>;
--				xlnx,txfifo = <0x1000>;
--			} ;
--		} ;
--		IIC_EEPROM: i2c@81600000 {
--			compatible = "xlnx,xps-iic-2.00.a";
--			interrupt-parent = <&xps_intc_0>;
--			interrupts = < 6 2 >;
--			reg = < 0x81600000 0x10000 >;
--			xlnx,clk-freq = <0x7735940>;
--			xlnx,family = "virtex5";
--			xlnx,gpo-width = <0x1>;
--			xlnx,iic-freq = <0x186a0>;
--			xlnx,scl-inertial-delay = <0x0>;
--			xlnx,sda-inertial-delay = <0x0>;
--			xlnx,ten-bit-adr = <0x0>;
--		} ;
--		LEDs_8Bit: gpio@81400000 {
-+		};
-+
-+		gpio@81400000 {
- 			compatible = "xlnx,xps-gpio-1.00.a";
--			interrupt-parent = <&xps_intc_0>;
--			interrupts = < 7 2 >;
--			reg = < 0x81400000 0x10000 >;
-+			interrupt-parent = <0x1>;
-+			interrupts = <0x2 0x2>;
-+			reg = <0x81400000 0x10000>;
- 			xlnx,all-inputs = <0x0>;
- 			xlnx,all-inputs-2 = <0x0>;
- 			xlnx,dout-default = <0x0>;
- 			xlnx,dout-default-2 = <0x0>;
--			xlnx,family = "virtex5";
-+			xlnx,family = "spartan3adsp";
- 			xlnx,gpio-width = <0x8>;
- 			xlnx,interrupt-present = <0x1>;
--			xlnx,is-bidir = <0x1>;
-+			xlnx,is-bidir = <0x0>;
- 			xlnx,is-bidir-2 = <0x1>;
- 			xlnx,is-dual = <0x0>;
- 			xlnx,tri-default = <0xffffffff>;
- 			xlnx,tri-default-2 = <0xffffffff>;
--			#gpio-cells = <2>;
--			gpio-controller;
--		} ;
--
--		gpio-leds {
--			compatible = "gpio-leds";
--
--			heartbeat {
--				label = "Heartbeat";
--				gpios = <&LEDs_8Bit 4 1>;
--				linux,default-trigger = "heartbeat";
--			};
--
--			yellow {
--				label = "Yellow";
--				gpios = <&LEDs_8Bit 5 1>;
--			};
--
--			red {
--				label = "Red";
--				gpios = <&LEDs_8Bit 6 1>;
--			};
--
--			green {
--				label = "Green";
--				gpios = <&LEDs_8Bit 7 1>;
--			};
--		} ;
--		RS232_Uart_1: serial@84000000 {
--			clock-frequency = <125000000>;
-+		};
-+
-+		serial@84000000 {
-+			clock-frequency = <0x3b9aca0>;
- 			compatible = "xlnx,xps-uartlite-1.00.a";
--			current-speed = <115200>;
-+			current-speed = <0x1c200>;
- 			device_type = "serial";
--			interrupt-parent = <&xps_intc_0>;
--			interrupts = < 8 0 >;
--			port-number = <0>;
--			reg = < 0x84000000 0x10000 >;
-+			interrupt-parent = <0x1>;
-+			interrupts = <0x3 0x0>;
-+			port-number = <0x0>;
-+			reg = <0x84000000 0x10000>;
- 			xlnx,baudrate = <0x1c200>;
- 			xlnx,data-bits = <0x8>;
--			xlnx,family = "virtex5";
-+			xlnx,family = "spartan3adsp";
- 			xlnx,odd-parity = <0x0>;
- 			xlnx,use-parity = <0x0>;
--		} ;
--		SysACE_CompactFlash: sysace@83600000 {
--			compatible = "xlnx,xps-sysace-1.00.a";
--			interrupt-parent = <&xps_intc_0>;
--			interrupts = < 4 2 >;
--			reg = < 0x83600000 0x10000 >;
--			xlnx,family = "virtex5";
--			xlnx,mem-width = <0x10>;
--		} ;
--		debug_module: debug@84400000 {
-+		};
-+
-+		debug@84400000 {
- 			compatible = "xlnx,mdm-1.00.d";
--			reg = < 0x84400000 0x10000 >;
--			xlnx,family = "virtex5";
-+			reg = <0x84400000 0x10000>;
-+			xlnx,family = "spartan3adsp";
- 			xlnx,interconnect = <0x1>;
- 			xlnx,jtag-chain = <0x2>;
- 			xlnx,mb-dbg-ports = <0x1>;
- 			xlnx,uart-width = <0x8>;
- 			xlnx,use-uart = <0x1>;
- 			xlnx,write-fsl-ports = <0x0>;
--		} ;
-+		};
-+
- 		mpmc@90000000 {
--			#address-cells = <1>;
--			#size-cells = <1>;
--			compatible = "xlnx,mpmc-4.02.a";
--			ranges ;
--			PIM3: sdma@84600180 {
--				compatible = "xlnx,ll-dma-1.00.a";
--				interrupt-parent = <&xps_intc_0>;
--				interrupts = < 2 2 1 2 >;
--				reg = < 0x84600180 0x80 >;
--			} ;
--		} ;
--		xps_intc_0: interrupt-controller@81800000 {
-+			#address-cells = <0x1>;
-+			#size-cells = <0x1>;
-+			compatible = "xlnx,mpmc-4.03.a";
-+		};
-+
-+		interrupt-controller@81800000 {
- 			#interrupt-cells = <0x2>;
- 			compatible = "xlnx,xps-intc-1.00.a";
--			interrupt-controller ;
--			reg = < 0x81800000 0x10000 >;
--			xlnx,kind-of-intr = <0x100>;
--			xlnx,num-intr-inputs = <0x9>;
--		} ;
--		xps_timer_1: timer@83c00000 {
-+			interrupt-controller;
-+			reg = <0x81800000 0x10000>;
-+			xlnx,kind-of-intr = <0xa>;
-+			xlnx,num-intr-inputs = <0x4>;
-+			linux,phandle = <0x1>;
-+		};
-+
-+		timer@83c00000 {
- 			compatible = "xlnx,xps-timer-1.00.a";
--			interrupt-parent = <&xps_intc_0>;
--			interrupts = < 3 2 >;
--			reg = < 0x83c00000 0x10000 >;
-+			interrupt-parent = <0x1>;
-+			interrupts = <0x0 0x2>;
-+			reg = <0x83c00000 0x10000>;
- 			xlnx,count-width = <0x20>;
--			xlnx,family = "virtex5";
-+			xlnx,family = "spartan3adsp";
- 			xlnx,gen0-assert = <0x1>;
- 			xlnx,gen1-assert = <0x1>;
- 			xlnx,one-timer-only = <0x0>;
- 			xlnx,trig0-assert = <0x1>;
- 			xlnx,trig1-assert = <0x1>;
--		} ;
--	} ;
--}  ;
-+		};
-+	};
-+};