Skip to contentSkip to conversation

sunxi: move CONFIG_SYS_TEXT_BASE out of defconfigs

PATCH Superseded Andre Przywara 3 participants 3 messages Feb 19, 2018 Arm/Allwinner sunXi SoC support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sunxi: move CONFIG_SYS_TEXT_BASE out of defconfigs

Commit 278b90ce786f ("configs: Migrate CONFIG_SYS_TEXT_BASE") made CONFIG_SYS_TEXT_BASE a proper Kconfig variable, with the consequence of moving the common definition shared by almost every sunxi board into 123 individual defconfig files. But the U-Boot start address for Allwinner boards is a platform decision which has been around for ages, so defining it in each *board* config file seems a bit over the top.
Define the standard value (160MB into DRAM) if ARCH_SUNXI is selected, and delete the lines from the individual defconfigs.
This leaves the few exceptions (three A80 boards and the LicheePi Zero) alone, their defconfig value simply overrides the default.

---
Hi,

the resulting .config files for each sunxi board are identical before and after this patch, so no regressions are expected.

Cheers,
Andre.

 Kconfig                                        | 1 +
 configs/A10-OLinuXino-Lime_defconfig           | 1 -
 configs/A10s-OLinuXino-M_defconfig             | 1 -
 configs/A13-OLinuXinoM_defconfig               | 1 -
 configs/A13-OLinuXino_defconfig                | 1 -
 configs/A20-OLinuXino-Lime2-eMMC_defconfig     | 1 -
 configs/A20-OLinuXino-Lime2_defconfig          | 1 -
 configs/A20-OLinuXino-Lime_defconfig           | 1 -
 configs/A20-OLinuXino_MICRO-eMMC_defconfig     | 1 -
 configs/A20-OLinuXino_MICRO_defconfig          | 1 -
 configs/A20-Olimex-SOM-EVB_defconfig           | 1 -
 configs/A33-OLinuXino_defconfig                | 1 -
 configs/Ainol_AW1_defconfig                    | 1 -
 configs/Ampe_A76_defconfig                     | 1 -
 configs/Auxtek-T003_defconfig                  | 1 -
 configs/Auxtek-T004_defconfig                  | 1 -
 configs/Bananapi_M2_Ultra_defconfig            | 1 -
 configs/Bananapi_defconfig                     | 1 -
 configs/Bananapi_m2m_defconfig                 | 1 -
 configs/Bananapro_defconfig                    | 1 -
 configs/CHIP_defconfig                         | 1 -
 configs/CHIP_pro_defconfig                     | 1 -
 configs/CSQ_CS908_defconfig                    | 1 -
 configs/Chuwi_V7_CW0825_defconfig              | 1 -
 configs/Colombus_defconfig                     | 1 -
 configs/Cubieboard2_defconfig                  | 1 -
 configs/Cubieboard_defconfig                   | 1 -
 configs/Cubietruck_defconfig                   | 1 -
 configs/Cubietruck_plus_defconfig              | 1 -
 configs/Empire_electronix_d709_defconfig       | 1 -
 configs/Empire_electronix_m712_defconfig       | 1 -
 configs/Hummingbird_A31_defconfig              | 1 -
 configs/Hyundai_A7HD_defconfig                 | 1 -
 configs/Itead_Ibox_A20_defconfig               | 1 -
 configs/Lamobo_R1_defconfig                    | 1 -
 configs/Linksprite_pcDuino3_Nano_defconfig     | 1 -
 configs/Linksprite_pcDuino3_defconfig          | 1 -
 configs/Linksprite_pcDuino_defconfig           | 1 -
 configs/MK808C_defconfig                       | 1 -
 configs/MSI_Primo73_defconfig                  | 1 -
 configs/MSI_Primo81_defconfig                  | 1 -
 configs/Marsboard_A10_defconfig                | 1 -
 configs/Mele_A1000G_quad_defconfig             | 1 -
 configs/Mele_A1000_defconfig                   | 1 -
 configs/Mele_I7_defconfig                      | 1 -
 configs/Mele_M3_defconfig                      | 1 -
 configs/Mele_M5_defconfig                      | 1 -
 configs/Mele_M9_defconfig                      | 1 -
 configs/Mini-X_defconfig                       | 1 -
 configs/Nintendo_NES_Classic_Edition_defconfig | 1 -
 configs/Orangepi_defconfig                     | 1 -
 configs/Orangepi_mini_defconfig                | 1 -
 configs/Sinlinx_SinA31s_defconfig              | 1 -
 configs/Sinlinx_SinA33_defconfig               | 1 -
 configs/Sinovoip_BPI_M2_Plus_defconfig         | 1 -
 configs/Sinovoip_BPI_M2_defconfig              | 1 -
 configs/Sinovoip_BPI_M3_defconfig              | 1 -
 configs/UTOO_P66_defconfig                     | 1 -
 configs/Wexler_TAB7200_defconfig               | 1 -
 configs/Wits_Pro_A20_DKT_defconfig             | 1 -
 configs/Wobo_i5_defconfig                      | 1 -
 configs/Yones_Toptech_BD1078_defconfig         | 1 -
 configs/Yones_Toptech_BS1078_V2_defconfig      | 1 -
 configs/a64-olinuxino_defconfig                | 1 -
 configs/ba10_tv_box_defconfig                  | 1 -
 configs/bananapi_m1_plus_defconfig             | 1 -
 configs/bananapi_m64_defconfig                 | 1 -
 configs/colorfly_e708_q1_defconfig             | 1 -
 configs/difrnce_dit4350_defconfig              | 1 -
 configs/dserve_dsrv9703c_defconfig             | 1 -
 configs/ga10h_v1_1_defconfig                   | 1 -
 configs/gt90h_v4_defconfig                     | 1 -
 configs/h8_homlet_v2_defconfig                 | 1 -
 configs/i12-tvbox_defconfig                    | 1 -
 configs/iNet_3F_defconfig                      | 1 -
 configs/iNet_3W_defconfig                      | 1 -
 configs/iNet_86VS_defconfig                    | 1 -
 configs/iNet_D978_rev2_defconfig               | 1 -
 configs/icnova-a20-swac_defconfig              | 1 -
 configs/inet1_defconfig                        | 1 -
 configs/inet86dz_defconfig                     | 1 -
 configs/inet97fv2_defconfig                    | 1 -
 configs/inet98v_rev2_defconfig                 | 1 -
 configs/inet9f_rev03_defconfig                 | 1 -
 configs/inet_q972_defconfig                    | 1 -
 configs/jesurun_q5_defconfig                   | 1 -
 configs/libretech_all_h3_cc_h3_defconfig       | 1 -
 configs/mixtile_loftq_defconfig                | 1 -
 configs/mk802_a10s_defconfig                   | 1 -
 configs/mk802_defconfig                        | 1 -
 configs/mk802ii_defconfig                      | 1 -
 configs/nanopi_a64_defconfig                   | 1 -
 configs/nanopi_m1_defconfig                    | 1 -
 configs/nanopi_m1_plus_defconfig               | 1 -
 configs/nanopi_neo2_defconfig                  | 1 -
 configs/nanopi_neo_air_defconfig               | 1 -
 configs/nanopi_neo_defconfig                   | 1 -
 configs/nanopi_neo_plus2_defconfig             | 1 -
 configs/orangepi_2_defconfig                   | 1 -
 configs/orangepi_lite_defconfig                | 1 -
 configs/orangepi_one_defconfig                 | 1 -
 configs/orangepi_pc2_defconfig                 | 1 -
 configs/orangepi_pc_defconfig                  | 1 -
 configs/orangepi_pc_plus_defconfig             | 1 -
 configs/orangepi_plus2e_defconfig              | 1 -
 configs/orangepi_plus_defconfig                | 1 -
 configs/orangepi_prime_defconfig               | 1 -
 configs/orangepi_win_defconfig                 | 1 -
 configs/orangepi_zero_defconfig                | 1 -
 configs/orangepi_zero_plus2_defconfig          | 1 -
 configs/parrot_r16_defconfig                   | 1 -
 configs/pine64_plus_defconfig                  | 1 -
 configs/polaroid_mid2407pxe03_defconfig        | 1 -
 configs/polaroid_mid2809pxe04_defconfig        | 1 -
 configs/pov_protab2_ips9_defconfig             | 1 -
 configs/q8_a13_tablet_defconfig                | 1 -
 configs/q8_a23_tablet_800x480_defconfig        | 1 -
 configs/q8_a33_tablet_1024x600_defconfig       | 1 -
 configs/q8_a33_tablet_800x480_defconfig        | 1 -
 configs/r7-tv-dongle_defconfig                 | 1 -
 configs/sopine_baseboard_defconfig             | 1 -
 configs/sun8i_a23_evb_defconfig                | 1 -
 configs/sunxi_Gemei_G9_defconfig               | 1 -
 configs/tbs_a711_defconfig                     | 1 -
 124 files changed, 1 insertion(+), 123 deletions(-)
