Commit 36a75344d7c7d7add3df0e562ca5e920632ea18b
Committed by
Tom Rini
Tom Rini
1 parent
6dd18bb111
Exists in
smarc_8mq_lf_v2020.04
and in
11 other branches
ARM: omap3: evm: Update DM SPL support
- Switch to using the omap3-u-boot.dtsi file for needed properties - Enable SPL_OF_CONTROL This commit is based on the following series: https://patchwork.ozlabs.org/project/uboot/list/?series=92472 https://patchwork.ozlabs.org/project/uboot/list/?series=92462 Signed-off-by: Derald D. Woods <woods.technical@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
Showing 4 changed files with 15 additions and 39 deletions Side-by-side Diff
arch/arm/dts/omap3-evm-37xx-u-boot.dtsi
| ... | ... | @@ -5,21 +5,11 @@ |
| 5 | 5 | * (C) Copyright 2017 Derald D. Woods <woods.technical@gmail.com> |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | +#include "omap3-u-boot.dtsi" | |
| 9 | + | |
| 8 | 10 | / { |
| 9 | 11 | chosen { |
| 10 | 12 | stdout-path = &uart1; |
| 11 | 13 | }; |
| 12 | -}; | |
| 13 | - | |
| 14 | -&uart1 { | |
| 15 | - reg-shift = <2>; | |
| 16 | -}; | |
| 17 | - | |
| 18 | -&uart2 { | |
| 19 | - reg-shift = <2>; | |
| 20 | -}; | |
| 21 | - | |
| 22 | -&uart3 { | |
| 23 | - reg-shift = <2>; | |
| 24 | 14 | }; |
arch/arm/dts/omap3-evm-u-boot.dtsi
| ... | ... | @@ -5,21 +5,11 @@ |
| 5 | 5 | * (C) Copyright 2017 Derald D. Woods <woods.technical@gmail.com> |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | +#include "omap3-u-boot.dtsi" | |
| 9 | + | |
| 8 | 10 | / { |
| 9 | 11 | chosen { |
| 10 | 12 | stdout-path = &uart1; |
| 11 | 13 | }; |
| 12 | -}; | |
| 13 | - | |
| 14 | -&uart1 { | |
| 15 | - reg-shift = <2>; | |
| 16 | -}; | |
| 17 | - | |
| 18 | -&uart2 { | |
| 19 | - reg-shift = <2>; | |
| 20 | -}; | |
| 21 | - | |
| 22 | -&uart3 { | |
| 23 | - reg-shift = <2>; | |
| 24 | 14 | }; |
board/ti/evm/evm.c
| ... | ... | @@ -40,18 +40,6 @@ |
| 40 | 40 | |
| 41 | 41 | DECLARE_GLOBAL_DATA_PTR; |
| 42 | 42 | |
| 43 | -static const struct ns16550_platdata omap3_evm_serial = { | |
| 44 | - .base = OMAP34XX_UART1, | |
| 45 | - .reg_shift = 2, | |
| 46 | - .clock = V_NS16550_CLK, | |
| 47 | - .fcr = UART_FCR_DEFVAL, | |
| 48 | -}; | |
| 49 | - | |
| 50 | -U_BOOT_DEVICE(omap3_evm_uart) = { | |
| 51 | - "ns16550_serial", | |
| 52 | - &omap3_evm_serial | |
| 53 | -}; | |
| 54 | - | |
| 55 | 43 | static u32 omap3_evm_version; |
| 56 | 44 | |
| 57 | 45 | u32 get_omap3_evm_rev(void) |
configs/omap3_evm_defconfig
| 1 | 1 | CONFIG_ARM=y |
| 2 | +# CONFIG_SPL_USE_ARCH_MEMCPY is not set | |
| 3 | +# CONFIG_SPL_USE_ARCH_MEMSET is not set | |
| 2 | 4 | CONFIG_ARCH_OMAP2PLUS=y |
| 3 | -CONFIG_SYS_TEXT_BASE=0x80100000 | |
| 4 | -CONFIG_SYS_MALLOC_F_LEN=0x2000 | |
| 5 | +CONFIG_SYS_MALLOC_F_LEN=0x4000 | |
| 5 | 6 | CONFIG_TARGET_OMAP3_EVM=y |
| 7 | +CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 | |
| 6 | 8 | CONFIG_SPL=y |
| 7 | 9 | CONFIG_DISTRO_DEFAULTS=y |
| 8 | 10 | CONFIG_NR_DRAM_BANKS=2 |
| 11 | +CONFIG_TPL_SYS_MALLOC_F_LEN=0x400 | |
| 9 | 12 | CONFIG_SYS_CONSOLE_INFO_QUIET=y |
| 10 | 13 | CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" |
| 11 | 14 | CONFIG_VERSION_VARIABLE=y |
| 15 | +CONFIG_SPL_SYS_MALLOC_SIMPLE=y | |
| 16 | +CONFIG_SPL_SEPARATE_BSS=y | |
| 12 | 17 | # CONFIG_SPL_FS_EXT4 is not set |
| 13 | 18 | CONFIG_SPL_MTD_SUPPORT=y |
| 14 | -CONFIG_SPL_OS_BOOT=y | |
| 15 | 19 | CONFIG_SYS_PROMPT="OMAP3_EVM # " |
| 16 | 20 | CONFIG_CMD_SPL=y |
| 17 | 21 | CONFIG_CMD_SPL_NAND_OFS=0x280000 |
| 18 | 22 | |
| 19 | 23 | |
| ... | ... | @@ -36,9 +40,13 @@ |
| 36 | 40 | # CONFIG_EFI_PARTITION is not set |
| 37 | 41 | CONFIG_SPL_PARTITION_UUIDS=y |
| 38 | 42 | CONFIG_OF_CONTROL=y |
| 43 | +CONFIG_SPL_OF_CONTROL=y | |
| 39 | 44 | CONFIG_DEFAULT_DEVICE_TREE="omap3-evm" |
| 45 | +CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" | |
| 40 | 46 | CONFIG_ENV_IS_IN_NAND=y |
| 41 | 47 | CONFIG_SPL_DM=y |
| 48 | +CONFIG_SPL_DM_SEQ_ALIAS=y | |
| 49 | +CONFIG_SPL_OF_TRANSLATE=y | |
| 42 | 50 | # CONFIG_SPL_BLK is not set |
| 43 | 51 | CONFIG_USB_FUNCTION_FASTBOOT=y |
| 44 | 52 | CONFIG_FASTBOOT_BUF_ADDR=0x82000000 |