From 144c4e37db2adb1c296ab36467288a97885aff5a Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Mon, 20 Aug 2018 16:23:58 +0200 Subject: [PATCH] ARM: display5: Remove "factory procedure" from display5 board config This code now is regarded as dead one and hence shall be removed. Signed-off-by: Lukasz Majewski --- configs/display5_factory_defconfig | 2 +- include/configs/display5.h | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index edb37c3b2f..5962b642b2 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -15,7 +15,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="run factory" +CONFIG_BOOTCOMMAND="echo SDP Display5 recovery" CONFIG_SUPPORT_RAW_INITRD=y CONFIG_MISC_INIT_R=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/include/configs/display5.h b/include/configs/display5.h index 514638f684..6d00699ebd 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -115,27 +115,6 @@ "name=rootfs2,size=512M,uuid=${uuid_gpt_rootfs2};" \ "name=data,size=-,uuid=${uuid_gpt_data}\0" -#define FACTORY_PROCEDURE \ - "echo '#######################';" \ - "echo '# Factory Boot #';" \ - "echo '#######################';" \ - "env default -a;" \ - "saveenv;" \ - "gpt write mmc ${mmcdev} ${partitions};" \ - "run tftp_sf_SPL;" \ - "run tftp_sf_uboot;" \ - TFTP_UPDATE_KERNEL \ - "run tftp_sf_fitImg_SWU;" \ - "run tftp_sf_initramfs_SWU;" \ - TFTP_UPDATE_ROOTFS \ - "echo '#######################';" \ - "echo '# END - OK #';" \ - "echo '#######################';" \ - "setenv bootcmd 'env default -a; saveenv; run falcon_setup; reset';" \ - "setenv boot_os 'n';" \ - "saveenv;" \ - "reset;" - #define SWUPDATE_RECOVERY_PROCEDURE \ "echo '#######################';" \ "echo '# RECOVERY SWUupdate #';" \ @@ -261,7 +240,6 @@ "bootdelay=1\0" \ "baudrate=115200\0" \ "bootcmd=" CONFIG_BOOTCOMMAND "\0" \ - "factory=" FACTORY_PROCEDURE "\0" \ "ethact=FEC\0" \ "netdev=eth0\0" \ "boot_os=y\0" \ -- 2.25.1