From patchwork Tue Oct 27 19:06:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 536810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 8C5CE14134B for ; Wed, 28 Oct 2015 06:06:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 53E744B62B; Tue, 27 Oct 2015 20:06:54 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j5fQpYg85K_S; Tue, 27 Oct 2015 20:06:53 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 714324B615; Tue, 27 Oct 2015 20:06:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DDE3F4B615 for ; Tue, 27 Oct 2015 20:06:50 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cgjpjvdPUzkv for ; Tue, 27 Oct 2015 20:06:50 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by theia.denx.de (Postfix) with ESMTP id 897DB4A03A for ; Tue, 27 Oct 2015 20:06:46 +0100 (CET) Received: from localhost (unknown [IPv6:2601:1c2:200:d15e:221a:6ff:fe04:64bd]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 4A5BC3F286; Tue, 27 Oct 2015 12:06:45 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Tue, 27 Oct 2015 12:06:30 -0700 Message-Id: <1445972790-25578-1-git-send-email-vagrant@debian.org> X-Mailer: git-send-email 2.1.4 Cc: Fabio Estevam , Otavio Salvador , Tom Rini , Vagrant Cascadian Subject: [U-Boot] [PATCH] arm: imx: Switch Wandboard to use config_distro_bootcmd.h. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This allows for more flexible and standardized boot across multiple platforms. Remove most redundant legacy boot environment. Cc: Otavio Salvador Signed-off-by: Vagrant Cascadian --- include/configs/wandboard.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 6e8aec2..67d5a6a 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -95,6 +95,7 @@ "fdtfile=undefined\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ + "fdt_addr_r=0x18000000\0" \ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ @@ -199,9 +200,23 @@ "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine dtb to use; fi; \0" \ + "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "pxe_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "ramdisk_addr_r=0x13000000\0" \ + "ramdiskaddr=0x13000000\0" \ + "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + BOOTENV + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) #define CONFIG_BOOTCOMMAND \ "run findfdt; " \ + "run distro_bootcmd; " \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ "run bootscript; " \ @@ -213,6 +228,9 @@ "fi; " \ "else run netboot; fi" +#include +#include + /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR