From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- target/arm/kernel/cubox-i | 4 ---- target/arm/kernel/qemu-arm-versatilepb | 7 ------- target/arm/kernel/qemu-arm-vexpress-a9 | 4 ---- target/arm/kernel/raspberry-pi | 2 -- 4 files changed, 17 deletions(-) (limited to 'target/arm') diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/cubox-i index 0b56db7d7..02b35f76b 100644 --- a/target/arm/kernel/cubox-i +++ b/target/arm/kernel/cubox-i @@ -15,9 +15,5 @@ CONFIG_NEON=y CONFIG_PCI_IMX6=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_NET_VENDOR_FREESCALE=y -CONFIG_FEC=y -CONFIG_PHYLIB=y -CONFIG_AT803X_PHY=y CONFIG_ATAGS=y CONFIG_CMDLINE_FORCE=y diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index ec76019d4..56ce4b98c 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -11,15 +11,8 @@ CONFIG_KUSER_HELPERS=y CONFIG_CPU_ARM926T=y CONFIG_CPU_32v5=y CONFIG_ARM_AMBA=y -CONFIG_PCI=y -CONFIG_PCI_SYSCALL=y CONFIG_AEABI=y CONFIG_USE_OF=y CONFIG_ATAGS=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_MII=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMC91X=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9 index b89b87337..9c2194631 100644 --- a/target/arm/kernel/qemu-arm-vexpress-a9 +++ b/target/arm/kernel/qemu-arm-vexpress-a9 @@ -13,9 +13,5 @@ CONFIG_ATAGS=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y -CONFIG_OF=y -CONFIG_DTC=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMSC911X=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi index 486ec929b..86af8de40 100644 --- a/target/arm/kernel/raspberry-pi +++ b/target/arm/kernel/raspberry-pi @@ -9,6 +9,4 @@ CONFIG_BCM2708_VCMEM=y CONFIG_BCM2708_DMAER=y CONFIG_AEABI=y CONFIG_VFP=y -CONFIG_DTC=y -CONFIG_OF=y CONFIG_BCM2708_VCHIQ=y -- cgit v1.2.3