diff options
author | Marek Vasut <marex@denx.de> | 2012-09-18 18:37:17 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-09-19 10:00:37 -0400 |
commit | 7aff3fba8437438a86e6debe2429cd12a69b05d0 (patch) | |
tree | 3a05b84a7c7ee90b342f5f8d3a444d9930a0fdf4 /arch/arm/mach-mxs/mach-mxs.c | |
parent | b493129482851ad34c43db3369b2750fc59aa249 (diff) |
ARM: mxs: m28evk: Disable OCOTP OUI loading
Don't load the FEC MAC address from OCOTP, but use the one supplied
via device tree by U-Boot. This is the preferred way, every DT-capable
bootloader does set up "mac-address" and "local-mac-address" properties
into the DT passed to the kernel.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/mach-mxs.c')
-rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index 5cbb6376c685..433af893ad8a 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c | |||
@@ -288,8 +288,6 @@ static void __init imx28_evk_post_init(void) | |||
288 | 288 | ||
289 | static void __init m28evk_init(void) | 289 | static void __init m28evk_init(void) |
290 | { | 290 | { |
291 | update_fec_mac_prop(OUI_DENX); | ||
292 | |||
293 | mxsfb_pdata.mode_list = m28evk_video_modes; | 291 | mxsfb_pdata.mode_list = m28evk_video_modes; |
294 | mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes); | 292 | mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes); |
295 | mxsfb_pdata.default_bpp = 16; | 293 | mxsfb_pdata.default_bpp = 16; |