Kconfig +1 -0
index 724d4c0bd3..6aef964d84 100644
@@ -381,6 +381,7 @@ config SYS_TEXT_BASE
 	depends on !NIOS2 && !XTENSA
 	depends on !EFI_APP
 	default 0x80800000 if ARCH_OMAP2PLUS
+	default 0x4a000000 if ARCH_SUNXI
 	hex "Text Base"
 	help
 	  The address in memory that U-Boot will be running from, initially.
configs/A10-OLinuXino-Lime_defconfig +0 -1
index d4f95f5e3d..89bb823123 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=480
 CONFIG_DRAM_EMR1=4
configs/A10s-OLinuXino-M_defconfig +0 -1
index cf8e7d524c..a06762a3c1 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MMC0_CD_PIN="PG1"
configs/A13-OLinuXinoM_defconfig +0 -1
index f32be685d5..22c7026401 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_EMR1=0
configs/A13-OLinuXino_defconfig +0 -1
index d054474252..4532d796a7 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_EMR1=0
configs/A20-OLinuXino-Lime2-eMMC_defconfig +0 -1
index a9904f2476..e09c1b3cf5 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
configs/A20-OLinuXino-Lime2_defconfig +0 -1
index 018a28fb40..ecb9e5fcc8 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
configs/A20-OLinuXino-Lime_defconfig +0 -1
index 8399e0b535..3f0e8571b2 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
configs/A20-OLinuXino_MICRO-eMMC_defconfig +0 -1
index e73410ab8e..76d9a4139a 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
configs/A20-OLinuXino_MICRO_defconfig +0 -1
index 0f4046bd4a..b96aa38c11 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
configs/A20-Olimex-SOM-EVB_defconfig +0 -1
index a1a5e4c93a..2f44cfd736 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
configs/A33-OLinuXino_defconfig +0 -1
index b926b261bd..9bf9e13311 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_CONS_INDEX=1
 CONFIG_MACH_SUN8I_A33=y
 CONFIG_DRAM_CLK=432
