diff options
| author | Tom Rini <[email protected]> | 2025-11-29 15:39:36 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-29 15:39:36 -0600 |
| commit | 65a131531077d75eaa01f8376d8f7f04c146a457 (patch) | |
| tree | 137e6bf4444fa092c45c4e37197eea16573aaf16 /include | |
| parent | 7af532a8ef1c6685eac58d587c9502ab31855aae (diff) | |
| parent | c8daa0abdb3c48aba9dd86228ed50a34c5482a73 (diff) | |
Merge tag 'u-boot-imx-next-20251129' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/28551
- Stop disabling device tree relocation on i.MX boards.
- Add support for imx6ulz_smm_m2d.
- Add support for Kontron i.MX93 OSM-S SoM and BL carrier board
- Fix probe of i.MX FEC MDIO bus for DM_MDIO.
- Cleanup for tqma6 boards.
- Initialize the ELE RNG context on imx95_evk
- Disable EFI partition, MP, sysboot, bind commands on tbs2910.
Diffstat (limited to 'include')
43 files changed, 69 insertions, 44 deletions
diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 6d24c5decd5..4a0b9edf457 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -57,7 +57,6 @@ /* Extra env settings (including the target-defined ones if any) */ #define CFG_EXTRA_ENV_SETTINGS \ BK4_EXTRA_ENV_SETTINGS \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "blimg_file=u-boot.vyb\0" \ "blimg_addr=0x81000000\0" \ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 8c363137b4f..baf7bbf0ad4 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -35,7 +35,6 @@ "storagebootcmd=echo Booting from ${storagetype} ...; run ${storagetype}args; run doboot;\0" \ "kernel=zImage\0" \ "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdtfile=imx7d-sbc-imx7.dtb\0" \ "fdtaddr=0x83000000\0" \ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index f7fd4c517b4..966f7596750 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -31,7 +31,6 @@ /* Environment */ #define CFG_EXTRA_ENV_SETTINGS \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ "ramdisk_addr_r=0x13000000\0" \ diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 2b329b4065c..7c4c869f771 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -65,7 +65,6 @@ /* Default environment */ #define CFG_EXTRA_ENV_SETTINGS \ - "fdt_high=0xffffffff\0" \ "console=ttymxc0,115200n8\0" \ "addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ "fit_addr=0x82000000\0" \ diff --git a/include/configs/display5.h b/include/configs/display5.h index 19d71d6066f..c311b35bb97 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -175,7 +175,6 @@ "fdtaddr=0x12800000\0" \ "console=ttymxc4,115200 quiet cma=256M\0" \ "fdtfile=imx6q-display5.dtb\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_file=fitImage\0" \ "fitImg_fw_sz=0x2200\0" \ diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 3d5701c636c..f81ae428420 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -30,7 +30,6 @@ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "image=uImage\0" \ "fit_image=fit.itb\0" \ - "fdt_high=0xffffffff\0" \ "fdt_addr=" FDT_ADDR "\0" \ "boot_fdt=try\0" \ "mmcpart=1\0" \ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 8abb58b0691..1a48bf646b6 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -24,7 +24,6 @@ "scriptaddr=0x14000000\0" \ "fdt_addr_r=0x13000000\0" \ "kernel_addr_r=0x10008000\0" \ - "fdt_high=0xffffffff\0" \ "dfu_alt_info_spl=spl raw 0x2 0x400\0" \ "dfu_alt_info_uboot=u-boot raw 0x8a 0x11400\0" \ BOOTENV diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index a30d0da5050..972f9def551 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -34,7 +34,6 @@ "image=Image\0" \ "console=ttymxc0,115200\0" \ "fdt_addr=0x43000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ "boot_fdt=try\0" \ "fdt_file=imx8mq-phanbell.dtb\0" \ "initrd_addr=0x43800000\0" \ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 24e7aa96ec1..5776c8ede75 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -29,7 +29,6 @@ "panel=NULL\0" \ "console=ttyLP0,${baudrate} earlycon=lpuart32,0x5a060000,${baudrate}\0" \ "fdt_addr=0x83000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ "boot_fdt=try\0" \ "fdt_file=undefined\0" \ "initrd_addr=0x83800000\0" \ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index abc3603bacf..846b422b0f2 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -29,7 +29,6 @@ "panel=NULL\0" \ "console=ttyLP0\0" \ "fdt_addr=0x83000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ "boot_fdt=try\0" \ "fdt_file=undefined\0" \ "initrd_addr=0x83800000\0" \ diff --git a/include/configs/kontron-osm-s-mx8mp.h b/include/configs/kontron-osm-s-mx8mp.h new file mode 100644 index 00000000000..24b07842bb6 --- /dev/null +++ b/include/configs/kontron-osm-s-mx8mp.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2023 Kontron Electronics GmbH + * + * Configuration settings for the Kontron OSM-S/BL i.MX8M Plus boards and modules. + */ +#ifndef __KONTRON_MX8MP_CONFIG_H +#define __KONTRON_MX8MP_CONFIG_H + +#include <asm/arch/imx-regs.h> +#include <linux/sizes.h> + +/* RAM */ +#define PHYS_SDRAM DDR_CSD1_BASE_ADDR +#define PHYS_SDRAM_SIZE (SZ_2G + SZ_1G) +#define PHYS_SDRAM_2 0x100000000 +#define PHYS_SDRAM_2_SIZE (SZ_1G + SZ_4G) +#define CFG_SYS_SDRAM_BASE PHYS_SDRAM + +#define CFG_SYS_INIT_RAM_ADDR 0x40000000 +#define CFG_SYS_INIT_RAM_SIZE SZ_512K + +/* Board and environment settings */ + +#ifdef CONFIG_USB_EHCI_HCD +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0 +#endif + +#endif /* __KONTRON_MX8MP_CONFIG_H */ diff --git a/include/configs/kontron-osm-s-mx93.h b/include/configs/kontron-osm-s-mx93.h new file mode 100644 index 00000000000..ab2b42298c8 --- /dev/null +++ b/include/configs/kontron-osm-s-mx93.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2024 Kontron Electronics GmbH + * + * Configuration settings for the Kontron OSM-S/BL i.MX93 boards and modules. + */ +#ifndef __KONTRON_MX93_CONFIG_H +#define __KONTRON_MX93_CONFIG_H + +#include <asm/arch/imx-regs.h> +#include <linux/sizes.h> + +/* RAM */ +#define PHYS_SDRAM 0x80000000 +#define PHYS_SDRAM_SIZE (SZ_2G) +#define CFG_SYS_SDRAM_BASE PHYS_SDRAM + +#define CFG_SYS_INIT_RAM_ADDR 0x80000000 +#define CFG_SYS_INIT_RAM_SIZE SZ_2M + +/* Board and environment settings */ + +#ifdef CONFIG_USB_EHCI_HCD +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0 +#endif + +#define WDOG_BASE_ADDR WDG3_BASE_ADDR + +#endif /* __KONTRON_MX93_CONFIG_H */ diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index 78c6c67ab99..bb136b7e129 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -18,7 +18,6 @@ #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc1,115200\0" \ "fdt_addr=0x75000000\0" \ - "fdt_high=0xffffffff\0" \ "scriptaddr=0x74000000\0" \ "kernel_file=fitImage\0"\ "silent=1\0"\ diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index c0cb3db23e7..e89e9601ae8 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -19,7 +19,6 @@ #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_addr=0x18000000\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x10008000\0" \ "fdt_addr_r=0x13000000\0" \ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 2934c76a662..a90d02c049f 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -24,7 +24,6 @@ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr=0x83000000\0" \ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index b64bf93bcb7..9f401718bfb 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -35,7 +35,6 @@ #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200 quiet\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "boot_os=yes\0" \ "kernelsize=0x300000\0" \ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 70aa140036f..2bd1426c7d9 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -40,7 +40,6 @@ "scriptaddr=0x74000000\0" \ "ramdisk_addr_r=0x80000000\0" \ "kernel_addr_r=0x72000000\0" \ - "fdt_high=0xffffffff\0" \ "console=ttymxc1,115200\0" \ "stdin=serial\0" \ "stdout=serial,vidconsole\0" \ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index c8e5757d0bb..ef2848b71f3 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -47,7 +47,6 @@ "dfu_alt_info_spl=spl raw 0x400\0" \ "dfu_alt_info_img=u-boot raw 0x10000\0" \ "dfu_alt_info=spl raw 0x400\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "mmcdev=" __stringify(CONFIG_ENV_MMC_DEVICE_INDEX) "\0" \ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index d4e66a39882..24019be7a3e 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -19,7 +19,6 @@ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx6sl-evk.dtb\0" \ "fdt_addr=0x88000000\0" \ diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 1ffad5931c4..38a7dd6061e 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -17,7 +17,6 @@ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx6sll-evk.dtb\0" \ "fdt_addr=0x83000000\0" \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 36d82e81d5d..db8d483ad72 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -16,7 +16,6 @@ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx6sx-sabreauto.dtb\0" \ "fdt_addr=0x88000000\0" \ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 844becbfd2c..bb04ca3a98e 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -39,7 +39,6 @@ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx6sx-sdb.dtb\0" \ "fdt_addr=0x88000000\0" \ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 203a037e342..e5f8d736900 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -34,7 +34,6 @@ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=undefined\0" \ "fdt_addr=0x83000000\0" \ diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 353267dddec..88b535e1bd0 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -27,7 +27,6 @@ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=undefined\0" \ "fdt_addr=0x83000000\0" \ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index f5ab4720750..b08bbe94667 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -57,7 +57,6 @@ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ "finduuid=part uuid mmc 0:1 uuid\0" \ "initrd_high=0xffffffff\0" \ "fdtfile=imx7d-sdb.dtb\0" \ diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index 139536547de..d27e9d2eaa1 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -31,7 +31,6 @@ #define CFG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "console=ttyLP0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx7ulp-com.dtb\0" \ "fdt_addr=0x63000000\0" \ diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 654537684ba..ace1eee70cf 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -31,7 +31,6 @@ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttyLP0\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx7ulp-evk.dtb\0" \ "fdt_addr=0x63000000\0" \ diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index ddd46c8f945..35a69f15211 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -32,7 +32,6 @@ #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ "fdt_addr_r=0x82000000\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x81000000\0" \ "pxefile_addr_r=0x87100000\0" \ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 23eefaffc72..cbfbdce48d5 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -60,7 +60,6 @@ #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc1\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ diff --git a/include/configs/novena.h b/include/configs/novena.h index 059b8104e4b..12fb759afe2 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -53,7 +53,6 @@ /* Extra U-Boot environment. */ #define CFG_EXTRA_ENV_SETTINGS \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "consdev=ttymxc1\0" \ "baudrate=115200\0" \ diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index 0c96506b5fb..e5f4dadcf46 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -44,7 +44,6 @@ #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ "fdt_addr_r=0x82000000\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x81000000\0" \ "pxefile_addr_r=0x87100000\0" \ diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index 0f265adc5dc..a1322a2874b 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -62,7 +62,6 @@ /* Default environment */ #define CFG_EXTRA_ENV_SETTINGS \ - "fdt_high=0xffffffff\0" \ "console=ttymxc0,115200n8\0" \ "addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ "fit_addr=0x82000000\0" \ diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index f6a7ccfe87c..eb9256a012a 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -38,7 +38,6 @@ "console=ttymxc0\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ BOOTMENU_ENV \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ "fdt_addr=0x18000000\0" \ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 37f4c7d8a09..21a536f9fe9 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -45,7 +45,6 @@ "image=zImage\0" \ "splashpos=m,m\0" \ "console=ttymxc5\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "videomode=video=ctfb:x:800,y:480,depth:24,mode:0,pclk:30000,le:46,ri:210,up:22,lo:23,hs:20,vs:10,sync:0,vmode:0\0" \ diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 89850d8e4a7..cc5c8b01159 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -56,7 +56,6 @@ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "console=ttymxc4\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "videomode=video=ctfb:x:800,y:480,depth:24,mode:0,pclk:30000,le:46,ri:210,up:22,lo:23,hs:20,vs:10,sync:0,vmode:0\0" \ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index f80773f2bc1..a0d587860d5 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -29,7 +29,6 @@ "image=Image\0" \ "console=ttymxc0,115200\0" \ "fdt_addr=0x43000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ "fdt_file=imx8mq-pico-pi.dtb\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 329fe3c86ed..5e89cd6937a 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -1,6 +1,8 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * Copyright (C) 2013, 2014, 2017 Markus Niebel <[email protected]> + * Copyright (c) 2013-2014, 2017 TQ-Systems GmbH <[email protected]>, + * D-82229 Seefeld, Germany. + * Author: Markus Niebel * * Configuration settings for the TQ-Systems TQMa6<Q,D,DL,S> module. */ @@ -203,7 +205,6 @@ "fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0" \ "console=" CONSOLE_DEV "\0" \ "cma_size="__stringify(TQMA6_CMA_SIZE)"\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "rootfsmode=ro\0" \ "addcma=setenv bootargs ${bootargs} cma=${cma_size}\0" \ diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index b5871424bc6..9b9f4150951 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -1,6 +1,8 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * Copyright (C) 2013 - 2017 Markus Niebel <[email protected]> + * Copyright (c) 2013-2017 TQ-Systems GmbH <[email protected]>, + * D-82229 Seefeld, Germany. + * Author: Markus Niebel * * Configuration settings for the TQ-Systems TQMa6<Q,D,DL,S> module on * MBa6 starter kit diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 5e21463305a..110bd895a8a 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Stefan Roese <[email protected]> */ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index d85cf7808c7..a1efa4ff945 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -17,7 +17,6 @@ #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc1,115200\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdtfile=undefined\0" \ "fdt_addr=0x18000000\0" \ diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 4ecd71f9653..8e784e9f0cd 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -21,7 +21,6 @@ /* Linux only */ #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdtfile=undefined\0" \ "fdt_addr=0x83000000\0" \ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 7f764b90098..7015df87b4b 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -21,7 +21,6 @@ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdtfile=undefined\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ "fdt_addr=0x18000000\0" \ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index c79c4e5bafe..eb792c228c7 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -35,7 +35,6 @@ "image=zImage\0" \ "console=ttymxc0\0" \ "ethact=usb_ether\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx7s-warp.dtb\0" \ "fdt_addr=0x83000000\0" \ |