OSDN -- オープンソース・ソフトウェアの開発とダウンロード
日本語の翻訳状況 translation status for ja
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

コミットメタ情報

リビジョンa9ec2f6509f09eacd5094eff176723d4f99a483e (tree)
日時2022-07-26 03:57:27
作者Andrew Davis <afd@ti.c...>
コミッターTom Rini

ログメッセージ

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>

変更サマリ

差分

--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2149,21 +2149,6 @@ config TI_SECURE_DEVICE
21492149 authenticated) and the code. See the doc/README.ti-secure
21502150 file for further details.
21512151
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-
21672152 config SYS_KWD_CONFIG
21682153 string "kwbimage config file path"
21692154 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),)
66 ifneq ($(wildcard $(TI_SECURE_DEV_PKG)/scripts/create-boot-image.sh),)
77 ifneq ($(CONFIG_SPL_BUILD),)
88 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) \
1010 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
1111 else
1212 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) \
1414 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
1515 endif
1616 else
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -256,7 +256,9 @@ config SPL_LDSCRIPT
256256
257257 config SPL_TEXT_BASE
258258 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
260262 default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I
261263 default 0x20060 if SUN50I_GEN_H6
262264 default 0x00060 if ARCH_SUNXI
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
22 CONFIG_ARCH_CPU_INIT=y
33 CONFIG_ARCH_OMAP2PLUS=y
44 CONFIG_TI_SECURE_DEVICE=y
5-CONFIG_ISW_ENTRY_ADDR=0x40300350
5+CONFIG_SPL_TEXT_BASE=0x40300350
66 CONFIG_TI_COMMON_CMD_OPTIONS=y
77 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
88 CONFIG_AM33XX=y
--- a/configs/am335x_hs_evm_uart_defconfig
+++ b/configs/am335x_hs_evm_uart_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
22 CONFIG_ARCH_CPU_INIT=y
33 CONFIG_ARCH_OMAP2PLUS=y
44 CONFIG_TI_SECURE_DEVICE=y
5-CONFIG_ISW_ENTRY_ADDR=0x40301950
5+CONFIG_SPL_TEXT_BASE=0x40301950
66 CONFIG_TI_COMMON_CMD_OPTIONS=y
77 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
88 CONFIG_AM33XX=y
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
22 CONFIG_SKIP_LOWLEVEL_INIT=y
33 CONFIG_ARCH_CPU_INIT=y
44 CONFIG_ARCH_OMAP2PLUS=y
5-CONFIG_ISW_ENTRY_ADDR=0x40300350
5+CONFIG_SPL_TEXT_BASE=0x40300350
66 CONFIG_ENV_SIZE=0x10000
77 CONFIG_DM_GPIO=y
88 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
33 CONFIG_ARCH_CPU_INIT=y
44 CONFIG_ARCH_OMAP2PLUS=y
55 CONFIG_TI_SECURE_DEVICE=y
6-CONFIG_ISW_ENTRY_ADDR=0x403018e0
76 CONFIG_TI_COMMON_CMD_OPTIONS=y
87 CONFIG_ENV_SIZE=0x10000
98 CONFIG_DM_GPIO=y
109 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
11-CONFIG_SPL_TEXT_BASE=0x403018E0
10+CONFIG_SPL_TEXT_BASE=0x403018e0
1211 CONFIG_AM43XX=y
1312 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
1413 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 @@
11 CONFIG_ARM=y
22 CONFIG_ARCH_OMAP2PLUS=y
33 CONFIG_TI_SECURE_DEVICE=y
4-CONFIG_ISW_ENTRY_ADDR=0x40306d50
4+CONFIG_SPL_TEXT_BASE=0x40306d50
55 CONFIG_TI_COMMON_CMD_OPTIONS=y
66 CONFIG_NR_DRAM_BANKS=2
77 CONFIG_DM_GPIO=y
--- a/configs/dra7xx_hs_evm_usb_defconfig
+++ b/configs/dra7xx_hs_evm_usb_defconfig
@@ -1,7 +1,7 @@
11 CONFIG_ARM=y
22 CONFIG_ARCH_OMAP2PLUS=y
33 CONFIG_TI_SECURE_DEVICE=y
4-CONFIG_ISW_ENTRY_ADDR=0x40306d50
4+CONFIG_SPL_TEXT_BASE=0x40306d50
55 CONFIG_SYS_MALLOC_F_LEN=0x18000
66 CONFIG_TI_COMMON_CMD_OPTIONS=y
77 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
44 CONFIG_SYS_DCACHE_OFF=y
55 CONFIG_ARCH_CPU_INIT=y
66 CONFIG_ARCH_KEYSTONE=y
7-CONFIG_ISW_ENTRY_ADDR=0xC100000
7+CONFIG_SPL_TEXT_BASE=0xC100000
88 CONFIG_SYS_TEXT_BASE=0xC000000
99 CONFIG_SYS_MALLOC_LEN=0x2000000
1010 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
44 CONFIG_ARCH_CPU_INIT=y
55 CONFIG_ARCH_KEYSTONE=y
66 CONFIG_TI_SECURE_DEVICE=y
7-CONFIG_ISW_ENTRY_ADDR=0xC100000
87 CONFIG_SYS_TEXT_BASE=0xC000060
98 CONFIG_SYS_MALLOC_LEN=0x2000000
109 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
44 CONFIG_SYS_DCACHE_OFF=y
55 CONFIG_ARCH_CPU_INIT=y
66 CONFIG_ARCH_KEYSTONE=y
7-CONFIG_ISW_ENTRY_ADDR=0xC0A0000
7+CONFIG_SPL_TEXT_BASE=0xC0A0000
88 CONFIG_SYS_TEXT_BASE=0xC000000
99 CONFIG_SYS_MALLOC_LEN=0x2000000
1010 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
44 CONFIG_ARCH_CPU_INIT=y
55 CONFIG_ARCH_KEYSTONE=y
66 CONFIG_TI_SECURE_DEVICE=y
7-CONFIG_ISW_ENTRY_ADDR=0xC0A0000
87 CONFIG_SYS_TEXT_BASE=0xC000060
98 CONFIG_SYS_MALLOC_LEN=0x2000000
109 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
44 CONFIG_SYS_DCACHE_OFF=y
55 CONFIG_ARCH_CPU_INIT=y
66 CONFIG_ARCH_KEYSTONE=y
7-CONFIG_ISW_ENTRY_ADDR=0xC200000
7+CONFIG_SPL_TEXT_BASE=0xC200000
88 CONFIG_SYS_TEXT_BASE=0xC000000
99 CONFIG_SYS_MALLOC_LEN=0x2000000
1010 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
44 CONFIG_ARCH_CPU_INIT=y
55 CONFIG_ARCH_KEYSTONE=y
66 CONFIG_TI_SECURE_DEVICE=y
7-CONFIG_ISW_ENTRY_ADDR=0xC200000
87 CONFIG_SYS_TEXT_BASE=0xC000060
98 CONFIG_SYS_MALLOC_LEN=0x2000000
109 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
44 CONFIG_SYS_DCACHE_OFF=y
55 CONFIG_ARCH_CPU_INIT=y
66 CONFIG_ARCH_KEYSTONE=y
7-CONFIG_ISW_ENTRY_ADDR=0xC100000
7+CONFIG_SPL_TEXT_BASE=0xC100000
88 CONFIG_SYS_TEXT_BASE=0xC000000
99 CONFIG_SYS_MALLOC_LEN=0x2000000
1010 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
44 CONFIG_ARCH_CPU_INIT=y
55 CONFIG_ARCH_KEYSTONE=y
66 CONFIG_TI_SECURE_DEVICE=y
7-CONFIG_ISW_ENTRY_ADDR=0xC100000
87 CONFIG_SYS_TEXT_BASE=0xC000060
98 CONFIG_SYS_MALLOC_LEN=0x2000000
109 CONFIG_SYS_MALLOC_F_LEN=0x400