From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Cc: Igor Grinberg <grinberg@compulab.co.il>,
Nikita Kiryanov <nikita@compulab.co.il>
Subject: [PATCH 07/17] compulab: Clean up some unused symbols
Date: Sun, 12 Sep 2021 20:32:23 -0400 [thread overview]
Message-ID: <20210913003233.4125-7-trini@konsulko.com> (raw)
In-Reply-To: <20210913003233.4125-1-trini@konsulko.com>
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>
---
board/compulab/common/eeprom.c | 43 ----------------------------------
include/configs/cm_t335.h | 2 --
include/configs/cm_t43.h | 1 -
3 files changed, 46 deletions(-)
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 05ce33e8d68a..c4b257f851d6 100644
--- 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 4ca4f35eb3ff..38e421ebc4a4 100644
--- 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 fb6d8cfbf31a..6e5c26edc938 100644
--- 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 */
--
2.17.1
next prev parent reply other threads:[~2021-09-13 0:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 0:32 [PATCH 01/17] am335x_guardian: Enable SPL_OF_CONTROL Tom Rini
2021-09-13 0:32 ` [PATCH 02/17] am335x_boneblack_vboot: " Tom Rini
2021-09-13 0:32 ` [PATCH 03/17] am335x: Remove legacy non-DM_USB code Tom Rini
2021-09-13 0:32 ` [PATCH 04/17] keystone2: Move CONFIG_AEMIF_CNTRL_BASE out of CONFIG namespace Tom Rini
2021-09-28 23:20 ` Tom Rini
2021-09-13 0:32 ` [PATCH 05/17] usb: phy: ti: Remove non-DM PHY code Tom Rini
2021-09-28 23:20 ` Tom Rini
2021-09-13 0:32 ` [PATCH 06/17] Convert CONFIG_USB_XHCI_OMAP to Kconfig Tom Rini
2021-09-28 23:20 ` Tom Rini
2021-09-13 0:32 ` Tom Rini [this message]
2021-09-28 23:21 ` [PATCH 07/17] compulab: Clean up some unused symbols Tom Rini
2021-09-13 0:32 ` [PATCH 08/17] ti: keystone: Clean up or migrate some NAND related options Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 09/17] ti: keystone: dma: Migrate to Kconfig Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 10/17] omapl138_lcdk: Stop using CONFIG_MACH_OMAPL138_LCDK Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 11/17] usb: ehci-omap: Drop non-DM_USB legacy code Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 12/17] Convert CONFIG_OMAP_EHCI_PHY1_RESET_GPIO et al to Kconfig Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 13/17] am3517_evm: Remove unused comments/code Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 14/17] omap3_logic: " Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 15/17] omap4_panda: " Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 16/17] ti: keystone: Move away from CONFIG_SOC_KEYSTONE Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 17/17] ti: keystone: Migrate CONFIG_SOC_K2* to Kconfig Tom Rini
2021-09-28 23:21 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210913003233.4125-7-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=grinberg@compulab.co.il \
--cc=nikita@compulab.co.il \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).