Merge branch '2021-07-28-build-improvements'

- Assorted Makefile cleanups
- A few code / build cleanups
This commit is contained in:
Tom Rini 2021-07-28 18:51:16 -04:00
commit bbcacdf4cd
548 changed files with 1233 additions and 1188 deletions

View file

@ -802,16 +802,19 @@ c_flags := $(KBUILD_CFLAGS) $(cpp_flags)
HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makefile),y,n) HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makefile),y,n)
libs-y += lib/ libs-$(CONFIG_API) += api/
libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/ libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
libs-y += cmd/
libs-y += common/
libs-$(CONFIG_OF_EMBED) += dts/ libs-$(CONFIG_OF_EMBED) += dts/
libs-y += env/
libs-y += lib/
libs-y += fs/ libs-y += fs/
libs-y += net/ libs-y += net/
libs-y += disk/ libs-y += disk/
libs-y += drivers/ libs-y += drivers/
libs-y += drivers/dma/ libs-y += drivers/dma/
libs-y += drivers/gpio/ libs-y += drivers/gpio/
libs-y += drivers/i2c/
libs-y += drivers/net/ libs-y += drivers/net/
libs-y += drivers/net/phy/ libs-y += drivers/net/phy/
libs-y += drivers/power/ \ libs-y += drivers/power/ \
@ -841,10 +844,6 @@ libs-y += drivers/usb/musb/
libs-y += drivers/usb/musb-new/ libs-y += drivers/usb/musb-new/
libs-y += drivers/usb/phy/ libs-y += drivers/usb/phy/
libs-y += drivers/usb/ulpi/ libs-y += drivers/usb/ulpi/
libs-y += cmd/
libs-y += common/
libs-y += env/
libs-$(CONFIG_API) += api/
ifdef CONFIG_POST ifdef CONFIG_POST
libs-y += post/ libs-y += post/
endif endif
@ -1128,7 +1127,7 @@ endif
$(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\ $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\
$(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG)) $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG))
$(call deprecated,CONFIG_DM_ETH,Ethernet drivers,v2020.07,$(CONFIG_NET)) $(call deprecated,CONFIG_DM_ETH,Ethernet drivers,v2020.07,$(CONFIG_NET))
$(call deprecated,CONFIG_DM_I2C,I2C drivers,v2022.04,$(CONFIG_I2C)) $(call deprecated,CONFIG_DM_I2C,I2C drivers,v2022.04,$(CONFIG_SYS_I2C_LEGACY))
@# Check that this build does not use CONFIG options that we do not @# Check that this build does not use CONFIG options that we do not
@# know about unless they are in Kconfig. All the existing CONFIG @# know about unless they are in Kconfig. All the existing CONFIG
@# options are whitelisted, so new ones should not be added. @# options are whitelisted, so new ones should not be added.
@ -2100,7 +2099,7 @@ CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h tools/version.h \
# Directories & files removed with 'make mrproper' # Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config include/generated spl tpl \ MRPROPER_DIRS += include/config include/generated spl tpl \
.tmp_objdiff doc/output .tmp_objdiff doc/output include/asm
# Remove include/asm symlink created by U-Boot before v2014.01 # Remove include/asm symlink created by U-Boot before v2014.01
MRPROPER_FILES += .config .config.old include/autoconf.mk* include/config.h \ MRPROPER_FILES += .config .config.old include/autoconf.mk* include/config.h \

25
README
View file

