diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-04 18:03:27 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-23 18:07:03 +0300 |
| commit | 957848882c88722da8a3a2e6fba77c2cf113b17e (patch) | |
| tree | aef65758d7fd6b86bb4da02b1e4bdaaf8f0affc7 | |
| parent | b9d1f88b3aae10c15c0cd767acccc1026f5ef6d8 (diff) | |
| download | u-boot-957848882c88722da8a3a2e6fba77c2cf113b17e.tar.xz | |
rk32xx: Use standard TPL linker script
As of 2f41ade79e59 ("linker: Modify linker scripts to be more generic")
we can use the same linker script for SPL and TPL and not have to make
use of #undef tricks. Remove these last remnants.
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/arm/mach-rockchip/rk3288/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/u-boot-tpl.lds | 12 | ||||
| -rw-r--r-- | configs/evb-rk3229_defconfig | 1 |
3 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 1be2b58521..ea94ad1142 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -168,9 +168,6 @@ config SPL_LIBGENERIC_SUPPORT config SPL_SERIAL default y -config TPL_LDSCRIPT - default "arch/arm/mach-rockchip/u-boot-tpl.lds" - config TPL_STACK default 0xff718000 diff --git a/arch/arm/mach-rockchip/u-boot-tpl.lds b/arch/arm/mach-rockchip/u-boot-tpl.lds deleted file mode 100644 index f5a89721ce..0000000000 --- a/arch/arm/mach-rockchip/u-boot-tpl.lds +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2019 Rockchip Electronic Co.,Ltd - */ - -#undef CONFIG_SPL_TEXT_BASE -#define CONFIG_SPL_TEXT_BASE CONFIG_TPL_TEXT_BASE - -#undef CONFIG_SPL_MAX_SIZE -#define CONFIG_SPL_MAX_SIZE CONFIG_TPL_MAX_SIZE - -#include "../cpu/u-boot-spl.lds" diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 33202e48fe..8b4da5b3e7 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -11,7 +11,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb" CONFIG_SPL_TEXT_BASE=0x60000000 CONFIG_ROCKCHIP_RK322X=y CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 -CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl.lds" CONFIG_TARGET_EVB_RK3229=y CONFIG_SPL_STACK_R_ADDR=0x60600000 CONFIG_DEBUG_UART_BASE=0x11030000 |