GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-27 09:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: DRA7x/AM57xx: Get rid of CONFIG_AM57XX

Browse source 
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>
This commit is contained in:
Nishanth Menon 2016-11-29 15:22:00 +05:30 • committed by Tom Rini
parent 042fdb7cab
commit 3891a54f47
11 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/include/asm/arch-omap5/clock.h
View file

@ -348,7 +348,7 @@
*/ */
#define CONFIG_DEFAULT_OMAP_RESET_TIME_MAX_USEC 31219 #define CONFIG_DEFAULT_OMAP_RESET_TIME_MAX_USEC 31219
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
#define V_OSCK 20000000 /* Clock output from T2 */ #define V_OSCK 20000000 /* Clock output from T2 */
#else #else
#define V_OSCK 19200000 /* Clock output from T2 */ #define V_OSCK 19200000 /* Clock output from T2 */

2
arch/arm/include/asm/arch-omap5/hardware.h
View file

@ -24,7 +24,7 @@
#define GPMC_BASE 0x50000000 #define GPMC_BASE 0x50000000
/* EDMA3 Base address for DRA7XX and AM57XX */ /* EDMA3 Base address for DRA7XX and AM57XX */
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
#define EDMA3_BASE 0x43300000 #define EDMA3_BASE 0x43300000
#endif #endif

6
arch/arm/include/asm/arch-omap5/omap.h
View file

@ -29,13 +29,13 @@
#define CONTROL_CORE_ID_CODE 0x4A002204 #define CONTROL_CORE_ID_CODE 0x4A002204
#define CONTROL_WKUP_ID_CODE 0x4AE0C204 #define CONTROL_WKUP_ID_CODE 0x4AE0C204
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
#define CONTROL_ID_CODE CONTROL_WKUP_ID_CODE #define CONTROL_ID_CODE CONTROL_WKUP_ID_CODE
#else #else
#define CONTROL_ID_CODE CONTROL_CORE_ID_CODE #define CONTROL_ID_CODE CONTROL_CORE_ID_CODE
#endif #endif
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
#define DRA7_USB_OTG_SS1_BASE 0x48890000 #define DRA7_USB_OTG_SS1_BASE 0x48890000
#define DRA7_USB_OTG_SS1_GLUE_BASE 0x48880000 #define DRA7_USB_OTG_SS1_GLUE_BASE 0x48880000
#define DRA7_USB3_PHY1_PLL_CTRL 0x4A084C00 #define DRA7_USB3_PHY1_PLL_CTRL 0x4A084C00
@ -185,7 +185,7 @@ struct s32ktimer {
* much larger) and do not, at this time, make use of the additional * much larger) and do not, at this time, make use of the additional
* space. * space.
*/ */
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
#define NON_SECURE_SRAM_START 0x40300000 #define NON_SECURE_SRAM_START 0x40300000
#define NON_SECURE_SRAM_END 0x40380000 /* Not inclusive */ #define NON_SECURE_SRAM_END 0x40380000 /* Not inclusive */
#define NON_SECURE_SRAM_IMG_END 0x4037E000 #define NON_SECURE_SRAM_IMG_END 0x4037E000

2
arch/arm/mach-omap2/omap5/boot.c
View file