@ -128,7 +128,7 @@ Examples:
Directory Hierarchy: Directory Hierarchy:
==================== ====================
/arch Architecture specific files /arch Architecture-specific files
/arc Files generic to ARC architecture /arc Files generic to ARC architecture
/arm Files generic to ARM architecture /arm Files generic to ARM architecture
/m68k Files generic to m68k architecture /m68k Files generic to m68k architecture
@ -142,16 +142,16 @@ Directory Hierarchy:
/sh Files generic to SH architecture /sh Files generic to SH architecture
/x86 Files generic to x86 architecture /x86 Files generic to x86 architecture
/xtensa Files generic to Xtensa architecture /xtensa Files generic to Xtensa architecture
/api Machine/arch independent API for external apps /api Machine/arch-independent API for external apps
/board Board dependent files /board Board-dependent files
/cmd U-Boot commands functions /cmd U-Boot commands functions
/common Misc architecture independent functions /common Misc architecture-independent functions
/configs Board default configuration files /configs Board default configuration files
/disk Code for disk drive partition handling /disk Code for disk drive partition handling
/doc Documentation (don't expect too much) /doc Documentation (a mix of ReST and READMEs)
/drivers Commonly used device drivers /drivers Device drivers
/dts Contains Makefile for building internal U-Boot fdt. /dts Makefile for building internal U-Boot fdt.
/env Environment files /env Environment support
/examples Example code for standalone applications, etc. /examples Example code for standalone applications, etc.
/fs Filesystem code (cramfs, ext2, jffs2, etc.) /fs Filesystem code (cramfs, ext2, jffs2, etc.)
/include Header Files /include Header Files
@ -161,7 +161,7 @@ Directory Hierarchy:
/post Power On Self Test /post Power On Self Test
/scripts Various build scripts and Makefiles /scripts Various build scripts and Makefiles
/test Various unit test files /test Various unit test files
/tools Tools to build S-Record or U-Boot images, etc. /tools Tools to build and sign FIT images, etc.
Software Configuration: Software Configuration:
======================= =======================
@ -1461,9 +1461,12 @@ The following options need to be configured:
In such cases CONFIG_GPIO_LED_INVERTED_TABLE may be defined In such cases CONFIG_GPIO_LED_INVERTED_TABLE may be defined
with a list of GPIO LEDs that have inverted polarity. with a list of GPIO LEDs that have inverted polarity.
- I2C Support: CONFIG_SYS_I2C - I2C Support: CONFIG_SYS_I2C_LEGACY
This enable the NEW i2c subsystem, and will allow you to use Note: This is deprecated in favour of driver model. Use
CONFIG_DM_I2C instead.
This enable the legacy i2c subsystem, and will allow you to use
i2c commands at the u-boot command line (as long as you set i2c commands at the u-boot command line (as long as you set
CONFIG_SYS_I2C_SOFT_SPEED and CONFIG_SYS_I2C_SOFT_SLAVE CONFIG_SYS_I2C_SOFT_SPEED and CONFIG_SYS_I2C_SOFT_SLAVE
for defining speed and slave address for defining speed and slave address

View file

@ -229,8 +229,8 @@ config X86
# Thing to enable for when SPL/TPL are enabled: SPL # Thing to enable for when SPL/TPL are enabled: SPL
imply SPL_DM imply SPL_DM
imply SPL_OF_LIBFDT imply SPL_OF_LIBFDT
imply SPL_DRIVERS_MISC_SUPPORT imply SPL_DRIVERS_MISC
imply SPL_GPIO_SUPPORT imply SPL_GPIO
imply SPL_PINCTRL imply SPL_PINCTRL
imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBGENERIC_SUPPORT imply SPL_LIBGENERIC_SUPPORT
@ -243,8 +243,8 @@ config X86
imply SPL_SYSCON imply SPL_SYSCON
# TPL # TPL
imply TPL_DM imply TPL_DM
imply TPL_DRIVERS_MISC_SUPPORT imply TPL_DRIVERS_MISC
imply TPL_GPIO_SUPPORT imply TPL_GPIO
imply TPL_PINCTRL imply TPL_PINCTRL
imply TPL_LIBCOMMON_SUPPORT imply TPL_LIBCOMMON_SUPPORT
imply TPL_LIBGENERIC_SUPPORT imply TPL_LIBGENERIC_SUPPORT

View file

@ -954,7 +954,7 @@ config ARCH_SOCFPGA
select SPL_SEPARATE_BSS if TARGET_SOCFPGA_SOC64 select SPL_SEPARATE_BSS if TARGET_SOCFPGA_SOC64
select SPL_SERIAL_SUPPORT select SPL_SERIAL_SUPPORT
select SPL_SYSRESET select SPL_SYSRESET
select SPL_WATCHDOG_SUPPORT select SPL_WATCHDOG
select SUPPORT_SPL select SUPPORT_SPL
select SYS_NS16550 select SYS_NS16550
select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
@ -1019,11 +1019,11 @@ config ARCH_SUNXI
imply FIT imply FIT
imply OF_LIBFDT_OVERLAY imply OF_LIBFDT_OVERLAY
imply PRE_CONSOLE_BUFFER imply PRE_CONSOLE_BUFFER
imply SPL_GPIO_SUPPORT imply SPL_GPIO
imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBGENERIC_SUPPORT imply SPL_LIBGENERIC_SUPPORT
imply SPL_MMC_SUPPORT if MMC imply SPL_MMC_SUPPORT if MMC
imply SPL_POWER_SUPPORT imply SPL_POWER
imply SPL_SERIAL_SUPPORT imply SPL_SERIAL_SUPPORT
imply USB_GADGET imply USB_GADGET

View file

@ -329,7 +329,7 @@ static void erratum_rcw_src(void)
#ifdef CONFIG_SYS_FSL_ERRATUM_A009203 #ifdef CONFIG_SYS_FSL_ERRATUM_A009203
static void erratum_a009203(void) static void erratum_a009203(void)
{ {
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
u8 __iomem *ptr; u8 __iomem *ptr;
#ifdef I2C1_BASE_ADDR #ifdef I2C1_BASE_ADDR
ptr = (u8 __iomem *)(I2C1_BASE_ADDR + I2C_DEBUG_REG); ptr = (u8 __iomem *)(I2C1_BASE_ADDR + I2C_DEBUG_REG);

View file

@ -88,8 +88,8 @@ void board_init_f(ulong dummy)
preloader_console_init(); preloader_console_init();
spl_set_bd(); spl_set_bd();
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
#ifdef CONFIG_SPL_I2C_SUPPORT #ifdef CONFIG_SPL_I2C
i2c_init_all(); i2c_init_all();
#endif #endif
#endif #endif

View file

@ -184,7 +184,7 @@
#define TZPC_BASE 0x02200000 #define TZPC_BASE 0x02200000
#define TZPCDECPROT_0_SET_BASE (TZPC_BASE + 0x804) #define TZPCDECPROT_0_SET_BASE (TZPC_BASE + 0x804)
#if !CONFIG_IS_ENABLED(DM_I2C) #if !CONFIG_IS_ENABLED(DM_I2C)
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_LEGACY
#define CONFIG_SYS_I2C_EARLY_INIT #define CONFIG_SYS_I2C_EARLY_INIT
#endif #endif
#define SRDS_MAX_LANES 8 #define SRDS_MAX_LANES 8

View file

@ -78,7 +78,7 @@ endif
if ARCH_EXYNOS5 if ARCH_EXYNOS5
config SPL_GPIO_SUPPORT config SPL_GPIO
default y default y
config SPL_LIBCOMMON_SUPPORT config SPL_LIBCOMMON_SUPPORT

View file

@ -301,7 +301,7 @@ config TARGET_MX6DL_MAMOJ
select PINCTRL select PINCTRL
select SPL select SPL
select SPL_DM if SPL select SPL_DM if SPL
select SPL_GPIO_SUPPORT if SPL select SPL_GPIO if SPL
select SPL_LIBCOMMON_SUPPORT if SPL select SPL_LIBCOMMON_SUPPORT if SPL
select SPL_LIBDISK_SUPPORT if SPL select SPL_LIBDISK_SUPPORT if SPL
select SPL_LIBGENERIC_SUPPORT if SPL select SPL_LIBGENERIC_SUPPORT if SPL
@ -312,9 +312,9 @@ config TARGET_MX6DL_MAMOJ
select SPL_SEPARATE_BSS if SPL select SPL_SEPARATE_BSS if SPL
select SPL_SERIAL_SUPPORT if SPL select SPL_SERIAL_SUPPORT if SPL
select SPL_USB_GADGET if SPL select SPL_USB_GADGET if SPL
select SPL_USB_HOST_SUPPORT if SPL select SPL_USB_HOST if SPL
select SPL_USB_SDP_SUPPORT if SPL select SPL_USB_SDP_SUPPORT if SPL
select SPL_WATCHDOG_SUPPORT if SPL select SPL_WATCHDOG if SPL
select SUPPORT_SPL select SUPPORT_SPL
imply CMD_DM imply CMD_DM

View file

@ -96,7 +96,7 @@
*/ */
#if defined(CONFIG_CMD_I2C) && !CONFIG_IS_ENABLED(DM_I2C) #if defined(CONFIG_CMD_I2C) && !CONFIG_IS_ENABLED(DM_I2C)
#ifndef CONFIG_SYS_I2C_SOFT #ifndef CONFIG_SYS_I2C_SOFT
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_LEGACY
#define CONFIG_SYS_I2C_MVTWSI #define CONFIG_SYS_I2C_MVTWSI
#endif #endif
#define CONFIG_SYS_I2C_SLAVE 0x0 #define CONFIG_SYS_I2C_SLAVE 0x0

View file

@ -264,7 +264,7 @@ config MVEBU_SPL_BOOT_DEVICE_MMC
# GPIO needed for eMMC/SD card presence detection # GPIO needed for eMMC/SD card presence detection
select SPL_DM_GPIO select SPL_DM_GPIO
select SPL_DM_MMC select SPL_DM_MMC
select SPL_GPIO_SUPPORT select SPL_GPIO
select SPL_LIBDISK_SUPPORT select SPL_LIBDISK_SUPPORT
select SPL_MMC_SUPPORT select SPL_MMC_SUPPORT

View file

@ -15,15 +15,15 @@ config OMAP34XX
imply NAND_OMAP_GPMC imply NAND_OMAP_GPMC
imply SPL_FS_EXT4 imply SPL_FS_EXT4
imply SPL_FS_FAT imply SPL_FS_FAT
imply SPL_GPIO_SUPPORT imply SPL_GPIO
imply SPL_I2C_SUPPORT imply SPL_I2C
imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBDISK_SUPPORT imply SPL_LIBDISK_SUPPORT
imply SPL_LIBGENERIC_SUPPORT imply SPL_LIBGENERIC_SUPPORT
imply SPL_MMC_SUPPORT imply SPL_MMC_SUPPORT
imply SPL_NAND_SUPPORT imply SPL_NAND_SUPPORT
imply SPL_OMAP3_ID_NAND imply SPL_OMAP3_ID_NAND
imply SPL_POWER_SUPPORT imply SPL_POWER
imply SPL_SERIAL_SUPPORT imply SPL_SERIAL_SUPPORT
imply SYS_I2C_OMAP24XX imply SYS_I2C_OMAP24XX
imply SYS_THUMB_BUILD imply SYS_THUMB_BUILD
@ -37,15 +37,15 @@ config OMAP44XX
imply SPL_DISPLAY_PRINT imply SPL_DISPLAY_PRINT
imply SPL_FS_EXT4 imply SPL_FS_EXT4
imply SPL_FS_FAT imply SPL_FS_FAT
imply SPL_GPIO_SUPPORT imply SPL_GPIO
imply SPL_I2C_SUPPORT imply SPL_I2C
imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBDISK_SUPPORT imply SPL_LIBDISK_SUPPORT
imply SPL_LIBGENERIC_SUPPORT imply SPL_LIBGENERIC_SUPPORT
imply SPL_MMC_SUPPORT imply SPL_MMC_SUPPORT
imply SPL_NAND_SIMPLE imply SPL_NAND_SIMPLE
imply SPL_NAND_SUPPORT imply SPL_NAND_SUPPORT
imply SPL_POWER_SUPPORT imply SPL_POWER
imply SPL_SERIAL_SUPPORT imply SPL_SERIAL_SUPPORT
imply SYS_I2C_OMAP24XX imply SYS_I2C_OMAP24XX
imply SYS_THUMB_BUILD imply SYS_THUMB_BUILD
@ -61,8 +61,8 @@ config OMAP54XX
imply SPL_ENV_SUPPORT imply SPL_ENV_SUPPORT
imply SPL_FS_EXT4 imply SPL_FS_EXT4
imply SPL_FS_FAT imply SPL_FS_FAT
imply SPL_GPIO_SUPPORT imply SPL_GPIO
imply SPL_I2C_SUPPORT imply SPL_I2C
imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBDISK_SUPPORT imply SPL_LIBDISK_SUPPORT
imply SPL_LIBGENERIC_SUPPORT imply SPL_LIBGENERIC_SUPPORT
@ -70,7 +70,7 @@ config OMAP54XX
imply SPL_NAND_AM33XX_BCH imply SPL_NAND_AM33XX_BCH
imply SPL_NAND_AM33XX_BCH imply SPL_NAND_AM33XX_BCH
imply SPL_NAND_SUPPORT imply SPL_NAND_SUPPORT
imply SPL_POWER_SUPPORT imply SPL_POWER
imply SPL_SERIAL_SUPPORT imply SPL_SERIAL_SUPPORT
imply SYS_I2C_OMAP24XX imply SYS_I2C_OMAP24XX

View file

@ -41,19 +41,19 @@ config TARGET_AM335X_EVM
imply SPL_ENV_SUPPORT imply SPL_ENV_SUPPORT
imply SPL_FS_EXT4 imply SPL_FS_EXT4
imply SPL_FS_FAT imply SPL_FS_FAT
imply SPL_GPIO_SUPPORT imply SPL_GPIO
imply SPL_I2C_SUPPORT imply SPL_I2C
imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBDISK_SUPPORT imply SPL_LIBDISK_SUPPORT
imply SPL_LIBGENERIC_SUPPORT imply SPL_LIBGENERIC_SUPPORT
imply SPL_MMC_SUPPORT imply SPL_MMC_SUPPORT
imply SPL_NAND_SUPPORT imply SPL_NAND_SUPPORT
imply SPL_OF_LIBFDT imply SPL_OF_LIBFDT
imply SPL_POWER_SUPPORT imply SPL_POWER
imply SPL_SEPARATE_BSS imply SPL_SEPARATE_BSS
imply SPL_SERIAL_SUPPORT imply SPL_SERIAL_SUPPORT
imply SPL_SYS_MALLOC_SIMPLE imply SPL_SYS_MALLOC_SIMPLE
imply SPL_WATCHDOG_SUPPORT imply SPL_WATCHDOG
imply SPL_YMODEM_SUPPORT imply SPL_YMODEM_SUPPORT
help help
This option specifies support for the AM335x This option specifies support for the AM335x
@ -225,16 +225,16 @@ config TARGET_AM43XX_EVM
imply SPL_ENV_SUPPORT imply SPL_ENV_SUPPORT
imply SPL_FS_EXT4 imply SPL_FS_EXT4
imply SPL_FS_FAT imply SPL_FS_FAT
imply SPL_GPIO_SUPPORT imply SPL_GPIO
imply SPL_I2C_SUPPORT imply SPL_I2C
imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBDISK_SUPPORT imply SPL_LIBDISK_SUPPORT
imply SPL_LIBGENERIC_SUPPORT imply SPL_LIBGENERIC_SUPPORT
imply SPL_MMC_SUPPORT imply SPL_MMC_SUPPORT
imply SPL_NAND_SUPPORT imply SPL_NAND_SUPPORT
imply SPL_POWER_SUPPORT imply SPL_POWER
imply SPL_SERIAL_SUPPORT imply SPL_SERIAL_SUPPORT
imply SPL_WATCHDOG_SUPPORT imply SPL_WATCHDOG
imply SPL_YMODEM_SUPPORT imply SPL_YMODEM_SUPPORT
help help
This option specifies support for the AM43xx This option specifies support for the AM43xx

View file

@ -209,7 +209,7 @@ int cpu_mmc_init(struct bd_info *bis)
#if (defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST)) && \ #if (defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST)) && \
(defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1)) && \ (defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1)) && \
(!CONFIG_IS_ENABLED(DM_USB) || !CONFIG_IS_ENABLED(OF_CONTROL)) && \ (!CONFIG_IS_ENABLED(DM_USB) || !CONFIG_IS_ENABLED(OF_CONTROL)) && \
(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_MUSB_NEW_SUPPORT)) (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_MUSB_NEW))
static struct musb_hdrc_config musb_config = { static struct musb_hdrc_config musb_config = {
.multipoint = 1, .multipoint = 1,

View file

@ -104,7 +104,7 @@ void save_omap_boot_params(void)
sys_boot_device = 1; sys_boot_device = 1;
break; break;
#endif #endif
#if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH_SUPPORT) #if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH)
case BOOT_DEVICE_CPGMAC: case BOOT_DEVICE_CPGMAC:
sys_boot_device = 1; sys_boot_device = 1;
break; break;
@ -202,10 +202,10 @@ void spl_board_init(void)
#if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT) #if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT)
gpmc_init(); gpmc_init();
#endif #endif
#if defined(CONFIG_SPL_I2C_SUPPORT) && !CONFIG_IS_ENABLED(DM_I2C) #if defined(CONFIG_SPL_I2C) && !CONFIG_IS_ENABLED(DM_I2C)
i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
#endif #endif
#if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW_SUPPORT) #if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW)
arch_misc_init(); arch_misc_init();
#endif #endif
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)

View file

@ -56,7 +56,7 @@ config ROCKCHIP_RK3188
select SPL_REGMAP select SPL_REGMAP
select SPL_SYSCON select SPL_SYSCON
select SPL_RAM select SPL_RAM
select SPL_DRIVERS_MISC_SUPPORT select SPL_DRIVERS_MISC
select SPL_ROCKCHIP_EARLYRETURN_TO_BROM select SPL_ROCKCHIP_EARLYRETURN_TO_BROM
select SPL_ROCKCHIP_BACK_TO_BROM select SPL_ROCKCHIP_BACK_TO_BROM
select BOARD_LATE_INIT select BOARD_LATE_INIT
@ -82,7 +82,7 @@ config ROCKCHIP_RK322X
select TPL_OF_LIBFDT select TPL_OF_LIBFDT
select TPL_NEEDS_SEPARATE_TEXT_BASE if SPL select TPL_NEEDS_SEPARATE_TEXT_BASE if SPL
select TPL_NEEDS_SEPARATE_STACK if TPL select TPL_NEEDS_SEPARATE_STACK if TPL
select SPL_DRIVERS_MISC_SUPPORT select SPL_DRIVERS_MISC
imply ROCKCHIP_COMMON_BOARD imply ROCKCHIP_COMMON_BOARD
imply SPL_SERIAL_SUPPORT imply SPL_SERIAL_SUPPORT
imply SPL_ROCKCHIP_COMMON_BOARD imply SPL_ROCKCHIP_COMMON_BOARD
@ -108,7 +108,7 @@ config ROCKCHIP_RK3288
imply SPL_ROCKCHIP_COMMON_BOARD imply SPL_ROCKCHIP_COMMON_BOARD
imply TPL_CLK imply TPL_CLK
imply TPL_DM imply TPL_DM
imply TPL_DRIVERS_MISC_SUPPORT imply TPL_DRIVERS_MISC
imply TPL_LIBCOMMON_SUPPORT imply TPL_LIBCOMMON_SUPPORT
imply TPL_LIBGENERIC_SUPPORT imply TPL_LIBGENERIC_SUPPORT
imply TPL_NEEDS_SEPARATE_TEXT_BASE imply TPL_NEEDS_SEPARATE_TEXT_BASE
@ -219,7 +219,7 @@ config ROCKCHIP_RK3399
select TPL_NEEDS_SEPARATE_STACK if TPL select TPL_NEEDS_SEPARATE_STACK if TPL
select SPL_SEPARATE_BSS select SPL_SEPARATE_BSS
select SPL_SERIAL_SUPPORT select SPL_SERIAL_SUPPORT
select SPL_DRIVERS_MISC_SUPPORT select SPL_DRIVERS_MISC
select CLK select CLK
select FIT select FIT
select PINCTRL select PINCTRL
@ -238,7 +238,7 @@ config ROCKCHIP_RK3399
imply TPL_LIBCOMMON_SUPPORT imply TPL_LIBCOMMON_SUPPORT
imply TPL_LIBGENERIC_SUPPORT imply TPL_LIBGENERIC_SUPPORT
imply TPL_SYS_MALLOC_SIMPLE imply TPL_SYS_MALLOC_SIMPLE
imply TPL_DRIVERS_MISC_SUPPORT imply TPL_DRIVERS_MISC
imply TPL_OF_CONTROL imply TPL_OF_CONTROL
imply TPL_DM imply TPL_DM
imply TPL_REGMAP imply TPL_REGMAP

View file

@ -154,7 +154,7 @@ config SYS_SOC
config SYS_MALLOC_F_LEN config SYS_MALLOC_F_LEN
default 0x2000 default 0x2000
config SPL_DRIVERS_MISC_SUPPORT config SPL_DRIVERS_MISC
default y default y
config SPL_LIBCOMMON_SUPPORT config SPL_LIBCOMMON_SUPPORT

View file

@ -218,7 +218,7 @@ void spl_perform_fixups(struct spl_image_info *spl_image)
"u-boot,spl-boot-device", boot_ofpath); "u-boot,spl-boot-device", boot_ofpath);
} }
#if defined(SPL_GPIO_SUPPORT) #if defined(SPL_GPIO)
static void rk3399_force_power_on_reset(void) static void rk3399_force_power_on_reset(void)
{ {
ofnode node; ofnode node;
@ -250,7 +250,7 @@ void spl_board_init(void)
{ {
led_setup(); led_setup();
#if defined(SPL_GPIO_SUPPORT) #if defined(SPL_GPIO)
struct rockchip_cru *cru = rockchip_get_cru(); struct rockchip_cru *cru = rockchip_get_cru();
/* /*

View file

@ -31,8 +31,8 @@ config STM32F7
select SPL_DM select SPL_DM
select SPL_DM_RESET select SPL_DM_RESET
select SPL_DM_SEQ_ALIAS select SPL_DM_SEQ_ALIAS
select SPL_DRIVERS_MISC_SUPPORT select SPL_DRIVERS_MISC
select SPL_GPIO_SUPPORT select SPL_GPIO
select SPL_LIBCOMMON_SUPPORT select SPL_LIBCOMMON_SUPPORT
select SPL_LIBGENERIC_SUPPORT select SPL_LIBGENERIC_SUPPORT
select SPL_MTD_SUPPORT select SPL_MTD_SUPPORT

View file

@ -5,9 +5,9 @@ config SPL
select SPL_CLK select SPL_CLK
select SPL_DM select SPL_DM
select SPL_DM_SEQ_ALIAS select SPL_DM_SEQ_ALIAS
select SPL_DRIVERS_MISC_SUPPORT select SPL_DRIVERS_MISC
select SPL_FRAMEWORK select SPL_FRAMEWORK
select SPL_GPIO_SUPPORT select SPL_GPIO
select SPL_LIBCOMMON_SUPPORT select SPL_LIBCOMMON_SUPPORT
select SPL_LIBGENERIC_SUPPORT select SPL_LIBGENERIC_SUPPORT
select SPL_OF_CONTROL select SPL_OF_CONTROL
@ -17,7 +17,7 @@ config SPL
select SPL_DM_RESET select SPL_DM_RESET
select SPL_SERIAL_SUPPORT select SPL_SERIAL_SUPPORT
select SPL_SYSCON select SPL_SYSCON
select SPL_WATCHDOG_SUPPORT if WATCHDOG select SPL_WATCHDOG if WATCHDOG
imply BOOTSTAGE_STASH if SPL_BOOTSTAGE imply BOOTSTAGE_STASH if SPL_BOOTSTAGE
imply SPL_BOOTSTAGE if BOOTSTAGE imply SPL_BOOTSTAGE if BOOTSTAGE
imply SPL_DISPLAY_PRINT imply SPL_DISPLAY_PRINT

View file

@ -339,7 +339,7 @@ void board_init_f(ulong dummy)
spl_init(); spl_init();
preloader_console_init(); preloader_console_init();
#ifdef CONFIG_SPL_I2C_SUPPORT #ifdef CONFIG_SPL_I2C
/* Needed early by sunxi_board_init if PMU is enabled */ /* Needed early by sunxi_board_init if PMU is enabled */
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif #endif

View file

@ -1,6 +1,6 @@
if ARCH_TEGRA if ARCH_TEGRA
config SPL_GPIO_SUPPORT config SPL_GPIO
default y default y
config SPL_LIBCOMMON_SUPPORT config SPL_LIBCOMMON_SUPPORT

View file

@ -122,7 +122,7 @@ config MPC83XX_SDHC_SUPPORT
config MPC83XX_SATA_SUPPORT config MPC83XX_SATA_SUPPORT
bool bool
config MPC83XX_SECOND_I2C_SUPPORT config MPC83XX_SECOND_I2C
bool bool
config MPC83XX_LDP_PIN config MPC83XX_LDP_PIN
@ -138,14 +138,14 @@ config ARCH_MPC8308
select MPC83XX_TSEC1_SUPPORT select MPC83XX_TSEC1_SUPPORT
select MPC83XX_TSEC2_SUPPORT select MPC83XX_TSEC2_SUPPORT
select MPC83XX_PCIE1_SUPPORT select MPC83XX_PCIE1_SUPPORT
select MPC83XX_SECOND_I2C_SUPPORT select MPC83XX_SECOND_I2C
config ARCH_MPC8309 config ARCH_MPC8309
bool bool
select ARCH_MPC830X select ARCH_MPC830X
select MPC83XX_QUICC_ENGINE select MPC83XX_QUICC_ENGINE
select MPC83XX_PCI_SUPPORT select MPC83XX_PCI_SUPPORT
select MPC83XX_SECOND_I2C_SUPPORT select MPC83XX_SECOND_I2C
select SYS_FSL_ERRATUM_ESDHC111 select SYS_FSL_ERRATUM_ESDHC111
select FSL_ELBC select FSL_ELBC
@ -158,7 +158,7 @@ config ARCH_MPC831X
config ARCH_MPC8313 config ARCH_MPC8313
bool bool
select ARCH_MPC831X select ARCH_MPC831X
select MPC83XX_SECOND_I2C_SUPPORT select MPC83XX_SECOND_I2C
select FSL_ELBC select FSL_ELBC
config ARCH_MPC832X config ARCH_MPC832X
@ -176,14 +176,14 @@ config ARCH_MPC8349
select MPC83XX_TSEC1_SUPPORT select MPC83XX_TSEC1_SUPPORT
select MPC83XX_TSEC2_SUPPORT select MPC83XX_TSEC2_SUPPORT
select MPC83XX_LDP_PIN select MPC83XX_LDP_PIN
select MPC83XX_SECOND_I2C_SUPPORT select MPC83XX_SECOND_I2C
config ARCH_MPC8360 config ARCH_MPC8360
bool bool
select MPC83XX_QUICC_ENGINE select MPC83XX_QUICC_ENGINE
select MPC83XX_PCI_SUPPORT select MPC83XX_PCI_SUPPORT
select MPC83XX_LDP_PIN select MPC83XX_LDP_PIN
select MPC83XX_SECOND_I2C_SUPPORT select MPC83XX_SECOND_I2C
config ARCH_MPC837X config ARCH_MPC837X
bool bool
@ -195,7 +195,7 @@ config ARCH_MPC837X
select MPC83XX_SDHC_SUPPORT select MPC83XX_SDHC_SUPPORT
select MPC83XX_SATA_SUPPORT select MPC83XX_SATA_SUPPORT
select MPC83XX_LDP_PIN select MPC83XX_LDP_PIN
select MPC83XX_SECOND_I2C_SUPPORT select MPC83XX_SECOND_I2C
select FSL_ELBC select FSL_ELBC
config SYS_IMMR config SYS_IMMR

View file

@ -37,4 +37,4 @@ config SIFIVE_FU740
imply PWM_SIFIVE imply PWM_SIFIVE
imply DM_I2C imply DM_I2C
imply SYS_I2C_OCORES imply SYS_I2C_OCORES
imply SPL_I2C_SUPPORT imply SPL_I2C

View file

@ -106,7 +106,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
env_relocate(); env_relocate();
#endif #endif
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
i2c_init_all(); i2c_init_all();
#else #else
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);

View file

@ -5,6 +5,6 @@
# Author: Igor Grinberg <grinberg@compulab.co.il> # Author: Igor Grinberg <grinberg@compulab.co.il>
obj-y += common.o obj-y += common.o
obj-$(CONFIG_SYS_I2C) += eeprom.o obj-$(CONFIG_SYS_I2C_LEGACY) += eeprom.o
obj-$(CONFIG_LCD) += omap3_display.o obj-$(CONFIG_LCD) += omap3_display.o
obj-$(CONFIG_SMC911X) += omap3_smc911x.o obj-$(CONFIG_SMC911X) += omap3_smc911x.o

View file

@ -10,7 +10,7 @@
#define _EEPROM_ #define _EEPROM_
#include <errno.h> #include <errno.h>
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus); int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus);
u32 cl_eeprom_get_board_rev(uint eeprom_bus); u32 cl_eeprom_get_board_rev(uint eeprom_bus);
int cl_eeprom_get_product_name(uchar *buf, uint eeprom_bus); int cl_eeprom_get_product_name(uchar *buf, uint eeprom_bus);

View file

@ -13,7 +13,7 @@ static u32 opp_voltage_mv __section(".data");
void board_vddcore_init(u32 voltage_mv) void board_vddcore_init(u32 voltage_mv)
{ {
if (IS_ENABLED(CONFIG_PMIC_STPMIC1) && CONFIG_IS_ENABLED(POWER_SUPPORT)) if (IS_ENABLED(CONFIG_PMIC_STPMIC1) && CONFIG_IS_ENABLED(POWER))
opp_voltage_mv = voltage_mv; opp_voltage_mv = voltage_mv;
} }

View file

@ -213,7 +213,7 @@ void board_init_f(ulong dummy)
preloader_console_init(); preloader_console_init();
#ifdef CONFIG_SPL_I2C_SUPPORT #ifdef CONFIG_SPL_I2C
i2c_init_all(); i2c_init_all();
#endif #endif

View file

@ -99,7 +99,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
env_relocate(); env_relocate();
#endif #endif
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
i2c_init_all(); i2c_init_all();
#else #else
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);

