summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-24 17:05:11 -0500
committerTom Rini <trini@ti.com>2014-11-24 17:05:11 -0500
commitfce0a90a68de507dc827c1ff40d9e446047fa043 (patch)
tree9b8aececd44fd791810d4fef68ac66f62e4a48bd /include
parentf3a05c8f944ab2cd832e69a5705708ee7a1797fa (diff)
parent8bc347e2ec17bca44b1639a001eeed50d042f0db (diff)
downloadu-boot-imx-fce0a90a68de507dc827c1ff40d9e446047fa043.zip
u-boot-imx-fce0a90a68de507dc827c1ff40d9e446047fa043.tar.gz
u-boot-imx-fce0a90a68de507dc827c1ff40d9e446047fa043.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include')
-rw-r--r--include/configs/arndale.h2
-rw-r--r--include/configs/sun7i.h2
-rw-r--r--include/configs/vexpress_ca15_tc2.h2
3 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index f9ee40f..aa6b631 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -60,6 +60,4 @@
/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000
-#define CONFIG_ARMV7_VIRT
-
#endif /* __CONFIG_H */
diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
index ea40790..3629587 100644
--- a/include/configs/sun7i.h
+++ b/include/configs/sun7i.h
@@ -22,8 +22,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#endif
-#define CONFIG_ARMV7_VIRT 1
-#define CONFIG_ARMV7_NONSEC 1
#define CONFIG_ARMV7_PSCI 1
#define CONFIG_ARMV7_PSCI_NR_CPUS 2
#define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE
diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h
index 982f4a7..b43afa2 100644
--- a/include/configs/vexpress_ca15_tc2.h
+++ b/include/configs/vexpress_ca15_tc2.h
@@ -18,6 +18,4 @@
#define CONFIG_SYSFLAGS_ADDR 0x1c010030
#define CONFIG_SMP_PEN_ADDR CONFIG_SYSFLAGS_ADDR
-#define CONFIG_ARMV7_VIRT
-
#endif