X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=blobdiff_plain;f=arch%2Farm%2FKconfig;h=2c52ff025a2219b7578ceefe3c014705d207a075;hp=30a6f6dc538a9d3886b1b0aadae5ae2902b2f519;hb=5fbed8f2c63bde8a482ccba6bce6477346301cb4;hpb=f2ee91501892d3280a4c58093ad3a18dccd0b562 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 30a6f6dc53..2c52ff025a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -287,9 +287,8 @@ config ENABLE_ARM_SOC_BOOT0_HOOK bool "prepare BOOT0 header" help If the SoC's BOOT0 requires a header area filled with (magic) - values, then choose this option, and create a define called - ARM_SOC_BOOT0_HOOK which contains the required assembler - preprocessor code. + values, then choose this option, and create a file included as + which contains the required assembler code. config ARM_CORTEX_CPU_IS_UP bool @@ -396,63 +395,6 @@ config TARGET_APF27 select CPU_ARM926EJS select SUPPORT_SPL -config TARGET_APX4DEVKIT - bool "Support apx4devkit" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - -config TARGET_XFI3 - bool "Support xfi3" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - -config TARGET_M28EVK - bool "Support m28evk" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - -config TARGET_MX23EVK - bool "Support mx23evk" - select CPU_ARM926EJS - select SUPPORT_SPL - select BOARD_EARLY_INIT_F - select PL011_SERIAL - -config TARGET_MX28EVK - bool "Support mx28evk" - select CPU_ARM926EJS - select SUPPORT_SPL - select BOARD_EARLY_INIT_F - select PL011_SERIAL - -config TARGET_MX23_OLINUXINO - bool "Support mx23_olinuxino" - select CPU_ARM926EJS - select SUPPORT_SPL - select BOARD_EARLY_INIT_F - select PL011_SERIAL - -config TARGET_BG0900 - bool "Support bg0900" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - -config TARGET_SANSA_FUZE_PLUS - bool "Support sansa_fuze_plus" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - -config TARGET_SC_SPS_1 - bool "Support sc_sps_1" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - config ORION5X bool "Marvell Orion" select CPU_ARM926EJS @@ -550,6 +492,7 @@ config ARCH_BCM283X select DM_GPIO select OF_CONTROL select PL01X_SERIAL + select SERIAL_SEARCH_ALL imply FAT_WRITE config TARGET_VEXPRESS_CA15_TC2 @@ -659,14 +602,34 @@ config ARCH_MESON targeted at media players and tablet computers. We currently support the S905 (GXBaby) 64-bit SoC. +config ARCH_MX8M + bool "NXP i.MX8M platform" + select ARM64 + select DM + select SUPPORT_SPL + +config ARCH_MX23 + bool "NXP i.MX23 family" + select CPU_ARM926EJS + select PL011_SERIAL + select SUPPORT_SPL + config ARCH_MX25 bool "NXP MX25" select CPU_ARM926EJS + imply MXC_GPIO + +config ARCH_MX28 + bool "NXP i.MX28 family" + select CPU_ARM926EJS + select PL011_SERIAL + select SUPPORT_SPL config ARCH_MX7ULP bool "NXP MX7ULP" select CPU_V7 select ROM_UNIFIED_SECTIONS + imply MXC_GPIO config ARCH_MX7 bool "Freescale MX7" @@ -676,6 +639,7 @@ config ARCH_MX7 select SYS_FSL_SEC_LE select BOARD_EARLY_INIT_F select ARCH_MISC_INIT + imply MXC_GPIO config ARCH_MX6 bool "Freescale MX6" @@ -684,6 +648,7 @@ config ARCH_MX6 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select SYS_THUMB_BUILD if SPL + imply MXC_GPIO if ARCH_MX6 config SPL_LDSCRIPT @@ -694,6 +659,7 @@ config ARCH_MX5 bool "Freescale MX5" select CPU_V7 select BOARD_EARLY_INIT_F + imply MXC_GPIO config ARCH_QEMU bool "QEMU Virtual Platform" @@ -732,16 +698,17 @@ config ARCH_SOCFPGA select OF_CONTROL select SPL_OF_CONTROL select DM - select DM_SPI_FLASH - select DM_SPI select ENABLE_ARM_SOC_BOOT0_HOOK select ARCH_EARLY_INIT_R select ARCH_MISC_INIT - select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION select SYS_THUMB_BUILD imply CMD_MTDPARTS imply CRC32_VERIFY + imply DM_SPI + imply DM_SPI_FLASH imply FAT_WRITE + imply HW_WATCHDOG + imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs" @@ -780,12 +747,6 @@ config ARCH_SUNXI imply SPL_SERIAL_SUPPORT imply USB_GADGET -config TARGET_TS4600 - bool "Support TS4600" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - config ARCH_VF610 bool "Freescale Vybrid" select CPU_V7 @@ -802,18 +763,16 @@ config ARCH_ZYNQ select SPL_BOARD_INIT if SPL select SPL_OF_CONTROL if SPL select DM - select DM_ETH - select DM_GPIO + select DM_ETH if NET select SPL_DM if SPL - select DM_MMC + select DM_MMC if MMC select DM_SPI select DM_SERIAL select DM_SPI_FLASH select SPL_SEPARATE_BSS if SPL select DM_USB if USB - select BLK select CLK - select SPL_CLK + select SPL_CLK if SPL select CLK_ZYNQ imply CMD_CLK imply FAT_WRITE @@ -1231,6 +1190,16 @@ config ARCH_ASPEED endchoice +config TI_SECURE_DEVICE + bool "HS Device Type Support" + depends on ARCH_KEYSTONE || ARCH_OMAP2PLUS + help + If a high secure (HS) device type is being used, this config + must be set. This option impacts various aspects of the + build system (to create signed boot images that can be + authenticated) and the code. See the doc/README.ti-secure + file for further details. + source "arch/arm/mach-aspeed/Kconfig" source "arch/arm/mach-at91/Kconfig" @@ -1255,13 +1224,17 @@ source "arch/arm/cpu/armv7/ls102xa/Kconfig" source "arch/arm/mach-imx/mx2/Kconfig" -source "arch/arm/mach-imx/mx7ulp/Kconfig" +source "arch/arm/mach-imx/mx5/Kconfig" + +source "arch/arm/mach-imx/mx6/Kconfig" source "arch/arm/mach-imx/mx7/Kconfig" -source "arch/arm/mach-imx/mx6/Kconfig" +source "arch/arm/mach-imx/mx7ulp/Kconfig" -source "arch/arm/mach-imx/mx5/Kconfig" +source "arch/arm/mach-imx/mx8m/Kconfig" + +source "arch/arm/mach-imx/mxs/Kconfig" source "arch/arm/mach-omap2/Kconfig" @@ -1305,7 +1278,6 @@ source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/mach-imx/Kconfig" -source "board/aries/m28evk/Kconfig" source "board/bosch/shc/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" @@ -1313,7 +1285,6 @@ source "board/Marvell/gplugd/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress64/Kconfig" -source "board/bluegiga/apx4devkit/Kconfig" source "board/broadcom/bcm23550_w1d/Kconfig" source "board/broadcom/bcm28155_ap/Kconfig" source "board/broadcom/bcmcygnus/Kconfig" @@ -1321,7 +1292,6 @@ source "board/broadcom/bcmnsp/Kconfig" source "board/broadcom/bcmns2/Kconfig" source "board/cavium/thunderx/Kconfig" source "board/cirrus/edb93xx/Kconfig" -source "board/creative/xfi3/Kconfig" source "board/eets/pdu001/Kconfig" source "board/freescale/ls2080a/Kconfig" source "board/freescale/ls2080aqds/Kconfig" @@ -1337,8 +1307,6 @@ source "board/freescale/ls1046ardb/Kconfig" source "board/freescale/ls1012aqds/Kconfig" source "board/freescale/ls1012ardb/Kconfig" source "board/freescale/ls1012afrdm/Kconfig" -source "board/freescale/mx23evk/Kconfig" -source "board/freescale/mx28evk/Kconfig" source "board/freescale/mx31ads/Kconfig" source "board/freescale/mx31pdk/Kconfig" source "board/freescale/mx35pdk/Kconfig" @@ -1351,11 +1319,7 @@ source "board/hisilicon/hikey/Kconfig" source "board/hisilicon/poplar/Kconfig" source "board/imx31_phycore/Kconfig" source "board/isee/igep003x/Kconfig" -source "board/olimex/mx23_olinuxino/Kconfig" source "board/phytec/pcm051/Kconfig" -source "board/ppcag/bg0900/Kconfig" -source "board/sandisk/sansa_fuze_plus/Kconfig" -source "board/schulercontrol/sc_sps_1/Kconfig" source "board/silica/pengwyn/Kconfig" source "board/spear/spear300/Kconfig" source "board/spear/spear310/Kconfig" @@ -1367,7 +1331,6 @@ source "board/tcl/sl50/Kconfig" source "board/birdland/bav335x/Kconfig" source "board/timll/devkit3250/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" -source "board/technologic/ts4600/Kconfig" source "board/vscom/baltos/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" @@ -1378,7 +1341,7 @@ source "arch/arm/Kconfig.debug" endmenu config SPL_LDSCRIPT - default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if TARGET_APX4DEVKIT || TARGET_BG0900 || TARGET_M28EVK || TARGET_MX23_OLINUXINO || TARGET_MX23EVK || TARGET_MX28EVK || TARGET_SANSA_FUZE_PLUS || TARGET_SC_SPS_1 || TARGET_TS4600 || TARGET_XFI3 + default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if ARCH_MX23 || ARCH_MX28 default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64