View file

@ -89,7 +89,7 @@ static int phycore_init(void)
if (ret) if (ret)
return ret; return ret;
#if defined(CONFIG_SPL_POWER_SUPPORT) #if defined(CONFIG_SPL_POWER)
/* Increase USB input current to 2A */ /* Increase USB input current to 2A */
ret = rk818_spl_configure_usb_input_current(pmic, 2000); ret = rk818_spl_configure_usb_input_current(pmic, 2000);
if (ret) if (ret)

View file

@ -38,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR;
int board_early_init_f(void) int board_early_init_f(void)
{ {
#if defined(CONFIG_SYS_I2C) && defined(CONFIG_SYS_I2C_SH) #if defined(CONFIG_SYS_I2C_LEGACY) && defined(CONFIG_SYS_I2C_SH)
/* DVFS for reset */ /* DVFS for reset */
mstp_clrbits_le32(SMSTPCR9, SMSTPCR9, DVFS_MSTP926); mstp_clrbits_le32(SMSTPCR9, SMSTPCR9, DVFS_MSTP926);
#endif #endif

View file

@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;
int board_early_init_f(void) int board_early_init_f(void)
{ {
#if defined(CONFIG_SYS_I2C) && defined(CONFIG_SYS_I2C_SH) #if defined(CONFIG_SYS_I2C_LEGACY) && defined(CONFIG_SYS_I2C_SH)
/* DVFS for reset */ /* DVFS for reset */
mstp_clrbits_le32(SMSTPCR9, SMSTPCR9, DVFS_MSTP926); mstp_clrbits_le32(SMSTPCR9, SMSTPCR9, DVFS_MSTP926);
#endif #endif
@ -78,7 +78,7 @@ int board_init(void)
void reset_cpu(void) void reset_cpu(void)
{ {
#if defined(CONFIG_SYS_I2C) && defined(CONFIG_SYS_I2C_SH) #if defined(CONFIG_SYS_I2C_LEGACY) && defined(CONFIG_SYS_I2C_SH)
i2c_reg_write(CONFIG_SYS_I2C_POWERIC_ADDR, 0x20, 0x80); i2c_reg_write(CONFIG_SYS_I2C_POWERIC_ADDR, 0x20, 0x80);
#else #else
/* only CA57 ? */ /* only CA57 ? */

View file

@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR;
int board_early_init_f(void) int board_early_init_f(void)
{ {
#if defined(CONFIG_SYS_I2C) && defined(CONFIG_SYS_I2C_SH) #if defined(CONFIG_SYS_I2C_LEGACY) && defined(CONFIG_SYS_I2C_SH)
/* DVFS for reset */ /* DVFS for reset */
mstp_clrbits_le32(SMSTPCR9, SMSTPCR9, DVFS_MSTP926); mstp_clrbits_le32(SMSTPCR9, SMSTPCR9, DVFS_MSTP926);
#endif #endif

View file

@ -288,7 +288,7 @@ int board_late_init(void)
#endif #endif
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
static void cpsw_control(int enabled) static void cpsw_control(int enabled)
{ {
/* VTP can be added here */ /* VTP can be added here */

View file

@ -171,7 +171,7 @@ int read_eeprom(void)
} }
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
static void cpsw_control(int enabled) static void cpsw_control(int enabled)
{ {
/* VTP can be added here */ /* VTP can be added here */
@ -220,7 +220,7 @@ int board_eth_init(struct bd_info *bis)
{ {
int n = 0; int n = 0;
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
#ifdef CONFIG_FACTORYSET #ifdef CONFIG_FACTORYSET
int rv; int rv;

View file

@ -104,7 +104,7 @@ int board_init(void)
/* Address of boot parameters */ /* Address of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
#endif #endif

View file

@ -17,13 +17,13 @@ static u32 opp_voltage_mv __section(".data");
void board_vddcore_init(u32 voltage_mv) void board_vddcore_init(u32 voltage_mv)
{ {
if (IS_ENABLED(CONFIG_PMIC_STPMIC1) && CONFIG_IS_ENABLED(POWER_SUPPORT)) if (IS_ENABLED(CONFIG_PMIC_STPMIC1) && CONFIG_IS_ENABLED(POWER))
opp_voltage_mv = voltage_mv; opp_voltage_mv = voltage_mv;
} }
int board_early_init_f(void) int board_early_init_f(void)
{ {
if (IS_ENABLED(CONFIG_PMIC_STPMIC1) && CONFIG_IS_ENABLED(POWER_SUPPORT)) if (IS_ENABLED(CONFIG_PMIC_STPMIC1) && CONFIG_IS_ENABLED(POWER))
stpmic1_init(opp_voltage_mv); stpmic1_init(opp_voltage_mv);
return 0; return 0;

View file

@ -250,7 +250,7 @@ int board_late_init(void)
#endif #endif
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
static void cpsw_control(int enabled) static void cpsw_control(int enabled)
{ {
/* VTP can be added here */ /* VTP can be added here */
@ -302,7 +302,7 @@ static struct cpsw_platform_data cpsw_data = {
* Build in only these cases to avoid warnings about unused variables * Build in only these cases to avoid warnings about unused variables
* when we build an SPL that has neither option but full U-Boot will. * when we build an SPL that has neither option but full U-Boot will.
*/ */
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \ #if ((defined(CONFIG_SPL_ETH) || defined(CONFIG_SPL_USB_ETHER)) \
&& defined(CONFIG_SPL_BUILD)) || \ && defined(CONFIG_SPL_BUILD)) || \
((defined(CONFIG_DRIVER_TI_CPSW) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \
defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
@ -324,7 +324,7 @@ int board_eth_init(struct bd_info *bis)
mac_addr[5] = (mac_lo & 0xFF00) >> 8; mac_addr[5] = (mac_lo & 0xFF00) >> 8;
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
if (!env_get("ethaddr")) { if (!env_get("ethaddr")) {
printf("<ethaddr> not set. Validating first E-fuse MAC\n"); printf("<ethaddr> not set. Validating first E-fuse MAC\n");

View file

@ -588,7 +588,7 @@ void sdram_init(void)
#endif #endif
#if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \ #if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD)))
static void request_and_set_gpio(int gpio, char *name, int val) static void request_and_set_gpio(int gpio, char *name, int val)
{ {
int ret; int ret;
@ -724,7 +724,7 @@ int board_init(void)
#endif #endif
#if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \ #if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD)))
if (board_is_icev2()) { if (board_is_icev2()) {
int rv; int rv;
u32 reg; u32 reg;

View file

@ -171,7 +171,7 @@ int board_spi_cs_gpio(unsigned bus, unsigned cs)
#endif #endif
#endif #endif
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
static struct i2c_pads_info tqma6_i2c3_pads = { static struct i2c_pads_info tqma6_i2c3_pads = {
/* I2C3: on board LM75, M24C64, */ /* I2C3: on board LM75, M24C64, */
.scl = { .scl = {
@ -216,7 +216,7 @@ int board_init(void)
#ifndef CONFIG_DM_SPI #ifndef CONFIG_DM_SPI
tqma6_iomuxc_spi(); tqma6_iomuxc_spi();
#endif #endif
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
tqma6_setup_i2c(); tqma6_setup_i2c();
#endif #endif

View file

@ -379,7 +379,7 @@ int board_late_init(void)
#endif #endif
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
static void cpsw_control(int enabled) static void cpsw_control(int enabled)
{ {
/* VTP can be added here */ /* VTP can be added here */
@ -421,7 +421,7 @@ static struct cpsw_platform_data cpsw_data = {
}; };
#endif #endif
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \ #if ((defined(CONFIG_SPL_ETH) || defined(CONFIG_SPL_USB_ETHER)) \
&& defined(CONFIG_SPL_BUILD)) || \ && defined(CONFIG_SPL_BUILD)) || \
((defined(CONFIG_DRIVER_TI_CPSW) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \
defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
@ -450,7 +450,7 @@ int board_eth_init(struct bd_info *bis)
mac_addr[5] = (mac_lo & 0xFF00) >> 8; mac_addr[5] = (mac_lo & 0xFF00) >> 8;
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
if (!env_get("ethaddr")) { if (!env_get("ethaddr")) {
printf("<ethaddr> not set. Validating first E-fuse MAC\n"); printf("<ethaddr> not set. Validating first E-fuse MAC\n");

View file

@ -167,7 +167,7 @@ config CMD_TLV_EEPROM
config SPL_CMD_TLV_EEPROM config SPL_CMD_TLV_EEPROM
bool "tlv_eeprom for SPL" bool "tlv_eeprom for SPL"
depends on SPL_I2C_EEPROM depends on SPL_I2C_EEPROM
select SPL_DRIVERS_MISC_SUPPORT select SPL_DRIVERS_MISC
help help
Read system EEPROM data block in ONIE Tlvinfo format from SPL. Read system EEPROM data block in ONIE Tlvinfo format from SPL.

View file

@ -46,7 +46,7 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc,
printf("Cannot find RTC: err=%d\n", rcode); printf("Cannot find RTC: err=%d\n", rcode);
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }
#elif defined(CONFIG_SYS_I2C) #elif defined(CONFIG_SYS_I2C_LEGACY)
old_bus = i2c_get_bus_num(); old_bus = i2c_get_bus_num();
i2c_set_bus_num(CONFIG_SYS_RTC_BUS_NUM); i2c_set_bus_num(CONFIG_SYS_RTC_BUS_NUM);
#else #else
@ -119,7 +119,7 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc,
} }
/* switch back to original I2C bus */ /* switch back to original I2C bus */
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
i2c_set_bus_num(old_bus); i2c_set_bus_num(old_bus);
#elif !defined(CONFIG_DM_RTC) #elif !defined(CONFIG_DM_RTC)
I2C_SET_BUS(old_bus); I2C_SET_BUS(old_bus);

View file

@ -75,7 +75,7 @@ void eeprom_init(int bus)
/* I2C EEPROM */ /* I2C EEPROM */
#if CONFIG_IS_ENABLED(DM_I2C) #if CONFIG_IS_ENABLED(DM_I2C)
eeprom_i2c_bus = bus; eeprom_i2c_bus = bus;
#elif defined(CONFIG_SYS_I2C) #elif defined(CONFIG_SYS_I2C_LEGACY)
if (bus >= 0) if (bus >= 0)
i2c_set_bus_num(bus); i2c_set_bus_num(bus);
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);

View file

@ -98,7 +98,7 @@ static uint i2c_mm_last_alen;
* pairs. The following macros take care of this */ * pairs. The following macros take care of this */
#if defined(CONFIG_SYS_I2C_NOPROBES) #if defined(CONFIG_SYS_I2C_NOPROBES)
#if defined(CONFIG_SYS_I2C) || defined(CONFIG_I2C_MULTI_BUS) #if defined(CONFIG_SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS)
static struct static struct
{ {
uchar bus; uchar bus;
@ -114,7 +114,7 @@ static uchar i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES;
#define COMPARE_BUS(b,i) ((b) == 0) /* Make compiler happy */ #define COMPARE_BUS(b,i) ((b) == 0) /* Make compiler happy */
#define COMPARE_ADDR(a,i) (i2c_no_probes[(i)] == (a)) #define COMPARE_ADDR(a,i) (i2c_no_probes[(i)] == (a))
#define NO_PROBE_ADDR(i) i2c_no_probes[(i)] #define NO_PROBE_ADDR(i) i2c_no_probes[(i)]
#endif /* defined(CONFIG_SYS_I2C) */ #endif /* defined(CONFIG_SYS_I2C_LEGACY) */
#endif #endif
#define DISP_LINE_LEN 16 #define DISP_LINE_LEN 16
@ -209,7 +209,7 @@ void i2c_init_board(void)
* *
* Returns I2C bus speed in Hz. * Returns I2C bus speed in Hz.
*/ */
#if !defined(CONFIG_SYS_I2C) && !CONFIG_IS_ENABLED(DM_I2C) #if !defined(CONFIG_SYS_I2C_LEGACY) && !CONFIG_IS_ENABLED(DM_I2C)
/* /*
* TODO: Implement architecture-specific get/set functions * TODO: Implement architecture-specific get/set functions
* Should go away, if we switched completely to new multibus support * Should go away, if we switched completely to new multibus support
@ -1725,7 +1725,7 @@ static void show_bus(struct udevice *bus)
* *
* Returns zero always. * Returns zero always.
*/ */
#if defined(CONFIG_SYS_I2C) || CONFIG_IS_ENABLED(DM_I2C) #if defined(CONFIG_SYS_I2C_LEGACY) || CONFIG_IS_ENABLED(DM_I2C)
static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc, static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
{ {
@ -1811,7 +1811,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
* Returns zero on success, CMD_RET_USAGE in case of misuse and negative * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
* on error. * on error.
*/ */
#if defined(CONFIG_SYS_I2C) || defined(CONFIG_I2C_MULTI_BUS) || \ #if defined(CONFIG_SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS) || \
CONFIG_IS_ENABLED(DM_I2C) CONFIG_IS_ENABLED(DM_I2C)
static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc, static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
@ -1834,7 +1834,7 @@ static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc,
printf("Current bus is %d\n", bus_no); printf("Current bus is %d\n", bus_no);
} else { } else {
bus_no = simple_strtoul(argv[1], NULL, 10); bus_no = simple_strtoul(argv[1], NULL, 10);
#if defined(CONFIG_SYS_I2C) #if defined(CONFIG_SYS_I2C_LEGACY)
if (bus_no >= CONFIG_SYS_NUM_I2C_BUSES) { if (bus_no >= CONFIG_SYS_NUM_I2C_BUSES) {
printf("Invalid bus %d\n", bus_no); printf("Invalid bus %d\n", bus_no);
return -1; return -1;
@ -1852,7 +1852,7 @@ static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc,
return ret ? CMD_RET_FAILURE : 0; return ret ? CMD_RET_FAILURE : 0;
} }
#endif /* defined(CONFIG_SYS_I2C) */ #endif /* defined(CONFIG_SYS_I2C_LEGACY) */
/** /**
* do_i2c_bus_speed() - Handle the "i2c speed" command-line command * do_i2c_bus_speed() - Handle the "i2c speed" command-line command
@ -1951,7 +1951,7 @@ static int do_i2c_reset(struct cmd_tbl *cmdtp, int flag, int argc,
printf("Error: Not supported by the driver\n"); printf("Error: Not supported by the driver\n");
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }
#elif defined(CONFIG_SYS_I2C) #elif defined(CONFIG_SYS_I2C_LEGACY)
i2c_init(I2C_ADAP->speed, I2C_ADAP->slaveaddr); i2c_init(I2C_ADAP->speed, I2C_ADAP->slaveaddr);
#else #else
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
@ -1960,11 +1960,11 @@ static int do_i2c_reset(struct cmd_tbl *cmdtp, int flag, int argc,
} }
static struct cmd_tbl cmd_i2c_sub[] = { static struct cmd_tbl cmd_i2c_sub[] = {
#if defined(CONFIG_SYS_I2C) || CONFIG_IS_ENABLED(DM_I2C) #if defined(CONFIG_SYS_I2C_LEGACY) || CONFIG_IS_ENABLED(DM_I2C)
U_BOOT_CMD_MKENT(bus, 1, 1, do_i2c_show_bus, "", ""), U_BOOT_CMD_MKENT(bus, 1, 1, do_i2c_show_bus, "", ""),
#endif #endif
U_BOOT_CMD_MKENT(crc32, 3, 1, do_i2c_crc, "", ""), U_BOOT_CMD_MKENT(crc32, 3, 1, do_i2c_crc, "", ""),
#if defined(CONFIG_SYS_I2C) || \ #if defined(CONFIG_SYS_I2C_LEGACY) || \
defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C) defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
U_BOOT_CMD_MKENT(dev, 1, 1, do_i2c_bus_num, "", ""), U_BOOT_CMD_MKENT(dev, 1, 1, do_i2c_bus_num, "", ""),
#endif /* CONFIG_I2C_MULTI_BUS */ #endif /* CONFIG_I2C_MULTI_BUS */
@ -2036,12 +2036,12 @@ static int do_i2c(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
/***************************************************/ /***************************************************/
#ifdef CONFIG_SYS_LONGHELP #ifdef CONFIG_SYS_LONGHELP
static char i2c_help_text[] = static char i2c_help_text[] =
#if defined(CONFIG_SYS_I2C) || CONFIG_IS_ENABLED(DM_I2C) #if defined(CONFIG_SYS_I2C_LEGACY) || CONFIG_IS_ENABLED(DM_I2C)
"bus [muxtype:muxaddr:muxchannel] - show I2C bus info\n" "bus [muxtype:muxaddr:muxchannel] - show I2C bus info\n"
"i2c " /* That's the prefix for the crc32 command below. */ "i2c " /* That's the prefix for the crc32 command below. */
#endif #endif
"crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n" "crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n"
#if defined(CONFIG_SYS_I2C) || \ #if defined(CONFIG_SYS_I2C_LEGACY) || \
defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C) defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
"i2c dev [dev] - show or set current I2C bus\n" "i2c dev [dev] - show or set current I2C bus\n"
#endif /* CONFIG_I2C_MULTI_BUS */ #endif /* CONFIG_I2C_MULTI_BUS */

View file

@ -184,7 +184,7 @@ config SPL_FIT_SIGNATURE
depends on SPL_LOAD_FIT || SPL_LOAD_FIT_FULL depends on SPL_LOAD_FIT || SPL_LOAD_FIT_FULL
select FIT_SIGNATURE select FIT_SIGNATURE
select SPL_FIT select SPL_FIT
select SPL_CRYPTO_SUPPORT select SPL_CRYPTO
select SPL_HASH_SUPPORT select SPL_HASH_SUPPORT
select SPL_RSA select SPL_RSA
select SPL_RSA_VERIFY select SPL_RSA_VERIFY

View file

@ -72,7 +72,7 @@ obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o
obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
ifdef CONFIG_SPL_USB_HOST_SUPPORT ifdef CONFIG_SPL_USB_HOST
obj-y += usb.o obj-y += usb.o
obj-y += usb_hub.o obj-y += usb_hub.o
obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o

View file

@ -244,7 +244,7 @@ __weak int dram_init_banksize(void)
return 0; return 0;
} }
#if defined(CONFIG_SYS_I2C) #if defined(CONFIG_SYS_I2C_LEGACY)
static int init_func_i2c(void) static int init_func_i2c(void)
{ {
puts("I2C: "); puts("I2C: ");
@ -871,7 +871,7 @@ static const init_fnc_t init_sequence_f[] = {
misc_init_f, misc_init_f,
#endif #endif
INIT_FUNC_WATCHDOG_RESET INIT_FUNC_WATCHDOG_RESET
#if defined(CONFIG_SYS_I2C) #if defined(CONFIG_SYS_I2C_LEGACY)
init_func_i2c, init_func_i2c,
#endif #endif
#if defined(CONFIG_VID) && !defined(CONFIG_SPL) #if defined(CONFIG_VID) && !defined(CONFIG_SPL)

View file

@ -511,7 +511,7 @@ config SPL_CPU
may improve boot performance. Enable this option to build the may improve boot performance. Enable this option to build the
drivers in drivers/cpu as part of an SPL build. drivers in drivers/cpu as part of an SPL build.
config SPL_CRYPTO_SUPPORT config SPL_CRYPTO
bool "Support crypto drivers" bool "Support crypto drivers"
help help
Enable crypto drivers in SPL. These drivers can be used to Enable crypto drivers in SPL. These drivers can be used to
@ -548,7 +548,7 @@ config SPL_DMA
the CPU moving the data. Enable this option to build the drivers the CPU moving the data. Enable this option to build the drivers
in drivers/dma as part of an SPL build. in drivers/dma as part of an SPL build.
config SPL_DRIVERS_MISC_SUPPORT config SPL_DRIVERS_MISC
bool "Support misc drivers" bool "Support misc drivers"
help help
Enable miscellaneous drivers in SPL. These drivers perform various Enable miscellaneous drivers in SPL. These drivers perform various
@ -582,7 +582,7 @@ config SPL_SAVEENV
"reboot_image" and act accordingly and change the reboot_image "reboot_image" and act accordingly and change the reboot_image
to default mode using setenv and save the environment. to default mode using setenv and save the environment.
config SPL_ETH_SUPPORT config SPL_ETH
bool "Support Ethernet" bool "Support Ethernet"
depends on SPL_ENV_SUPPORT depends on SPL_ENV_SUPPORT
help help
@ -636,7 +636,7 @@ config SPL_FPGA
as early as possible during boot, and this option can enable that as early as possible during boot, and this option can enable that
within SPL. within SPL.
config SPL_GPIO_SUPPORT config SPL_GPIO
bool "Support GPIO in SPL" bool "Support GPIO in SPL"
help help
Enable support for GPIOs (General-purpose Input/Output) in SPL. Enable support for GPIOs (General-purpose Input/Output) in SPL.
@ -647,7 +647,7 @@ config SPL_GPIO_SUPPORT
for example. Enable this option to build the drivers in for example. Enable this option to build the drivers in
drivers/gpio as part of an SPL build. drivers/gpio as part of an SPL build.
config SPL_I2C_SUPPORT config SPL_I2C
bool "Support I2C" bool "Support I2C"
help help
Enable support for the I2C (Inter-Integrated Circuit) bus in SPL. Enable support for the I2C (Inter-Integrated Circuit) bus in SPL.
@ -761,7 +761,7 @@ config SPL_MTD_SUPPORT
devices. See SPL_NAND_SUPPORT and SPL_ONENAND_SUPPORT for how devices. See SPL_NAND_SUPPORT and SPL_ONENAND_SUPPORT for how
to enable specific MTD drivers. to enable specific MTD drivers.
config SPL_MUSB_NEW_SUPPORT config SPL_MUSB_NEW
bool "Support new Mentor Graphics USB" bool "Support new Mentor Graphics USB"
help help
Enable support for Mentor Graphics USB in SPL. This is a new Enable support for Mentor Graphics USB in SPL. This is a new
@ -926,7 +926,7 @@ config SPL_NET_SUPPORT
This permits SPL to load U-Boot over a network link rather than This permits SPL to load U-Boot over a network link rather than
from an on-board peripheral. Environment support is required since from an on-board peripheral. Environment support is required since
the network stack uses a number of environment variables. See also the network stack uses a number of environment variables. See also
SPL_ETH_SUPPORT. SPL_ETH.
if SPL_NET_SUPPORT if SPL_NET_SUPPORT
config SPL_NET_VCI_STRING config SPL_NET_VCI_STRING
@ -1034,7 +1034,7 @@ config SPL_DM_RESET
by using the generic reset API provided by driver model. by using the generic reset API provided by driver model.
This enables the drivers in drivers/reset as part of an SPL build. This enables the drivers in drivers/reset as part of an SPL build.
config SPL_POWER_SUPPORT config SPL_POWER
bool "Support power drivers" bool "Support power drivers"
help help
Enable support for power control in SPL. This includes support Enable support for power control in SPL. This includes support
@ -1192,7 +1192,7 @@ config SPL_THERMAL
automatic power-off when the temperature gets too high or low. Other automatic power-off when the temperature gets too high or low. Other
devices may be discrete but connected on a suitable bus. devices may be discrete but connected on a suitable bus.
config SPL_USB_HOST_SUPPORT config SPL_USB_HOST
bool "Support USB host drivers" bool "Support USB host drivers"
select HAVE_BLOCK_DEVICE select HAVE_BLOCK_DEVICE
help help
@ -1205,7 +1205,7 @@ config SPL_USB_HOST_SUPPORT
config SPL_USB_STORAGE config SPL_USB_STORAGE
bool "Support loading from USB" bool "Support loading from USB"
depends on SPL_USB_HOST_SUPPORT && !(BLK && !DM_USB) depends on SPL_USB_HOST && !(BLK && !DM_USB)
help help
Enable support for USB devices in SPL. This allows use of USB Enable support for USB devices in SPL. This allows use of USB
devices such as hard drives and flash drivers for loading U-Boot. devices such as hard drives and flash drivers for loading U-Boot.
@ -1229,7 +1229,7 @@ config SPL_USB_ETHER
USB-connected Ethernet link (such as a USB Ethernet dongle) rather USB-connected Ethernet link (such as a USB Ethernet dongle) rather
than from an onboard peripheral. Environment support is required than from an onboard peripheral. Environment support is required
since the network stack uses a number of environment variables. since the network stack uses a number of environment variables.
See also SPL_NET_SUPPORT and SPL_ETH_SUPPORT. See also SPL_NET_SUPPORT and SPL_ETH.
config SPL_DFU config SPL_DFU
bool "Support DFU (Device Firmware Upgrade)" bool "Support DFU (Device Firmware Upgrade)"
@ -1275,7 +1275,7 @@ config SPL_SDP_USB_DEV
so it can be used in compiled environment. so it can be used in compiled environment.
endif endif
config SPL_WATCHDOG_SUPPORT config SPL_WATCHDOG
bool "Support watchdog drivers" bool "Support watchdog drivers"
imply SPL_WDT if !HW_WATCHDOG imply SPL_WDT if !HW_WATCHDOG
help help
@ -1477,7 +1477,7 @@ config TPL_BOOTROM_SUPPORT
BOOT_DEVICE_BOOTROM (or fall-through to the next boot device in the BOOT_DEVICE_BOOTROM (or fall-through to the next boot device in the
boot device list, if not implemented for a given board) boot device list, if not implemented for a given board)
config TPL_DRIVERS_MISC_SUPPORT config TPL_DRIVERS_MISC
bool "Support misc drivers in TPL" bool "Support misc drivers in TPL"
help help
Enable miscellaneous drivers in TPL. These drivers perform various Enable miscellaneous drivers in TPL. These drivers perform various
@ -1490,7 +1490,7 @@ config TPL_ENV_SUPPORT
help help
Enable environment support in TPL. See SPL_ENV_SUPPORT for details. Enable environment support in TPL. See SPL_ENV_SUPPORT for details.
config TPL_GPIO_SUPPORT config TPL_GPIO
bool "Support GPIO in TPL" bool "Support GPIO in TPL"
help help
Enable support for GPIOs (General-purpose Input/Output) in TPL. Enable support for GPIOs (General-purpose Input/Output) in TPL.
@ -1501,10 +1501,10 @@ config TPL_GPIO_SUPPORT
for example. Enable this option to build the drivers in for example. Enable this option to build the drivers in
drivers/gpio as part of an TPL build. drivers/gpio as part of an TPL build.
config TPL_I2C_SUPPORT config TPL_I2C
bool "Support I2C" bool "Support I2C"
help help
Enable support for the I2C bus in TPL. See SPL_I2C_SUPPORT for Enable support for the I2C bus in TPL. See SPL_I2C for
details. details.
config TPL_LIBCOMMON_SUPPORT config TPL_LIBCOMMON_SUPPORT

View file

@ -707,7 +707,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
spl_board_init(); spl_board_init();
#endif #endif
#if defined(CONFIG_SPL_WATCHDOG_SUPPORT) && CONFIG_IS_ENABLED(WDT) #if defined(CONFIG_SPL_WATCHDOG) && CONFIG_IS_ENABLED(WDT)
initr_watchdog(); initr_watchdog();
#endif #endif

View file

@ -15,7 +15,7 @@
#include <net.h> #include <net.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER) #if defined(CONFIG_SPL_ETH) || defined(CONFIG_SPL_USB_ETHER)
static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
ulong count, void *buf) ulong count, void *buf)
{ {
@ -69,7 +69,7 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
} }
#endif #endif
#ifdef CONFIG_SPL_ETH_SUPPORT #ifdef CONFIG_SPL_ETH
int spl_net_load_image_cpgmac(struct spl_image_info *spl_image, int spl_net_load_image_cpgmac(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
{ {

View file

@ -336,7 +336,7 @@ int stdio_add_devices(void)
dev->name); dev->name);
} }
} }
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C_LEGACY
i2c_init_all(); i2c_init_all();
#endif #endif
if (IS_ENABLED(CONFIG_DM_VIDEO)) { if (IS_ENABLED(CONFIG_DM_VIDEO)) {

View file

@ -11,7 +11,7 @@ CONFIG_I2C1_ENABLE=y
CONFIG_SATAPWR="PC3" CONFIG_SATAPWR="PC3"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_SUN4I_EMAC=y CONFIG_SUN4I_EMAC=y

View file

@ -9,7 +9,7 @@ CONFIG_MMC1_CD_PIN="PG13"
CONFIG_MMC_SUNXI_SLOT_EXTRA=1 CONFIG_MMC_SUNXI_SLOT_EXTRA=1
CONFIG_USB1_VBUS_PIN="PB10" CONFIG_USB1_VBUS_PIN="PB10"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_SUN4I_EMAC=y CONFIG_SUN4I_EMAC=y
CONFIG_AXP152_POWER=y CONFIG_AXP152_POWER=y

View file

@ -15,7 +15,7 @@ CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y
CONFIG_VIDEO_LCD_POWER="AXP0-0" CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_USB_MASS_STORAGE=y
CONFIG_DFU_RAM=y CONFIG_DFU_RAM=y

View file

@ -13,7 +13,7 @@ CONFIG_SATAPWR="PC3"
CONFIG_SPL_SPI_SUNXI=y CONFIG_SPL_SPI_SUNXI=y
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_USB_MASS_STORAGE=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y

View file

@ -11,7 +11,7 @@ CONFIG_I2C1_ENABLE=y
CONFIG_SATAPWR="PC3" CONFIG_SATAPWR="PC3"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_USB_MASS_STORAGE=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y

View file

@ -9,7 +9,7 @@ CONFIG_I2C1_ENABLE=y
CONFIG_SATAPWR="PC3" CONFIG_SATAPWR="PC3"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -11,7 +11,7 @@ CONFIG_VIDEO_VGA=y
CONFIG_SATAPWR="PB8" CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -12,7 +12,7 @@ CONFIG_VIDEO_VGA=y
CONFIG_SATAPWR="PB8" CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -13,7 +13,7 @@ CONFIG_USB0_VBUS_DET="PH5"
CONFIG_SATAPWR="PC3" CONFIG_SATAPWR="PC3"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_RTL8211X_PHY_FORCE_MASTER=y CONFIG_RTL8211X_PHY_FORCE_MASTER=y

View file

@ -13,7 +13,7 @@ CONFIG_SATAPWR="PC3"
CONFIG_GMAC_TX_DELAY=4 CONFIG_GMAC_TX_DELAY=4
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
CONFIG_PHY_ADDR=3 CONFIG_PHY_ADDR=3

View file

@ -12,7 +12,7 @@ CONFIG_SATAPWR="PC3"
CONFIG_GMAC_TX_DELAY=4 CONFIG_GMAC_TX_DELAY=4
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
CONFIG_PHY_ADDR=3 CONFIG_PHY_ADDR=3

View file

@ -14,5 +14,5 @@ CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7" CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y

View file

@ -15,6 +15,6 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1" CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_CONS_INDEX=2 CONFIG_CONS_INDEX=2
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y

View file

@ -8,7 +8,7 @@ CONFIG_DRAM_EMR1=0
CONFIG_USB1_VBUS_PIN="PB10" CONFIG_USB1_VBUS_PIN="PB10"
CONFIG_VIDEO_COMPOSITE=y CONFIG_VIDEO_COMPOSITE=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_AXP152_POWER=y CONFIG_AXP152_POWER=y
CONFIG_CONS_INDEX=2 CONFIG_CONS_INDEX=2
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y

View file

@ -6,7 +6,7 @@ CONFIG_MACH_SUN5I=y
CONFIG_DRAM_CLK=432 CONFIG_DRAM_CLK=432
CONFIG_USB1_VBUS_PIN="PG13" CONFIG_USB1_VBUS_PIN="PG13"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_AXP152_POWER=y CONFIG_AXP152_POWER=y
CONFIG_CONS_INDEX=2 CONFIG_CONS_INDEX=2
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y

View file

@ -11,7 +11,7 @@ CONFIG_USB1_VBUS_PIN="PH23"
CONFIG_USB2_VBUS_PIN="PH23" CONFIG_USB2_VBUS_PIN="PH23"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_RGMII=y CONFIG_RGMII=y
CONFIG_SUN8I_EMAC=y CONFIG_SUN8I_EMAC=y

View file

@ -9,7 +9,7 @@ CONFIG_VIDEO_COMPOSITE=y
CONFIG_GMAC_TX_DELAY=3 CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y

View file

@ -11,7 +11,7 @@ CONFIG_VIDEO_COMPOSITE=y
CONFIG_GMAC_TX_DELAY=3 CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y

View file

@ -7,7 +7,7 @@ CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
CONFIG_USB0_VBUS_PIN="PB10" CONFIG_USB0_VBUS_PIN="PB10"
CONFIG_VIDEO_COMPOSITE=y CONFIG_VIDEO_COMPOSITE=y
CONFIG_CHIP_DIP_SCAN=y CONFIG_CHIP_DIP_SCAN=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_DFU_RAM=y CONFIG_DFU_RAM=y
# CONFIG_MMC is not set # CONFIG_MMC is not set

View file

@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN5I=y CONFIG_MACH_SUN5I=y
CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
CONFIG_USB0_VBUS_PIN="PB10" CONFIG_USB0_VBUS_PIN="PB10"
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=sunxi-nand.0" CONFIG_MTDIDS_DEFAULT="nand0=sunxi-nand.0"

View file

@ -14,7 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_VIDEO_LCD_PANEL_HITACHI_TX18D42VM=y CONFIG_VIDEO_LCD_PANEL_HITACHI_TX18D42VM=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y
CONFIG_VIDEO_LCD_SPI_CS="PA0" CONFIG_VIDEO_LCD_SPI_CS="PA0"
CONFIG_VIDEO_LCD_SPI_SCLK="PA1" CONFIG_VIDEO_LCD_SPI_SCLK="PA1"

View file

@ -8,7 +8,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_SATAPWR="PB8" CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -8,7 +8,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_SATAPWR="PB8" CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_SUN4I_EMAC=y CONFIG_SUN4I_EMAC=y

View file

@ -13,7 +13,7 @@ CONFIG_SATAPWR="PH12"
CONFIG_GMAC_TX_DELAY=1 CONFIG_GMAC_TX_DELAY=1
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_USB_MASS_STORAGE=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y

View file

@ -16,6 +16,6 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1" CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_CONS_INDEX=2 CONFIG_CONS_INDEX=2
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y

View file

@ -15,6 +15,6 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1" CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_CONS_INDEX=2 CONFIG_CONS_INDEX=2
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y

View file

@ -15,5 +15,5 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set # CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
CONFIG_VIDEO_LCD_PANEL_LVDS=y CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y

View file

@ -8,7 +8,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_SATAPWR="PB8" CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -10,7 +10,7 @@ CONFIG_SATAPWR="PB3"
CONFIG_GMAC_TX_DELAY=4 CONFIG_GMAC_TX_DELAY=4
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_B53_SWITCH=y CONFIG_B53_SWITCH=y
CONFIG_B53_PHY_PORTS=0x1f CONFIG_B53_PHY_PORTS=0x1f

View file

@ -10,7 +10,7 @@ CONFIG_SATAPWR="PH2"
CONFIG_GMAC_TX_DELAY=3 CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -8,7 +8,7 @@ CONFIG_DRAM_ZQ=122
CONFIG_SATAPWR="PH2" CONFIG_SATAPWR="PH2"
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -6,7 +6,7 @@ CONFIG_MACH_SUN4I=y
CONFIG_USB1_VBUS_PIN="" CONFIG_USB1_VBUS_PIN=""
CONFIG_USB2_VBUS_PIN="" CONFIG_USB2_VBUS_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_SUN4I_EMAC=y CONFIG_SUN4I_EMAC=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y

View file

@ -5,6 +5,6 @@ CONFIG_SPL=y
CONFIG_MACH_SUN7I=y CONFIG_MACH_SUN7I=y
CONFIG_DRAM_CLK=384 CONFIG_DRAM_CLK=384
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y

View file

@ -10,4 +10,4 @@ CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7" CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y

View file

@ -8,7 +8,7 @@ CONFIG_VIDEO_VGA=y
CONFIG_VIDEO_COMPOSITE=y CONFIG_VIDEO_COMPOSITE=y
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_SUN4I_EMAC=y CONFIG_SUN4I_EMAC=y

View file

@ -9,7 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_VIDEO_VGA=y CONFIG_VIDEO_VGA=y
CONFIG_VIDEO_COMPOSITE=y CONFIG_VIDEO_COMPOSITE=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_MII=y CONFIG_MII=y

View file

@ -9,7 +9,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_VIDEO_COMPOSITE=y CONFIG_VIDEO_COMPOSITE=y
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -6,7 +6,7 @@ CONFIG_MACH_SUN4I=y
CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_PIN="PB9"
CONFIG_VIDEO_COMPOSITE=y CONFIG_VIDEO_COMPOSITE=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y

View file

@ -12,7 +12,7 @@ CONFIG_VIDEO_COMPOSITE=y
CONFIG_GMAC_TX_DELAY=3 CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -14,7 +14,7 @@ CONFIG_VIDEO_COMPOSITE=y
CONFIG_GMAC_TX_DELAY=3 CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

View file

@ -7,7 +7,7 @@ CONFIG_SPL_TEXT_BASE=0xFF800000
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_TPL_LIBCOMMON_SUPPORT=y CONFIG_TPL_LIBCOMMON_SUPPORT=y
CONFIG_TPL_LIBGENERIC_SUPPORT=y CONFIG_TPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB_PA=y CONFIG_TARGET_P1010RDB_PA=y
@ -26,9 +26,9 @@ CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_SPL_NAND_BOOT=y CONFIG_SPL_NAND_BOOT=y
CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y
CONFIG_TPL=y CONFIG_TPL=y
CONFIG_TPL_DRIVERS_MISC_SUPPORT=y CONFIG_TPL_DRIVERS_MISC=y
CONFIG_TPL_ENV_SUPPORT=y CONFIG_TPL_ENV_SUPPORT=y
CONFIG_TPL_I2C_SUPPORT=y CONFIG_TPL_I2C=y
CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT=y
CONFIG_TPL_NAND_SUPPORT=y CONFIG_TPL_NAND_SUPPORT=y
CONFIG_TPL_SERIAL_SUPPORT=y CONFIG_TPL_SERIAL_SUPPORT=y

View file

@ -8,7 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b"
CONFIG_SPL_TEXT_BASE=0xD0001000 CONFIG_SPL_TEXT_BASE=0xD0001000
CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB_PA=y CONFIG_TARGET_P1010RDB_PA=y
@ -25,7 +25,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
# CONFIG_SPL_FRAMEWORK is not set # CONFIG_SPL_FRAMEWORK is not set
CONFIG_SPL_MMC_BOOT=y CONFIG_SPL_MMC_BOOT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_IMLS=y CONFIG_CMD_IMLS=y

View file

@ -8,7 +8,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b" CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b"
CONFIG_SPL_TEXT_BASE=0xD0001000 CONFIG_SPL_TEXT_BASE=0xD0001000
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
@ -27,7 +27,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
# CONFIG_SPL_FRAMEWORK is not set # CONFIG_SPL_FRAMEWORK is not set
CONFIG_SPL_SPI_BOOT=y CONFIG_SPL_SPI_BOOT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_IMLS=y CONFIG_CMD_IMLS=y

View file

@ -7,7 +7,7 @@ CONFIG_SPL_TEXT_BASE=0xFF800000
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_TPL_LIBCOMMON_SUPPORT=y CONFIG_TPL_LIBCOMMON_SUPPORT=y
CONFIG_TPL_LIBGENERIC_SUPPORT=y CONFIG_TPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB_PA=y CONFIG_TARGET_P1010RDB_PA=y
@ -25,9 +25,9 @@ CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_SPL_NAND_BOOT=y CONFIG_SPL_NAND_BOOT=y
CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y
CONFIG_TPL=y CONFIG_TPL=y
CONFIG_TPL_DRIVERS_MISC_SUPPORT=y CONFIG_TPL_DRIVERS_MISC=y
CONFIG_TPL_ENV_SUPPORT=y CONFIG_TPL_ENV_SUPPORT=y
CONFIG_TPL_I2C_SUPPORT=y CONFIG_TPL_I2C=y
CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT=y
CONFIG_TPL_NAND_SUPPORT=y CONFIG_TPL_NAND_SUPPORT=y
CONFIG_TPL_SERIAL_SUPPORT=y CONFIG_TPL_SERIAL_SUPPORT=y

View file

@ -8,7 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa"
CONFIG_SPL_TEXT_BASE=0xD0001000 CONFIG_SPL_TEXT_BASE=0xD0001000
CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB_PA=y CONFIG_TARGET_P1010RDB_PA=y
@ -24,7 +24,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
# CONFIG_SPL_FRAMEWORK is not set # CONFIG_SPL_FRAMEWORK is not set
CONFIG_SPL_MMC_BOOT=y CONFIG_SPL_MMC_BOOT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_IMLS=y CONFIG_CMD_IMLS=y

View file

@ -8,7 +8,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa" CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa"
CONFIG_SPL_TEXT_BASE=0xD0001000 CONFIG_SPL_TEXT_BASE=0xD0001000
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
@ -26,7 +26,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
# CONFIG_SPL_FRAMEWORK is not set # CONFIG_SPL_FRAMEWORK is not set
CONFIG_SPL_SPI_BOOT=y CONFIG_SPL_SPI_BOOT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C=y
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_IMLS=y CONFIG_CMD_IMLS=y

View file

@ -7,7 +7,7 @@ CONFIG_SPL_TEXT_BASE=0xFF800000
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_TPL_LIBCOMMON_SUPPORT=y CONFIG_TPL_LIBCOMMON_SUPPORT=y
CONFIG_TPL_LIBGENERIC_SUPPORT=y CONFIG_TPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB_PB=y CONFIG_TARGET_P1010RDB_PB=y
@ -26,9 +26,9 @@ CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_SPL_NAND_BOOT=y CONFIG_SPL_NAND_BOOT=y
CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y
CONFIG_TPL=y CONFIG_TPL=y
CONFIG_TPL_DRIVERS_MISC_SUPPORT=y CONFIG_TPL_DRIVERS_MISC=y
CONFIG_TPL_ENV_SUPPORT=y CONFIG_TPL_ENV_SUPPORT=y
CONFIG_TPL_I2C_SUPPORT=y CONFIG_TPL_I2C=y
CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT=y
CONFIG_TPL_NAND_SUPPORT=y CONFIG_TPL_NAND_SUPPORT=y
CONFIG_TPL_SERIAL_SUPPORT=y CONFIG_TPL_SERIAL_SUPPORT=y

Some files were not shown because too many files have changed in this diff Show more