Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / include / configs / ti_armv7_common.h

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index d54831c7df2a2c540a8d0548e9d38cd72fd95323..9257e2b0a435beb04a49026195404f6534dd2395 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * ti_armv7_common.h
  *
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * The various ARMv7 SoCs from TI all share a number of IP blocks when
  * implementing a given feature.  Rather than define these in every
  * board or even SoC common file, we define a common file to be re-used
@@ -98,11 +97,6 @@
 #define CONFIG_DM_I2C_COMPAT
 #endif
 
-/* McSPI IP block */
-#define CONFIG_SPI
-
-/* GPIO block */
-
 /*
  * The following are general good-enough settings for U-Boot.  We set a
  * large malloc pool as we generally have a lot of DDR, and we opt for
@@ -226,6 +220,4 @@
 #define NETARGS ""
 #endif
 
-#include <config_distro_defaults.h>
-
 #endif /* __CONFIG_TI_ARMV7_COMMON_H__ */