@ -12,7 +12,7 @@
#include <spl.h> #include <spl.h>
static u32 boot_devices[] = { static u32 boot_devices[] = {
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
BOOT_DEVICE_MMC2, BOOT_DEVICE_MMC2,
BOOT_DEVICE_NAND, BOOT_DEVICE_NAND,
BOOT_DEVICE_MMC1, BOOT_DEVICE_MMC1,

4
arch/arm/mach-omap2/omap5/hw_data.c
View file

@ -456,7 +456,7 @@ void enable_basic_clocks(void)
void enable_basic_uboot_clocks(void) void enable_basic_uboot_clocks(void)
{ {
u32 const clk_domains_essential[] = { u32 const clk_domains_essential[] = {
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
(*prcm)->cm_ipu_clkstctrl, (*prcm)->cm_ipu_clkstctrl,
#endif #endif
0 0
@ -472,7 +472,7 @@ void enable_basic_uboot_clocks(void)
(*prcm)->cm_l4per_i2c2_clkctrl, (*prcm)->cm_l4per_i2c2_clkctrl,
(*prcm)->cm_l4per_i2c3_clkctrl, (*prcm)->cm_l4per_i2c3_clkctrl,
(*prcm)->cm_l4per_i2c4_clkctrl, (*prcm)->cm_l4per_i2c4_clkctrl,
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
(*prcm)->cm_ipu_i2c5_clkctrl, (*prcm)->cm_ipu_i2c5_clkctrl,
#else #else
(*prcm)->cm_l4per_i2c5_clkctrl, (*prcm)->cm_l4per_i2c5_clkctrl,

5
drivers/mmc/omap_hsmmc.c
View file

@ -700,8 +700,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
case 1: case 1:
priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE; priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE;
#if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \ #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) || \ defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \
defined(CONFIG_AM33XX) || \
defined(CONFIG_AM43XX) || defined(CONFIG_SOC_KEYSTONE)) && \ defined(CONFIG_AM43XX) || defined(CONFIG_SOC_KEYSTONE)) && \
defined(CONFIG_HSMMC2_8BIT) defined(CONFIG_HSMMC2_8BIT)
/* Enable 8-bit interface for eMMC on OMAP4/5 or DRA7XX */ /* Enable 8-bit interface for eMMC on OMAP4/5 or DRA7XX */
@ -712,7 +711,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
#ifdef OMAP_HSMMC3_BASE #ifdef OMAP_HSMMC3_BASE
case 2: case 2:
priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC3_BASE; priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC3_BASE;
#if (defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX)) && defined(CONFIG_HSMMC3_8BIT) #if defined(CONFIG_DRA7XX) && defined(CONFIG_HSMMC3_8BIT)
/* Enable 8-bit interface for eMMC on DRA7XX */ /* Enable 8-bit interface for eMMC on DRA7XX */
host_caps_val |= MMC_MODE_8BIT; host_caps_val |= MMC_MODE_8BIT;
#endif #endif

2
drivers/power/palmas.c
View file

@ -27,7 +27,7 @@ int palmas_mmc1_poweron_ldo(void)
{ {
u8 val = 0; u8 val = 0;
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
/* /*
* Currently valid for the dra7xx_evm board: * Currently valid for the dra7xx_evm board:
* Set TPS659038 LDO1 to 3.0 V * Set TPS659038 LDO1 to 3.0 V

2
drivers/spi/ti_qspi.c
View file

@ -383,7 +383,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
priv->base = (struct ti_qspi_regs *)QSPI_BASE; priv->base = (struct ti_qspi_regs *)QSPI_BASE;
priv->mode = mode; priv->mode = mode;
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
priv->ctrl_mod_mmap = (void *)CORE_CTRL_IO; priv->ctrl_mod_mmap = (void *)CORE_CTRL_IO;
priv->slave.memory_map = (void *)MMAP_START_ADDR_DRA; priv->slave.memory_map = (void *)MMAP_START_ADDR_DRA;
priv->fclk = QSPI_DRA7XX_FCLK; priv->fclk = QSPI_DRA7XX_FCLK;

4
drivers/usb/dwc3/ti_usb_phy.c
View file

@ -193,7 +193,7 @@ void ti_usb2_phy_power(struct ti_usb_phy *phy, int on)
val = readl(phy->usb2_phy_power); val = readl(phy->usb2_phy_power);
if (on) { if (on) {
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
if (phy->index == 1) if (phy->index == 1)
val &= ~OMAP_CTRL_USB2_PHY_PD; val &= ~OMAP_CTRL_USB2_PHY_PD;
else else
@ -205,7 +205,7 @@ void ti_usb2_phy_power(struct ti_usb_phy *phy, int on)
AM437X_CTRL_USB2_OTGSESSEND_EN); AM437X_CTRL_USB2_OTGSESSEND_EN);
#endif #endif
} else { } else {
#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #if defined(CONFIG_DRA7XX)
if (phy->index == 1) if (phy->index == 1)
val |= OMAP_CTRL_USB2_PHY_PD; val |= OMAP_CTRL_USB2_PHY_PD;
else else

2
include/configs/am57xx_evm.h
View file

@ -14,7 +14,7 @@
#include <environment/ti/dfu.h> #include <environment/ti/dfu.h>
#define CONFIG_AM57XX #define CONFIG_DRA7XX
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_IODELAY_RECALIBRATION #define CONFIG_IODELAY_RECALIBRATION

1
scripts/config_whitelist.txt
View file

@ -86,7 +86,6 @@ CONFIG_AM335X_USB1
CONFIG_AM335X_USB1_MODE CONFIG_AM335X_USB1_MODE
CONFIG_AM33XX CONFIG_AM33XX
CONFIG_AM437X_USB2PHY2_HOST CONFIG_AM437X_USB2PHY2_HOST
CONFIG_AM57XX
CONFIG_AMBAPP_IOAREA CONFIG_AMBAPP_IOAREA
CONFIG_AMCC_DEF_ENV CONFIG_AMCC_DEF_ENV
CONFIG_AMCC_DEF_ENV_NOR_UPD CONFIG_AMCC_DEF_ENV_NOR_UPD