From 0700093b852ac62bc68a80e96dea9ba255d7efbc Mon Sep 17 00:00:00 2001 From: Ezra Buehler Date: Sat, 9 May 2020 22:05:39 +0200 Subject: arm: mvebu: ds414: define CONFIG_SYS_U_BOOT_OFFS Without CONFIG_SYS_U_BOOT_OFFS set to CONFIG_SYS_SPI_U_BOOT_OFFS, U-Boot will be located at address 0x16000. But, SPL will try to load the payload from 0x24000 causing the boot to hang. Signed-off-by: Ezra Buehler Reviewed-by: Stefan Roese --- include/configs/ds414.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/configs/ds414.h b/include/configs/ds414.h index e369376..b179b99 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -87,7 +87,10 @@ #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) +#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI) /* SPL related SPI defines */ +#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS +#endif /* DS414 bus width is 32bits */ #define CONFIG_DDR_32BIT -- cgit v1.1 From df9ebbe17ea13de4c443849ecf23cba545dd0395 Mon Sep 17 00:00:00 2001 From: Luka Kovacic Date: Tue, 26 May 2020 20:17:50 +0200 Subject: arm: mvebu: Convert CRS305-1G-4S board to CRS3xx-98DX3236 Convert the CRS305-1G-4S board to CRS3xx-98DX3236 to enable easier implementation of new CRS3xx series boards, based on Marvell Prestera 98DX3236. Signed-off-by: Luka Kovacic Reviewed-by: Stefan Roese Cc: Luka Perkov Cc: Jakov Petrina --- include/configs/crs305-1g-4s.h | 35 ----------------------------------- include/configs/crs3xx-98dx3236.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 include/configs/crs305-1g-4s.h create mode 100644 include/configs/crs3xx-98dx3236.h (limited to 'include') diff --git a/include/configs/crs305-1g-4s.h b/include/configs/crs305-1g-4s.h deleted file mode 100644 index 617c8af..0000000 --- a/include/configs/crs305-1g-4s.h +++ /dev/null @@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2014 Stefan Roese - */ - -#ifndef _CONFIG_CRS305_1G_4S_H -#define _CONFIG_CRS305_1G_4S_H - -/* - * High Level Configuration Options (easy to change) - */ - -#define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) /* 64 MB */ -#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg -#define CONFIG_SYS_TCLK 200000000 /* 200MHz */ - -/* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI - -/* Environment in SPI NOR flash */ - -/* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "fdt_high=0x10000000\0" \ - "initrd_high=0x10000000\0" - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ -#include "mv-common.h" -#undef CONFIG_SYS_MAXARGS -#define CONFIG_SYS_MAXARGS 96 - -#endif /* _CONFIG_CRS305_1G_4S_H */ diff --git a/include/configs/crs3xx-98dx3236.h b/include/configs/crs3xx-98dx3236.h new file mode 100644 index 0000000..e2ba7b8 --- /dev/null +++ b/include/configs/crs3xx-98dx3236.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2014 Stefan Roese + */ + +#ifndef _CONFIG_CRS3XX_98DX3236_H +#define _CONFIG_CRS3XX_98DX3236_H + +/* + * High Level Configuration Options (easy to change) + */ + +#define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) /* 64 MB */ +#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg +#define CONFIG_SYS_TCLK 200000000 /* 200MHz */ + +/* USB/EHCI configuration */ +#define CONFIG_EHCI_IS_TDI + +/* Environment in SPI NOR flash */ + +/* Keep device tree and initrd in lower memory so the kernel can access them */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_high=0x10000000\0" \ + "initrd_high=0x10000000\0" + +/* + * mv-common.h should be defined after CMD configs since it used them + * to enable certain macros + */ +#include "mv-common.h" +#undef CONFIG_SYS_MAXARGS +#define CONFIG_SYS_MAXARGS 96 + +#endif /* _CONFIG_CRS3XX_98DX3236_H */ -- cgit v1.1