OSDN > Desarrollador > ysato > Chamber > uboot > Commit

uboot
Fork

(Original repository, No fork origin)

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revisión	a9ec2f6509f09eacd5094eff176723d4f99a483e (tree)
Tiempo	2022-07-26 03:57:27
Autor	Andrew Davis <afd@ti.c...>
Commiter	Tom Rini

Log Message

spl: Use SPL_TEXT_BASE instead of ISW_ENTRY_ADDR

The ISW_ENTRY_ADDR symbol was used for OMAP devices in place of
SPL_TEXT_BASE. Keystone2 HS devices were not using it right either.
Remove ISW_ENTRY_ADDR and use SPL_TEXT_BASE directly.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

Cambiar Resumen

modified: arch/arm/Kconfig (diff)
modified: arch/arm/mach-omap2/config_secure.mk (diff)
modified: common/spl/Kconfig (diff)
modified: configs/am335x_hs_evm_defconfig (diff)
modified: configs/am335x_hs_evm_uart_defconfig (diff)
modified: configs/am43xx_evm_usbhost_boot_defconfig (diff)
modified: configs/am43xx_hs_evm_defconfig (diff)
modified: configs/am57xx_hs_evm_usb_defconfig (diff)
modified: configs/dra7xx_hs_evm_usb_defconfig (diff)
modified: configs/k2e_evm_defconfig (diff)
modified: configs/k2e_hs_evm_defconfig (diff)
modified: configs/k2g_evm_defconfig (diff)
modified: configs/k2g_hs_evm_defconfig (diff)
modified: configs/k2hk_evm_defconfig (diff)
modified: configs/k2hk_hs_evm_defconfig (diff)
modified: configs/k2l_evm_defconfig (diff)
modified: configs/k2l_hs_evm_defconfig (diff)

Diferencia incremental

--- a/arch/arm/Kconfig

+++ b/arch/arm/Kconfig

		@@ -2149,21 +2149,6 @@ config TI_SECURE_DEVICE
2149	2149	authenticated) and the code. See the doc/README.ti-secure
2150	2150	file for further details.
2151	2151
2152		-if AM43XX \|\| AM33XX \|\| OMAP54XX \|\| ARCH_KEYSTONE
2153		-config ISW_ENTRY_ADDR
2154		- hex "Address in memory or XIP address of bootloader entry point"
2155		- default 0x402F4000 if AM43XX
2156		- default 0x402F0400 if AM33XX
2157		- default 0x40301350 if OMAP54XX
2158		- help
2159		- After any reset, the boot ROM searches the boot media for a valid
2160		- boot image. For non-XIP devices, the ROM then copies the image into
2161		- internal memory. For all boot modes, after the ROM processes the
2162		- boot image it eventually computes the entry point address depending
2163		- on the device type (secure/non-secure), boot media (xip/non-xip) and
2164		- image headers.
2165		-endif
2166		-
2167	2152	config SYS_KWD_CONFIG
2168	2153	string "kwbimage config file path"
2169	2154	depends on ARCH_KIRKWOOD \|\| ARCH_MVEBU

--- a/arch/arm/mach-omap2/config_secure.mk

+++ b/arch/arm/mach-omap2/config_secure.mk

		@@ -6,11 +6,11 @@ ifneq ($(TI_SECURE_DEV_PKG),)
6	6	ifneq ($(wildcard $(TI_SECURE_DEV_PKG)/scripts/create-boot-image.sh),)
7	7	ifneq ($(CONFIG_SPL_BUILD),)
8	8	cmd_mkomapsecimg = $(TI_SECURE_DEV_PKG)/scripts/create-boot-image.sh \
9		- $(patsubst u-boot-spl_HS_%,%,$(@F)) $< $@ $(CONFIG_ISW_ENTRY_ADDR) \
	9	+ $(patsubst u-boot-spl_HS_%,%,$(@F)) $< $@ $(CONFIG_SPL_TEXT_BASE) \
10	10	$(if $(KBUILD_VERBOSE:1=), >/dev/null)
11	11	else
12	12	cmd_mkomapsecimg = $(TI_SECURE_DEV_PKG)/scripts/create-boot-image.sh \
13		- $(patsubst u-boot_HS_%,%,$(@F)) $< $@ $(CONFIG_ISW_ENTRY_ADDR) \
	13	+ $(patsubst u-boot_HS_%,%,$(@F)) $< $@ $(CONFIG_SYS_TEXT_BASE) \
14	14	$(if $(KBUILD_VERBOSE:1=), >/dev/null)
15	15	endif
16	16	else

--- a/common/spl/Kconfig

+++ b/common/spl/Kconfig

		@@ -256,7 +256,9 @@ config SPL_LDSCRIPT
256	256
257	257	config SPL_TEXT_BASE
258	258	hex "SPL Text Base"
259		- default ISW_ENTRY_ADDR if AM43XX \|\| AM33XX \|\| OMAP54XX \|\| ARCH_KEYSTONE
	259	+ default 0x402F4000 if AM43XX
	260	+ default 0x402F0400 if AM33XX
	261	+ default 0x40301350 if OMAP54XX
