Skip to content

Commit a93fbf4

Browse files
masahir0ytrini
masahir0y
authored and
trini
committed
ARM: omap2+: rename config to ARCH_OMAP2PLUS and consolidate Kconfig
In Linux, CONFIG_ARCH_OMAP2PLUS is used for OMAP2 or later SoCs. Rename CONFIG_ARCH_OMAP2 to CONFIG_ARCH_OMAP2PLUS to follow this naming. Move the OMAP2+ board/SoC choice down to mach-omap2/Kconfig to slim down the arch/arm/Kconfig level. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Tom Rini <trini@konsulko.com>
1 parent efbe99c commit a93fbf4

File tree

87 files changed

+298
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+298
-232
lines changed

‎arch/arm/Kconfig‎

Lines changed: 6 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,6 @@ config SPL_USE_ARCH_MEMSET
263263
Such implementation may be faster under some conditions
264264
but may increase the binary size.
265265

266-
config ARCH_OMAP2
267-
bool
268-
select CPU_V7
269-
select SUPPORT_SPL
270-
imply FIT
271-
272266
config ARM64_SUPPORT_AARCH32
273267
bool "ARM64 system support AArch32 execution state"
274268
default y if ARM64 && !TARGET_THUNDERX_88XX
@@ -491,72 +485,6 @@ config TARGET_VEXPRESS_CA9X4
491485
bool "Support vexpress_ca9x4"
492486
select CPU_V7
493487

494-
config TARGET_BRXRE1
495-
bool "Support BRXRE1"
496-
select ARCH_OMAP2
497-
select BOARD_LATE_INIT
498-
499-
config TARGET_BRPPT1
500-
bool "Support BRPPT1"
501-
select ARCH_OMAP2
502-
select BOARD_LATE_INIT
503-
504-
config TARGET_DRACO
505-
bool "Support draco"
506-
select ARCH_OMAP2
507-
select BOARD_LATE_INIT
508-
select DM
509-
select DM_SERIAL
510-
select DM_GPIO
511-
512-
config TARGET_THUBAN
513-
bool "Support thuban"
514-
select ARCH_OMAP2
515-
select BOARD_LATE_INIT
516-
select DM
517-
select DM_SERIAL
518-
select DM_GPIO
519-
520-
config TARGET_RASTABAN
521-
bool "Support rastaban"
522-
select ARCH_OMAP2
523-
select BOARD_LATE_INIT
524-
select DM
525-
select DM_SERIAL
526-
select DM_GPIO
527-
528-
config TARGET_ETAMIN
529-
bool "Support etamin"
530-
select ARCH_OMAP2
531-
select BOARD_LATE_INIT
532-
select DM
533-
select DM_SERIAL
534-
select DM_GPIO
535-
536-
config TARGET_PXM2
537-
bool "Support pxm2"
538-
select ARCH_OMAP2
539-
select BOARD_LATE_INIT
540-
select DM
541-
select DM_SERIAL
542-
select DM_GPIO
543-
544-
config TARGET_RUT
545-
bool "Support rut"
546-
select ARCH_OMAP2
547-
select BOARD_LATE_INIT
548-
select DM
549-
select DM_SERIAL
550-
select DM_GPIO
551-
552-
config TARGET_TI814X_EVM
553-
bool "Support ti814x_evm"
554-
select ARCH_OMAP2
555-
556-
config TARGET_TI816X_EVM
557-
bool "Support ti816x_evm"
558-
select ARCH_OMAP2
559-
560488
config TARGET_BCM23550_W1D
561489
bool "Support bcm23550_w1d"
562490
select CPU_V7
@@ -616,6 +544,12 @@ config ARCH_KEYSTONE
616544
select CMD_POWEROFF
617545
imply FIT
618546

547+
config ARCH_OMAP2PLUS
548+
bool "TI OMAP2+"
549+
select CPU_V7
550+
select SUPPORT_SPL
551+
imply FIT
552+
619553
config ARCH_MESON
620554
bool "Amlogic Meson"
621555
help
@@ -684,92 +618,6 @@ config TARGET_MX53SMD
684618
select CPU_V7
685619
select BOARD_EARLY_INIT_F
686620

