Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

TI: Drop 'CONFIG_OMAP'

Browse source 
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 <trini@konsulko.com>
This commit is contained in:
Tom Rini 2017-05-12 22:33:16 -04:00
parent 8f339d2346
commit 89024ddc9e
20 changed files with 4 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/include/asm/spl.h
View file

@ -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 */

10
drivers/serial/ns16550.c
View file

@ -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

1
include/configs/am3517_crane.h
View file

@ -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 */

4
include/configs/am3517_evm.h
View file

@ -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 */

1
include/configs/bur_am335x_common.h
View file

@ -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 */

1
include/configs/cm_t35.h
View file

@ -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 */

1
include/configs/cm_t3517.h
View file

@ -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

2
include/configs/kc1.h
View file

@ -26,8 +26,6 @@
/*
* Platform
*/
#define CONFIG_OMAP
#define CONFIG_OMAP4430
/*

1
include/configs/mcx.h
View file

@ -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

3
include/configs/nokia_rx51.h
View file

@ -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 */

1
include/configs/omap3_evm.h
View file

@ -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 */

1
include/configs/siemens-am33x-common.h
View file

@ -15,7 +15,6 @@
#define __CONFIG_SIEMENS_AM33X_COMMON_H
#define CONFIG_AM33XX
#define CONFIG_OMAP
#include <asm/arch/omap.h>

6
include/configs/sniper.h
View file

@ -18,12 +18,6 @@
#define CONFIG_ARM_ARCH_CP15_ERRATA
/*
* Platform
*/
#define CONFIG_OMAP
/*
* Board
*/

1
include/configs/tam3517-common.h
View file

@ -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

2
include/configs/tao3530.h
View file

@ -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 */

1
include/configs/ti814x_evm.h
View file

@ -18,7 +18,6 @@
#define CONFIG_TI81XX
#define CONFIG_TI814X
#define CONFIG_OMAP
#include <asm/arch/omap.h>

1
include/configs/ti816x_evm.h
View file

@ -12,7 +12,6 @@
#define CONFIG_TI81XX
#define CONFIG_TI816X
#define CONFIG_OMAP
#define CONFIG_ARCH_CPU_INIT

3
include/configs/ti_armv7_omap.h
View file

@ -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

3
include/configs/tricorder.h
View file

@ -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

2
scripts/config_whitelist.txt
View file

@ -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