diff options
| author | Tom Rini <[email protected]> | 2018-11-26 22:52:19 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-11-26 22:52:19 -0500 |
| commit | 5d5833af64bbafb308b3a2415e3186def678861b (patch) | |
| tree | 4d6f9762fb060dee45f5771604d61d5906aa5d66 /include | |
| parent | 430c166bcedd22e0ce93ce298747275f814b172f (diff) | |
| parent | 70c44f171882768fc6e4dcb0435110b7f897d02e (diff) | |
Merge branch '2018-11-26-master-imports'
- chiliboard updates
- misc TI platform updates
Diffstat (limited to 'include')
| -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/vexpress_common.h | 2 | ||||
| -rw-r--r-- | include/environment/ti/boot.h | 4 |
7 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 484c5ef2fe1..31749c6d06f 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 ba878eb13be..14a3046f19e 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 89aa11c0ed4..645fc3ffb81 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 e2585171afb..0de83f6723c 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 5eeb5a16249..a8030931635 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/vexpress_common.h b/include/configs/vexpress_common.h index 267b230fda6..47ea89df660 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) diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index 3c9c87f21b1..5891009a5a2 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -34,9 +34,9 @@ "partitions_android=" \ "uuid_disk=${uuid_gpt_disk};" \ "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \ - "name=bootloader,size=1792K,uuid=${uuid_gpt_bootloader};" \ + "name=bootloader,size=2048K,uuid=${uuid_gpt_bootloader};" \ + "name=reserved,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \ "name=misc,size=128K,uuid=${uuid_gpt_misc};" \ - "name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \ "name=efs,size=16M,uuid=${uuid_gpt_efs};" \ "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \ "name=recovery,size=40M,uuid=${uuid_gpt_recovery};" \ |