260	262	default 0x10060 if MACH_SUN50I \|\| MACH_SUN50I_H5 \|\| MACH_SUN9I
261	263	default 0x20060 if SUN50I_GEN_H6
262	264	default 0x00060 if ARCH_SUNXI

--- a/configs/am335x_hs_evm_defconfig

+++ b/configs/am335x_hs_evm_defconfig

		@@ -2,7 +2,7 @@ CONFIG_ARM=y
2	2	CONFIG_ARCH_CPU_INIT=y
3	3	CONFIG_ARCH_OMAP2PLUS=y
4	4	CONFIG_TI_SECURE_DEVICE=y
5		-CONFIG_ISW_ENTRY_ADDR=0x40300350
	5	+CONFIG_SPL_TEXT_BASE=0x40300350
6	6	CONFIG_TI_COMMON_CMD_OPTIONS=y
7	7	CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
8	8	CONFIG_AM33XX=y

--- a/configs/am335x_hs_evm_uart_defconfig

+++ b/configs/am335x_hs_evm_uart_defconfig

		@@ -2,7 +2,7 @@ CONFIG_ARM=y
2	2	CONFIG_ARCH_CPU_INIT=y
3	3	CONFIG_ARCH_OMAP2PLUS=y
4	4	CONFIG_TI_SECURE_DEVICE=y
5		-CONFIG_ISW_ENTRY_ADDR=0x40301950
	5	+CONFIG_SPL_TEXT_BASE=0x40301950
6	6	CONFIG_TI_COMMON_CMD_OPTIONS=y
7	7	CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
8	8	CONFIG_AM33XX=y

--- a/configs/am43xx_evm_usbhost_boot_defconfig

+++ b/configs/am43xx_evm_usbhost_boot_defconfig

		@@ -2,7 +2,7 @@ CONFIG_ARM=y
2	2	CONFIG_SKIP_LOWLEVEL_INIT=y
3	3	CONFIG_ARCH_CPU_INIT=y
4	4	CONFIG_ARCH_OMAP2PLUS=y
5		-CONFIG_ISW_ENTRY_ADDR=0x40300350
	5	+CONFIG_SPL_TEXT_BASE=0x40300350
6	6	CONFIG_ENV_SIZE=0x10000
7	7	CONFIG_DM_GPIO=y
8	8	CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"

--- a/configs/am43xx_hs_evm_defconfig

+++ b/configs/am43xx_hs_evm_defconfig

		@@ -3,12 +3,11 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
3	3	CONFIG_ARCH_CPU_INIT=y
4	4	CONFIG_ARCH_OMAP2PLUS=y
5	5	CONFIG_TI_SECURE_DEVICE=y
6		-CONFIG_ISW_ENTRY_ADDR=0x403018e0
7	6	CONFIG_TI_COMMON_CMD_OPTIONS=y
8	7	CONFIG_ENV_SIZE=0x10000
9	8	CONFIG_DM_GPIO=y
10	9	CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
11		-CONFIG_SPL_TEXT_BASE=0x403018E0
	10	+CONFIG_SPL_TEXT_BASE=0x403018e0
12	11	CONFIG_AM43XX=y
13	12	CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
14	13	CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000

--- a/configs/am57xx_hs_evm_usb_defconfig

+++ b/configs/am57xx_hs_evm_usb_defconfig

		@@ -1,7 +1,7 @@
1	1	CONFIG_ARM=y
2	2	CONFIG_ARCH_OMAP2PLUS=y
3	3	CONFIG_TI_SECURE_DEVICE=y
4		-CONFIG_ISW_ENTRY_ADDR=0x40306d50
	4	+CONFIG_SPL_TEXT_BASE=0x40306d50
5	5	CONFIG_TI_COMMON_CMD_OPTIONS=y
6	6	CONFIG_NR_DRAM_BANKS=2
7	7	CONFIG_DM_GPIO=y

--- a/configs/dra7xx_hs_evm_usb_defconfig

+++ b/configs/dra7xx_hs_evm_usb_defconfig

		@@ -1,7 +1,7 @@
1	1	CONFIG_ARM=y
2	2	CONFIG_ARCH_OMAP2PLUS=y
3	3	CONFIG_TI_SECURE_DEVICE=y
4		-CONFIG_ISW_ENTRY_ADDR=0x40306d50
	4	+CONFIG_SPL_TEXT_BASE=0x40306d50
5	5	CONFIG_SYS_MALLOC_F_LEN=0x18000
6	6	CONFIG_TI_COMMON_CMD_OPTIONS=y
7	7	CONFIG_NR_DRAM_BANKS=2

--- a/configs/k2e_evm_defconfig

+++ b/configs/k2e_evm_defconfig

		@@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y
4	4	CONFIG_SYS_DCACHE_OFF=y
5	5	CONFIG_ARCH_CPU_INIT=y
6	6	CONFIG_ARCH_KEYSTONE=y
7		-CONFIG_ISW_ENTRY_ADDR=0xC100000
	7	+CONFIG_SPL_TEXT_BASE=0xC100000
