[U-Boot] [PATCH] arm64: mvebu: a8k: Add distro boot support

The various load address values are taken from the a37xx configuration and match the dowstream 'u-boot-2017.03-armada-17.10' release where appropriate.
Signed-off-by: Mark Kettenis kettenis@openbsd.org --- include/configs/mvebu_armada-8k.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index f288cf5b17..1cd0fa93d3 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -106,4 +106,23 @@ #define CONFIG_E1000 #endif
+#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\0" \ + "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ + BOOTENV + #endif /* _CONFIG_MVEBU_ARMADA_8K_H */

On 17.03.2018 09:34, Mark Kettenis wrote:
The various load address values are taken from the a37xx configuration and match the dowstream 'u-boot-2017.03-armada-17.10' release where appropriate.
Signed-off-by: Mark Kettenis kettenis@openbsd.org
include/configs/mvebu_armada-8k.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index f288cf5b17..1cd0fa93d3 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -106,4 +106,23 @@ #define CONFIG_E1000 #endif
+#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\0" \
- "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
- BOOTENV
- #endif /* _CONFIG_MVEBU_ARMADA_8K_H */
Applied to u-boot-marvell/master.
Thanks, Stefan

On Fri, Mar 30, 2018 at 9:10 AM, Stefan Roese stefan.roese@gmail.com wrote:
On 17.03.2018 09:34, Mark Kettenis wrote:
The various load address values are taken from the a37xx configuration and match the dowstream 'u-boot-2017.03-armada-17.10' release where appropriate.
Signed-off-by: Mark Kettenis kettenis@openbsd.org
include/configs/mvebu_armada-8k.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index f288cf5b17..1cd0fa93d3 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -106,4 +106,23 @@ #define CONFIG_E1000 #endif +#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)
Make sure you only add DHCP if CONFIG_CMD_DHCP is set and only add PXE if CONFIG_CMD_DHCP and CONFIG_CMD_PXE are set.
+#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\0" \
"fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
BOOTENV
- #endif /* _CONFIG_MVEBU_ARMADA_8K_H */
Applied to u-boot-marvell/master.
Thanks, Stefan
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
participants (3)
-
Joe Hershberger
-
Mark Kettenis
-
Stefan Roese