687-
config OMAP34XX
688-
bool "OMAP34XX SoC"
689-
select ARCH_OMAP2
690-
select ARM_ERRATA_430973
691-
select ARM_ERRATA_454179
692-
select ARM_ERRATA_621766
693-
select ARM_ERRATA_725233
694-
select USE_TINY_PRINTF
695-
imply SPL_EXT_SUPPORT
696-
imply SPL_FAT_SUPPORT
697-
imply SPL_GPIO_SUPPORT
698-
imply SPL_I2C_SUPPORT
699-
imply SPL_LIBCOMMON_SUPPORT
700-
imply SPL_LIBDISK_SUPPORT
701-
imply SPL_LIBGENERIC_SUPPORT
702-
imply SPL_MMC_SUPPORT
703-
imply SPL_NAND_SUPPORT
704-
imply SPL_POWER_SUPPORT
705-
imply SPL_SERIAL_SUPPORT
706-
imply SYS_THUMB_BUILD
707-
708-
config OMAP44XX
709-
bool "OMAP44XX SoC"
710-
select ARCH_OMAP2
711-
select USE_TINY_PRINTF
712-
imply SPL_DISPLAY_PRINT
713-
imply SPL_EXT_SUPPORT
714-
imply SPL_FAT_SUPPORT
715-
imply SPL_GPIO_SUPPORT
716-
imply SPL_I2C_SUPPORT
717-
imply SPL_LIBCOMMON_SUPPORT
718-
imply SPL_LIBDISK_SUPPORT
719-
imply SPL_LIBGENERIC_SUPPORT
720-
imply SPL_MMC_SUPPORT
721-
imply SPL_NAND_SUPPORT
722-
imply SPL_POWER_SUPPORT
723-
imply SPL_SERIAL_SUPPORT
724-
imply SYS_THUMB_BUILD
725-
726-
config OMAP54XX
727-
bool "OMAP54XX SoC"
728-
select ARCH_OMAP2
729-
select ARM_ERRATA_798870
730-
select SYS_THUMB_BUILD
731-
imply SPL_DISPLAY_PRINT
732-
imply SPL_ENV_SUPPORT
733-
imply SPL_EXT_SUPPORT
734-
imply SPL_FAT_SUPPORT
735-
imply SPL_GPIO_SUPPORT
736-
imply SPL_I2C_SUPPORT
737-
imply SPL_LIBCOMMON_SUPPORT
738-
imply SPL_LIBDISK_SUPPORT
739-
imply SPL_LIBGENERIC_SUPPORT
740-
imply SPL_MMC_SUPPORT
741-
imply SPL_NAND_SUPPORT
742-
imply SPL_POWER_SUPPORT
743-
imply SPL_SERIAL_SUPPORT
744-
745-
config AM43XX
746-
bool "AM43XX SoC"
747-
select ARCH_OMAP2
748-
imply SPL_DM
749-
imply SPL_DM_SEQ_ALIAS
750-
imply SPL_OF_CONTROL
751-
imply SPL_OF_TRANSLATE
752-
imply SPL_SEPARATE_BSS
753-
imply SPL_SYS_MALLOC_SIMPLE
754-
imply SYS_THUMB_BUILD
755-
help
756-
Support for AM43xx SOC from Texas Instruments.
757-
The AM43xx high performance SOC features a Cortex-A9
758-
ARM core, a quad core PRU-ICSS for industrial Ethernet
759-
protocols, dual camera support, optional 3D graphics
760-
and an optional customer programmable secure boot.
761-
762-
config AM33XX
763-
bool "AM33XX SoC"
764-
select ARCH_OMAP2
765-
imply SYS_THUMB_BUILD
766-
help
767-
Support for AM335x SOC from Texas Instruments.
768-
The AM335x high performance SOC features a Cortex-A8
769-
ARM core, a dual core PRU-ICSS for industrial Ethernet
770-
protocols, optional 3D graphics and an optional customer
771-
programmable secure boot.
772-
773621
config ARCH_RMOBILE
774622
bool "Renesas ARM SoCs"
775623
select DM
@@ -807,10 +655,6 @@ config ARCH_SOCFPGA
807655
select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
808656
select SYS_THUMB_BUILD
809657

