| Message ID | 20171202094637.17009-5-a.heider@gmail.com |
|---|---|
| State | Accepted |
| Commit | 6779d65b9f2256ecbfe957a7dd7c8de38f7f8126 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [U-Boot,1/4] arm64: a37xx: use disto defaults | expand |
> -----Original Message----- > From: Andre Heider [mailto:a.heider@gmail.com] > Sent: Saturday, December 02, 2017 11:47 > To: u-boot@lists.denx.de > Cc: Stefan Roese; Kostya Porotchkin > Subject: [EXT] [PATCH 4/4] arm64: a37xx: use distro bootcmd > > External Email > > ---------------------------------------------------------------------- > Signed-off-by: Andre Heider <a.heider@gmail.com> > --- > include/configs/mvebu_armada-37xx.h | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/include/configs/mvebu_armada-37xx.h > b/include/configs/mvebu_armada-37xx.h > index 383e6dfaf4..f5b4f72118 100644 > --- a/include/configs/mvebu_armada-37xx.h > +++ b/include/configs/mvebu_armada-37xx.h > @@ -108,11 +108,22 @@ > > #include <config_distro_defaults.h> > > +#define BOOT_TARGET_DEVICES(func) \ > + func(MMC, mmc, 1) \ > + func(MMC, mmc, 0) \ > + func(USB, usb, 0) \ > + func(SCSI, scsi, 0) \ > + func(PXE, pxe, na) \ > + func(DHCP, dhcp, na) > + > +#include <config_distro_bootcmd.h> > + > #define CONFIG_EXTRA_ENV_SETTINGS \ > "scriptaddr=0x4d00000\0" \ > "pxefile_addr_r=0x4e00000\0" \ > "fdt_addr_r=0x4f00000\0" \ > "kernel_addr_r=0x5000000\0" \ > - "ramdisk_addr_r=0x8000000" > + "ramdisk_addr_r=0x8000000\0" \ > + BOOTENV > > #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */ > -- > 2.15.1 Reviewed-by: Konstantin Porotchkin <kostap@marvell.com>
On 02.12.2017 10:46, Andre Heider wrote: > Signed-off-by: Andre Heider <a.heider@gmail.com> > --- > include/configs/mvebu_armada-37xx.h | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h > index 383e6dfaf4..f5b4f72118 100644 > --- a/include/configs/mvebu_armada-37xx.h > +++ b/include/configs/mvebu_armada-37xx.h > @@ -108,11 +108,22 @@ > > #include <config_distro_defaults.h> > > +#define BOOT_TARGET_DEVICES(func) \ > + func(MMC, mmc, 1) \ > + func(MMC, mmc, 0) \ > + func(USB, usb, 0) \ > + func(SCSI, scsi, 0) \ > + func(PXE, pxe, na) \ > + func(DHCP, dhcp, na) > + > +#include <config_distro_bootcmd.h> > + > #define CONFIG_EXTRA_ENV_SETTINGS \ > "scriptaddr=0x4d00000\0" \ > "pxefile_addr_r=0x4e00000\0" \ > "fdt_addr_r=0x4f00000\0" \ > "kernel_addr_r=0x5000000\0" \ > - "ramdisk_addr_r=0x8000000" > + "ramdisk_addr_r=0x8000000\0" \ > + BOOTENV > > #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */ > Applied to u-boot-marvell/master Thanks, Stefan
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 383e6dfaf4..f5b4f72118 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -108,11 +108,22 @@ #include <config_distro_defaults.h> +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(SCSI, scsi, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + #define CONFIG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x4d00000\0" \ "pxefile_addr_r=0x4e00000\0" \ "fdt_addr_r=0x4f00000\0" \ "kernel_addr_r=0x5000000\0" \ - "ramdisk_addr_r=0x8000000" + "ramdisk_addr_r=0x8000000\0" \ + BOOTENV #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
Signed-off-by: Andre Heider <a.heider@gmail.com> --- include/configs/mvebu_armada-37xx.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)