X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=arch%2Farm%2Fcpu%2Farmv7%2Fmx5%2Fsoc.c;fp=arch%2Farm%2Fcpu%2Farmv7%2Fmx5%2Fsoc.c;h=30b90e9d281294ecf4fe35b1614debd995c1bfcc;hp=95564a8257d33fb1e3b8b6a0fa13a3cb87d33b99;hb=dfdb35946c027cdebf25c3705b2cce8658f71632;hpb=d920f497705564ba800ca91e8c2105164178699c

diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/cpu/armv7/mx5/soc.c
index 95564a8257..30b90e9d28 100644
--- a/arch/arm/cpu/armv7/mx5/soc.c
+++ b/arch/arm/cpu/armv7/mx5/soc.c
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 #include <asm/imx-common/boot_mode.h>
 
-#if !(defined(CONFIG_MX51) || defined(CONFIG_MX53))
+#if !(defined(CONFIG_SOC_MX51) || defined(CONFIG_SOC_MX53))
 #error "CPU_TYPE not defined"
 #endif
 
@@ -39,14 +39,14 @@ void hw_watchdog_reset(void)
 
 u32 get_cpu_rev(void)
 {
-#ifdef CONFIG_MX51
+#ifdef CONFIG_SOC_MX51
 	int system_rev = 0x51000;
 #else
 	int system_rev = 0x53000;
 #endif
 	int reg = __raw_readl(ROM_SI_REV);
 
-#if defined(CONFIG_MX51)
+#if defined(CONFIG_SOC_MX51)
 	switch (reg) {
 	case 0x02:
 		system_rev |= CHIP_REV_1_1;
@@ -106,7 +106,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
 
 #endif
 
-#ifdef CONFIG_MX53
+#ifdef CONFIG_SOC_MX53
 void boot_mode_apply(unsigned cfg_val)
 {
 	writel(cfg_val, &((struct srtc_regs *)SRTC_BASE_ADDR)->lpgr);