From 89024ddc9ea63be4f71815a6a915fb3a58268d81 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 12 May 2017 22:33:16 -0400 Subject: TI: Drop 'CONFIG_OMAP' In the two cases in the code where we use CONFIG_OMAP as a useful test currently we can make use of CONFIG_ARCH_OMAP2PLUS instead. With that changed we can drop all defines of CONFIG_OMAP. While in here, CONFIG_OMAP3430 is only defined and then never used, so drop. Signed-off-by: Tom Rini diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h index a0bda28..5d7f7e6 100644 --- a/arch/arm/include/asm/spl.h +++ b/arch/arm/include/asm/spl.h @@ -7,7 +7,7 @@ #ifndef _ASM_SPL_H_ #define _ASM_SPL_H_ -#if defined(CONFIG_OMAP) \ +#if defined(CONFIG_ARCH_OMAP2PLUS) \ || defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \ || defined(CONFIG_EXYNOS4210) /* Platform-specific defines */ diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index ca55df7..0eb7c02 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -175,21 +175,17 @@ void NS16550_init(NS16550_t com_port, int baud_divisor) ; serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier); -#if defined(CONFIG_OMAP) || defined(CONFIG_AM33XX) || \ - defined(CONFIG_TI81XX) || defined(CONFIG_AM43XX) +#if defined(CONFIG_ARCH_OMAP2PLUS) serial_out(0x7, &com_port->mdr1); /* mode select reset TL16C750*/ #endif serial_out(UART_MCRVAL, &com_port->mcr); serial_out(ns16550_getfcr(com_port), &com_port->fcr); if (baud_divisor != -1) NS16550_setbrg(com_port, baud_divisor); -#if defined(CONFIG_OMAP) || \ - defined(CONFIG_AM33XX) || defined(CONFIG_SOC_DA8XX) || \ - defined(CONFIG_TI81XX) || defined(CONFIG_AM43XX) - +#if defined(CONFIG_ARCH_OMAP2PLUS) || defined(CONFIG_SOC_DA8XX) /* /16 is proper to hit 115200 with 48MHz */ serial_out(0, &com_port->mdr1); -#endif /* CONFIG_OMAP */ +#endif #if defined(CONFIG_SOC_KEYSTONE) serial_out(UART_REG_VAL_PWREMU_MGMT_UART_ENABLE, &com_port->regC); #endif diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 8be49af..19d1bc1 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -16,7 +16,6 @@ /* * High Level Configuration Options */ -#define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP3_AM3517CRANE 1 /* working with CRANEBOARD */ #define CONFIG_EMIF4 /* The chip has EMIF4 controller */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 7490f2b..27d64ea 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -13,10 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* High Level Configuration Options */ - -#define CONFIG_OMAP - #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define CONFIG_EMIF4 /* The chip has EMIF4 controller */ diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 3742514..4f57241 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -13,7 +13,6 @@ #define __BUR_AM335X_COMMON_H__ /* ------------------------------------------------------------------------- */ #define CONFIG_AM33XX -#define CONFIG_OMAP #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ /* Timer information */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index dfdad6c..2d5b6f2 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -22,7 +22,6 @@ /* * High Level Configuration Options */ -#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP_GPIO #define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index e12dc02..8093e7f 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -13,7 +13,6 @@ /* * High Level Configuration Options */ -#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_CM_T3517 /* working with CM-T3517 */ #define CONFIG_SYS_TEXT_BASE 0x80008000 diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 85bc0e3..939bd6c 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -26,8 +26,6 @@ /* * Platform */ - -#define CONFIG_OMAP #define CONFIG_OMAP4430 /* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index e4f2a02..44d3fa3 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -12,7 +12,6 @@ /* * High Level Configuration Options */ -#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP3_MCX /* working with mcx */ #define CONFIG_OMAP_GPIO diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index f51bfc3..99d3189 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -22,9 +22,6 @@ /* * High Level Configuration Options */ - -#define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP3430 /* which is in a 3430 */ #define CONFIG_OMAP3_RX51 /* working with RX51 */ #define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index bf5b2f5..c4cac83 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -83,7 +83,6 @@ /* * High level configuration options */ -#define CONFIG_OMAP /* This is TI OMAP core */ #define CONFIG_OMAP_GPIO #define CONFIG_SDRC /* The chip has SDRC controller */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 508b849..68278c0 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -15,7 +15,6 @@ #define __CONFIG_SIEMENS_AM33X_COMMON_H #define CONFIG_AM33XX -#define CONFIG_OMAP #include diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 5214827..4f60bf7 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -19,12 +19,6 @@ #define CONFIG_ARM_ARCH_CP15_ERRATA /* - * Platform - */ - -#define CONFIG_OMAP - -/* * Board */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 0bdf52e..09a4f25 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -13,7 +13,6 @@ /* * High Level Configuration Options */ -#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP_GPIO #define CONFIG_SYS_TEXT_BASE 0x80008000 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 9bb4a1a..24144d4 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -16,8 +16,6 @@ /* * High Level Configuration Options */ -#define CONFIG_OMAP /* in a TI OMAP core */ - #define CONFIG_OMAP_GPIO #define CONFIG_SDRC /* Has an SDRC controller */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index baf818b..44650f3 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -18,7 +18,6 @@ #define CONFIG_TI81XX #define CONFIG_TI814X -#define CONFIG_OMAP #include diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index b7ec200..4233bad 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -12,7 +12,6 @@ #define CONFIG_TI81XX #define CONFIG_TI816X -#define CONFIG_OMAP #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h index de14b85..b7ca905 100644 --- a/include/configs/ti_armv7_omap.h +++ b/include/configs/ti_armv7_omap.h @@ -12,9 +12,6 @@ #ifndef __CONFIG_TI_ARMV7_OMAP_H__ #define __CONFIG_TI_ARMV7_OMAP_H__ -/* Common defines for all OMAP architecture based SoCs */ -#define CONFIG_OMAP - /* I2C IP block */ #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 9741ca5..9b46386 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -16,9 +16,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* High Level Configuration Options */ -#define CONFIG_OMAP /* in a TI OMAP core */ - #define CONFIG_MACH_TYPE MACH_TYPE_TRICORDER /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7646bb6..5febd2a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1980,8 +1980,6 @@ CONFIG_OF_SPI CONFIG_OF_SPI_FLASH CONFIG_OF_STDOUT_PATH CONFIG_OF_SUPPORT_OLD_DEVICE_TREES -CONFIG_OMAP -CONFIG_OMAP3430 CONFIG_OMAP3_AM3517CRANE CONFIG_OMAP3_DEVKIT8000 CONFIG_OMAP3_EVM -- cgit v0.10.2