compulab: Clean up some unused symbols

Since cm_t35 was removed, CONFIG_CM_T3X does not exist.  This lets us
simplify the code in board/compulab/common/eeprom.c a bit.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 05ce33e..c4b257f 100644 (file)
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -385,43 +385,8 @@ int eeprom_field_update_date(struct eeprom_field *field, char *value)
 #define        LAYOUT_VERSION_VER2 3
 #define        LAYOUT_VERSION_VER3 4
 
-extern struct eeprom_field layout_unknown[1];
-
 #define DEFINE_PRINT_UPDATE(x) eeprom_field_print_##x, eeprom_field_update_##x
 
-#ifdef CONFIG_CM_T3X
-struct eeprom_field layout_legacy[5] = {
-       { "MAC address",          6, NULL, DEFINE_PRINT_UPDATE(mac) },
-       { "Board Revision",       2, NULL, DEFINE_PRINT_UPDATE(bin) },
-       { "Serial Number",        8, NULL, DEFINE_PRINT_UPDATE(bin) },
-       { "Board Configuration", 64, NULL, DEFINE_PRINT_UPDATE(ascii) },
-       { RESERVED_FIELDS,      176, NULL, eeprom_field_print_reserved,
-                                          eeprom_field_update_ascii },
-};
-#else
-#define layout_legacy layout_unknown
-#endif
-
-#if defined(CONFIG_CM_T3X)
-struct eeprom_field layout_v1[12] = {
-       { "Major Revision",      2, NULL, DEFINE_PRINT_UPDATE(bin_ver) },
-       { "Minor Revision",      2, NULL, DEFINE_PRINT_UPDATE(bin_ver) },
-       { "1st MAC Address",     6, NULL, DEFINE_PRINT_UPDATE(mac) },
-       { "2nd MAC Address",     6, NULL, DEFINE_PRINT_UPDATE(mac) },
-       { "Production Date",     4, NULL, DEFINE_PRINT_UPDATE(date) },
-       { "Serial Number",      12, NULL, DEFINE_PRINT_UPDATE(bin_rev) },
-       { RESERVED_FIELDS,      96, NULL, DEFINE_PRINT_UPDATE(reserved) },
-       { "Product Name",       16, NULL, DEFINE_PRINT_UPDATE(ascii) },
-       { "Product Options #1", 16, NULL, DEFINE_PRINT_UPDATE(ascii) },
-       { "Product Options #2", 16, NULL, DEFINE_PRINT_UPDATE(ascii) },
-       { "Product Options #3", 16, NULL, DEFINE_PRINT_UPDATE(ascii) },
-       { RESERVED_FIELDS,      64, NULL, eeprom_field_print_reserved,
-                                         eeprom_field_update_ascii },
-};
-#else
-#define layout_v1 layout_unknown
-#endif
-
 struct eeprom_field layout_v2[15] = {
        { "Major Revision",            2, NULL, DEFINE_PRINT_UPDATE(bin_ver) },
        { "Minor Revision",            2, NULL, DEFINE_PRINT_UPDATE(bin_ver) },
@@ -464,14 +429,6 @@ struct eeprom_field layout_v3[16] = {
 void eeprom_layout_assign(struct eeprom_layout *layout, int layout_version)
 {
        switch (layout->layout_version) {
-       case LAYOUT_VERSION_LEGACY:
-               layout->fields = layout_legacy;
-               layout->num_of_fields = ARRAY_SIZE(layout_legacy);
-               break;
-       case LAYOUT_VERSION_VER1:
-               layout->fields = layout_v1;
-               layout->num_of_fields = ARRAY_SIZE(layout_v1);
-               break;
        case LAYOUT_VERSION_VER2:
                layout->fields = layout_v2;
                layout->num_of_fields = ARRAY_SIZE(layout_v2);

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 4ca4f35..38e421e 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_CM_T335_H
 #define __CONFIG_CM_T335_H
 
-#define CONFIG_CM_T335
-
 #include <configs/ti_am335x_common.h>
 
 #undef CONFIG_MAX_RAM_BANK_SIZE

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index fb6d8cf..6e5c26e 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -8,7 +8,6 @@
 #ifndef __CONFIG_CM_T43_H
 #define __CONFIG_CM_T43_H
 
-#define CONFIG_CM_T43
 #define CONFIG_MAX_RAM_BANK_SIZE       (2048 << 20)    /* 2GB */
 #define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */