Browse Source

am33xx: Finish migration of CONFIG_AM33XX/AM43XX

Almost all users of CONFIG_AM33XX/AM43XX have been migrated.  Finish
moving the last few over to Kconfig, and put all of the boards under the
appropriate Kconfig chocie now.  This board choice is non-optional, so
remove that keyword on am33xx.

Signed-off-by: Tom Rini <trini@konsulko.com>
tags/2020-06-01
Tom Rini 4 years ago
parent
commit
f2d78c1ced
16 changed files with 81 additions and 66 deletions
  1. +1
    -54
      arch/arm/mach-omap2/Kconfig
  2. +59
    -1
      arch/arm/mach-omap2/am33xx/Kconfig
  3. +1
    -0
      configs/brppt1_mmc_defconfig
  4. +1
    -0
      configs/brppt1_nand_defconfig
  5. +1
    -0
      configs/brppt1_spi_defconfig
  6. +3
    -0
      configs/brxre1_defconfig
  7. +1
    -0
      configs/cm_t43_defconfig
  8. +2
    -1
      configs/draco_defconfig
  9. +2
    -1
      configs/etamin_defconfig
  10. +2
    -1
      configs/pxm2_defconfig
  11. +2
    -1
      configs/rastaban_defconfig
  12. +3
    -1
      configs/rut_defconfig
  13. +2
    -1
      configs/thuban_defconfig
  14. +0
    -1
      include/configs/bur_am335x_common.h
  15. +1
    -2
      include/configs/cm_t43.h
  16. +0
    -2
      include/configs/siemens-am33x-common.h

+ 1
- 54
arch/arm/mach-omap2/Kconfig View File

@@ -2,57 +2,7 @@ if ARCH_OMAP2PLUS

choice
prompt "OMAP2+ platform select"
default TARGET_BRXRE1

config TARGET_BRXRE1
bool "Support BRXRE1"
select BOARD_LATE_INIT

config TARGET_BRPPT1
bool "Support BRPPT1"
select BOARD_LATE_INIT

config TARGET_DRACO
bool "Support draco"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_THUBAN
bool "Support thuban"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_RASTABAN
bool "Support rastaban"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_ETAMIN
bool "Support etamin"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_PXM2
bool "Support pxm2"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_RUT
bool "Support rut"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO
default OMAP34XX

config OMAP34XX
bool "OMAP34XX SoC"
@@ -151,9 +101,6 @@ config AM33XX
protocols, optional 3D graphics and an optional customer
programmable secure boot.

config TARGET_CM_T43
bool "Support cm_t43"

endchoice

config SYS_MPUCLK


+ 59
- 1
arch/arm/mach-omap2/am33xx/Kconfig View File

@@ -26,7 +26,6 @@ config AM33XX_CHILISOM

choice
prompt "AM33xx board select"
optional

config TARGET_AM335X_EVM
bool "Support am335x_evm"
@@ -104,6 +103,14 @@ config TARGET_BAV335X

For more information, visit: http://birdland.com/oem

config TARGET_BRXRE1
bool "Support BRXRE1"
select BOARD_LATE_INIT

config TARGET_BRPPT1
bool "Support BRPPT1"
select BOARD_LATE_INIT

config TARGET_CHILIBOARD
bool "Grinn chiliBoard"
select AM33XX_CHILISOM
@@ -117,6 +124,20 @@ config TARGET_CM_T335
select DM_SERIAL
select DM_GPIO

config TARGET_DRACO
bool "Support draco"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_ETAMIN
bool "Support etamin"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_PCM051
bool "Support pcm051"
select DM
@@ -135,12 +156,43 @@ config TARGET_PEPPER
select DM_SERIAL
select DM_GPIO

config TARGET_PXM2
bool "Support pxm2"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_RASTABAN
bool "Support rastaban"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_RUT
bool "Support rut"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

config TARGET_THUBAN
bool "Support thuban"
select BOARD_LATE_INIT
select DM
select DM_SERIAL
select DM_GPIO

endchoice

endif

if AM43XX

choice
prompt "AM43xx board select"

