diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-12 19:45:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-12 19:45:07 -0500 |
| commit | 277b06684ddf5231ce1e684ee2860aedacb32b3c (patch) | |
| tree | 90df350acedf6dd201f2506b40fc6243d11a2d73 /include | |
| parent | ee168783ae889cf449cee36cc1e51e108a210ed4 (diff) | |
| parent | dda9af3ad156c5b765d31a0646d01bfbb1977d9a (diff) | |
Merge branch '2018-12-12-master-imports'
- Various small TI platform updates
- Two unit test fixes
- qemu-arm updates
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am3517_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/qemu-arm.h | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 4e7e5209d47..eb50012ff77 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -88,7 +88,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ - "console=ttyO2,115200n8\0" \ + "console=ttyS2,115200n8\0" \ "fdtfile=am3517-evm.dtb\0" \ "fdtaddr=0x82C00000\0" \ "vram=16M\0" \ diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index fedc4662fa1..0431a7982d1 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -21,10 +21,12 @@ #define CONFIG_SYS_HZ 1000 /* Environment options */ -#define CONFIG_ENV_SIZE SZ_64K +#define CONFIG_ENV_ADDR 0x4000000 +#define CONFIG_ENV_SIZE SZ_256K #define BOOT_TARGET_DEVICES(func) \ func(SCSI, scsi, 0) \ + func(VIRTIO, virtio, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> @@ -42,4 +44,9 @@ #define CONFIG_SYS_CBSIZE 512 +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_FLASH_BASE 0x0 +#define CONFIG_SYS_MAX_FLASH_BANKS 2 +#define CONFIG_SYS_MAX_FLASH_SECT 256 /* Sector: 256K, Bank: 64M */ + #endif /* __CONFIG_H */ |