October 2024 - U-Boot

[PATCH] efi_loader: Mark static function in dumpdtb
by Ilias Apalodimas 26 Oct '24

26 Oct '24

A few functions are only used locally but miss the 'static' keyword. Add it and quiesce W=1 build wanrings Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/dtbdump.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/efi_loader/dtbdump.c b/lib/efi_loader/dtbdump.c index 9f1d8fb82cb0..a3d59a2fd3be 100644 --- a/lib/efi_loader/dtbdump.c +++ b/lib/efi_loader/dtbdump.c @@ -225,7 +225,7 @@ static u32 f2h(fdt32_t val) * @systable: system table * Return: device tree or NULL */ -void *get_dtb(struct efi_system_table *systable) +static void *get_dtb(struct efi_system_table *systable) { void *dtb = NULL; efi_uintn_t i; @@ -246,7 +246,7 @@ void *get_dtb(struct efi_system_table *systable) * @pos: UTF-16 string * Return: pointer to first non-whitespace */ -u16 *skip_whitespace(u16 *pos) +static u16 *skip_whitespace(u16 *pos) { for (; *pos && *pos <= 0x20; ++pos) ; @@ -260,7 +260,7 @@ u16 *skip_whitespace(u16 *pos) * @keyword: keyword to be searched * Return: true fi @string starts with the keyword */ -bool starts_with(u16 *string, u16 *keyword) +static bool starts_with(u16 *string, u16 *keyword) { for (; *keyword; ++string, ++keyword) { if (*string != *keyword) @@ -272,7 +272,7 @@ bool starts_with(u16 *string, u16 *keyword) /** * do_help() - print help */ -void do_help(void) +static void do_help(void) { error(u"dump - print device-tree\r\n"); error(u"load <dtb> - load device-tree from file\r\n"); @@ -332,7 +332,7 @@ open_file_system(struct efi_simple_file_system_protocol **file_system) * @filename: file name * Return: status code */ -efi_status_t do_load(u16 *filename) +static efi_status_t do_load(u16 *filename) { struct efi_dt_fixup_protocol *dt_fixup_prot; struct efi_simple_file_system_protocol *file_system; @@ -469,7 +469,7 @@ out: * @filename: file name * Return: status code */ -efi_status_t do_save(u16 *filename) +static efi_status_t do_save(u16 *filename) { struct efi_simple_file_system_protocol *file_system; efi_uintn_t dtb_size; -- 2.43.0

1 0

[PATCH] cmd/eficonfig: capitalize 'enter description'
by Heinrich Schuchardt 26 Oct '24

26 Oct '24

To conform with other messages capitalize the first letter: %s/enter description/Enter description/g Adjust the unit tests accordingly. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/eficonfig.c | 2 +- test/py/tests/test_eficonfig/test_eficonfig.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index bea09e4ecc7..029180250f0 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -963,7 +963,7 @@ static efi_status_t eficonfig_boot_add_enter_description(void *data) return handle_user_input(bo->description, EFICONFIG_DESCRIPTION_MAX, 22, "\n ** Edit Description **\n" "\n" - " enter description: "); + " Enter description: "); } /** diff --git a/test/py/tests/test_eficonfig/test_eficonfig.py b/test/py/tests/test_eficonfig/test_eficonfig.py index 1d8e033f75d..d98de5249df 100644 --- a/test/py/tests/test_eficonfig/test_eficonfig.py +++ b/test/py/tests/test_eficonfig/test_eficonfig.py @@ -117,7 +117,7 @@ def test_efi_eficonfig(u_boot_console, efi_eficonfig_data): press_up_down_enter_and_wait(0, 0, True, 'Quit') # Press the enter key to select 'Description:' entry, then enter Description - press_up_down_enter_and_wait(0, 0, True, 'enter description:') + press_up_down_enter_and_wait(0, 0, True, 'Enter description:') # Send Description user input, press ENTER key to complete send_user_input_and_wait('test 1', 'Quit') @@ -166,7 +166,7 @@ def test_efi_eficonfig(u_boot_console, efi_eficonfig_data): press_up_down_enter_and_wait(0, 0, True, 'Quit') # Press the enter key to select 'Description:' entry, then enter Description - press_up_down_enter_and_wait(0, 0, True, 'enter description:') + press_up_down_enter_and_wait(0, 0, True, 'Enter description:') # Send Description user input, press ENTER key to complete send_user_input_and_wait('test 2', 'Quit') @@ -278,7 +278,7 @@ def test_efi_eficonfig(u_boot_console, efi_eficonfig_data): u_boot_console.p.expect([i]) # Press the enter key to select 'Description:' entry, then enter Description - press_up_down_enter_and_wait(0, 0, True, 'enter description:') + press_up_down_enter_and_wait(0, 0, True, 'Enter description:') # Send Description user input, press ENTER key to complete send_user_input_and_wait('test 3', 'Quit') -- 2.45.2

2 1

[GIT PULL v2] Please pull u-boot-imx-master-20241025a
by Fabio Estevam 26 Oct '24

26 Oct '24

Hi Tom, Please pull from u-boot-imx/master, thanks. The following changes since commit 08ae12be8509daf3d1c5a148b8a50c0ffb6457c2: Mark a few functions static inline (2024-10-24 11:21:48 -0600) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-master-20241025a for you to fetch changes up to 0ccff7f8dca1e30863374a69c9292c82c142eb5e: ARM: imx: soc: Move default TEXT_BASE for i.MX7 (2024-10-25 20:22:01 -0300) u-boot-imx-master-20241025a --------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22989 - Remove unneeded USB board code and fix reset on mx6ul_14x14_evk. - Update fastboot buffer size/address for verdin-imx8m{m|p}. - Fix imxrt1050-evk boot and convert it to standard boot. - Fix imx8qxp-mek and imx8qm-mek boot. - Add support for the i.MX93 9X9 QSB board. - Make livetree API to work on i.MX. - Set sane default value for i.MX8M SPL_LOAD_FIT_ADDRESS. - Deduplicate DH i.MX8MP/i.MX6 DHSOM defconfigs. - Select default TEXT_BASE for i.MX6/i.MX7. - Several updates for DH i.MX8MP DRC02. ---------------------------------------------------------------- Fabio Estevam (2): mx6ul_14x14_evk: Remove unneeded USB board code mx6ul_14x14_evk: Convert to watchdog driver model Hiago De Franco (1): verdin-imx8m{m|p}: defconfig: update fastboot buffer size/address Jesse Taube (4): imx: imxrt*: Fix binman breaking boot imx: imxrt1050-evk: Fix missing clocks for mmc configs: imxrt1050-evk: Enable standard boot ARM: dts: imxrt1170: Fix default cells value warnings Marek Vasut (7): arm64: imx: imx8mp: Enable DM regulator on DH i.MX8MP DHCOM SoM on DRC02 board arm64: imx: imx8mp: Disable PCI support on DH i.MX8MP DHCOM SoM on DRC02 board arm64: imx: imx8mp: Disable PCA954x I2C mux on DH i.MX8MP DRC02 and PicoITX arm64: imx: Deduplicate DH i.MX8MP DHSOM defconfigs arm64: imx: Deduplicate DH i.MX6 DHSOM defconfig ARM: imx: soc: Select default TEXT_BASE for i.MX6 ARM: imx: soc: Move default TEXT_BASE for i.MX7 Peng Fan (4): arm: dts: imx8qxp-mek: fix boot arm: dts: imx8qm-mek: fix boot imx9: clock: Add 800MHz fracpll entry imx: Support i.MX93 9X9 QSB board Rasmus Villemoes (1): imx8m: set sane default value for SPL_LOAD_FIT_ADDRESS Tim Harvey (4): pinctrl: imx: Convert to use livetree API for fdt access imx: power-domain: Convert to use livetree API for fdt access i2c: mxc_i2c: Convert to use livetree API for fdt access mmc: fsl_esdhc: Convert to use livetree API for fdt access Kconfig | 2 + arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 33 + arch/arm/dts/fsl-imx8qm-mek.dts | 1 - arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 18 +- arch/arm/dts/fsl-imx8qxp-mek.dts | 1 - arch/arm/dts/imx93-9x9-qsb-u-boot.dtsi | 162 ++ arch/arm/dts/imxrt1050.dtsi | 2 +- arch/arm/dts/imxrt1170-evk.dts | 2 + arch/arm/mach-imx/imx9/Kconfig | 8 + arch/arm/mach-imx/imx9/clock.c | 1 + arch/arm/mach-imx/imx9/clock_root.c | 3 +- arch/arm/mach-imx/mx7/Kconfig | 7 - board/freescale/imx93_qsb/Kconfig | 12 + board/freescale/imx93_qsb/MAINTAINERS | 7 + board/freescale/imx93_qsb/Makefile | 16 + board/freescale/imx93_qsb/imx93_qsb.c | 33 + board/freescale/imx93_qsb/imx93_qsb.env | 63 + board/freescale/imx93_qsb/lpddr4_timing.c | 1995 ++++++++++++++++++++ board/freescale/imx93_qsb/lpddr4_timing_ecc.c | 1995 ++++++++++++++++++++ board/freescale/imx93_qsb/spl.c | 172 ++ .../freescale/imxrt1050-evk/imxrt1050-evk-nor.env | 13 + board/freescale/imxrt1050-evk/imxrt1050-evk.env | 13 + board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 51 - boot/Kconfig | 1 + common/spl/Kconfig | 2 + configs/apalis_imx6_defconfig | 2 - configs/aristainetos2c_defconfig | 1 - configs/aristainetos2ccslb_defconfig | 1 - configs/brppt2_defconfig | 1 - configs/cm_fx6_defconfig | 2 - configs/colibri_imx6_defconfig | 2 - configs/dh_imx6_defconfig | 167 +- configs/dhsom.config | 56 + configs/display5_defconfig | 2 - configs/display5_factory_defconfig | 2 - configs/ge_b1x5v2_defconfig | 2 - configs/ge_bx50v3_defconfig | 1 - configs/gwventana_emmc_defconfig | 2 - configs/gwventana_nand_defconfig | 2 - configs/imx6dl_icore_nand_defconfig | 2 - configs/imx6dl_mamoj_defconfig | 2 - configs/imx6dl_sielaff_defconfig | 2 - configs/imx6q_bosch_acc_defconfig | 1 - configs/imx6q_icore_nand_defconfig | 2 - configs/imx6q_logic_defconfig | 2 - configs/imx6qdl_icore_mipi_defconfig | 2 - configs/imx6qdl_icore_mmc_defconfig | 2 - configs/imx6qdl_icore_nand_defconfig | 2 - configs/imx6qdl_icore_rqs_defconfig | 2 - configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_geam_nand_defconfig | 1 - configs/imx6ul_isiot_emmc_defconfig | 1 - configs/imx6ul_isiot_nand_defconfig | 1 - configs/imx6ulz_smm_m2_defconfig | 1 - configs/imx8mp_dhcom_drc02_defconfig | 274 +-- configs/imx8mp_dhcom_pdk2_defconfig | 270 +-- configs/imx8mp_dhcom_pdk3_defconfig | 276 +-- configs/imx8mp_dhcom_picoitx_defconfig | 272 +-- configs/imx8mp_dhsom.config | 158 ++ configs/imx93_9x9_qsb_defconfig | 139 ++ configs/imx93_9x9_qsb_inline_ecc_defconfig | 140 ++ configs/imx_dhsom.config | 96 + configs/imxrt1020-evk_defconfig | 1 + configs/imxrt1050-evk_defconfig | 5 +- configs/imxrt1050-evk_fspi_defconfig | 6 +- configs/imxrt1170-evk_defconfig | 1 + configs/kontron-sl-mx6ul_defconfig | 1 - configs/kp_imx6q_tpc_defconfig | 2 - configs/liteboard_defconfig | 1 - configs/lxr2_defconfig | 2 - configs/marsboard_defconfig | 1 - configs/mccmon6_nor_defconfig | 2 - configs/mccmon6_sd_defconfig | 2 - configs/mx6cuboxi_defconfig | 2 - configs/mx6memcal_defconfig | 2 - configs/mx6qsabrelite_defconfig | 1 - configs/mx6sabreauto_defconfig | 2 - configs/mx6sabresd_defconfig | 2 - configs/mx6ul_14x14_evk_defconfig | 6 +- configs/mx6ul_9x9_evk_defconfig | 1 - configs/nitrogen6dl2g_defconfig | 1 - configs/nitrogen6dl_defconfig | 1 - configs/nitrogen6q2g_defconfig | 1 - configs/nitrogen6q_defconfig | 1 - configs/nitrogen6s1g_defconfig | 1 - configs/nitrogen6s_defconfig | 1 - configs/novena_defconfig | 2 - configs/opos6uldev_defconfig | 1 - configs/pcm058_defconfig | 2 - configs/pico-hobbit-imx6ul_defconfig | 1 - configs/pico-imx6_defconfig | 2 - configs/pico-imx6ul_defconfig | 1 - configs/pico-pi-imx6ul_defconfig | 1 - configs/riotboard_defconfig | 2 - configs/tbs2910_defconfig | 1 - configs/udoo_defconfig | 2 - configs/udoo_neo_defconfig | 1 - configs/variscite_dart6ul_defconfig | 1 - configs/verdin-imx8mm_defconfig | 3 +- configs/verdin-imx8mp_defconfig | 3 +- configs/vining_2000_defconfig | 1 - configs/wandboard_defconfig | 2 - doc/board/nxp/imx93_9x9_qsb.rst | 70 + doc/board/nxp/index.rst | 1 + drivers/clk/imx/clk-imxrt1050.c | 3 + drivers/ddr/imx/imx9/Kconfig | 5 + drivers/i2c/mxc_i2c.c | 16 +- drivers/mmc/fsl_esdhc_imx.c | 15 +- drivers/pinctrl/nxp/pinctrl-imx.c | 25 +- drivers/power/domain/imx8m-power-domain.c | 18 +- include/configs/imx93_qsb.h | 25 + include/configs/imxrt1050-evk.h | 7 - 112 files changed, 5362 insertions(+), 1400 deletions(-) create mode 100644 arch/arm/dts/imx93-9x9-qsb-u-boot.dtsi create mode 100644 board/freescale/imx93_qsb/Kconfig create mode 100644 board/freescale/imx93_qsb/MAINTAINERS create mode 100644 board/freescale/imx93_qsb/Makefile create mode 100644 board/freescale/imx93_qsb/imx93_qsb.c create mode 100644 board/freescale/imx93_qsb/imx93_qsb.env create mode 100644 board/freescale/imx93_qsb/lpddr4_timing.c create mode 100644 board/freescale/imx93_qsb/lpddr4_timing_ecc.c create mode 100644 board/freescale/imx93_qsb/spl.c create mode 100644 board/freescale/imxrt1050-evk/imxrt1050-evk-nor.env create mode 100644 board/freescale/imxrt1050-evk/imxrt1050-evk.env create mode 100644 configs/dhsom.config create mode 100644 configs/imx8mp_dhsom.config create mode 100644 configs/imx93_9x9_qsb_defconfig create mode 100644 configs/imx93_9x9_qsb_inline_ecc_defconfig create mode 100644 configs/imx_dhsom.config create mode 100644 doc/board/nxp/imx93_9x9_qsb.rst create mode 100644 include/configs/imx93_qsb.h

2 1

[PATCH v4 0/8] Allow showing the memory map
by Simon Glass 26 Oct '24

26 Oct '24

This little series adds a new 'memmap' command, intended to show the layout of memory within U-Boot and how much memory is available for loading images. Changes in v4: - Drop am65x patch as it is not needed - Add patch to export the lmb data structure - Add new patch to show the lmb records Changes in v3: - Add a new Kconfig for the extra functionality Changes in v2: - Split into its own patch - Modify the existing 'meminfo' command instead Simon Glass (8): common: Fix up malloc() comment in reserve_noncached() common: Tidy up how malloc() is inited global_data: Add some more accessors bootstage: Allow counting memory without strings cmd: Move meminfo command into its own file cmd: Update the meminfo command to show the memory map lmb: Export the lmb data structure meminfo: Show the lmb records cmd/Kconfig | 12 +++ cmd/Makefile | 1 + cmd/mem.c | 19 ----- cmd/meminfo.c | 99 +++++++++++++++++++++++ common/board_f.c | 8 +- common/board_r.c | 3 +- common/bootstage.c | 16 ++-- common/dlmalloc.c | 8 +- common/spl/spl.c | 4 +- doc/usage/cmd/meminfo.rst | 128 ++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + include/asm-generic/global_data.h | 30 +++++++ include/bootstage.h | 5 +- include/malloc.h | 8 ++ lib/lmb.c | 2 +- test/cmd/Makefile | 3 +- test/cmd/meminfo.c | 42 ++++++++++ 17 files changed, 347 insertions(+), 42 deletions(-) create mode 100644 cmd/meminfo.c create mode 100644 doc/usage/cmd/meminfo.rst create mode 100644 test/cmd/meminfo.c -- 2.43.0

3 11

[PATCH v2 1/2] ARM: imx: soc: Select default TEXT_BASE for i.MX6
by Marek Vasut 26 Oct '24

26 Oct '24

Select default U-Boot and SPL text base for the i.MX6 SoC. The U-Boot and SPL text base is picked as the one used by various i.MX6 boards. Update all the boards. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Adam Ford <aford173(a)gmail.com> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Francesco Dolcini <francesco.dolcini(a)toradex.com> Cc: Frieder Schrempf <frieder.schrempf(a)kontron.de> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Igor Opaniuk <igor.opaniuk(a)foundries.io> Cc: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Cc: Michael Trimarchi <michael(a)amarulasolutions.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Quentin Schulz <quentin.schulz(a)cherry.de> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com --- V2: - Move TEXT_BASE/SPL_TEXT_BASE to Kconfig and common/spl/Kconfig - Trim the CC list --- Kconfig | 1 + common/spl/Kconfig | 1 + configs/apalis_imx6_defconfig | 2 -- configs/aristainetos2c_defconfig | 1 - configs/aristainetos2ccslb_defconfig | 1 - configs/brppt2_defconfig | 1 - configs/cm_fx6_defconfig | 2 -- configs/colibri_imx6_defconfig | 2 -- configs/dh_imx6_defconfig | 2 -- configs/display5_defconfig | 2 -- configs/display5_factory_defconfig | 2 -- configs/ge_b1x5v2_defconfig | 2 -- configs/ge_bx50v3_defconfig | 1 - configs/gwventana_emmc_defconfig | 2 -- configs/gwventana_nand_defconfig | 2 -- configs/imx6dl_icore_nand_defconfig | 2 -- configs/imx6dl_mamoj_defconfig | 2 -- configs/imx6dl_sielaff_defconfig | 2 -- configs/imx6q_bosch_acc_defconfig | 1 - configs/imx6q_icore_nand_defconfig | 2 -- configs/imx6q_logic_defconfig | 2 -- configs/imx6qdl_icore_mipi_defconfig | 2 -- configs/imx6qdl_icore_mmc_defconfig | 2 -- configs/imx6qdl_icore_nand_defconfig | 2 -- configs/imx6qdl_icore_rqs_defconfig | 2 -- configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_geam_nand_defconfig | 1 - configs/imx6ul_isiot_emmc_defconfig | 1 - configs/imx6ul_isiot_nand_defconfig | 1 - configs/imx6ulz_smm_m2_defconfig | 1 - configs/kontron-sl-mx6ul_defconfig | 1 - configs/kp_imx6q_tpc_defconfig | 2 -- configs/liteboard_defconfig | 1 - configs/lxr2_defconfig | 2 -- configs/marsboard_defconfig | 1 - configs/mccmon6_nor_defconfig | 2 -- configs/mccmon6_sd_defconfig | 2 -- configs/mx6cuboxi_defconfig | 2 -- configs/mx6memcal_defconfig | 2 -- configs/mx6qsabrelite_defconfig | 1 - configs/mx6sabreauto_defconfig | 2 -- configs/mx6sabresd_defconfig | 2 -- configs/mx6ul_14x14_evk_defconfig | 1 - configs/mx6ul_9x9_evk_defconfig | 1 - configs/nitrogen6dl2g_defconfig | 1 - configs/nitrogen6dl_defconfig | 1 - configs/nitrogen6q2g_defconfig | 1 - configs/nitrogen6q_defconfig | 1 - configs/nitrogen6s1g_defconfig | 1 - configs/nitrogen6s_defconfig | 1 - configs/novena_defconfig | 2 -- configs/opos6uldev_defconfig | 1 - configs/pcm058_defconfig | 2 -- configs/pico-hobbit-imx6ul_defconfig | 1 - configs/pico-imx6_defconfig | 2 -- configs/pico-imx6ul_defconfig | 1 - configs/pico-pi-imx6ul_defconfig | 1 - configs/riotboard_defconfig | 2 -- configs/tbs2910_defconfig | 1 - configs/udoo_defconfig | 2 -- configs/udoo_neo_defconfig | 1 - configs/variscite_dart6ul_defconfig | 1 - configs/vining_2000_defconfig | 1 - configs/wandboard_defconfig | 2 -- 64 files changed, 2 insertions(+), 94 deletions(-) diff --git a/Kconfig b/Kconfig index a206d1f8124..b1dd4556a4e 100644 --- a/Kconfig +++ b/Kconfig @@ -647,6 +647,7 @@ config HAVE_TEXT_BASE config TEXT_BASE depends on HAVE_TEXT_BASE default 0x0 if POSITION_INDEPENDENT + default 0x17800000 if ARCH_MX6 default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 default 0x81700000 if MACH_SUNIV default 0x2a000000 if MACH_SUN9I diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 9a27eabd741..ed997d82cfc 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -271,6 +271,7 @@ config SPL_TEXT_BASE default 0x40200000 if OMAP34XX default 0x402F4000 if AM43XX default 0x402F0400 if AM33XX + default 0x00908000 if ARCH_MX6 default 0x40301350 if OMAP54XX default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I default 0x20060 if SUN50I_GEN_H6 || SUNXI_GEN_NCAT2 diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 92d304a880d..b44861df5c8 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -16,7 +15,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-apalis-eval" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y diff --git a/configs/aristainetos2c_defconfig b/configs/aristainetos2c_defconfig index 95d6f3f7246..b6e259b490b 100644 --- a/configs/aristainetos2c_defconfig +++ b/configs/aristainetos2c_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_F_LEN=0x13000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 diff --git a/configs/aristainetos2ccslb_defconfig b/configs/aristainetos2ccslb_defconfig index 7de378388fa..0ea13d46f31 100644 --- a/configs/aristainetos2ccslb_defconfig +++ b/configs/aristainetos2ccslb_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_F_LEN=0x13000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 diff --git a/configs/brppt2_defconfig b/configs/brppt2_defconfig index 299e2633c2f..0bbb682c8f2 100644 --- a/configs/brppt2_defconfig +++ b/configs/brppt2_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y # CONFIG_SPL_SYS_THUMB_BUILD is not set CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_GPIO=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index cfe7c2a349b..0e916771d9f 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -13,7 +12,6 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_MX6QDL=y CONFIG_TARGET_CM_FX6=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-cm-fx6" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index fc9404a7c43..facf0b299a4 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -16,7 +15,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-colibri-eval-v3" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index f435ecc8450..5a5d59902f5 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -4,8 +4,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_MX6QDL=y CONFIG_TARGET_DHCOMIMX6=y -CONFIG_TEXT_BASE=0x17800000 -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SYS_L2_PL310=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-dhcom-pdk2" CONFIG_MX6_DDRCAL=y diff --git a/configs/display5_defconfig b/configs/display5_defconfig index c91cb64d288..765920bd5d1 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_GPIO=y @@ -18,7 +17,6 @@ CONFIG_SYS_I2C_MXC_I2C1=y CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-display5" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index c5a4f820714..4007c8900ce 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_GPIO=y @@ -18,7 +17,6 @@ CONFIG_SYS_I2C_MXC_I2C1=y CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-display5" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/ge_b1x5v2_defconfig b/configs/ge_b1x5v2_defconfig index 403a5a526f0..cfa51b2c47d 100644 --- a/configs/ge_b1x5v2_defconfig +++ b/configs/ge_b1x5v2_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y @@ -16,7 +15,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_GE_B1X5V2=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-b1x5v2" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SERIAL=y CONFIG_BOOTCOUNT_BOOTLIMIT=10 CONFIG_WATCHDOG_TIMEOUT_MSECS=30000 diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index 9cd88af9da6..c24513f6ab1 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 44f37c55f27..95d5b1172ff 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -15,7 +14,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_CMD_EECONFIG=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 82b359da68d..1d8af5ce103 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -15,7 +14,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_CMD_EECONFIG=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig index 3a20b7acc26..4352e3871f5 100644 --- a/configs/imx6dl_icore_nand_defconfig +++ b/configs/imx6dl_icore_nand_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -11,7 +10,6 @@ CONFIG_ENV_OFFSET=0x400000 CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index 0e4ac2f1e4c..95797ff0f12 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x2300000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 @@ -8,7 +7,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_MX6QDL=y CONFIG_TARGET_MX6DL_MAMOJ=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mamoj" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_IMX_HAB=y # CONFIG_CMD_BMODE is not set diff --git a/configs/imx6dl_sielaff_defconfig b/configs/imx6dl_sielaff_defconfig index c4e02a8f0b9..a364e2c9cdd 100644 --- a/configs/imx6dl_sielaff_defconfig +++ b/configs/imx6dl_sielaff_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y @@ -16,7 +15,6 @@ CONFIG_MX6S=y CONFIG_TARGET_MX6S_SIELAFF=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-sielaff" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SF_DEFAULT_BUS=1 diff --git a/configs/imx6q_bosch_acc_defconfig b/configs/imx6q_bosch_acc_defconfig index a46b3250b2e..54758df8c01 100644 --- a/configs/imx6q_bosch_acc_defconfig +++ b/configs/imx6q_bosch_acc_defconfig @@ -13,7 +13,6 @@ CONFIG_MX6QDL=y CONFIG_MX6_DDRCAL=y CONFIG_TARGET_MX6Q_ACC=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-bosch-acc" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig index 48d08d3127f..2c7b8cc2c44 100644 --- a/configs/imx6q_icore_nand_defconfig +++ b/configs/imx6q_icore_nand_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -11,7 +10,6 @@ CONFIG_ENV_OFFSET=0x400000 CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index 2f68e2cf384..fd251e7cdd8 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -12,7 +11,6 @@ CONFIG_MX6Q=y CONFIG_MX6_OCRAM_256KB=y CONFIG_TARGET_MX6LOGICPD=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-logicpd" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/imx6qdl_icore_mipi_defconfig b/configs/imx6qdl_icore_mipi_defconfig index 77a12125803..cf4c2d9c6f1 100644 --- a/configs/imx6qdl_icore_mipi_defconfig +++ b/configs/imx6qdl_icore_mipi_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -11,7 +10,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-mipi" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 1e79c4f6c4e..fb0787d1beb 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -11,7 +10,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig index 48d08d3127f..2c7b8cc2c44 100644 --- a/configs/imx6qdl_icore_nand_defconfig +++ b/configs/imx6qdl_icore_nand_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -11,7 +10,6 @@ CONFIG_ENV_OFFSET=0x400000 CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index 69ba60ffa46..49feb1af830 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -11,7 +10,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-rqs" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig index 6a84c0a9676..a5c3b486987 100644 --- a/configs/imx6ul_geam_mmc_defconfig +++ b/configs/imx6ul_geam_mmc_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig index 32e18bdac54..187fae80ff9 100644 --- a/configs/imx6ul_geam_nand_defconfig +++ b/configs/imx6ul_geam_nand_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_OFFSET=0x400000 CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set diff --git a/configs/imx6ul_isiot_emmc_defconfig b/configs/imx6ul_isiot_emmc_defconfig index a65659e8792..f285b82e6dc 100644 --- a/configs/imx6ul_isiot_emmc_defconfig +++ b/configs/imx6ul_isiot_emmc_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-emmc" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig index acd49fb1d48..fe70c199288 100644 --- a/configs/imx6ul_isiot_nand_defconfig +++ b/configs/imx6ul_isiot_nand_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_OFFSET=0x400000 CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-nand" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set diff --git a/configs/imx6ulz_smm_m2_defconfig b/configs/imx6ulz_smm_m2_defconfig index c2adff17abf..15a3ec5c627 100644 --- a/configs/imx6ulz_smm_m2_defconfig +++ b/configs/imx6ulz_smm_m2_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x400000 CONFIG_MX6ULL=y CONFIG_TARGET_MX6ULZ_SMM_M2=y CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6ulz-bsh-smm-m2" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SERIAL=y CONFIG_SPL_BSS_START_ADDR=0x84100000 CONFIG_SPL=y diff --git a/configs/kontron-sl-mx6ul_defconfig b/configs/kontron-sl-mx6ul_defconfig index 0ca7d33da10..9ee02259948 100644 --- a/configs/kontron-sl-mx6ul_defconfig +++ b/configs/kontron-sl-mx6ul_defconfig @@ -14,7 +14,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_KONTRON_MX6UL=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-kontron-bl" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig index fceda3f14d4..7fd2bfb0efa 100644 --- a/configs/kp_imx6q_tpc_defconfig +++ b/configs/kp_imx6q_tpc_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_F_LEN=0x2200 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -12,7 +11,6 @@ CONFIG_MX6QDL=y CONFIG_MX6_DDRCAL=y CONFIG_TARGET_KP_IMX6Q_TPC=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-kp" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/liteboard_defconfig b/configs/liteboard_defconfig index 941a1cfdf47..9a81e973e3c 100644 --- a/configs/liteboard_defconfig +++ b/configs/liteboard_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_LITEBOARD=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-liteboard" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/lxr2_defconfig b/configs/lxr2_defconfig index d202cad0ad9..7ab817960a2 100644 --- a/configs/lxr2_defconfig +++ b/configs/lxr2_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y @@ -15,7 +14,6 @@ CONFIG_MX6Q=y CONFIG_TARGET_LXR2=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-lxr" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig index 198fec2cb2c..b90d294ec7d 100644 --- a/configs/marsboard_defconfig +++ b/configs/marsboard_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index 8edc461088c..9b60ce3d2fc 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -13,7 +12,6 @@ CONFIG_IMX_CONFIG="board/liebherr/mccmon6/mon6_imximage_nor.cfg" CONFIG_MX6QDL=y CONFIG_TARGET_MCCMON6=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-mccmon6" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig index 6088d08a87e..ecd3e31e676 100644 --- a/configs/mccmon6_sd_defconfig +++ b/configs/mccmon6_sd_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -13,7 +12,6 @@ CONFIG_IMX_CONFIG="board/liebherr/mccmon6/mon6_imximage_sd.cfg" CONFIG_MX6QDL=y CONFIG_TARGET_MCCMON6=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-mccmon6" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index e3aba715aa5..14c1386e11f 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -12,7 +11,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6CUBOXI=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-hummingboard2-emmc-som-v15" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index bfde8b0cfb3..b5cc341b923 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y @@ -9,7 +8,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_MX6QDL=y CONFIG_MX6_DDRCAL=y CONFIG_TARGET_MX6MEMCAL=y -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_SYS_MEMTEST_START=0x10000000 diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index bb830c429d0..916992351ce 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 76f6eec4658..94b251cbdeb 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y @@ -14,7 +13,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6SABREAUTO=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 2a83b8cd067..f041f1fd1a3 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y @@ -14,7 +13,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6SABRESD=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabresd" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index bbeb364e256..ecb7a46308f 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -15,7 +15,6 @@ CONFIG_SYS_I2C_MXC_I2C1=y CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-14x14-evk" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig index 101653a3dfd..11a18d16f52 100644 --- a/configs/mx6ul_9x9_evk_defconfig +++ b/configs/mx6ul_9x9_evk_defconfig @@ -15,7 +15,6 @@ CONFIG_SYS_I2C_MXC_I2C1=y CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-9x9-evk" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 7060d3cf961..a0d77725083 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index c2566c96aba..436ce289f1f 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 07800eff08a..827e8830602 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index c5e6ce52858..62fc8d8f3b6 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index e91c19d30e9..d16cf2ac30f 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index b8b410c2cfe..bd3ae139362 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/novena_defconfig b/configs/novena_defconfig index dd3541bc59a..bcd40b3f5e5 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -15,7 +14,6 @@ CONFIG_SYS_I2C_MXC_I2C1=y CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index 2b06de5d4c6..ef26332eb5f 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_MX6UL=y CONFIG_TARGET_OPOS6ULDEV=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-opos6uldev" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index 48f63c982eb..8ab2c1c069e 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -16,7 +15,6 @@ CONFIG_TARGET_PCM058=y CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-phytec-mira-rdk-nand" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/pico-hobbit-imx6ul_defconfig b/configs/pico-hobbit-imx6ul_defconfig index e3aca6e82e1..b945adfe734 100644 --- a/configs/pico-hobbit-imx6ul_defconfig +++ b/configs/pico-hobbit-imx6ul_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_PICO_IMX6UL=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-pico-hobbit" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/pico-imx6_defconfig b/configs/pico-imx6_defconfig index 9b2496e4fa6..4a9c5ac1a98 100644 --- a/configs/pico-imx6_defconfig +++ b/configs/pico-imx6_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x2300000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -12,7 +11,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_PICO_IMX6=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-pico" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index ce29718a903..c9a0ccd15f6 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_PICO_IMX6UL=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-pico-hobbit" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig index 81f3e9bbebb..daff2e36b00 100644 --- a/configs/pico-pi-imx6ul_defconfig +++ b/configs/pico-pi-imx6ul_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_PICO_IMX6UL=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-pico-pi" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig index a1e806be421..24c6c59ac2b 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -14,7 +13,6 @@ CONFIG_MX6S=y CONFIG_TARGET_EMBESTMX6BOARDS=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-riotboard" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 3ab6799ef1e..99fe65d3109 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x8000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig index 00b732b9288..5730dacd060 100644 --- a/configs/udoo_defconfig +++ b/configs/udoo_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -12,7 +11,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_UDOO=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-udoo" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 0c76b005557..8183edd1f62 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6SX=y CONFIG_TARGET_UDOO_NEO=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6sx-udoo-neo-basic" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/variscite_dart6ul_defconfig b/configs/variscite_dart6ul_defconfig index 0b96484b030..9c69d9aef97 100644 --- a/configs/variscite_dart6ul_defconfig +++ b/configs/variscite_dart6ul_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_MX6ULL=y CONFIG_TARGET_DART_6UL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-dart-6ul" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig index e5c9c2861e1..5842916fbdb 100644 --- a/configs/vining_2000_defconfig +++ b/configs/vining_2000_defconfig @@ -16,7 +16,6 @@ CONFIG_SYS_I2C_MXC_I2C1=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6sx-softing-vining-2000" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index e9deab38038..e0dc56b1d00 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -15,7 +14,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revd1" -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y -- 2.45.2

4 6

[PATCH v2 1/5] arm64: imx: imx8mp: Enable DM regulator on DH i.MX8MP DHCOM SoM on DRC02 board
by Marek Vasut 26 Oct '24

26 Oct '24

Make sure DM regulator support is enabled on this board, just like on all the other DH i.MX8MP DHCOM SoM based boards. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Andreas Geisreiter <ageisreiter(a)dh-electronics.de> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Quentin Schulz <quentin.schulz(a)cherry.de> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de --- V2: No change --- configs/imx8mp_dhcom_drc02_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/imx8mp_dhcom_drc02_defconfig b/configs/imx8mp_dhcom_drc02_defconfig index d0877ad6f72..ffc9bf0e1c2 100644 --- a/configs/imx8mp_dhcom_drc02_defconfig +++ b/configs/imx8mp_dhcom_drc02_defconfig @@ -161,6 +161,8 @@ CONFIG_TFTP_TSIZE=y CONFIG_PROT_TCP_SACK=y CONFIG_IPV6=y CONFIG_SPL_DM=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_MAGIC=0xB0C40000 CONFIG_SPL_CLK_COMPOSITE_CCF=y @@ -231,6 +233,7 @@ CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y CONFIG_SPL_DM_PMIC_PCA9450=y +CONFIG_DM_REGULATOR=y CONFIG_SPL_DM_REGULATOR=y CONFIG_DM_REGULATOR_PCA9450=y CONFIG_SPL_DM_REGULATOR_PCA9450=y -- 2.45.2

2 5

[PATCH] imx8m: set sane default value for SPL_LOAD_FIT_ADDRESS
by Rasmus Villemoes 26 Oct '24

26 Oct '24

I enabled IMX_HAB on an imx8mp board, but even though I knew about the implementation, I forgot that I had to provide a sane value for SPL_LOAD_FIT_ADDRESS. The help text for IMX_HAB doesn't mention this implicit requirement, and there's no build-time warning; the default 0x0 value just ends up being returned from board_spl_fit_buffer_addr(), obviously resulting in a non-booting board. The existing imx8m* board configs that set a non-zero value currently all use 0x44000000. The actual value doesn't matter too much, but 0 is always wrong for imx8m platforms. So just use 0x44000000 as default for those platforms. Signed-off-by: Rasmus Villemoes <ravi(a)prevas.dk> --- boot/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/Kconfig b/boot/Kconfig index 940389d4882..72d1f69afcd 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -231,6 +231,7 @@ config SPL_LOAD_FIT config SPL_LOAD_FIT_ADDRESS hex "load address of fit image" depends on SPL_LOAD_FIT + default 0x44000000 if ARCH_IMX8M default 0x0 help Specify the load address of the fit image that will be loaded -- 2.47.0

4 9

[PATCH 1/5] arm64: imx: imx8mp: Enable DM regulator on DH i.MX8MP DHCOM SoM on DRC02 board
by Marek Vasut 26 Oct '24

26 Oct '24

Make sure DM regulator support is enabled on this board, just like on all the other DH i.MX8MP DHCOM SoM based boards. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Andreas Geisreiter <ageisreiter(a)dh-electronics.de> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Quentin Schulz <quentin.schulz(a)cherry.de> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de --- configs/imx8mp_dhcom_drc02_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/imx8mp_dhcom_drc02_defconfig b/configs/imx8mp_dhcom_drc02_defconfig index d0877ad6f72..ffc9bf0e1c2 100644 --- a/configs/imx8mp_dhcom_drc02_defconfig +++ b/configs/imx8mp_dhcom_drc02_defconfig @@ -161,6 +161,8 @@ CONFIG_TFTP_TSIZE=y CONFIG_PROT_TCP_SACK=y CONFIG_IPV6=y CONFIG_SPL_DM=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_MAGIC=0xB0C40000 CONFIG_SPL_CLK_COMPOSITE_CCF=y @@ -231,6 +233,7 @@ CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y CONFIG_SPL_DM_PMIC_PCA9450=y +CONFIG_DM_REGULATOR=y CONFIG_SPL_DM_REGULATOR=y CONFIG_DM_REGULATOR_PCA9450=y CONFIG_SPL_DM_REGULATOR_PCA9450=y -- 2.45.2

2 6

Re: FIT signature security flay
by Sean Anderson 25 Oct '24

25 Oct '24

Hi Lev, On 10/14/24 13:15, Lev R. Oshvang wrote: > [You don't often get email from levonshe(a)gmail.com. Learn why this is important at https://cas5-0-urlprotect.trendmicro.com:443/wis/clicktime/v1/query?url=htt… ] > > Hi Sean, > Thanks for replying. > Of course, I have public key embedded into u-boot dtb. > I see it with dtdiff utility clearly., that it has rsa components and > mention required property, but there are no means : > - signature { > - > - key-dev_key { > - algo = "sha1,rsa2048"; > - key-name-hint = "dev_key"; > - required = "conf"; > - rsa,exponent = <0x00 0x10001>; > - rsa,modulus = <0xca0facd8 0xc8a49486 > 0x9785b0a8 0xd8560eae 0xffaefc34 0xd958e8d9 0xba5b1623 0x197b8ae > 0x216b0699 0xb5f048ab 0x1167f69a 0x3d02f44b 0xe1bdc8f3 0x533eaa9c > 0xd2ce119d 0xf34d90e7 0x9f470b92 0xa672fc84 0x25ce9a70 0x1ba0422f > 0xa92f1dc2 0x8a6026e9 0xc06c080 0x23d300b0 0xe1c325aa 0x9c229a84 > 0x40a59d7 0x3f59c482 0x7eb27b44 0x9e6d300 0xbd36a4c4 0x5cc65b1 > 0xb5708d8a 0xfc19f30 0x11ce5b3 0xed2c646b 0x77492129 0x4b0382ab > 0xcf7ac83d 0x93ca0078 0x6f4db3f7 0xd9934ef1 0x2bdb929c 0x4e0726fd > 0x56568874 0xf0950b02 0x1b2c51ae 0x94d685a4 0x6edd9044 0xb62bb692 > 0x3b131cc8 0xce8c1649 0x41726a8 0x34282ad7 0x7c978b86 0xf970b5cc > 0xc0505052 0x392a0a39 0xf9b25e93 0x5f32ff98 0x38b8ceda 0xda3a2855 > 0x2bbcb269 0x61db7b91>; > - rsa,n0-inverse = <0xc1255a8f>; > - rsa,num-bits = <0x800>; > - rsa,r-squared = <0x50fdcf54 0x76c283ab > 0x897a6a96 0x5011d310 0xc70c897 0x638fdc61 0xbde79c4c 0x5a66d6a5 > 0x7747e613 0xcac6b564 0x62456d6c 0x73d3f181 0xfd1d48ae 0xf8159021 > 0xa5c7cadf 0xf3ea3aee 0x3a801e43 0xc4d573cd 0x2c7e8dc 0x44030a5d > 0xa679da1f 0xad11fad2 0x93fc1da4 0xb3ca4d43 0x30cb4202 0xab21f661 > 0x57041882 0xa63b5c94 0x89c38732 0x8f2b191 0xe9e4a99 0x8292fc7f > 0x6e7cf63a 0x9eef2fab 0xa1414bfc 0xfdea67c0 0x713fe78d 0xaf176725 > 0x72168246 0x7ab0706d 0xac7f19b4 0x500118c8 0x5915e449 0xaf2cf688 > 0xb70d5fbb 0x8740ba88 0xc89fde6a 0x91931a8d 0x915b76b5 0x5dfcb2e9 > 0x7fe48d92 0xfec26649 0x541dd9c7 0x82c4957 0xb1a7b46 0x1b29c87d > 0xbb76c881 0x8da006a5 0xeaacff4 0xf39c1d12 0x82cc7dfa 0xc8de4237 > 0xf03ee80d 0xb060a204>; > - }; > - }; > - > > > But u-boot control dtb does not impose any requirement that FIT image > structure MUST have. > I think this is a reason for behaviour I observe. > It would be better to add FIT nodes structure to uboot dtb for the > case like mine > > I am attaching my 2 its files, one that do requires signature and > second that requires only a hash > Both flawlessly boot kernel. > > There is also script I use for signage and CTRL_FDT file my-iuboot.dtb I compared your images to some examples I have and they seem correct. It may seem silly, but do you have CONFIG_FIT_SIGNATURE set? Also: note that `iminfo` will only report if *image* (not conf) signatures are correct. The conf signatures will be verified, but only when you boot (or source) the image using a particular config. --Sean > On Mon, Oct 14, 2024 at 5:24 PM Sean Anderson <sean.anderson(a)seco.com> wrote: >> >> Hi Lev, >> >> On 10/14/24 04:42, Lev R. Oshvang wrote: >> > Hi Sean, >> > >> > I am looking for help with Uboot FIT signatures problem >> > >> > >> > >> > I started to work with FIT image (u-boot 2024) and managed to sign >> > kernel and load this image with Uboot using 'required' property in >> > signature as : >> > >> > signature-1 { >> > >> > algo = "sha1,rsa2048"; >> > >> > key-name-hint = "dev_key"; >> > >> > sign-images="kernel"; >> > >> > required="conf"; >> > >> > { >> > >> > Iminfo reports" >> > >> > ## Checking hash(es) for FIT Image at 01000000 ... >> > >> > Hash(es) for Image 0 (kernel-1): sha256+ sha256,rsa2048:dev_key- >> > >> > >> > >> > To test the procedure, I generated another private key and signed >> > another kernel with this new key on another Linux host. >> > >> > >> > >> > >> > >> > I expected bootm to fail, but it just happily loads this image!!! >> > >> > Even an image without a signature but with a valid hash is not >> > rejected against my expectations. >> > >> > In this case iminfo report only hash is OK >> >> Did you embed the public key into your U-Boot devicetree with `mkimage -K` ? >> >> --Sean

1 0

[GIT PULL] xilinx patches for v2025.01-rc1 cont
by Michal Simek 25 Oct '24

25 Oct '24

Hi, I have collected couple of more patches and would be good for me to clean my queue. There are some other patches which have been sent recently which will come later after review. I am especially waiting for memtop series (sent today) from Sughosh because it is fixing issue on Kria platform which is regression because of LMB series. Also would like to get rid of SPL_FIT_GENERATOR in this version but I think we are almost there. We also started to upstream qemu model for MBV to be able to wire this platform in our CI. http://lore.kernel.org/r/20241017072507.4033413-1-sai.pavan.boddu@amd.com Thanks, Michal The following changes since commit 08ae12be8509daf3d1c5a148b8a50c0ffb6457c2: Mark a few functions static inline (2024-10-24 11:21:48 -0600) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2025.01-rc1-v2 for you to fetch changes up to b3d9c6c71412fe63320e879d89873da672e69100: .mailmap: update e-mail address for Padmarao Begari (2024-10-25 16:21:00 +0200) ---------------------------------------------------------------- AMD/Xilinx changes for v2025.01-rc1 v2 .mailmap: - Switch Padmarao's email to AMD one zynq_spi: - Make update_stripe static xilinx: - Update DT description for EMMCs zynqmp: - Update logic around RPUs and tcm handling - Update bootmenu selection for Kria - Add description for SC vm-p-b1369 - Fix comment about file location in zynqmp-p-a2197-00-revA.dts versal: - Fix logic around USB boot versal2: - Disable useless features for Mini configurations versal-net: - Get rid of current-speed DT property from mini configuration microblaze: - Fix scriptaddr location ---------------------------------------------------------------- John Vicky Vykuntapu (1): xilinx: zynqmp: Remove conditional check for bootmenu_default variable Michal Simek (6): arm64: versal: Remove description for USB1 arm64: versal: Wire USB0 in distro boot arm64: zynqmp: Add description for SC on vm-p-m1369 board arm64: versal-net: Remove current-speed from mini arm64: xilinx: Fix file location described in zynqmp-p-a2197-00-revA.dts amd: Disable LMB, BOOTM, MTD and EFI loader for mini configurations Padmarao Begari (5): arm64: zynqmp: Print an error for split to lock mode switch arm64: zynqmp: Fix tcminit mode value based on argv xilinx: common: fix script address for Microblaze arm64: zynqmp: fix tcm initialization for mini u-boot .mailmap: update e-mail address for Padmarao Begari Paul Alvin (1): xilinx: Add cap-mmc-hw-reset and no-sd, no-sdio property to eMMC Venkatesh Yadav Abbarapu (1): spi: zynq_qspi: Add missing prototype for update_stripe .mailmap | 1 + arch/arm/dts/Makefile | 2 + arch/arm/dts/versal-mini-emmc0.dts | 3 + arch/arm/dts/versal-mini-emmc1.dts | 3 + arch/arm/dts/versal-net-mini-emmc.dts | 3 + arch/arm/dts/versal-net-mini.dts | 1 - arch/arm/dts/zynq-dlc20-rev1.0.dts | 3 + arch/arm/dts/zynq-minized.dts | 3 + arch/arm/dts/zynqmp-dlc21-revA.dts | 3 + arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 3 + arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 3 + arch/arm/dts/zynqmp-m-a2197-02-revA.dts | 3 + arch/arm/dts/zynqmp-m-a2197-03-revA.dts | 3 + arch/arm/dts/zynqmp-mini-emmc0.dts | 3 + arch/arm/dts/zynqmp-mini-emmc1.dts | 3 + arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 47 +-- arch/arm/dts/zynqmp-sc-revB.dts | 3 + arch/arm/dts/zynqmp-sc-vm-p-m1369-00-revA.dtso | 400 ++++++++++++++++++++ arch/arm/dts/zynqmp-sm-k26-revA.dts | 3 + arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts | 3 + arch/arm/dts/zynqmp-vpk120-revA.dts | 3 + arch/arm/dts/zynqmp-zcu100-revC.dts | 3 + arch/arm/mach-zynqmp/cpu.c | 23 +- arch/arm/mach-zynqmp/include/mach/sys_proto.h | 3 +- arch/arm/mach-zynqmp/mp.c | 24 ++ arch/arm/mach-zynqmp/zynqmp.c | 16 +- board/xilinx/microblaze-generic/microblaze-generic.c | 2 +- board/xilinx/zynqmp/zynqmp_kria.env | 3 +- configs/amd_versal2_mini_defconfig | 3 + configs/amd_versal2_mini_ospi_defconfig | 3 + configs/amd_versal2_mini_qspi_defconfig | 4 +- drivers/spi/zynq_qspi.c | 2 +- include/configs/xilinx_versal.h | 11 +- 33 files changed, 551 insertions(+), 45 deletions(-) create mode 100644 arch/arm/dts/zynqmp-sc-vm-p-m1369-00-revA.dtso

2 1