configs/Ainol_AW1_defconfig +0 -1
index 45e39c6e7c..e11e75d418 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_ZQ=123
configs/Ampe_A76_defconfig +0 -1
index ebfc7e04dc..2a12595731 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MMC0_CD_PIN="PG0"
configs/Auxtek-T003_defconfig +0 -1
index aefa98dfd5..8fa46ba4bc 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_EMR1=0
configs/Auxtek-T004_defconfig +0 -1
index 7ddc44d5f7..b2658572df 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_USB1_VBUS_PIN="PG13"
configs/Bananapi_M2_Ultra_defconfig +0 -1
index cf75312879..b40c210e04 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_R40=y
 CONFIG_DRAM_CLK=576
 CONFIG_DRAM_ZQ=3881979
configs/Bananapi_defconfig +0 -1
index 73461166d8..a1a1a92b71 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MACPWR="PH23"
configs/Bananapi_m2m_defconfig +0 -1
index 141fccb8b7..9fc1c94212 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_CONS_INDEX=1
 CONFIG_MACH_SUN8I_A33=y
 CONFIG_DRAM_CLK=600
configs/Bananapro_defconfig +0 -1
index 0d7e4fbd17..8a5394ee83 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MACPWR="PH23"
configs/CHIP_defconfig +0 -1
index 5cd8aa0045..0a79219bf6 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
 CONFIG_USB0_VBUS_PIN="PB10"
configs/CHIP_pro_defconfig +0 -1
index a98bb40c03..5adc8b5ad8 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
configs/CSQ_CS908_defconfig +0 -1
index 86545bda10..263b3097ef 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_CLK=432
 CONFIG_USB1_VBUS_PIN=""
