From fdded72629e9f585ec5ef8ceedf00c6d7e417937 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Tue, 20 Dec 2016 12:49:15 +0100 Subject: apalis/colibri t20/t30/tk1: distro boot integration Rather than relying on our separate proprietary storage media dependent boot commands use regular distro boot as a fall back. Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher --- include/configs/apalis-tk1.h | 6 ++---- include/configs/apalis_t30.h | 6 ++---- include/configs/colibri_t20.h | 6 ++---- include/configs/colibri_t30.h | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) (limited to 'include/configs') diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index a38f5d54b2..519da4807f 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -66,10 +66,8 @@ #define CONFIG_SERVERIP 192.168.10.1 #define CONFIG_BOOTCOMMAND \ - "run emmcboot; echo; echo emmcboot failed; " \ - "run sdboot; echo; echo sdboot failed; " \ - "run usbboot; echo; echo usbboot failed; " \ - "run nfsboot; echo; echo nfsboot failed" + "run emmcboot; setenv fdtfile ${soc}-apalis-${fdt_board}.dtb && " \ + "run distro_bootcmd" #define DFU_ALT_EMMC_INFO "apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \ "boot part 0 1 mmcpart 0; " \ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 921911dc77..3b9c434d4c 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -81,10 +81,8 @@ #define CONFIG_SERVERIP 192.168.10.1 #define CONFIG_BOOTCOMMAND \ - "run emmcboot; echo; echo emmcboot failed; " \ - "run sdboot; echo; echo sdboot failed; " \ - "run usbboot; echo; echo usbboot failed; " \ - "run nfsboot; echo; echo nfsboot failed" + "run emmcboot; setenv fdtfile ${soc}-apalis-${fdt_board}.dtb && " \ + "run distro_bootcmd" #define DFU_ALT_EMMC_INFO "apalis_t30.img raw 0x0 0x500 mmcpart 1; " \ "boot part 0 1 mmcpart 0; " \ diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 36359fc0a1..bd4761b8cf 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -99,10 +99,8 @@ #define CONFIG_SERVERIP 192.168.10.1 #define CONFIG_BOOTCOMMAND \ - "run ubiboot; echo; echo ubiboot failed; " \ - "run sdboot; echo; echo sdboot failed; " \ - "run usbboot; echo; echo usbboot failed; " \ - "run nfsboot; echo; echo nfsboot failed" + "run ubiboot; setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \ + "run distro_bootcmd" #define DFU_ALT_NAND_INFO "u-boot part 0,0;ubi part 0,3" diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 8a7ea2c8df..71bbc823fd 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -77,10 +77,8 @@ #define CONFIG_SERVERIP 192.168.10.1 #define CONFIG_BOOTCOMMAND \ - "run emmcboot; echo; echo emmcboot failed; " \ - "run sdboot; echo; echo sdboot failed; " \ - "run usbboot; echo; echo usbboot failed; " \ - "run nfsboot; echo; echo nfsboot failed" + "run emmcboot; setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \ + "run distro_bootcmd" #define DFU_ALT_EMMC_INFO "colibri_t30.img raw 0x0 0x500 mmcpart 1; " \ "boot part 0 1 mmcpart 0; " \ -- cgit v1.2.3