diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-11 18:09:38 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-11 18:09:38 -0400 |
commit | 68deea2308141c26707da44654b273d7b072ab0d (patch) | |
tree | 1af260ebb9b053457bd6bf388510fa0475c3be16 /include | |
parent | 79b8d3c285f4f1c2ee4b27367f2ca3ecb76ed9ce (diff) | |
parent | cc66ebdeeca5c4ed095bbd521b748bb009d99728 (diff) | |
download | u-boot-68deea2308141c26707da44654b273d7b072ab0d.zip u-boot-68deea2308141c26707da44654b273d7b072ab0d.tar.gz u-boot-68deea2308141c26707da44654b273d7b072ab0d.tar.bz2 |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- SPL SATA enhancements to allow booting from RAW SATA device
needed for Clearfog (Baruch)
- Enable SATA booting on Clearfog (Baruch)
- Misc changes to Turris Omnia (Marek)
- Enable CMD_BOOTZ and increase SYS_BOOTM_LEN on crs305-1g-4s
(Luka)
- Enable FIT support for db-xc3-24g4xg (Chris)
- Enable DM_SPI on Keymile Kirkwood board with necessary changes
for this (Pascal)
- Set 38x and 39x AVS on lower frequency (Baruch)
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/clearfog.h | 2 | ||||
-rw-r--r-- | include/configs/crs305-1g-4s.h | 1 | ||||
-rw-r--r-- | include/configs/km/km_arm.h | 5 | ||||
-rw-r--r-- | include/configs/turris_omnia.h | 12 |
4 files changed, 6 insertions, 14 deletions
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 4198ff0..15c402b 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -85,7 +85,7 @@ /* SPL related SPI defines */ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS -#elif defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) +#elif defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA) /* SPL related MMC defines */ #define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10) #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS diff --git a/include/configs/crs305-1g-4s.h b/include/configs/crs305-1g-4s.h index c73cb99..a2df69a 100644 --- a/include/configs/crs305-1g-4s.h +++ b/include/configs/crs305-1g-4s.h @@ -10,6 +10,7 @@ * 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 */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 8a00ac0..a381a98 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -201,11 +201,6 @@ int get_scl(void); #define CONFIG_SYS_REDUNDAND_ENVIRONMENT - -/* SPI bus claim MPP configuration */ -#define CONFIG_SYS_KW_SPI_MPP 0x0 - -#define FLASH_GPIO_PIN 0x00010000 #define KM_FLASH_GPIO_PIN 16 #define CONFIG_KM_UPDATE_UBOOT \ diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 018f544..edd776e 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -22,17 +22,12 @@ #define CONFIG_EHCI_IS_TDI /* Environment in SPI NOR flash */ -#define CONFIG_ENV_OFFSET (3*(1 << 18)) /* 768KiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ -#define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ +#define CONFIG_ENV_OFFSET ((1 << 20) - CONFIG_ENV_SIZE) +#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ -/* PCIe support */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_PCI_SCAN_SHOW -#endif - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define RELOCATION_LIMITS_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ @@ -97,8 +92,8 @@ #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_MMC(func) \ - BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_DEVICES_SCSI(func) \ + BOOT_TARGET_DEVICES_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) @@ -122,6 +117,7 @@ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "console=ttyS0,115200\0" \ + "ethact=ethernet@34000\0" \ BOOTENV #endif /* CONFIG_SPL_BUILD */ |