projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: Move enetaddr env access code to env config instead of net config
[oweals/u-boot.git]
/
board
/
compulab
/
cm_t3517
/
cm_t3517.c
diff --git
a/board/compulab/cm_t3517/cm_t3517.c
b/board/compulab/cm_t3517/cm_t3517.c
index 03b2badd02882edbe59c9aebfd932c4de8a96f47..e4e346077c990b0f9920338c109cfd113b5fa7bc 100644
(file)
--- a/
board/compulab/cm_t3517/cm_t3517.c
+++ b/
board/compulab/cm_t3517/cm_t3517.c
@@
-7,6
+7,7
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <environment.h>
#include <status_led.h>
#include <net.h>
#include <netdev.h>
#include <status_led.h>
#include <net.h>
#include <netdev.h>
@@
-50,12
+51,12
@@
static struct omap_musb_board_data cm_t3517_musb_board_data = {
};
static struct musb_hdrc_platform_data cm_t3517_musb_pdata = {
};
static struct musb_hdrc_platform_data cm_t3517_musb_pdata = {
-#if defined(CONFIG_MUSB_HOST)
+#if defined(CONFIG_
USB_
MUSB_HOST)
.mode = MUSB_HOST,
.mode = MUSB_HOST,
-#elif defined(CONFIG_MUSB_GADGET)
+#elif defined(CONFIG_
USB_
MUSB_GADGET)
.mode = MUSB_PERIPHERAL,
#else
.mode = MUSB_PERIPHERAL,
#else
-#error "Please define either CONFIG_
MUSB_HOST or CONFIG
_MUSB_GADGET"
+#error "Please define either CONFIG_
USB_MUSB_HOST or CONFIG_USB
_MUSB_GADGET"
#endif
.config = &cm_t3517_musb_config,
.power = 250,
#endif
.config = &cm_t3517_musb_config,
.power = 250,
@@
-89,8
+90,8
@@
int board_init(void)
/* boot param addr */
gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
/* boot param addr */
gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
-#if defined(CONFIG_
STATUS_LED) && defined(STATUS_LED_BOOT
)
- status_led_set(
STATUS_LED_BOOT, STATUS_LED
_ON);
+#if defined(CONFIG_
LED_STATUS) && defined(CONFIG_LED_STATUS_BOOT_ENABLE
)
+ status_led_set(
CONFIG_LED_STATUS_BOOT, CONFIG_LED_STATUS
_ON);
#endif
cm_t3517_musb_init();
#endif
cm_t3517_musb_init();
@@
-98,15
+99,24
@@
int board_init(void)
return 0;
}
return 0;
}
+/*
+ * Routine: get_board_rev
+ * Description: read system revision
+ */
+u32 get_board_rev(void)
+{
+ return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS);
+};
+
int misc_init_r(void)
{
cl_print_pcb_info();
int misc_init_r(void)
{
cl_print_pcb_info();
-
dieid_num_r
();
+
omap_die_id_display
();
return 0;
}
return 0;
}
-#if defined(CONFIG_
GENERIC_MMC) && !defined(CONFIG_SPL_BUILD
)
+#if defined(CONFIG_
MMC
)
#define SB_T35_CD_GPIO 144
#define SB_T35_WP_GPIO 59
#define SB_T35_CD_GPIO 144
#define SB_T35_WP_GPIO 59
@@
-159,7
+169,7
@@
static int cm_t3517_handle_mac_address(void)
unsigned char enetaddr[6];
int ret;
unsigned char enetaddr[6];
int ret;
- ret = eth_
getenv
_enetaddr("ethaddr", enetaddr);
+ ret = eth_
env_get
_enetaddr("ethaddr", enetaddr);
if (ret)
return 0;
if (ret)
return 0;
@@
-173,7
+183,7
@@
static int cm_t3517_handle_mac_address(void)
if (!is_valid_ethaddr(enetaddr))
return -1;
if (!is_valid_ethaddr(enetaddr))
return -1;
- return eth_
setenv
_enetaddr("ethaddr", enetaddr);
+ return eth_
env_set
_enetaddr("ethaddr", enetaddr);
}
#define SB_T35_ETH_RST_GPIO 164
}
#define SB_T35_ETH_RST_GPIO 164