From 3549466e55bb3aa408fd245ebf6f67de9a7f7c63 Mon Sep 17 00:00:00 2001 From: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> Date: Tue, 21 Aug 2018 15:46:06 +0300 Subject: [PATCH] configs: sama5d27_som1_ek: Set CONFIG_BOOTARGS using Kconfig CONFIG_BOOTARGS can be set using Kconfig, so we no longer need it in the config files. Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> --- configs/sama5d27_som1_ek_mmc_defconfig | 2 ++ include/configs/sama5d27_som1_ek.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig index 56c7252841..3607470de5 100644 --- a/configs/sama5d27_som1_ek_mmc_defconfig +++ b/configs/sama5d27_som1_ek_mmc_defconfig @@ -22,6 +22,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL_SEPARATE_BSS=y diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index ef1a6f966f..6382a015d0 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -41,9 +41,6 @@ #define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 at91-sama5d27_som1_ek.dtb; " \ "fatload mmc 0:1 0x22000000 zImage; " \ "bootz 0x22000000 - 0x21000000" -#undef CONFIG_BOOTARGS -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" #endif #ifdef CONFIG_QSPI_BOOT -- 2.39.5