[U-Boot] [PATCH 3/3] omap3: Drop omap3_evm_quick_* targets
Lokesh Vutla
lokeshvutla at ti.com
Mon Aug 1 07:34:20 CEST 2016
On Thursday 28 July 2016 07:59 AM, Tom Rini wrote:
> These config targets were added well before the Kconfig migration began
> as a way to demonstrate how to make these platforms work with cut down
> features. At this point in time they no longer serve a good purpose so
> remove them.
>
> Signed-off-by: Tom Rini <trini at konsulko.com>
Reviewed-by: Lokesh Vutla <lokeshvutla at ti.com>
Thanks and regards,
Lokesh
> ---
> arch/arm/cpu/armv7/omap3/Kconfig | 6 ---
> board/ti/evm/Kconfig | 26 ----------
> board/ti/evm/MAINTAINERS | 4 --
> configs/omap3_evm_quick_mmc_defconfig | 30 -----------
> configs/omap3_evm_quick_nand_defconfig | 28 -----------
> include/configs/omap3_evm_quick_mmc.h | 89 ---------------------------------
> include/configs/omap3_evm_quick_nand.h | 91 ----------------------------------
> 7 files changed, 274 deletions(-)
> delete mode 100644 configs/omap3_evm_quick_mmc_defconfig
> delete mode 100644 configs/omap3_evm_quick_nand_defconfig
> delete mode 100644 include/configs/omap3_evm_quick_mmc.h
> delete mode 100644 include/configs/omap3_evm_quick_nand.h
>
> diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig
> index daf5411..99a25f9 100644
> --- a/arch/arm/cpu/armv7/omap3/Kconfig
> +++ b/arch/arm/cpu/armv7/omap3/Kconfig
> @@ -31,12 +31,6 @@ config TARGET_DEVKIT8000
> config TARGET_OMAP3_EVM
> bool "TI OMAP3 EVM"
>
> -config TARGET_OMAP3_EVM_QUICK_MMC
> - bool "TI OMAP3 EVM Quick MMC"
> -
> -config TARGET_OMAP3_EVM_QUICK_NAND
> - bool "TI OMAP3 EVM Quick NAND"
> -
> config TARGET_OMAP3_IGEP00X0
> bool "IGEP"
> select DM
> diff --git a/board/ti/evm/Kconfig b/board/ti/evm/Kconfig
> index f02aa31..4f490dd 100644
> --- a/board/ti/evm/Kconfig
> +++ b/board/ti/evm/Kconfig
> @@ -10,29 +10,3 @@ config SYS_CONFIG_NAME
> default "omap3_evm"
>
> endif
> -
> -if TARGET_OMAP3_EVM_QUICK_MMC
> -
> -config SYS_BOARD
> - default "evm"
> -
> -config SYS_VENDOR
> - default "ti"
> -
> -config SYS_CONFIG_NAME
> - default "omap3_evm_quick_mmc"
> -
> -endif
> -
> -if TARGET_OMAP3_EVM_QUICK_NAND
> -
> -config SYS_BOARD
> - default "evm"
> -
> -config SYS_VENDOR
> - default "ti"
> -
> -config SYS_CONFIG_NAME
> - default "omap3_evm_quick_nand"
> -
> -endif
> diff --git a/board/ti/evm/MAINTAINERS b/board/ti/evm/MAINTAINERS
> index 90c3f6b..612a08a 100644
> --- a/board/ti/evm/MAINTAINERS
> +++ b/board/ti/evm/MAINTAINERS
> @@ -3,8 +3,4 @@ M: Tom Rini <trini at konsulko.com>
> S: Maintained
> F: board/ti/evm/
> F: include/configs/omap3_evm.h
> -F: include/configs/omap3_evm_quick_mmc.h
> -F: include/configs/omap3_evm_quick_nand.h
> F: configs/omap3_evm_defconfig
> -F: configs/omap3_evm_quick_mmc_defconfig
> -F: configs/omap3_evm_quick_nand_defconfig
> diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig
> deleted file mode 100644
> index ebdc105..0000000
> --- a/configs/omap3_evm_quick_mmc_defconfig
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_OMAP34XX=y
> -CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y
> -CONFIG_SPL=y
> -CONFIG_BOOTDELAY=-2
> -CONFIG_SYS_PROMPT="OMAP3_EVM # "
> -# CONFIG_CMD_BDI is not set
> -# CONFIG_CMD_CONSOLE is not set
> -# CONFIG_CMD_BOOTD is not set
> -# CONFIG_CMD_RUN is not set
> -# CONFIG_CMD_IMI is not set
> -# CONFIG_CMD_IMLS is not set
> -# CONFIG_CMD_XIMG is not set
> -# CONFIG_CMD_EDITENV is not set
> -# CONFIG_CMD_SAVEENV is not set
> -# CONFIG_CMD_ENV_EXISTS is not set
> -# CONFIG_CMD_MEMORY is not set
> -# CONFIG_CMD_LOADB is not set
> -# CONFIG_CMD_LOADS is not set
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_MMC=y
> -# CONFIG_CMD_FPGA is not set
> -# CONFIG_CMD_ECHO is not set
> -# CONFIG_CMD_ITEST is not set
> -# CONFIG_CMD_SOURCE is not set
> -# CONFIG_CMD_SETEXPR is not set
> -# CONFIG_CMD_NFS is not set
> -# CONFIG_CMD_MISC is not set
> -CONFIG_CMD_FAT=y
> -CONFIG_SYS_NS16550=y
> diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig
> deleted file mode 100644
> index 52b08b8..0000000
> --- a/configs/omap3_evm_quick_nand_defconfig
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_OMAP34XX=y
> -CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y
> -CONFIG_SPL=y
> -CONFIG_BOOTDELAY=-2
> -CONFIG_SYS_PROMPT="OMAP3_EVM # "
> -# CONFIG_CMD_BDI is not set
> -# CONFIG_CMD_CONSOLE is not set
> -# CONFIG_CMD_BOOTD is not set
> -# CONFIG_CMD_RUN is not set
> -# CONFIG_CMD_IMI is not set
> -# CONFIG_CMD_IMLS is not set
> -# CONFIG_CMD_XIMG is not set
> -# CONFIG_CMD_EDITENV is not set
> -# CONFIG_CMD_SAVEENV is not set
> -# CONFIG_CMD_ENV_EXISTS is not set
> -# CONFIG_CMD_MEMORY is not set
> -# CONFIG_CMD_LOADB is not set
> -# CONFIG_CMD_LOADS is not set
> -# CONFIG_CMD_FLASH is not set
> -# CONFIG_CMD_FPGA is not set
> -# CONFIG_CMD_ECHO is not set
> -# CONFIG_CMD_ITEST is not set
> -# CONFIG_CMD_SOURCE is not set
> -# CONFIG_CMD_SETEXPR is not set
> -# CONFIG_CMD_NFS is not set
> -# CONFIG_CMD_MISC is not set
> -CONFIG_SYS_NS16550=y
> diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
> deleted file mode 100644
> index b7d8765..0000000
> --- a/include/configs/omap3_evm_quick_mmc.h
> +++ /dev/null
> @@ -1,89 +0,0 @@
> -/*
> - * Configuration settings for quick boot from MMC on OMAP3 EVM.
> - *
> - * Copyright (C) 2006-2010 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * Author :
> - * Sanjeev Premi <premi at ti.com>
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -#ifndef __OMAP3_EVM_QUICK_MMC_H
> -#define __OMAP3_EVM_QUICK_MMC_H
> -
> -#include <asm/arch/cpu.h>
> -#include <asm/arch/omap.h>
> -
> -/* ----------------------------------------------------------------------------
> - * Supported U-Boot commands
> - * ----------------------------------------------------------------------------
> - */
> -
> -/*
> - * Board revision is detected by probing the Ethernet chip.
> - *
> - * When revision is statically configured via CONFIG_STATIC_BOARD_REV,
> - * this option can be removed. Generated binary is leaner by ~16Kbytes.
> - */
> -
> -/* ----------------------------------------------------------------------------
> - * Supported U-Boot features
> - * ----------------------------------------------------------------------------
> - */
> -#define CONFIG_SILENT_CONSOLE
> -#define CONFIG_ENV_IS_NOWHERE
> -
> -/* ----------------------------------------------------------------------------
> - * Supported hardware
> - * ----------------------------------------------------------------------------
> - */
> -
> -/* MMC */
> -#define CONFIG_MMC
> -#define CONFIG_GENERIC_MMC
> -#define CONFIG_OMAP_HSMMC
> -#define CONFIG_DOS_PARTITION
> -
> -/* -----------------------------------------------------------------------------
> - * Include common board configuration
> - * -----------------------------------------------------------------------------
> - */
> -#include "omap3_evm_common.h"
> -
> -/* -----------------------------------------------------------------------------
> - * Default environment
> - * -----------------------------------------------------------------------------
> - */
> -
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> - "verify=no\0" \
> - "silent=1"
> -
> -#define CONFIG_BOOTCOMMAND \
> - "mmc rescan 0; " \
> - "fatload mmc 0 0x82000000 uImage; " \
> - "bootm 0x82000000;"
> -
> -/*
> - * Update the bootargs as necessary e.g. size of memory, partition and fstype
> - */
> -#define CONFIG_BOOTARGS \
> - "quiet " \
> - "console=ttyO0,115200n8 " \
> - "mem=128M " \
> - "noinitrd " \
> - "root=/dev/mmcblk0p2 rw " \
> - "rootfstype=ext3 rootwait"
> -
> -/*
> - * SPL
> - */
> -#define CONFIG_SPL_MMC_SUPPORT
> -#define CONFIG_SPL_FAT_SUPPORT
> -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
> -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
> -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
> -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
> -
> -#endif /* __OMAP3_EVM_QUICK_MMC_H */
> diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h
> deleted file mode 100644
> index da5d325..0000000
> --- a/include/configs/omap3_evm_quick_nand.h
> +++ /dev/null
> @@ -1,91 +0,0 @@
> -/*
> - * Configuration settings for quick boot from NAND on OMAP3 EVM.
> - *
> - * Copyright (C) 2006-2010 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * Author :
> - * Sanjeev Premi <premi at ti.com>
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -#ifndef __OMAP3_EVM_QUICK_NAND_H
> -#define __OMAP3_EVM_QUICK_NAND_H
> -
> -#include <asm/arch/cpu.h>
> -#include <asm/arch/omap.h>
> -
> -/* ----------------------------------------------------------------------------
> - * Supported U-Boot commands
> - * ----------------------------------------------------------------------------
> - */
> -#define CONFIG_CMD_NAND
> -
> -/*
> - * Board revision is detected by probing the Ethernet chip.
> - *
> - * When revision is statically configured via CONFIG_STATIC_BOARD_REV,
> - * this option can be removed. Generated binary is leaner by ~16Kbytes.
> - */
> -
> -/* ----------------------------------------------------------------------------
> - * Supported U-Boot features
> - * ----------------------------------------------------------------------------
> - */
> -#define CONFIG_SILENT_CONSOLE
> -#define CONFIG_ENV_IS_NOWHERE
> -
> -/* -----------------------------------------------------------------------------
> - * Include common board configuration
> - * -----------------------------------------------------------------------------
> - */
> -#include "omap3_evm_common.h"
> -
> -/* -----------------------------------------------------------------------------
> - * Default environment
> - * -----------------------------------------------------------------------------
> - */
> -
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> - "verify=no\0" \
> - "silent=1"
> -
> -#define CONFIG_BOOTCOMMAND \
> - "nandecc hw; " \
> - "nand read.i 0x80000000 280000 300000; " \
> - "bootm 0x80000000;"
> -
> -/*
> - * Update the bootargs as necessary e.g. size of memory, partition and fstype
> - */
> -#define CONFIG_BOOTARGS \
> - "quiet " \
> - "console=ttyO0,115200n8 " \
> - "mem=128M " \
> - "noinitrd " \
> - "root=/dev/mtdblock4 rw " \
> - "rootfstype=jffs2 "
> -
> -/*
> - * SPL
> - */
> -#define CONFIG_SPL_NAND_SIMPLE
> -#define CONFIG_SPL_NAND_SUPPORT
> -#define CONFIG_SPL_NAND_BASE
> -#define CONFIG_SPL_NAND_DRIVERS
> -#define CONFIG_SPL_NAND_ECC
> -#define CONFIG_SYS_NAND_5_ADDR_CYCLE
> -#define CONFIG_SYS_NAND_PAGE_COUNT 64
> -#define CONFIG_SYS_NAND_PAGE_SIZE 2048
> -#define CONFIG_SYS_NAND_OOBSIZE 64
> -#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024)
> -#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
> -#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\
> - 10, 11, 12, 13}
> -#define CONFIG_SYS_NAND_ECCSIZE 512
> -#define CONFIG_SYS_NAND_ECCBYTES 3
> -#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_HW
> -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
> -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
> -
> -#endif /* __OMAP3_EVM_QUICK_NAND_H */
>
More information about the U-Boot
mailing list