| Message ID | 1445972790-25578-1-git-send-email-vagrant@debian.org |
|---|---|
| State | Superseded |
| Headers | show |
On 2015-10-27, Vagrant Cascadian wrote: > This allows for more flexible and standardized boot across multiple > platforms. Remove most redundant legacy boot environment. Er, Bad commit message, this patch doesn't actually "Remove most redundant legacy boot environment" at all. Leftovers from an earlier attempt. live well, vagrant
On Tue, Oct 27, 2015 at 5:06 PM, Vagrant Cascadian <vagrant@debian.org> wrote: > This allows for more flexible and standardized boot across multiple > platforms. Remove most redundant legacy boot environment. > > Cc: Otavio Salvador <otavio@ossystems.com.br> > Signed-off-by: Vagrant Cascadian <vagrant@debian.org> You need to remove the old environment script which is now duplicated. Can you prepare a v2?
On Tue, Oct 27, 2015 at 5:13 PM, Vagrant Cascadian <vagrant@debian.org> wrote: > On 2015-10-27, Vagrant Cascadian wrote: >> This allows for more flexible and standardized boot across multiple >> platforms. Remove most redundant legacy boot environment. > > Er, Bad commit message, this patch doesn't actually "Remove most > redundant legacy boot environment" at all. Leftovers from an earlier > attempt. LOL, this was my complain a minute ago ;-)
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 <config_distro_defaults.h> +#include <config_distro_bootcmd.h> + /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
This allows for more flexible and standardized boot across multiple platforms. Remove most redundant legacy boot environment. Cc: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Vagrant Cascadian <vagrant@debian.org> --- include/configs/wandboard.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)