diff options
| author | Nishanth Menon <nm@ti.com> | 2016-11-29 15:22:00 +0530 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-03 13:21:11 -0500 |
| commit | 3891a54f479838bce3f9b298572200c9508106fc (patch) | |
| tree | 2398403f6d7ea7ef2e693a58f16189e496274c0a /arch/arm/mach-omap2/omap5 | |
| parent | 042fdb7cabb8270eb86c45f11263fa91c12e3b65 (diff) | |
| download | u-boot-imx-3891a54f479838bce3f9b298572200c9508106fc.zip u-boot-imx-3891a54f479838bce3f9b298572200c9508106fc.tar.gz u-boot-imx-3891a54f479838bce3f9b298572200c9508106fc.tar.bz2 | |
ARM: DRA7x/AM57xx: Get rid of CONFIG_AM57XX
CONFIG_AM57XX is just an unnecessary macro that is redundant given So,
remove the same instead of spreading through out the u-boot source
code and getting in the way to maintain common code for DRA7x family.
Acked-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap5')
| -rw-r--r-- | arch/arm/mach-omap2/omap5/boot.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap5/hw_data.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap5/boot.c b/arch/arm/mach-omap2/omap5/boot.c index 583becc..18750b8 100644 --- a/arch/arm/mach-omap2/omap5/boot.c +++ b/arch/arm/mach-omap2/omap5/boot.c @@ -12,7 +12,7 @@ #include <spl.h> static u32 boot_devices[] = { -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) BOOT_DEVICE_MMC2, BOOT_DEVICE_NAND, BOOT_DEVICE_MMC1, diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c index fc99135..02f086b 100644 --- a/arch/arm/mach-omap2/omap5/hw_data.c +++ b/arch/arm/mach-omap2/omap5/hw_data.c @@ -456,7 +456,7 @@ void enable_basic_clocks(void) void enable_basic_uboot_clocks(void) { u32 const clk_domains_essential[] = { -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) (*prcm)->cm_ipu_clkstctrl, #endif 0 @@ -472,7 +472,7 @@ void enable_basic_uboot_clocks(void) (*prcm)->cm_l4per_i2c2_clkctrl, (*prcm)->cm_l4per_i2c3_clkctrl, (*prcm)->cm_l4per_i2c4_clkctrl, -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) (*prcm)->cm_ipu_i2c5_clkctrl, #else (*prcm)->cm_l4per_i2c5_clkctrl, |