colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ti: keystone: Move away from CONFIG_SOC_KEYSTONE

Browse Source 
We have individual SOC symbols for each keystone 2 platform.  Use the
existing CONFIG_ARCH_KEYSTONE rather than CONFIG_SOC_KEYSTONE to
encompass all of the keystone families.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2021-09-12 20:32:32 -04:00
parent b17cc80781
commit f899cc1432
6 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/Makefile
View File

@@ -929,7 +929,7 @@ endif
dtb-$(CONFIG_RZA1) += \ dtb-$(CONFIG_RZA1) += \
r7s72100-gr-peach-u-boot.dtb r7s72100-gr-peach-u-boot.dtb
dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \ dtb-$(CONFIG_ARCH_KEYSTONE) += keystone-k2hk-evm.dtb \
keystone-k2l-evm.dtb \ keystone-k2l-evm.dtb \
keystone-k2e-evm.dtb \ keystone-k2e-evm.dtb \
keystone-k2g-evm.dtb \ keystone-k2g-evm.dtb \

2
cmd/fdt.c
View File

@@ -624,7 +624,7 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
fdt_strerror(err)); fdt_strerror(err));
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }
#ifdef CONFIG_SOC_KEYSTONE #ifdef CONFIG_ARCH_KEYSTONE
ft_board_setup_ex(working_fdt, gd->bd); ft_board_setup_ex(working_fdt, gd->bd);
#endif #endif
} }

2
common/image-fdt.c
View File

@@ -628,7 +628,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
if (!ft_verify_fdt(blob)) if (!ft_verify_fdt(blob))
goto err; goto err;
#if defined(CONFIG_SOC_KEYSTONE) #if defined(CONFIG_ARCH_KEYSTONE)
if (IMAGE_OF_BOARD_SETUP) if (IMAGE_OF_BOARD_SETUP)
ft_board_setup_ex(blob, gd->bd); ft_board_setup_ex(blob, gd->bd);
#endif #endif

4
drivers/mmc/omap_hsmmc.c
View File

@@ -42,7 +42,7 @@
#include <asm/arch/mux_dra7xx.h> #include <asm/arch/mux_dra7xx.h>
#include <asm/arch/dra7xx_iodelay.h> #include <asm/arch/dra7xx_iodelay.h>
#endif #endif
#if !defined(CONFIG_SOC_KEYSTONE) #if !defined(CONFIG_ARCH_KEYSTONE)
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#endif #endif
@@ -1559,7 +1559,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
priv->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE; priv->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_AM33XX) || \ defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \
defined(CONFIG_AM43XX) || defined(CONFIG_SOC_KEYSTONE)) && \ defined(CONFIG_AM43XX) || defined(CONFIG_ARCH_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 */
host_caps_val |= MMC_MODE_8BIT; host_caps_val |= MMC_MODE_8BIT;

4
drivers/serial/ns16550.c
View File

@@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR;
#endif #endif
#endif /* !CONFIG_DM_SERIAL */ #endif /* !CONFIG_DM_SERIAL */
#if defined(CONFIG_SOC_KEYSTONE) #if defined(CONFIG_ARCH_KEYSTONE)
#define UART_REG_VAL_PWREMU_MGMT_UART_DISABLE 0 #define UART_REG_VAL_PWREMU_MGMT_UART_DISABLE 0
#define UART_REG_VAL_PWREMU_MGMT_UART_ENABLE ((1 << 14) | (1 << 13) | (1 << 0)) #define UART_REG_VAL_PWREMU_MGMT_UART_ENABLE ((1 << 14) | (1 << 13) | (1 << 0))
#undef UART_MCRVAL #undef UART_MCRVAL
@@ -267,7 +267,7 @@ void ns16550_init(struct ns16550 *com_port, int baud_divisor)
/* /16 is proper to hit 115200 with 48MHz */ /* /16 is proper to hit 115200 with 48MHz */
serial_out(0, &com_port->mdr1); serial_out(0, &com_port->mdr1);
#endif #endif
#if defined(CONFIG_SOC_KEYSTONE) #if defined(CONFIG_ARCH_KEYSTONE)
serial_out(UART_REG_VAL_PWREMU_MGMT_UART_ENABLE, &com_port->regC); serial_out(UART_REG_VAL_PWREMU_MGMT_UART_ENABLE, &com_port->regC);
#endif #endif
} }

2
include/configs/ti_armv7_keystone2.h
View File

@@ -9,8 +9,6 @@
#ifndef __CONFIG_KS2_EVM_H #ifndef __CONFIG_KS2_EVM_H
#define __CONFIG_KS2_EVM_H #define __CONFIG_KS2_EVM_H
#define CONFIG_SOC_KEYSTONE
/* U-Boot Build Configuration */ /* U-Boot Build Configuration */
/* SoC Configuration */ /* SoC Configuration */