configs/Chuwi_V7_CW0825_defconfig +0 -1
index 937b6db938..b873986c25 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_EMR1=4
configs/Colombus_defconfig +0 -1
index d60f92a553..6d39cf86c7 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_CLK=240
 CONFIG_DRAM_ZQ=251
configs/Cubieboard2_defconfig +0 -1
index 648c8d3b34..3452ed9cba 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=480
 CONFIG_MMC0_CD_PIN="PH1"
configs/Cubieboard_defconfig +0 -1
index f1ee62355c..bb44c5996c 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=480
 CONFIG_MMC0_CD_PIN="PH1"
configs/Cubietruck_defconfig +0 -1
index c65f12d418..b22eafcea9 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MMC0_CD_PIN="PH1"
configs/Cubietruck_plus_defconfig +0 -1
index 033e28f6a0..57de90da73 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A83T=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=15355
configs/Empire_electronix_d709_defconfig +0 -1
index 7db66f09b9..aafdb84d7e 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_EMR1=0
configs/Empire_electronix_m712_defconfig +0 -1
index 5f2d55198c..0cda5abd6f 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=408
 CONFIG_MMC0_CD_PIN="PG0"
configs/Hummingbird_A31_defconfig +0 -1
index 6f30461a55..cbb07e8a7d 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_ZQ=251
 CONFIG_USB1_VBUS_PIN="PH24"
configs/Hyundai_A7HD_defconfig +0 -1
index 939bb80c41..07aefa16b5 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_EMR1=4
 CONFIG_USB0_VBUS_PIN="PB09"
configs/Itead_Ibox_A20_defconfig +0 -1
index 6553a6fabb..8c3597fa05 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=480
 CONFIG_MMC0_CD_PIN="PH1"
configs/Lamobo_R1_defconfig +0 -1
index 92e682128c..18d8b71805 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MACPWR="PH23"
configs/Linksprite_pcDuino3_Nano_defconfig +0 -1
index 70fc3ee74a..0d012bf0ae 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=122
configs/Linksprite_pcDuino3_defconfig +0 -1
index cf05c54c14..b65920ca9f 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=480
 CONFIG_DRAM_ZQ=122
configs/Linksprite_pcDuino_defconfig +0 -1
index e0f11e15d3..456f171a8c 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_USB1_VBUS_PIN=""
 CONFIG_USB2_VBUS_PIN=""
configs/MK808C_defconfig +0 -1
index 402f8efd3d..121abc88ad 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-mk808c"
configs/MSI_Primo73_defconfig +0 -1
index 13c2141f01..2243ecc124 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:60000,le:60,ri:160,up:13,lo:12,hs:100,vs:10,sync:3,vmode:0"
configs/MSI_Primo81_defconfig +0 -1
index 363fec186c..6a56ccb0ca 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_CLK=360
 CONFIG_DRAM_ZQ=122
configs/Marsboard_A10_defconfig +0 -1
index a77ac394c4..793660eb10 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard"
 CONFIG_AHCI=y
configs/Mele_A1000G_quad_defconfig +0 -1
index cfb3792220..090ae94e4b 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_ZQ=120
 CONFIG_INITIAL_USB_SCAN_DELAY=2000
configs/Mele_A1000_defconfig +0 -1
index b482c182f2..1723ffd936 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_MACPWR="PH15"
 CONFIG_VIDEO_VGA=y
configs/Mele_I7_defconfig +0 -1
index 1c9e4183b3..cb1d15ea14 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_ZQ=120
 CONFIG_USB1_VBUS_PIN="PC27"
configs/Mele_M3_defconfig +0 -1
index 0a99866416..ca2865c926 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
configs/Mele_M5_defconfig +0 -1
index 9df5b7cd9c..d21daad620 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_ZQ=122
configs/Mele_M9_defconfig +0 -1
index bf696fc870..dccb11fe23 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_ZQ=120
 CONFIG_USB1_VBUS_PIN="PC27"
configs/Mini-X_defconfig +0 -1
index 9c24dbd49e..a230372751 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_USB0_VBUS_PIN="PB9"
 CONFIG_VIDEO_COMPOSITE=y
configs/Nintendo_NES_Classic_Edition_defconfig +0 -1
index 2be724425c..6eb6c26706 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A33=y
 CONFIG_DRAM_CLK=600
 CONFIG_DRAM_ZQ=15291
