diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2013-02-08 16:28:27 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-11 20:56:20 +0100 |
| commit | c8a76d8ba04d37e66f784fde5daa963c0acca613 (patch) | |
| tree | f85252342e3e80cd5f4a49322f8fc334bef60caa /arch/arm/boards/ccxmx51 | |
| parent | 8afa17372fbc8c3093e26079ce28a74bda78e956 (diff) | |
| download | barebox-c8a76d8ba04d37e66f784fde5daa963c0acca613.tar.gz barebox-c8a76d8ba04d37e66f784fde5daa963c0acca613.tar.xz | |
ARM: ccmx51: Replace ifdefs with IS_ENABLED
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/ccxmx51')
| -rw-r--r-- | arch/arm/boards/ccxmx51/ccxmx51.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index 5ec304b299..01e02042e2 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/arch/arm/boards/ccxmx51/ccxmx51.c @@ -80,12 +80,10 @@ struct imx_nand_platform_data nand_info = { .flash_bbt = 1, }; -#ifdef CONFIG_DRIVER_NET_FEC_IMX static struct fec_platform_data fec_info = { .xcv_type = MII100, .phy_addr = 7, }; -#endif static iomux_v3_cfg_t ccxmx51_pads[] = { /* UART1 */ @@ -431,15 +429,12 @@ static int ccxmx51_devices_init(void) devfs_add_partition("nand0", 0x80000, 0x40000, DEVFS_PARTITION_FIXED, "env_raw"); dev_add_bb_dev("env_raw", "env0"); -#ifdef CONFIG_DRIVER_NET_FEC_IMX - if (ccxmx51_id->eth0 && !pwr) { + if (IS_ENABLED(CONFIG_DRIVER_NET_FEC_IMX) && ccxmx51_id->eth0 && !pwr) { eth_register_ethaddr(0, hwid); imx51_add_fec(&fec_info); } -#endif -#ifdef CONFIG_DRIVER_NET_SMC911X - if (ccxmx51_id->eth1 && !pwr) { + if (IS_ENABLED(CONFIG_DRIVER_NET_SMC911X) && ccxmx51_id->eth1 && !pwr) { /* Configure the WEIM CS5 timming, bus width, etc */ /* 16 bit on DATA[31..16], not multiplexed, async */ writel(0x00420081, MX51_WEIM_BASE_ADDR + WEIM_CSxGCR1(5)); @@ -455,7 +450,6 @@ static int ccxmx51_devices_init(void) /* LAN9221 network controller */ add_generic_device("smc911x", 1, NULL, MX51_CS5_BASE_ADDR, SZ_4K, IORESOURCE_MEM, NULL); } -#endif ccxmx51_otghost_init(); |