leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-dm

Browse Source
This commit is contained in:
Tom Rini
2015-02-13 13:11:09 -05:00
parent c445506d73 b1f6659c42
commit 757566d156
152 changed files with 2813 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

@@ -839,6 +839,8 @@ endchoice
source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
source "arch/arm/cpu/arm1176/bcm2835/Kconfig"
source "arch/arm/cpu/armv7/exynos/Kconfig"
source "arch/arm/cpu/armv7/highbank/Kconfig"

12
arch/arm/cpu/arm1176/bcm2835/Kconfig Normal file
View File

@@ -0,0 +1,12 @@
if TARGET_RPI
config DM
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
endif

21
arch/arm/cpu/armv7/exynos/Kconfig
View File

@@ -65,6 +65,27 @@ endchoice
config SYS_SOC
default "exynos"
config DM
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
config DM_SPI
default y if !SPL_BUILD
config DM_SPI_FLASH
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
config SYS_MALLOC_F
default y if !SPL_BUILD
config SYS_MALLOC_F_LEN
default 0x400 if !SPL_BUILD
source "board/samsung/smdkv310/Kconfig"
source "board/samsung/trats/Kconfig"
source "board/samsung/universal_c210/Kconfig"

15
arch/arm/cpu/armv7/omap3/Kconfig
View File

@@ -93,6 +93,21 @@ config TARGET_TWISTER
endchoice
config DM
default y if !SPL_BUILD
config DM_GPIO
default y if DM && !SPL_BUILD
config DM_SERIAL
default y if DM && !SPL_BUILD
config SYS_MALLOC_F
default y if DM && !SPL_BUILD
config SYS_MALLOC_F_LEN
default 0x400 if DM && !SPL_BUILD
config SYS_SOC
default "omap3"

24
arch/arm/cpu/armv7/tegra-common/Kconfig
View File

@@ -17,9 +17,33 @@ config TEGRA124
endchoice
config SYS_MALLOC_F
default y
config SYS_MALLOC_F_LEN
default 0x1800
config USE_PRIVATE_LIBGCC
default y if SPL_BUILD
config DM
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
config DM_SPI
default y if !SPL_BUILD
config DM_SPI_FLASH
default y if !SPL_BUILD
config DM_I2C
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
source "arch/arm/cpu/armv7/tegra20/Kconfig"
source "arch/arm/cpu/armv7/tegra30/Kconfig"
source "arch/arm/cpu/armv7/tegra114/Kconfig"

6
arch/arm/cpu/armv7/uniphier/Kconfig
View File

@@ -48,6 +48,12 @@ config DCC_MICRO_SUPPORT_CARD
endchoice
config SYS_MALLOC_F
default y
config SYS_MALLOC_F_LEN
default 0x2000
config CMD_PINMON
bool "Enable boot mode pins monitor command"
default y

12
arch/arm/include/asm/arch-at91/at91_pio.h
View File

@@ -114,14 +114,10 @@ typedef union at91_pio {
at91_port_t pioa;
at91_port_t piob;
at91_port_t pioc;
#if (ATMEL_PIO_PORTS > 3)
at91_port_t piod;
#endif
#if (ATMEL_PIO_PORTS > 4)
at91_port_t pioe;
#endif
} ;
at91_port_t port[ATMEL_PIO_PORTS];
at91_port_t piod; /* not present in all hardware */
at91_port_t pioe;/* not present in all hardware */
};
at91_port_t port[5];
} at91_pio_t;
#ifdef CONFIG_AT91_GPIO