diff options
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/am65x_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/da850evm.h | 3 | ||||
| -rw-r--r-- | include/configs/edminiv2.h | 1 | ||||
| -rw-r--r-- | include/configs/km/km_arm.h | 1 | ||||
| -rw-r--r-- | include/configs/mv-common.h | 1 | ||||
| -rw-r--r-- | include/configs/qemu-riscv.h | 28 | ||||
| -rw-r--r-- | include/configs/vexpress_common.h | 2 |
7 files changed, 33 insertions, 5 deletions
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 484c5ef2fe..31749c6d06 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -29,7 +29,9 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "tispl.bin" #endif +#ifndef CONFIG_CPU_V7R #define CONFIG_SKIP_LOWLEVEL_INIT +#endif #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE + \ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ba878eb13b..14a3046f19 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -124,8 +124,9 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif +#define CONFIG_ENV_SPI_MAX_HZ 0 +#define CONFIG_ENV_SPI_MODE 0 #ifdef CONFIG_USE_SPIFLASH #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 89aa11c0ed..645fc3ffb8 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -29,7 +29,6 @@ * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL 1 #define CONFIG_FEROCEON 1 /* CPU Core subversion */ #define CONFIG_88F5182 1 /* SOC Name */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index e2585171af..0de83f6723 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -22,7 +22,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 5eeb5a1624..a803093163 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -19,7 +19,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL 1 /* * Custom CONFIG_SYS_TEXT_BASE can be done in <board>.h diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index d279c233b2..b29d155d09 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -15,7 +15,35 @@ #define CONFIG_SYS_MALLOC_LEN SZ_8M +#define CONFIG_SYS_BOOTM_LEN SZ_16M + /* Environment options */ #define CONFIG_ENV_SIZE SZ_4K +#define BOOT_TARGET_DEVICES(func) \ + func(QEMU, qemu, na) \ + func(VIRTIO, virtio, 0) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + +#define BOOTENV_DEV_QEMU(devtypeu, devtypel, instance) \ + "bootcmd_qemu=" \ + "if env exists kernel_start; then " \ + "bootm ${kernel_start} - ${fdtcontroladdr};" \ + "fi;\0" + +#define BOOTENV_DEV_NAME_QEMU(devtypeu, devtypel, instance) \ + "qemu " + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + "kernel_addr_r=0x81000000\0" \ + "fdt_addr_r=0x82000000\0" \ + "scriptaddr=0x82100000\0" \ + "pxefile_addr_r=0x82200000\0" \ + "ramdisk_addr_r=0x82300000\0" \ + BOOTENV + #endif /* __CONFIG_H */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 267b230fda..47ea89df66 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -120,7 +120,7 @@ #define CONFIG_INITRD_TAG 1 /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 512 * 1024) /* >= 512 KiB */ #define SCTL_BASE V2M_SYSCTL #define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0) |