config TARGET_AM43XX_EVM
bool "Support am43xx_evm"
select BOARD_LATE_INIT
@@ -171,6 +223,12 @@ config TARGET_AM43XX_EVM
evaluation module system that enables developers
to write software and develop hardware around
an AM43xx processor subsystem.

config TARGET_CM_T43
bool "Support cm_t43"

endchoice

endif

if AM43XX || AM33XX


+ 1
- 0
configs/brppt1_mmc_defconfig View File

@@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_AM33XX=y
CONFIG_TARGET_BRPPT1=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y


+ 1
- 0
configs/brppt1_nand_defconfig View File

@@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_AM33XX=y
CONFIG_TARGET_BRPPT1=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y


+ 1
- 0
configs/brppt1_spi_defconfig View File

@@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_AM33XX=y
CONFIG_TARGET_BRPPT1=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y


+ 3
- 0
configs/brxre1_defconfig View File

@@ -3,6 +3,8 @@ CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_AM33XX=y
CONFIG_TARGET_BRXRE1=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
@@ -57,6 +59,7 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_LCD=y
# CONFIG_OMAP_WATCHDOG is not set
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set

+ 1
- 0
configs/cm_t43_defconfig View File

@@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y
CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_AM43XX=y
CONFIG_TARGET_CM_T43=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y


+ 2
- 1
configs/draco_defconfig View File

@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_DRACO=y
CONFIG_AM33XX=y
CONFIG_SYS_MPUCLK=300
CONFIG_TARGET_DRACO=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y


+ 2
- 1
configs/etamin_defconfig View File

@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_ETAMIN=y
CONFIG_AM33XX=y
CONFIG_SYS_MPUCLK=300
CONFIG_TARGET_ETAMIN=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y


+ 2
- 1
configs/pxm2_defconfig View File

@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_PXM2=y
CONFIG_AM33XX=y
CONFIG_SYS_MPUCLK=720
CONFIG_TARGET_PXM2=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y


+ 2
- 1
configs/rastaban_defconfig View File

@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_RASTABAN=y
CONFIG_AM33XX=y
CONFIG_SYS_MPUCLK=300
CONFIG_TARGET_RASTABAN=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y


+ 3
- 1
configs/rut_defconfig View File

@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_RUT=y
CONFIG_AM33XX=y
CONFIG_SYS_MPUCLK=600
CONFIG_TARGET_RUT=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
@@ -73,3 +74,4 @@ CONFIG_G_DNL_PRODUCT_NUM=0x02d2
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_SYS_CONSOLE_BG_COL=0xff
CONFIG_SYS_CONSOLE_FG_COL=0x00
# CONFIG_OMAP_WATCHDOG is not set

+ 2
- 1
configs/thuban_defconfig View File

@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_THUBAN=y
CONFIG_AM33XX=y
CONFIG_SYS_MPUCLK=300
CONFIG_TARGET_THUBAN=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y


+ 0
- 1
include/configs/bur_am335x_common.h View File

@@ -12,7 +12,6 @@
#ifndef __BUR_AM335X_COMMON_H__
#define __BUR_AM335X_COMMON_H__
/* ------------------------------------------------------------------------- */
#define CONFIG_AM33XX
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */

/* Timer information */


+ 1
- 2
include/configs/cm_t43.h View File

@@ -9,7 +9,6 @@
#ifndef __CONFIG_CM_T43_H
#define __CONFIG_CM_T43_H

#define CONFIG_AM43XX
#define CONFIG_CM_T43
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */
@@ -21,7 +20,7 @@
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_CLK 48000000
#define CONFIG_SYS_NS16550_COM1 0x44e09000
#ifdef CONFIG_SPL_BUILD
#if !defined(CONFIG_SPL_DM) || !defined(CONFIG_DM_SERIAL)
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#endif



+ 0
- 2
include/configs/siemens-am33x-common.h View File

@@ -14,8 +14,6 @@
#ifndef __CONFIG_SIEMENS_AM33X_COMMON_H
#define __CONFIG_SIEMENS_AM33X_COMMON_H

#define CONFIG_AM33XX

#include <asm/arch/omap.h>

#define CONFIG_DMA_COHERENT