From d7da5707705dbec3c524b60a224d57ddda8b9618 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Sat, 2 Dec 2017 10:46:34 +0100 Subject: arm64: a37xx: use disto defaults Signed-off-by: Andre Heider Reviewed-by: Konstantin Porotchkin Signed-off-by: Stefan Roese --- include/configs/mvebu_armada-37xx.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index af16b9454a..6aaf04edbe 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -44,9 +44,6 @@ /* * Other required minimal configurations */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ #define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ #define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */ @@ -107,4 +104,6 @@ #define CONFIG_SUPPORT_VFAT +#include + #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */ -- cgit From e1489ba89d4df187aed7e176227f47412c583002 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Sat, 2 Dec 2017 10:46:35 +0100 Subject: arm64: a37xx: add distro compatible env vars the values of dt_addr_r/kernel_addr_r/ramdisk_addr_r are taken from the downstream 'u-boot-2017.03-armada-17.10' release. the chosen values of scriptaddr and pxefile_addr_r are below fdt_addr_r, in 1MB steps. Signed-off-by: Andre Heider Reviewed-by: Konstantin Porotchkin Signed-off-by: Stefan Roese --- include/configs/mvebu_armada-37xx.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 6aaf04edbe..c7ccc6ef5e 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -106,4 +106,11 @@ #include +#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" + #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */ -- cgit From 6779d65b9f2256ecbfe957a7dd7c8de38f7f8126 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Sat, 2 Dec 2017 10:46:37 +0100 Subject: arm64: a37xx: use distro bootcmd Signed-off-by: Andre Heider Reviewed-by: Konstantin Porotchkin Signed-off-by: Stefan Roese --- include/configs/mvebu_armada-37xx.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index c7ccc6ef5e..9f2db099cd 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -106,11 +106,22 @@ #include +#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 + #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 */ -- cgit