810-
config TARGET_CM_T43
811-
bool "Support cm_t43"
812-
select ARCH_OMAP2
813-
814658
config ARCH_SUNXI
815659
bool "Support sunxi (Allwinner) SoCs"
816660
select CMD_GPIO
@@ -1256,8 +1100,6 @@ source "arch/arm/imx-common/Kconfig"
12561100
source "board/aries/m28evk/Kconfig"
12571101
source "board/aries/m53evk/Kconfig"
12581102
source "board/bosch/shc/Kconfig"
1259-
source "board/BuR/brxre1/Kconfig"
1260-
source "board/BuR/brppt1/Kconfig"
12611103
source "board/CarMediaLab/flea3/Kconfig"
12621104
source "board/Marvell/aspenite/Kconfig"
12631105
source "board/Marvell/gplugd/Kconfig"
@@ -1272,8 +1114,6 @@ source "board/broadcom/bcmnsp/Kconfig"
12721114
source "board/broadcom/bcmns2/Kconfig"
12731115
source "board/cavium/thunderx/Kconfig"
12741116
source "board/cirrus/edb93xx/Kconfig"
1275-
source "board/compulab/cm_t335/Kconfig"
1276-
source "board/compulab/cm_t43/Kconfig"
12771117
source "board/creative/xfi3/Kconfig"
12781118
source "board/freescale/ls2080a/Kconfig"
12791119
source "board/freescale/ls2080aqds/Kconfig"
@@ -1312,9 +1152,6 @@ source "board/phytec/pcm051/Kconfig"
13121152
source "board/ppcag/bg0900/Kconfig"
13131153
source "board/sandisk/sansa_fuze_plus/Kconfig"
13141154
source "board/schulercontrol/sc_sps_1/Kconfig"
1315-
source "board/siemens/draco/Kconfig"
1316-
source "board/siemens/pxm2/Kconfig"
1317-
source "board/siemens/rut/Kconfig"
13181155
source "board/silica/pengwyn/Kconfig"
13191156
source "board/spear/spear300/Kconfig"
13201157
source "board/spear/spear310/Kconfig"
@@ -1325,11 +1162,7 @@ source "board/st/stv0991/Kconfig"
13251162
source "board/sunxi/Kconfig"
13261163
source "board/syteco/zmx25/Kconfig"
13271164
source "board/tcl/sl50/Kconfig"
1328-
source "board/ti/am335x/Kconfig"
1329-
source "board/ti/am43xx/Kconfig"
13301165
source "board/birdland/bav335x/Kconfig"
1331-
source "board/ti/ti814x/Kconfig"
1332-
source "board/ti/ti816x/Kconfig"
13331166
source "board/timll/devkit3250/Kconfig"
13341167
source "board/toradex/colibri_pxa270/Kconfig"
13351168
source "board/technologic/ts4600/Kconfig"

‎arch/arm/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ machine-$(CONFIG_ARCH_MVEBU) += mvebu
6464
# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
6565
# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
6666
machine-$(CONFIG_ORION5X) += orion5x
67-
machine-$(CONFIG_ARCH_OMAP2) += omap2
67+
machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
6868
machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
6969
machine-$(CONFIG_ARCH_SUNXI) += sunxi
7070
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon

‎arch/arm/config.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77

88
ifndef CONFIG_STANDALONE_LOAD_ADDR
9-
ifneq ($(CONFIG_ARCH_OMAP2),)
9+
ifneq ($(CONFIG_ARCH_OMAP2PLUS),)
1010
CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
1111
else
1212
CONFIG_STANDALONE_LOAD_ADDR = 0xc100000

‎arch/arm/include/asm/global_data.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct arch_global_data {
6767
phys_addr_t resv_ram;
6868
#endif
6969

70-
#ifdef CONFIG_ARCH_OMAP2
70+
#ifdef CONFIG_ARCH_OMAP2PLUS
7171
u32 omap_boot_device;
7272
u32 omap_boot_mode;
7373
u8 omap_ch_flags;

‎arch/arm/include/asm/ti-common/sys_proto.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
DECLARE_GLOBAL_DATA_PTR;
1111

12-
#ifdef CONFIG_ARCH_OMAP2
12+
#ifdef CONFIG_ARCH_OMAP2PLUS
1313
#define TI_ARMV7_DRAM_ADDR_SPACE_START 0x80000000
1414
#define TI_ARMV7_DRAM_ADDR_SPACE_END 0xFFFFFFFF
1515

0 commit comments

Comments
 (0)