configs/Orangepi_defconfig +0 -1
index eb2550466e..416840ca31 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MACPWR="PH23"
configs/Orangepi_mini_defconfig +0 -1
index 0b3694476e..58a56dc5f6 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MACPWR="PH23"
configs/Sinlinx_SinA31s_defconfig +0 -1
index 102d672ae7..0cc9e0215d 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_ZQ=251
configs/Sinlinx_SinA33_defconfig +0 -1
index b0fe652584..c77fe3cc60 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_CONS_INDEX=1
 CONFIG_MACH_SUN8I_A33=y
 CONFIG_DRAM_CLK=552
configs/Sinovoip_BPI_M2_Plus_defconfig +0 -1
index a1eaf849bc..47ec0cf82e 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881979
configs/Sinovoip_BPI_M2_defconfig +0 -1
index aff76d97aa..a56632fa82 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_CLK=432
 CONFIG_USB1_VBUS_PIN=""
configs/Sinovoip_BPI_M3_defconfig +0 -1
index 90875b128a..95cf65d152 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A83T=y
 CONFIG_DRAM_TYPE=7
 CONFIG_DRAM_CLK=480
configs/UTOO_P66_defconfig +0 -1
index c0ca8322fe..ffe806aa62 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_EMR1=0
configs/Wexler_TAB7200_defconfig +0 -1
index 0312f2775b..708ba355da 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_USB0_VBUS_PIN="PB9"
configs/Wits_Pro_A20_DKT_defconfig +0 -1
index e570a43d43..a1a23b207c 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_VIDEO_VGA=y
configs/Wobo_i5_defconfig +0 -1
index c2b152beb7..12e32ff557 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MMC0_CD_PIN="PB3"
configs/Yones_Toptech_BD1078_defconfig +0 -1
index c7b6a500a2..fab651cd21 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=408
 CONFIG_MMC0_CD_PIN="PH1"
configs/Yones_Toptech_BS1078_V2_defconfig +0 -1
index 519b79b352..9a08a83da6 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_CLK=420
 CONFIG_DRAM_ZQ=251
configs/a64-olinuxino_defconfig +0 -1
index cabbba7484..cbd7f4cf6e 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I=y
 CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/ba10_tv_box_defconfig +0 -1
index e612a874fa..dcc05c91b9 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=384
 CONFIG_DRAM_EMR1=4
configs/bananapi_m1_plus_defconfig +0 -1
index db74254d5d..097ea0b15d 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MACPWR="PH23"
configs/bananapi_m64_defconfig +0 -1
index 8679ff5bf4..feb0658704 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I=y
 CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
 CONFIG_MMC0_CD_PIN="PH13"
configs/colorfly_e708_q1_defconfig +0 -1
index 0342d93265..e3ed19a0af 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_ZQ=251
configs/difrnce_dit4350_defconfig +0 -1
index 49bb62e04b..e24c189ee8 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=408
 CONFIG_MMC0_CD_PIN="PG0"
configs/dserve_dsrv9703c_defconfig +0 -1
index caf22298fe..74c8a95131 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_USB0_VBUS_PIN="PB9"
configs/ga10h_v1_1_defconfig +0 -1
index 1d7cc167a9..6be890aafe 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A33=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_ZQ=15291
configs/gt90h_v4_defconfig +0 -1
index 2b94fe2b87..873f95a8c6 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A23=y
 CONFIG_DRAM_CLK=480
 CONFIG_DRAM_ZQ=32767
configs/h8_homlet_v2_defconfig +0 -1
index 398da032b8..77e701b5da 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A83T=y
 CONFIG_DRAM_CLK=480
 CONFIG_DRAM_ZQ=15355
configs/i12-tvbox_defconfig +0 -1
index 88cea82965..61ae40aa41 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MACPWR="PH21"
configs/iNet_3F_defconfig +0 -1
index b785034de8..828f7ae7c4 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_EMR1=4
configs/iNet_3W_defconfig +0 -1
index 4a1e538ece..b0a3ade4ff 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=127
configs/iNet_86VS_defconfig +0 -1
index d85b04630a..7171c83de3 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=408
 CONFIG_USB0_VBUS_PIN="PG12"
