#ifndef __SYS_PROTO_H__
#define __SYS_PROTO_H__
+#include <asm/imx-common/regs-common.h>
+
int mxs_reset_block(struct mxs_register_32 *reg);
int mxs_wait_mask_set(struct mxs_register_32 *reg,
uint32_t mask,
int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int));
+void imx_get_mac_from_fuse(int dev_id, unsigned char *mac);
+
#ifdef CONFIG_SPL_BUILD
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
#include <asm/arch/iomux-mx23.h>
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
#include <asm/arch/iomux-mx28.h>
#endif
};
static const struct mxs_pair mxs_boot_modes[] = {
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
{ 0x00, 0x0f, "USB" },
{ 0x01, 0x1f, "I2C, master" },
{ 0x02, 0x1f, "SSP SPI #1, master, NOR" },
{ 0x03, 0x1f, "SSP SPI #2, master, NOR" },
{ 0x04, 0x1f, "NAND" },
+ { 0x06, 0x1f, "JTAG" },
{ 0x08, 0x1f, "SSP SPI #3, master, EEPROM" },
{ 0x09, 0x1f, "SSP SD/MMC #0" },
{ 0x0a, 0x1f, "SSP SD/MMC #1" },
{ 0x00, 0x00, "Reserved/Unknown/Wrong" },
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
{ 0x00, 0x0f, "USB #0" },
{ 0x01, 0x1f, "I2C #0, master, 3V3" },
{ 0x11, 0x1f, "I2C #0, master, 1V8" },
{ 0x13, 0x1f, "SSP SPI #3, master, 1V8 NOR" },
{ 0x04, 0x1f, "NAND, 3V3" },
{ 0x14, 0x1f, "NAND, 1V8" },
+ { 0x06, 0x1f, "JTAG" },
{ 0x08, 0x1f, "SSP SPI #3, master, 3V3 EEPROM" },
{ 0x18, 0x1f, "SSP SPI #3, master, 1V8 EEPROM" },
{ 0x09, 0x1f, "SSP SD/MMC #0, 3V3" },