[U-Boot] [PATCH] armv7: ls1021aiot: Fixing SPL compiling issues
To align with SPL change 38fed8ab and 693d4c9f, add Kconfig option CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR to defconfig, and remove CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS.
Signed-off-by: York Sun york.sun@nxp.com CC: Feng Li feng.li_2@nxp.com --- configs/ls1021aiot_sdcard_defconfig | 2 ++ include/configs/ls1021aiot.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig index 4b082ab..a5a391d 100644 --- a/configs/ls1021aiot_sdcard_defconfig +++ b/configs/ls1021aiot_sdcard_defconfig @@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AIOT=y CONFIG_SPL=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" CONFIG_DM_SPI=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI" diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 182a003..7af4bc4 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -96,7 +96,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400
#define CONFIG_SPL_TEXT_BASE 0x10000000 #define CONFIG_SPL_MAX_SIZE 0x1a000
Commit ec6617c3 includes autoconf.h in image-fit.c, causing conflict for board odroid-xu3 which overwrites CONFIG_SYS_BOARD in header file. Move the include higher and use linux/kconfig.h instead of generated/autoconf.h.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com --- common/image-fit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/image-fit.c b/common/image-fit.c index ea56d5b..9468e51 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -14,6 +14,7 @@ #include <time.h> #else #include <linux/compiler.h> +#include <linux/kconfig.h> #include <common.h> #include <errno.h> #include <mapmem.h> @@ -27,7 +28,6 @@ DECLARE_GLOBAL_DATA_PTR; #include <u-boot/md5.h> #include <u-boot/sha1.h> #include <u-boot/sha256.h> -#include <generated/autoconf.h>
/*****************************************************************************/ /* New uImage format routines */
-----Original Message----- From: York Sun [mailto:york.sun@nxp.com] Sent: Thursday, November 24, 2016 3:09 AM To: u-boot@lists.denx.de Cc: york sun york.sun@nxp.com; Alison Wang alison.wang@nxp.com Subject: [PATCH] image-fit: Fix compiling error caused by autoconf.h
Commit ec6617c3 includes autoconf.h in image-fit.c, causing conflict for board odroid-xu3 which overwrites CONFIG_SYS_BOARD in header file. Move the include higher and use linux/kconfig.h instead of generated/autoconf.h.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com
common/image-fit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/image-fit.c b/common/image-fit.c index ea56d5b..9468e51 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -14,6 +14,7 @@ #include <time.h> #else #include <linux/compiler.h> +#include <linux/kconfig.h> #include <common.h> #include <errno.h> #include <mapmem.h> @@ -27,7 +28,6 @@ DECLARE_GLOBAL_DATA_PTR; #include <u-boot/md5.h> #include <u-boot/sha1.h> #include <u-boot/sha256.h> -#include <generated/autoconf.h>
/********************************************************************** *******/ /* New uImage format routines */
Reviewed-by: Alison Wang Alison.wang@nxp.com
Thanks.
Best Regards, Alison Wang
participants (2)
-
Alison Wang -
York Sun