configs/iNet_D978_rev2_defconfig +0 -1
index 88e858c6b3..d406404a31 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A33=y
 CONFIG_DRAM_CLK=456
 CONFIG_DRAM_ZQ=15291
configs/icnova-a20-swac_defconfig +0 -1
index adbd46a9a8..65ebdb38f8 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_OLD_SUNXI_KERNEL_COMPAT=y
configs/inet1_defconfig +0 -1
index cf3b55788f..497f88e5b8 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_EMR1=4
configs/inet86dz_defconfig +0 -1
index b87dfb93c7..2d85a614de 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A23=y
 CONFIG_DRAM_CLK=552
 CONFIG_DRAM_ZQ=63351
configs/inet97fv2_defconfig +0 -1
index d7a34ab934..b260ce1033 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_EMR1=4
configs/inet98v_rev2_defconfig +0 -1
index 1107cb1727..b30859c850 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MMC0_CD_PIN="PG0"
configs/inet9f_rev03_defconfig +0 -1
index 96b315ab71..127a72f028 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_EMR1=4
configs/inet_q972_defconfig +0 -1
index 65fd45621d..7f3171dcd4 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_CLK=384
 CONFIG_DRAM_ZQ=251
configs/jesurun_q5_defconfig +0 -1
index adfc1723b4..60eb6d7512 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=312
 CONFIG_MACPWR="PH19"
configs/libretech_all_h3_cc_h3_defconfig +0 -1
index 3ed2889a02..5424638741 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881979
configs/mixtile_loftq_defconfig +0 -1
index a3f1dfd173..facd756c4c 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_ZQ=251
 CONFIG_MACPWR="PA21"
configs/mk802_a10s_defconfig +0 -1
index 8cd24f2b46..14d21f30d5 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_EMR1=0
configs/mk802_defconfig +0 -1
index b54d6e6fe7..e64f288bc2 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_USB2_VBUS_PIN="PH12"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802"
configs/mk802ii_defconfig +0 -1
index dd788a0472..e81bc42ccb 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802ii"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/nanopi_a64_defconfig +0 -1
index 76a86594f2..40acfa3586 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I=y
 CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
 CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-nanopi-a64"
configs/nanopi_m1_defconfig +0 -1
index ab4d3e3073..880282fc6f 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881979
configs/nanopi_m1_plus_defconfig +0 -1
index 22d515ae42..4864d6fb3c 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881979
configs/nanopi_neo2_defconfig +0 -1
index 0d6926e9ab..f78ee504b7 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
configs/nanopi_neo_air_defconfig +0 -1
index ca9c2dd962..9e20b29588 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881979
configs/nanopi_neo_defconfig +0 -1
index 8a558854c4..28352672f8 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881979
configs/nanopi_neo_plus2_defconfig +0 -1
index 975321825c..5b66f44b53 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881977
configs/orangepi_2_defconfig +0 -1
index 9c26fea930..a685cf9957 100644
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881979
configs/orangepi_lite_defconfig +0 -1
index 8cbf5d44d8..1467bcd12f 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881979
configs/orangepi_one_defconfig +0 -1
index 672ac7eefb..77c8c8e36c 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881979
configs/orangepi_pc2_defconfig +0 -1
index a6777ac4d7..e8bf285ab3 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
configs/orangepi_pc_defconfig +0 -1
index 983e9be8d4..bc2cedb07f 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
 CONFIG_DRAM_ZQ=3881979
configs/orangepi_pc_plus_defconfig +0 -1
index 93f170c831..7962f383e6 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
 CONFIG_DRAM_ZQ=3881979
configs/orangepi_plus2e_defconfig +0 -1
index 0e36f12066..9b47782ec8 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881979
configs/orangepi_plus_defconfig +0 -1
index e62a07421e..229c48a205 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881979
configs/orangepi_prime_defconfig +0 -1
index acff08c4c8..c1c82bb2dd 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
configs/orangepi_win_defconfig +0 -1
index f21ea328ae..400ea81681 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I=y
 CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
 CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-orangepi-win"
configs/orangepi_zero_defconfig +0 -1
index 8263803ee4..5d7f90b87d 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
 CONFIG_DRAM_ZQ=3881979
