summaryrefslogtreecommitdiffstats
path: root/configs/platform-v7a/patches/barebox-2017.08.0/0002-vexpress-device-tree-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'configs/platform-v7a/patches/barebox-2017.08.0/0002-vexpress-device-tree-support.patch')
-rw-r--r--configs/platform-v7a/patches/barebox-2017.08.0/0002-vexpress-device-tree-support.patch78
1 files changed, 0 insertions, 78 deletions
diff --git a/configs/platform-v7a/patches/barebox-2017.08.0/0002-vexpress-device-tree-support.patch b/configs/platform-v7a/patches/barebox-2017.08.0/0002-vexpress-device-tree-support.patch
deleted file mode 100644
index fc7ad48..0000000
--- a/configs/platform-v7a/patches/barebox-2017.08.0/0002-vexpress-device-tree-support.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sat, 10 Sep 2016 17:51:36 +0200
-Subject: [PATCH] vexpress: device tree support
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- arch/arm/boards/vexpress/init.c | 16 ++++++++++------
- arch/arm/dts/vexpress-v2p-ca9.dts | 27 +++++++++++++++++++++++++++
- 2 files changed, 37 insertions(+), 6 deletions(-)
- create mode 100644 arch/arm/dts/vexpress-v2p-ca9.dts
-
-diff --git a/arch/arm/boards/vexpress/init.c b/arch/arm/boards/vexpress/init.c
-index f89dff939231..68ebbfab2633 100644
---- a/arch/arm/boards/vexpress/init.c
-+++ b/arch/arm/boards/vexpress/init.c
-@@ -71,10 +71,12 @@ static void vexpress_a9_legacy_mem_init(void)
-
- static void vexpress_a9_legacy_devices_init(void)
- {
-- add_cfi_flash_device(0, 0x40000000, SZ_64M, 0);
-- add_cfi_flash_device(1, 0x44000000, SZ_64M, 0);
-- add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x4e000000,
-- 64 * 1024, IORESOURCE_MEM, NULL);
-+ if (!IS_ENABLED(CONFIG_OFDEVICE)) {
-+ add_cfi_flash_device(0, 0x40000000, SZ_64M, 0);
-+ add_cfi_flash_device(1, 0x44000000, SZ_64M, 0);
-+ add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x4e000000,
-+ 64 * 1024, IORESOURCE_MEM, NULL);
-+ }
- vexpress_a9_legacy_register_mmc(&mmci_plat);
- armlinux_set_architecture(MACH_TYPE_VEXPRESS);
- }
-@@ -107,8 +109,10 @@ static int vexpress_devices_init(void)
- writel(1, v2m_sysreg_base + V2M_SYS_FLASH);
- v2m_init->devices_init();
-
-- devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self");
-- devfs_add_partition("nor0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0");
-+ if (!IS_ENABLED(CONFIG_OFDEVICE)) {
-+ devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self");
-+ devfs_add_partition("nor0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0");
-+ }
-
- if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC))
- defaultenv_append_directory(defaultenv_vexpress);
-diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts
-new file mode 100644
-index 000000000000..541840ae22dc
---- /dev/null
-+++ b/arch/arm/dts/vexpress-v2p-ca9.dts
-@@ -0,0 +1,27 @@
-+#include <arm/vexpress-v2p-ca9.dts>
-+
-+/ {
-+ barebox_environment {
-+ compatible = "barebox,environment";
-+ device-path = &barebox_env;
-+ };
-+
-+ smb@4000000 {
-+ motherboard {
-+ flash@0,00000000 {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+
-+ partition@0 {
-+ label = "barebox";
-+ reg = <0x0 0x80000>;
-+ };
-+
-+ barebox_env: partition@80000 {
-+ label = "barebox-environment";
-+ reg = <0x80000 0x80000>;
-+ };
-+ };
-+ };
-+ };
-+};