diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2022-04-13 11:33:35 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2022-04-21 12:44:23 +0200 |
| commit | 3f7d518accc6f44fccba18f9d091c8f51cf5b6b7 (patch) | |
| tree | a0a6f110d085530dd416f06c523ebd82c3215640 | |
| parent | 405c97fd1dc838e98c8a5595c0a1b79aade8b440 (diff) | |
| download | u-boot-3f7d518accc6f44fccba18f9d091c8f51cf5b6b7.zip u-boot-3f7d518accc6f44fccba18f9d091c8f51cf5b6b7.tar.gz u-boot-3f7d518accc6f44fccba18f9d091c8f51cf5b6b7.tar.bz2 | |
configs: tdx: apalis/colibri_imx6: use preboot as well
Use PREBOOT as well. This allows a customer to just set fdt_board as
on any other module to customize the device tree for his carrier
board.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | configs/apalis_imx6_defconfig | 2 | ||||
| -rw-r--r-- | configs/colibri_imx6_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/apalis_imx6.h | 5 | ||||
| -rw-r--r-- | include/configs/colibri_imx6.h | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 00c9a24..ea4ad27 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -29,6 +29,8 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_BOOTDELAY=1 CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6q-apalis-${fdt_board}.dtb" CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 1c65d8a..4f38d5c 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -28,6 +28,8 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_BOOTDELAY=1 CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6dl-colibri-${fdt_board}.dtb" CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 57fd3ce..aa93d10 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -89,16 +89,13 @@ "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" -#define FDT_FILE "imx6q-apalis-eval.dtb" - #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ "boot_file=zImage\0" \ "boot_script_dhcp=boot.scr\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off vmalloc=400M\0" \ - "fdt_file=" FDT_FILE "\0" \ - "fdtfile=" FDT_FILE "\0" \ + "fdt_board=eval\0" \ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ UBOOT_UPDATE \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index f7e9709..9ca6bef 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -78,15 +78,13 @@ "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" -#define FDT_FILE "imx6dl-colibri-eval-v3.dtb" #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ "boot_file=zImage\0" \ "boot_script_dhcp=boot.scr\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \ - "fdt_file=" FDT_FILE "\0" \ - "fdtfile=" FDT_FILE "\0" \ + "fdt_board=eval-v3\0" \ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ UBOOT_UPDATE \ |