configs/orangepi_zero_plus2_defconfig +0 -1
index f8b626e70b..9f955304ca 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
configs/parrot_r16_defconfig +0 -1
index 6055501c99..b287dbe692 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A33=y
 CONFIG_DRAM_CLK=600
 CONFIG_DRAM_ZQ=15291
configs/pine64_plus_defconfig +0 -1
index 41ccff139d..a4ca68a752 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I=y
 CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
 CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus"
configs/polaroid_mid2407pxe03_defconfig +0 -1
index a9ec412d76..456e9d241b 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A23=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_ZQ=63351
configs/polaroid_mid2809pxe04_defconfig +0 -1
index 7526aa19f5..f1e31732a0 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A23=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_ZQ=63351
configs/pov_protab2_ips9_defconfig +0 -1
index 9ad0bc1c4f..73a9491aad 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=432
 CONFIG_USB0_VBUS_PIN="PB9"
configs/q8_a13_tablet_defconfig +0 -1
index 2e09a5c4dc..9d42468825 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PG0"
configs/q8_a23_tablet_800x480_defconfig +0 -1
index 426214306b..6d1f89b4f2 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A23=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_ZQ=63306
configs/q8_a33_tablet_1024x600_defconfig +0 -1
index c6cf921e89..da6c9e4978 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A33=y
 CONFIG_DRAM_CLK=456
 CONFIG_DRAM_ZQ=15291
configs/q8_a33_tablet_800x480_defconfig +0 -1
index c822175252..21c183b3bb 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A33=y
 CONFIG_DRAM_CLK=456
 CONFIG_DRAM_ZQ=15291
configs/r7-tv-dongle_defconfig +0 -1
index f2ee2295ef..617a0b5b5b 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=384
 CONFIG_USB1_VBUS_PIN="PG13"
configs/sopine_baseboard_defconfig +0 -1
index 8ca43a6eac..35ff89ad3d 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN50I=y
 CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
 CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
configs/sun8i_a23_evb_defconfig +0 -1
index b77a8b908f..8a628cf9b1 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A23=y
 CONFIG_DRAM_CLK=552
 CONFIG_DRAM_ZQ=63351
configs/sunxi_Gemei_G9_defconfig +0 -1
index 9c9e54a906..918a4823c2 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=432
 CONFIG_DRAM_EMR1=4
configs/tbs_a711_defconfig +0 -1
index 78881a370b..ef6d00fe57 100644
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
 CONFIG_MACH_SUN8I_A83T=y
 CONFIG_DRAM_TYPE=7
 CONFIG_DRAM_CLK=648
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 sunxi: move CONFIG_SYS_TEXT_BASE out of defconfigs

Quoted 9 lines · Andre Przywara

Commit 278b90ce786f ("configs: Migrate CONFIG_SYS_TEXT_BASE") made CONFIG_SYS_TEXT_BASE a proper Kconfig variable, with the consequence of moving the common definition shared by almost every sunxi board into 123 individual defconfig files. But the U-Boot start address for Allwinner boards is a platform decision which has been around for ages, so defining it in each *board* config file seems a bit over the top.
Define the standard value (160MB into DRAM) if ARCH_SUNXI is selected, and delete the lines from the individual defconfigs.

I suppose we could do the same for A80 with

    default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I

before the standard sunxi one? AFAIK that would work.

Thanks
ChenYu

Quoted 4 lines

This leaves the few exceptions (three A80 boards and the LicheePi Zero) alone, their defconfig value simply overrides the default.

#2 lore raw

PATCH 1/1 sunxi: move CONFIG_SYS_TEXT_BASE out of defconfigs

In reply to Andre Przywara
Quoted 12 lines · Andre Przywara

Commit 278b90ce786f ("configs: Migrate CONFIG_SYS_TEXT_BASE") made CONFIG_SYS_TEXT_BASE a proper Kconfig variable, with the consequence of moving the common definition shared by almost every sunxi board into 123 individual defconfig files. But the U-Boot start address for Allwinner boards is a platform decision which has been around for ages, so defining it in each *board* config file seems a bit over the top.
Define the standard value (160MB into DRAM) if ARCH_SUNXI is selected, and delete the lines from the individual defconfigs.
This leaves the few exceptions (three A80 boards and the LicheePi Zero) alone, their defconfig value simply overrides the default.

Quoted 1 line

Thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180219/0523b7f1/attachment.sig>