X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=arch%2Farm%2Finclude%2Fasm%2Farch-mxs%2Fsys_proto.h;h=2e86da5946c9c7e9fac9128f107b8e6321fe9b5f;hp=062f3de1d05bfd4de1011762b55fbb6311c84fc9;hb=dfdb35946c027cdebf25c3705b2cce8658f71632;hpb=d0796defbe8eff6fc3c27c893dcbc47af59d4764

diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index 062f3de1d0..2e86da5946 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -22,11 +22,13 @@ int mxs_wait_mask_clr(struct mxs_register_32 *reg,
 
 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
 
@@ -42,7 +44,7 @@ struct mxs_pair {
 };
 
 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" },
@@ -53,7 +55,7 @@ static const struct mxs_pair mxs_boot_modes[] = {
 	{ 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" },