diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ma5d4evk.h | 60 | ||||
| -rw-r--r-- | include/configs/smartweb.h | 3 | ||||
| -rw-r--r-- | include/configs/ti816x_evm.h | 9 |
3 files changed, 51 insertions, 21 deletions
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index bb661400ec..82aee15132 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -1,5 +1,5 @@ /* - * DENX MA5D4 configuration + * Aries MA5D4 configuration * Copyright (C) 2015 Marek Vasut <marex@denx.de> * * SPDX-License-Identifier: GPL-2.0+ @@ -13,6 +13,7 @@ #include "at91-sama5_common.h" #undef CONFIG_BOOTARGS #define CONFIG_SYS_USE_SERIALFLASH 1 +#define CONFIG_BOARD_LATE_INIT /* * Memory configurations @@ -31,13 +32,12 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_OFFSET 0x8000 +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE +#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE #define CONFIG_ENV_SIZE 0x4000 -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -#define CONFIG_ENV_SECT_SIZE 0x1000 +#define CONFIG_SYS_MMC_ENV_DEV 0 /* eMMC */ +#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* * U-Boot general configurations @@ -102,7 +102,10 @@ /* USB device */ #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS -#define CONFIG_USBNET_MANUFACTURER "DENX" +#define CONFIG_USBNET_MANUFACTURER "AriesEmbedded" +#define CONFIG_USB_FUNCTION_MASS_STORAGE +#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024) +#define DFU_DEFAULT_POLL_TIMEOUT 300 #endif /* @@ -127,10 +130,11 @@ "consdev=ttyS3\0" \ "baudrate=115200\0" \ "bootscript=boot.scr\0" \ - "bootdev=/dev/mmcblk1p1\0" \ - "bootpart=1:1\0" \ - "rootdev=/dev/mmcblk1p2\0" \ + "bootdev=/dev/mmcblk0p1\0" \ + "bootpart=0:1\0" \ + "rootdev=/dev/mmcblk0p2\0" \ "netdev=eth0\0" \ + "dfu_alt_info=mmc raw 0 3867148288\0" \ "kernel_addr_r=0x22000000\0" \ "update_spi_firmware_spl_addr=0x21000000\0" \ "update_spi_firmware_spl_filename=boot.bin\0" \ @@ -171,22 +175,27 @@ "nfsargs=" \ "setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath},v3,tcp\0" \ + "fdtimg=if test ${bootmode} = \"sf\" ; then " \ + "setenv kernel_fdt 1 ; " \ + "else ; " \ + "setenv kernel_fdt 2 ; " \ + "fi\0" \ "mmc_mmc=" \ - "run mmcload mmcargs addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg mmcload mmcargs addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "mmc_nfs=" \ - "run mmcload nfsargs addip addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg mmcload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "net_mmc=" \ - "run netload mmcargs addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg netload mmcargs addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "net_nfs=" \ - "run netload nfsargs addip addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg netload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "try_bootscript=" \ "mmc rescan;" \ - "if test -e mmc ${bootpart} ${bootscript} ; then " \ - "if load mmc ${bootpart} ${kernel_addr_r} ${bootscript};"\ + "if test -e mmc 1:1 ${bootscript} ; then " \ + "if load mmc 1:1 ${kernel_addr_r} ${bootscript};" \ "then ; " \ "echo Running bootscript... ; " \ "source ${kernel_addr_r} ; " \ @@ -206,4 +215,13 @@ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 +#define CONFIG_SYS_USE_MMC +#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/armv7/u-boot-spl.lds +#define CONFIG_SPL_MMC_SUPPORT +#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" +#define CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SPL_LIBDISK_SUPPORT + #endif /* __MA5D4EVK_CONFIG_H__ */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 1236da724e..8400278209 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -211,6 +211,9 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x301000 #define CONFIG_SPL_STACK_R #define CONFIG_SPL_STACK_R_ADDR CONFIG_SYS_TEXT_BASE +/* we have only 4k sram in SPL, so cut SYS_MALLOC_F_LEN */ +#undef CONFIG_SYS_MALLOC_F_LEN +#define CONFIG_SYS_MALLOC_F_LEN 0x400 #else /* * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM, diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index defcad4518..4a81b1daf8 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -123,6 +123,15 @@ #define CONFIG_SYS_TEXT_BASE 0x80800000 +#define CONFIG_DRIVER_TI_EMAC +#define CONFIG_MII +#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS2 +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_NET_RETRY_COUNT 10 + /* Since SPL did pll and ddr initialization for us, * we don't need to do it twice. */ |