diff options
author | Tom Rini <trini@konsulko.com> | 2020-09-21 21:25:37 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-09-21 21:25:37 +0300 |
commit | 751b18b8a1b576aecf51faf22c2bb9e7ce70debd (patch) | |
tree | 9339296afd74657deb93955cf5b187f9194d7b5d /board | |
parent | 3bacb5ee76eadc97c0606e1b408604d20db9a97d (diff) | |
parent | ba2a0cbb053951ed6d36161989d38da724696b4d (diff) | |
download | u-boot-751b18b8a1b576aecf51faf22c2bb9e7ce70debd.tar.xz |
Merge branch 'master' into next
Merge in v2020.10-rc5
Diffstat (limited to 'board')
-rw-r--r-- | board/elgin/elgin_rv1108/elgin_rv1108.c | 2 | ||||
-rw-r--r-- | board/intel/edison/Kconfig | 3 | ||||
-rw-r--r-- | board/rockchip/evb_rv1108/evb_rv1108.c | 2 | ||||
-rw-r--r-- | board/toradex/apalis-imx8/MAINTAINERS | 2 | ||||
-rw-r--r-- | board/toradex/apalis-imx8/apalis-imx8-imximage.cfg (renamed from board/toradex/apalis-imx8/apalis-imx8qm-imximage.cfg) | 0 | ||||
-rw-r--r-- | board/toradex/colibri-imx6ull/colibri-imx6ull.c | 2 | ||||
-rw-r--r-- | board/toradex/colibri-imx8x/MAINTAINERS | 2 | ||||
-rw-r--r-- | board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg (renamed from board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg) | 0 | ||||
-rw-r--r-- | board/toradex/colibri_imx7/colibri_imx7.c | 4 | ||||
-rw-r--r-- | board/toradex/common/tdx-common.c | 19 |
10 files changed, 9 insertions, 27 deletions
diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c index 5d8f62244b..245e5abcae 100644 --- a/board/elgin/elgin_rv1108/elgin_rv1108.c +++ b/board/elgin/elgin_rv1108/elgin_rv1108.c @@ -15,7 +15,7 @@ DECLARE_GLOBAL_DATA_PTR; -int mach_cpu_init(void) +int board_early_init_f(void) { struct rv1108_grf *grf; enum { diff --git a/board/intel/edison/Kconfig b/board/intel/edison/Kconfig index ef9b14aa2b..05d65445e4 100644 --- a/board/intel/edison/Kconfig +++ b/board/intel/edison/Kconfig @@ -12,6 +12,9 @@ config SYS_SOC config SYS_CONFIG_NAME default "edison" +config SYS_MALLOC_LEN + default 0x08000000 + config SYS_TEXT_BASE default 0x01101000 diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c index c57913828d..fc31c49311 100644 --- a/board/rockchip/evb_rv1108/evb_rv1108.c +++ b/board/rockchip/evb_rv1108/evb_rv1108.c @@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR; -int mach_cpu_init(void) +int board_early_init_f(void) { struct rv1108_grf *grf; enum { diff --git a/board/toradex/apalis-imx8/MAINTAINERS b/board/toradex/apalis-imx8/MAINTAINERS index feacf7eded..7fbd1be10f 100644 --- a/board/toradex/apalis-imx8/MAINTAINERS +++ b/board/toradex/apalis-imx8/MAINTAINERS @@ -5,6 +5,6 @@ S: Maintained F: arch/arm/dts/fsl-imx8-apalis.dts F: arch/arm/dts/fsl-imx8-apalis-u-boot.dtsi F: board/toradex/apalis-imx8/ -F: configs/apalis-imx8qm_defconfig +F: configs/apalis-imx8_defconfig F: doc/board/toradex/apalix-imx8.rst F: include/configs/apalis-imx8.h diff --git a/board/toradex/apalis-imx8/apalis-imx8qm-imximage.cfg b/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg index b8f0f3dc10..b8f0f3dc10 100644 --- a/board/toradex/apalis-imx8/apalis-imx8qm-imximage.cfg +++ b/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 89b99a0b74..45f8da3c42 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -173,8 +173,6 @@ int board_late_init(void) #if defined(CONFIG_DM_VIDEO) setup_lcd(); - - show_boot_logo(); #endif return 0; diff --git a/board/toradex/colibri-imx8x/MAINTAINERS b/board/toradex/colibri-imx8x/MAINTAINERS index f6853586c8..de62f87a56 100644 --- a/board/toradex/colibri-imx8x/MAINTAINERS +++ b/board/toradex/colibri-imx8x/MAINTAINERS @@ -5,6 +5,6 @@ S: Maintained F: arch/arm/dts/fsl-imx8x-colibri.dts F: arch/arm/dts/fsl-imx8x-colibri-u-boot.dtsi F: board/toradex/colibri-imx8x/ -F: configs/colibri-imx8qxp_defconfig +F: configs/colibri-imx8x_defconfig F: doc/board/toradex/colibri-imx8x.rst F: include/configs/colibri-imx8x.h diff --git a/board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg index 44f6c0c455..44f6c0c455 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg +++ b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 14df3fc42c..8afe1bfd5e 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -133,8 +133,10 @@ static int setup_lcd(void) */ void board_preboot_os(void) { +#ifdef CONFIG_DM_VIDEO gpio_direction_output(GPIO_PWM_A, 1); gpio_direction_output(GPIO_BL_ON, 0); +#endif } static void setup_iomux_uart(void) @@ -356,8 +358,6 @@ int board_late_init(void) { #if defined(CONFIG_DM_VIDEO) setup_lcd(); - - show_boot_logo(); #endif return 0; } diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index fe5295f94b..a3d287ed5e 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -203,22 +203,3 @@ int ft_common_board_setup(void *blob, struct bd_info *bd) } #endif /* CONFIG_TDX_CFG_BLOCK */ - -#if defined(CONFIG_DM_VIDEO) -int show_boot_logo(void) -{ - struct udevice *dev; - int ret; - int xpos, ypos; - - splash_get_pos(&xpos, &ypos); - - ret = uclass_get_device(UCLASS_VIDEO, 0, &dev); - if (ret) - return ret; - - ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, xpos, ypos, true); - - return ret; -} -#endif /* CONFIG_DM_VIDEO */ |