From 7dd6af85bc1c798108561a162aa7aba21d054b6a Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Tue, 23 Aug 2022 16:29:14 +0200 Subject: [PATCH] imx: imx6ul: kontron-sl-mx6ul: Migrate to use CONFIG_EXTRA_ENV_TEXT Move the environment from the board header to a separate text file and also drop those variables that are already set in env_default.h from the Kconfig options or are not needed anymore. Signed-off-by: Frieder Schrempf --- board/kontron/sl-mx6ul/sl-mx6ul.env | 4 ++++ include/configs/kontron-sl-mx6ul.h | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 board/kontron/sl-mx6ul/sl-mx6ul.env diff --git a/board/kontron/sl-mx6ul/sl-mx6ul.env b/board/kontron/sl-mx6ul/sl-mx6ul.env new file mode 100644 index 0000000000..9484e739dd --- /dev/null +++ b/board/kontron/sl-mx6ul/sl-mx6ul.env @@ -0,0 +1,4 @@ +kernel_addr_r=0x82000000 +ramdisk_addr_r=0x88080000 +pxefile_addr_r=0x80100000 +scriptaddr=0x80100000 diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index 7aac5d3f5a..f0586f7f72 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -49,14 +49,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr_r=0x82000000\0" \ - "ramdisk_addr_r=0x88080000\0" \ - "pxefile_addr_r=0x80100000\0" \ - "scriptaddr=0x80100000\0" \ - "bootdelay=3\0" \ - "ethact=" CONFIG_ETHPRIME "\0" \ - "hostname=" CONFIG_HOSTNAME "\0" \ - BOOTENV +#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV #endif /* __KONTRON_MX6UL_CONFIG_H */ -- 2.39.5