Merge branch '2022-10-31-broadcom-updates'

[platform/kernel/u-boot.git] / include / armcoremodule.h

diff --git a/include/armcoremodule.h b/include/armcoremodule.h
index b8ba36b..ee839c8 100644 (file)
--- a/include/armcoremodule.h
+++ b/include/armcoremodule.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2005
  * ARM Ltd.
@@ -5,8 +6,6 @@
  * Configuration for ARM Core Modules.
  * No standalonw port yet available
  * - this file is included by both integratorap.h & integratorcp.h
- *
- * SPDX-License-Identifier:    GPL-2.0+ 
  */
 
 #ifndef __ARMCOREMODULE_H
@@ -35,42 +34,6 @@
                                                /*   CM926EJ-S */
                                                /*   CM1136-EJ-S */
 
-#if defined (CONFIG_CM10200E) || defined (CONFIG_CM10220E)
-#define CMMASK_INIT_102        0x00000300              /* see CM102xx ref manual */
-                                               /* - PLL test clock bypassed */
-                                               /* - bus clock ratio 2 */
-                                               /* - little endian */
-                                               /* - vectors at zero */
-#endif /* CM1022xx */
-
-/* Determine CM characteristics */
-
-#undef CONFIG_CM_MULTIPLE_SSRAM
-#undef CONFIG_CM_SPD_DETECT
-#undef CONFIG_CM_REMAP
-#undef CONFIG_CM_INIT
-#undef CONFIG_CM_TCRAM
-
-#if defined (CONFIG_CM946E_S) || defined (CONFIG_CM966E_S)
-#define        CONFIG_CM_MULTIPLE_SSRAM        /* CM has multiple SSRAM mapping */
-#endif
-
-/* Excalibur core module has reduced functionality */
-#ifndef        CONFIG_CM922T_XA10
-#define CONFIG_CM_SPD_DETECT                   /* CM supports SPD query      */
-#define OS_SPD                 0x00000100      /* Address of SPD data        */
-#define CONFIG_CM_REMAP                                /* CM supports remapping      */
-#define CONFIG_CM_INIT                         /* CM has initialization reg  */
-#endif /* NOT EXCALIBUR */
-
-#if defined(CONFIG_CM926EJ_S)   || defined (CONFIG_CM946E_S)   || \
-    defined(CONFIG_CM966E_S)    || defined (CONFIG_CM1026EJ_S) || \
-    defined(CONFIG_CM1136JF_S)
-#define CONFIG_CM_TCRAM                                /* CM has TCRAM  */
-#endif
-
-#ifdef CONFIG_CM_SPD_DETECT
 #define OS_SPD         0x00000100      /* The SDRAM SPD data is copied here */
-#endif
 
 #endif /* __ARMCOREMODULE_H */