update microblaze qemu boards to 3.14

PATCH New Waldemar Brodkorb 2 participants 2 messages Apr 29, 2014 – May 1, 2014 Arm/Zynq architecture

Share & tools

Waldemar Brodkorb

author

2014-04-29 19:18 UTC #0 lore raw

PATCH v3 1/1 update microblaze qemu boards to 3.14

- fix networking in Qemu using a small patch
- disable DTS, because linux.bin does not include any DTB the default Qemu included DTB is used and this is okay and works fine

Signed-off-by Waldemar Brodkorb <[email protected]>

Acked-by Gustavo Zacarias <[email protected]>

Tested-by Gustavo Zacarias <[email protected]>

---
Changes v2 -> v3:
- reference correct patch
Changes v1 -> v2:
- remove default BR2_LINUX_KERNEL_USE_CUSTOM_DTS
- update to 3.14.2

---
 .../{linux-3.13.config => linux-3.14.config}       |    1 +
 board/qemu/microblazebe-mmu/system.dts             |  367 --------------------
 board/qemu/microblazebe-mmu/xilinx-xemaclite.patch |   11 +
 .../{linux-3.13.config => linux-3.14.config}       |    1 +
 board/qemu/microblazeel-mmu/system.dts             |  367 --------------------
 board/qemu/microblazeel-mmu/xilinx-xemaclite.patch |   11 +
 configs/qemu_microblazebe_mmu_defconfig            |    7 +-
 configs/qemu_microblazeel_mmu_defconfig            |    7 +-
 linux/Config.in                                    |    2 -
 9 files changed, 30 insertions(+), 744 deletions(-)
 rename board/qemu/microblazebe-mmu/{linux-3.13.config => linux-3.14.config} (98%)
 delete mode 100644 board/qemu/microblazebe-mmu/system.dts
 create mode 100644 board/qemu/microblazebe-mmu/xilinx-xemaclite.patch
 rename board/qemu/microblazeel-mmu/{linux-3.13.config => linux-3.14.config} (98%)
 delete mode 100644 board/qemu/microblazeel-mmu/system.dts
 create mode 100644 board/qemu/microblazeel-mmu/xilinx-xemaclite.patch

board/qemu/microblazebe-mmu/linux-3.14.config renamed from board/qemu/microblazebe-mmu/linux-3.13.config +1 -0

similarity index 98%
rename from board/qemu/microblazebe-mmu/linux-3.13.config
rename to board/qemu/microblazebe-mmu/linux-3.14.config
index c2ef789..d7e3235 100644
@@ -36,6 +36,7 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_NETDEVICES=y
+CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set

board/qemu/microblazebe-mmu/system.dts deleted +0 ~~-367~~

367 lines not on this page · raw message

board/qemu/microblazebe-mmu/xilinx-xemaclite.patch new file +11 -0

new file mode 100644
index 0000000..756bfae
@@ -0,0 +1,11 @@
+diff -Nur linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+--- linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c	2014-03-31 05:40:15.000000000 +0200
++++ linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c	2014-04-11 22:53:42.000000000 +0200
+@@ -1249,6 +1249,7 @@
+ 	{ .compatible = "xlnx,opb-ethernetlite-1.01.b", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-1.00.a", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-2.00.a", },
++	{ .compatible = "xlnx,xps-ethernetlite-2.00.b", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-2.01.a", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-3.00.a", },
+ 	{ /* end of list */ },

board/qemu/microblazeel-mmu/linux-3.14.config renamed from board/qemu/microblazeel-mmu/linux-3.13.config +1 -0

similarity index 98%
rename from board/qemu/microblazeel-mmu/linux-3.13.config
rename to board/qemu/microblazeel-mmu/linux-3.14.config
index 7426f1f..d31faf6 100644
@@ -35,6 +35,7 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_NETDEVICES=y
+CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set

board/qemu/microblazeel-mmu/system.dts deleted +0 ~~-367~~

367 lines not on this page · raw message

board/qemu/microblazeel-mmu/xilinx-xemaclite.patch new file +11 -0

new file mode 100644
index 0000000..756bfae
@@ -0,0 +1,11 @@
+diff -Nur linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+--- linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c	2014-03-31 05:40:15.000000000 +0200
++++ linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c	2014-04-11 22:53:42.000000000 +0200
+@@ -1249,6 +1249,7 @@
+ 	{ .compatible = "xlnx,opb-ethernetlite-1.01.b", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-1.00.a", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-2.00.a", },
++	{ .compatible = "xlnx,xps-ethernetlite-2.00.b", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-2.01.a", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-3.00.a", },
+ 	{ /* end of list */ },

configs/qemu_microblazebe_mmu_defconfig +3 -4

index f74a3a1..b3ec32f 100644
@@ -12,9 +12,8 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.13.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.14.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
-BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
+BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/xilinx-xemaclite.patch"

configs/qemu_microblazeel_mmu_defconfig +3 -4

index 3a66d1b..a009893 100644
@@ -12,9 +12,8 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.13.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.14.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
-BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"
+BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch"

linux/Config.in +0 -2

index 1eac3b2..e4fb712 100644
@@ -210,8 +210,6 @@ config BR2_LINUX_KERNEL_LINUX_BIN
 	bool "linux.bin"
 	depends on BR2_microblaze
 	select BR2_LINUX_KERNEL_UBOOT_IMAGE
-	select BR2_LINUX_KERNEL_DTS_SUPPORT
-	select BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
 
 config BR2_LINUX_KERNEL_VMLINUX_BIN
 	bool "vmlinux.bin"

Signature · 1 line

1.7.10.4

Peter Korsgaard

2014-05-01 21:42 UTC #1 lore raw

PATCH v3 1/1 update microblaze qemu boards to 3.14

Quoted 10 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Waldemar" == Waldemar Brodkorb <[email protected]> writes:
- fix networking in Qemu using a small patch
- disable DTS, because linux.bin does not include any DTB the default Qemu included DTB is used and this is okay and works fine
Signed-off-by Waldemar Brodkorb <[email protected]>
Acked-by Gustavo Zacarias <[email protected]>
Tested-by Gustavo Zacarias <[email protected]>

Quoted 6 lines

---
Changes v2 -> v3:
- reference correct patch
Changes v1 -> v2:
- remove default BR2_LINUX_KERNEL_USE_CUSTOM_DTS
- update to 3.14.2

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard