Skip to content

Commit 64f5f6f

Browse files
saschahauersaschahauer
committed
ARM: drop TEXT_BASE
With all ARM boards being relocatable TEXT_BASE is always defined to 0x0 and can be dropped. The ARCH_TEXT_BASE Kconfig symbol is also no longer used and can be removed. Link: https://lore.barebox.org/[email protected] Signed-off-by: Sascha Hauer <[email protected]>
1 parent 01d1492 commit 64f5f6f

File tree

16 files changed

+6
-72
lines changed

16 files changed

+6
-72
lines changed

‎arch/arm/Kconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ config ARM
1515
select PBL_RELOCATABLE
1616
default y
1717

18+
config ARCH_TEXT_BASE
19+
hex
20+
default 0x00000000
21+
1822
config ARM_LINUX
1923
bool
2024
default y
@@ -24,10 +28,6 @@ config ARM_USE_COMPRESSED_DTB
2428
bool
2529
select USE_COMPRESSED_DTB
2630

27-
config TEXT_BASE
28-
hex
29-
default 0x0
30-
3131
menu "System Type"
3232

3333
config ARCH_STM32

‎arch/arm/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ machine-$(CONFIG_ARCH_TEGRA) += tegra
102102
machine-$(CONFIG_ARCH_ZYNQ) += zynq
103103
machine-$(CONFIG_ARCH_ZYNQMP) += zynqmp
104104

105-
TEXT_BASE = $(CONFIG_TEXT_BASE)
106-
107-
KBUILD_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
108-
109105
# Add cleanup flags
110106
KBUILD_CPPFLAGS += -fdata-sections -ffunction-sections
111107
LDFLAGS_barebox += --gc-sections -pie

‎arch/arm/boards/versatile/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,4 @@
22

33
if MACH_VERSATILEPB
44

5-
config ARCH_TEXT_BASE
6-
hex
7-
default 0x01000000
8-
95
endif

‎arch/arm/lib32/barebox.lds.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@ SECTIONS
8383
#endif
8484

8585
_end = .;
86-
_barebox_image_size = __bss_start - TEXT_BASE;
86+
_barebox_image_size = __bss_start;
8787
}

‎arch/arm/lib64/barebox.lds.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ SECTIONS
5353
.bss : { *(.bss*) }
5454
.__bss_stop : { *(.__bss_stop) }
5555
_end = .;
56-
_barebox_image_size = __bss_start - TEXT_BASE;
56+
_barebox_image_size = __bss_start;
5757
}

‎arch/arm/mach-at91/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,6 @@ config SOC_SAMA7G5
147147
help
148148
Select this if you are using one of Microchip's SAMA7G5 family SoC.
149149

150-
config ARCH_TEXT_BASE
151-
hex
152-
default 0x73f00000 if SOC_AT91SAM9G45
153-
default 0x26f00000 if SOC_AT91SAM9X5
154-
default 0x20f00000 if SOC_AT91RM9200
155-
default 0x21f00000 if MACH_ANIMEO_IP
156-
default 0x23f00000
157-
158150
config HAVE_NAND_ATMEL_BUSWIDTH_16
159151
bool
160152

‎arch/arm/mach-bcm283x/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
if ARCH_BCM283X
44

5-
config ARCH_TEXT_BASE
6-
hex
7-
default 0x0
8-
95
config MACH_RPI_COMMON
106
bool
117
select ARM_USE_COMPRESSED_DTB

‎arch/arm/mach-mvebu/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22

33
if ARCH_MVEBU
44

5-
config ARCH_TEXT_BASE
6-
hex
7-
default 0x2000000 if ARCH_ARMADA_370
8-
default 0x2000000 if ARCH_ARMADA_XP
9-
default 0x2000000 if ARCH_DOVE
10-
default 0x2000000 if ARCH_KIRKWOOD
11-
125
config ARCH_ARMADA_370
136
bool
147
select CPU_V7

‎arch/arm/mach-mxs/Kconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22

33
if ARCH_MXS
44

5-
config ARCH_TEXT_BASE
6-
hex
7-
default 0x41000000 if MACH_MX23EVK
8-
default 0x42000000 if MACH_CHUMBY
9-
default 0x42000000 if MACH_IMX233_OLINUXINO
10-
default 0x47000000 if MACH_TX28
11-
default 0x47000000 if MACH_MX28EVK
12-
default 0x47000000 if MACH_CFA10036
13-
145
config ARCH_MXS_OF_SUPPORT
156
bool
167
select COMMON_CLK_OF_PROVIDER

‎arch/arm/mach-omap/Kconfig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,6 @@ config BAREBOX_UPDATE_AM33XX_EMMC
100100
help
101101
Say Y for barebox update eMMC handler.
102102

103-
config ARCH_TEXT_BASE
104-
hex
105-
default 0x80e80000 if MACH_OMAP343xSDP
106-
default 0x80e80000 if MACH_BEAGLE
107-
108103
config AM33XX_NET_BOOT
109104
bool "enable AM335x network boot"
110105
select ENVIRONMENT_VARIABLES
@@ -182,7 +177,6 @@ config MACH_VSCOM_BALTOS
182177
config MACH_WAGO_PFC_AM35XX
183178
bool "Wago PFC200 Fieldbus Controller"
184179
select ARCH_AM35XX
185-
select HAVE_CONFIGURABLE_MEMORY_LAYOUT
186180
help
187181
Say Y here if you are using a the AM3505 based PFC200 controller
188182

‎arch/arm/mach-rockchip/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
menu "Rockchip Features"
44
depends on ARCH_ROCKCHIP
55

6-
config ARCH_TEXT_BASE
7-
hex
8-
default 0x68000000 if ARCH_RK3188
9-
default 0x0
10-
116
config RK_TIMER
127
hex
138
default 1

‎arch/arm/mach-socfpga/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
if ARCH_SOCFPGA
44

5-
config ARCH_TEXT_BASE
6-
hex
7-
default 0x0
8-
95
config ARCH_SOCFPGA_XLOAD
106
bool
117
prompt "Build preloader image"

‎arch/arm/mach-tegra/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
if ARCH_TEGRA
44

5-
config ARCH_TEXT_BASE
6-
hex
7-
default 0x0
8-
95
# ---------------------------------------------------------
106

117
config ARCH_TEGRA_2x_SOC

‎arch/arm/mach-versatile/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
if ARCH_VERSATILE
44

5-
config ARCH_TEXT_BASE
6-
default 0x02000000
7-
85
config MACH_VERSATILEPB
96
bool
107
default y

‎arch/arm/mach-vexpress/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
if ARCH_VEXPRESS
44

5-
config ARCH_TEXT_BASE
6-
hex
7-
default 0x0
8-
95
config MACH_VEXPRESS
106
bool "ARM Vexpress"
117

‎arch/arm/mach-zynq/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
if ARCH_ZYNQ
44

5-
config ARCH_TEXT_BASE
6-
hex
7-
default 0x0
8-
95
config ZYNQ_DEBUG_LL_UART_BASE
106
hex
117
default 0xe0001000 if MACH_ZEDBOARD

0 commit comments

Comments
 (0)