[PATCH 1/2] ARM: vexpress: Disable non working devices

[PATCH 1/2] ARM: vexpress: Disable non working devices

[Sascha Hauer]

Disable some non working devices in the vexpress dts files to
avoid error messages during runtime. vexpress_defconfig has the
drivers for these devices disabled, but with multi_v7_defconfig
the driver are enabled. To make vexpress more usable with
multi_v7_defconfig disable the non working devices in the device
tree.

/timer@1e000600 doesn't work because our arm,cortex-a9-twd-timer
implementation needs a clock which the dts doesn't provide. We don't
need this as we use another timer anyway.

/bus@40000000/motherboard-bus@40000000/leds/ and /leds/ are a gpio-leds
devices which need a GPIO driver which doesn't exist in barebox

/bus@40000000/motherboard-bus@40000000/iofpga@7,00000000/compact-flash@1a000/
/bus@8000000/motherboard-bus@8000000/iofpga-bus@300000000/compact-flash@1a0000/
are ata-generic devices. The driver times out probing the device. While
it doesn't issue an error message it delays starting up the board for
several seconds.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/vexpress-v2p-ca15.dts |  8 ++++++++
 arch/arm/dts/vexpress-v2p-ca9.dts  | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/arch/arm/dts/vexpress-v2p-ca15.dts b/arch/arm/dts/vexpress-v2p-ca15.dts
index 78d0025909..cdf7bd37d5 100644
--- a/arch/arm/dts/vexpress-v2p-ca15.dts
+++ b/arch/arm/dts/vexpress-v2p-ca15.dts
@@ -28,3 +28,11 @@
 		};
 	};
 };
+
+&{/leds} {
+	status = "disabled";
+};
+
+&{/bus@8000000/motherboard-bus@8000000/iofpga-bus@300000000/compact-flash@1a0000/} {
+	status = "disabled";
+};
diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts
index a43628e7ce..113548bedb 100644
--- a/arch/arm/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/dts/vexpress-v2p-ca9.dts
@@ -91,3 +91,15 @@
 		};
 	};
 };
+
+&{/timer@1e000600} {
+	status = "disabled";
+};
+
+&{/bus@40000000/motherboard-bus@40000000/leds/} {
+	status = "disabled";
+};
+
+&{/bus@40000000/motherboard-bus@40000000/iofpga@7,00000000/compact-flash@1a000/} {
+	status = "disabled";
+};
-- 
2.39.2

[PATCH 2/2] ARM: remove vexpress_defconfig

[Sascha Hauer]

vexpress is now covered by multi_v7_defconfig. To reduce the number of
defconfigs remove vexpress_defconfig. While at it add a hint to the
documentation how to build the vexpress images.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 Documentation/boards/arm-qemu-vexpress.rst |  3 +
 arch/arm/configs/vexpress_defconfig        | 76 ----------------------
 2 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 arch/arm/configs/vexpress_defconfig

diff --git a/Documentation/boards/arm-qemu-vexpress.rst b/Documentation/boards/arm-qemu-vexpress.rst
index 010eae04a2..335af46990 100644
--- a/Documentation/boards/arm-qemu-vexpress.rst
+++ b/Documentation/boards/arm-qemu-vexpress.rst
@@ -7,6 +7,9 @@ ARM Qemu vexpress
 Running barebox on QEMU vexpress machine
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Images for the vexpress platform are built as part of the
+multi_v7_defconfig.
+
 Usage::
 
 	$ qemu-system-arm -m 1024M \
diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig
deleted file mode 100644
index d58ca7ebd0..0000000000
--- a/arch/arm/configs/vexpress_defconfig
+++ /dev/null
@@ -1,76 +0,0 @@
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_MACH_VEXPRESS=y
-CONFIG_MACH_VIRT=y
-CONFIG_AEABI=y
-CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-CONFIG_MALLOC_SIZE=0x0
-CONFIG_MALLOC_TLSF=y
-CONFIG_KALLSYMS=y
-CONFIG_PROMPT="vexpress: "
-CONFIG_HUSH_FANCY_PROMPT=y
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_MENU=y
-CONFIG_BOOTM_SHOW_TYPE=y
-CONFIG_BOOTM_VERBOSE=y
-CONFIG_BOOTM_INITRD=y
-CONFIG_CONSOLE_ACTIVATE_ALL=y
-CONFIG_CONSOLE_ALLOW_COLOR=y
-CONFIG_PARTITION_DISK_EFI=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_CMD_DMESG=y
-CONFIG_LONGHELP=y
-CONFIG_CMD_IOMEM=y
-CONFIG_CMD_MEMINFO=y
-# CONFIG_CMD_BOOTU is not set
-CONFIG_CMD_GO=y
-CONFIG_CMD_LOADB=y
-CONFIG_CMD_RESET=y
-CONFIG_CMD_UIMAGE=y
-CONFIG_CMD_PARTITION=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_FILETYPE=y
-CONFIG_CMD_UNCOMPRESS=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_TFTP=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_LOGIN=y
-CONFIG_CMD_MENU=y
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_PASSWD=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_TIMEOUT=y
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_CLK=y
-CONFIG_CMD_DETECT=y
-CONFIG_CMD_POWEROFF=y
-CONFIG_CMD_OFTREE=y
-CONFIG_NET=y
-CONFIG_NET_NFS=y
-CONFIG_NET_NETCONSOLE=y
-CONFIG_OF_BAREBOX_DRIVERS=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_DRIVER_NET_SMC91111=y
-# CONFIG_SPI is not set
-CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_DRIVER_CFI=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_MCI=y
-CONFIG_MCI_MMCI=y
-CONFIG_HWRNG=y
-CONFIG_HW_RANDOM_VIRTIO=y
-# CONFIG_PINCTRL is not set
-CONFIG_VIRTIO_MMIO=y
-CONFIG_FS_EXT4=y
-CONFIG_FS_TFTP=y
-CONFIG_FS_FAT=y
-CONFIG_DIGEST_SHA1_GENERIC=y
-CONFIG_DIGEST_SHA256_GENERIC=y
-- 
2.39.2