8	8	CONFIG_SYS_TEXT_BASE=0xC000000
9	9	CONFIG_SYS_MALLOC_LEN=0x2000000
10	10	CONFIG_SYS_MALLOC_F_LEN=0x400

--- a/configs/k2e_hs_evm_defconfig

+++ b/configs/k2e_hs_evm_defconfig

		@@ -4,7 +4,6 @@ CONFIG_SYS_DCACHE_OFF=y
4	4	CONFIG_ARCH_CPU_INIT=y
5	5	CONFIG_ARCH_KEYSTONE=y
6	6	CONFIG_TI_SECURE_DEVICE=y
7		-CONFIG_ISW_ENTRY_ADDR=0xC100000
8	7	CONFIG_SYS_TEXT_BASE=0xC000060
9	8	CONFIG_SYS_MALLOC_LEN=0x2000000
10	9	CONFIG_SYS_MALLOC_F_LEN=0x400

--- a/configs/k2g_evm_defconfig

+++ b/configs/k2g_evm_defconfig

		@@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y
4	4	CONFIG_SYS_DCACHE_OFF=y
5	5	CONFIG_ARCH_CPU_INIT=y
6	6	CONFIG_ARCH_KEYSTONE=y
7		-CONFIG_ISW_ENTRY_ADDR=0xC0A0000
	7	+CONFIG_SPL_TEXT_BASE=0xC0A0000
8	8	CONFIG_SYS_TEXT_BASE=0xC000000
9	9	CONFIG_SYS_MALLOC_LEN=0x2000000
10	10	CONFIG_SYS_MALLOC_F_LEN=0x400

--- a/configs/k2g_hs_evm_defconfig

+++ b/configs/k2g_hs_evm_defconfig

		@@ -4,7 +4,6 @@ CONFIG_SYS_DCACHE_OFF=y
4	4	CONFIG_ARCH_CPU_INIT=y
5	5	CONFIG_ARCH_KEYSTONE=y
6	6	CONFIG_TI_SECURE_DEVICE=y
7		-CONFIG_ISW_ENTRY_ADDR=0xC0A0000
8	7	CONFIG_SYS_TEXT_BASE=0xC000060
9	8	CONFIG_SYS_MALLOC_LEN=0x2000000
10	9	CONFIG_SYS_MALLOC_F_LEN=0x400

--- a/configs/k2hk_evm_defconfig

+++ b/configs/k2hk_evm_defconfig

		@@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y
4	4	CONFIG_SYS_DCACHE_OFF=y
5	5	CONFIG_ARCH_CPU_INIT=y
6	6	CONFIG_ARCH_KEYSTONE=y
7		-CONFIG_ISW_ENTRY_ADDR=0xC200000
	7	+CONFIG_SPL_TEXT_BASE=0xC200000
8	8	CONFIG_SYS_TEXT_BASE=0xC000000
9	9	CONFIG_SYS_MALLOC_LEN=0x2000000
10	10	CONFIG_SYS_MALLOC_F_LEN=0x400

--- a/configs/k2hk_hs_evm_defconfig

+++ b/configs/k2hk_hs_evm_defconfig

		@@ -4,7 +4,6 @@ CONFIG_SYS_DCACHE_OFF=y
4	4	CONFIG_ARCH_CPU_INIT=y
5	5	CONFIG_ARCH_KEYSTONE=y
6	6	CONFIG_TI_SECURE_DEVICE=y
7		-CONFIG_ISW_ENTRY_ADDR=0xC200000
8	7	CONFIG_SYS_TEXT_BASE=0xC000060
9	8	CONFIG_SYS_MALLOC_LEN=0x2000000
10	9	CONFIG_SYS_MALLOC_F_LEN=0x400

--- a/configs/k2l_evm_defconfig

+++ b/configs/k2l_evm_defconfig

		@@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y
4	4	CONFIG_SYS_DCACHE_OFF=y
5	5	CONFIG_ARCH_CPU_INIT=y
6	6	CONFIG_ARCH_KEYSTONE=y
7		-CONFIG_ISW_ENTRY_ADDR=0xC100000
	7	+CONFIG_SPL_TEXT_BASE=0xC100000
8	8	CONFIG_SYS_TEXT_BASE=0xC000000
9	9	CONFIG_SYS_MALLOC_LEN=0x2000000
10	10	CONFIG_SYS_MALLOC_F_LEN=0x400

--- a/configs/k2l_hs_evm_defconfig

+++ b/configs/k2l_hs_evm_defconfig

		@@ -4,7 +4,6 @@ CONFIG_SYS_DCACHE_OFF=y
4	4	CONFIG_ARCH_CPU_INIT=y
5	5	CONFIG_ARCH_KEYSTONE=y
6	6	CONFIG_TI_SECURE_DEVICE=y
7		-CONFIG_ISW_ENTRY_ADDR=0xC100000
8	7	CONFIG_SYS_TEXT_BASE=0xC000060
9	8	CONFIG_SYS_MALLOC_LEN=0x2000000
10	9	CONFIG_SYS_MALLOC_F_LEN=0x400

uboot Fork